Ver Código Fonte

旧隐私协议去除

huyuguo 4 anos atrás
pai
commit
62bde4787a

+ 6 - 47
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

335
    public static RelativeLayout paoRl;
335
    public static RelativeLayout paoRl;
336
    public static LinearLayout rl_control;
336
    public static LinearLayout rl_control;
337
    private RelativeLayout rela, ll_comment, rl_ad, rl_grade, rl_search, ll_paoxiang, rl_charging_notice;
337
    private RelativeLayout rela, ll_comment, rl_ad, rl_grade, rl_search, ll_paoxiang, rl_charging_notice;
338
    private ConstraintLayout rl_privacy_protocol;
339
    private ImageView private_protocol_sure_and_go;
340
    private Button private_protocol_web;
341
    private RelativeLayout tv_notice, tv_citynotice, rl_mapList, ll_tab_find;
338
    private RelativeLayout tv_notice, tv_citynotice, rl_mapList, ll_tab_find;
342
    private LinearLayout ll_paogo, ll_title, ll_open, tab_me, tab_screen;
339
    private LinearLayout ll_paogo, ll_title, ll_open, tab_me, tab_screen;
343
    public static LinearLayout ll_tuijian, ll_top_right;
340
    public static LinearLayout ll_tuijian, ll_top_right;
429
                    break;
426
                    break;
430
                //获取版本号及首页广告
427
                //获取版本号及首页广告
431
                case 2:
428
                case 2:
432
                    boolean showedPrivateProtocol = sharedPreferencesUtil.hasKey("cdz_private_protocol");
433
                    try {
429
                    try {
434
                        String data = JsonUtils.getKeyResult(msg.obj.toString(), "data");
430
                        String data = JsonUtils.getKeyResult(msg.obj.toString(), "data");
435
                        if (!data.equals("")) {
431
                        if (!data.equals("")) {
444
                            }
440
                            }
445
441
446
                            String adin = JsonUtils.getKeyResult(data, "adin");
442
                            String adin = JsonUtils.getKeyResult(data, "adin");
447
                            if (null == adin) {
448
                                if (!showedPrivateProtocol) {
449
                                    rl_privacy_protocol.setVisibility(View.VISIBLE);
450
                                }
451
                            } else {
443
                            if (null != adin) {
452
                                List<Adin> listAdin = JsonUtils.parseToObjectList(adin, Adin.class);
444
                                List<Adin> listAdin = JsonUtils.parseToObjectList(adin, Adin.class);
453
                                System.out.print("size:" + listAdin.size());
445
                                System.out.print("size:" + listAdin.size());
454
                                if (listAdin.size() > 0) {
446
                                if (listAdin.size() > 0) {
455
                                    sav.initData(listAdin);
447
                                    sav.initData(listAdin);
456
                                    if (!showedPrivateProtocol) {
457
                                        rl_privacy_protocol.setVisibility(View.VISIBLE);
458
                                    } else {
459
                                        rl_ad.setVisibility(View.VISIBLE);
460
                                        for (Adin item : listAdin) {
461
                                            if (item.getAdvertiser().equals("1")) {
462
                                                loadDmpData();
463
                                                break;
464
                                            }
448
                                    rl_ad.setVisibility(View.VISIBLE);
449
                                    for (Adin item : listAdin) {
450
                                        if (item.getAdvertiser().equals("1")) {
451
                                            loadDmpData();
452
                                            break;
465
                                        }
453
                                        }
466
                                    }
454
                                    }
467
                                } else {
468
                                    if (!showedPrivateProtocol) {
469
                                        rl_privacy_protocol.setVisibility(View.VISIBLE);
470
                                    }
471
                                }
455
                                }
472
                            }
456
                            }
473
457
491
                                }
475
                                }
492
                            }
476
                            }
493
477
494
                        } else {
495
                            if (!showedPrivateProtocol) {
496
                                rl_privacy_protocol.setVisibility(View.VISIBLE);
497
                            }
498
                        }
478
                        }
499
                    } catch (Exception e) {
479
                    } catch (Exception e) {
500
                        e.printStackTrace();
480
                        e.printStackTrace();
501
                        if (!showedPrivateProtocol) {
502
                            rl_privacy_protocol.setVisibility(View.VISIBLE);
503
                        }
504
                    }
481
                    }
505
482
506
483
1408
        //首页广告关闭按钮
1385
        //首页广告关闭按钮
1409
        iv_clear = (ImageView) findViewById(R.id.iv_clear);
1386
        iv_clear = (ImageView) findViewById(R.id.iv_clear);
1410
        iv_clear.setOnClickListener(this);
1387
        iv_clear.setOnClickListener(this);
1411
        // 首页隐私协议
1412
        rl_privacy_protocol = findViewById(R.id.rl_privacy_protocol);
1413
        rl_privacy_protocol.setOnClickListener(this);
1414
1415
        private_protocol_sure_and_go = findViewById(R.id.private_protocol_sure_and_go);
1416
        private_protocol_sure_and_go.setOnClickListener(this);
1417
1418
        private_protocol_web = findViewById(R.id.private_protocol_web);
1419
        private_protocol_web.setOnClickListener(this);
1420
1388
1421
        tv_citynotice = (RelativeLayout) findViewById(R.id.tv_citynotice);
1389
        tv_citynotice = (RelativeLayout) findViewById(R.id.tv_citynotice);
1422
        tv_citynotice.setOnClickListener(new View.OnClickListener() {
1390
        tv_citynotice.setOnClickListener(new View.OnClickListener() {
2876
            case R.id.iv_clear:
2844
            case R.id.iv_clear:
2877
                rl_ad.setVisibility(View.GONE);
2845
                rl_ad.setVisibility(View.GONE);
2878
                break;
2846
                break;
2879
            case R.id.private_protocol_sure_and_go:
2880
                sharedPreferencesUtil.putBoolean("cdz_private_protocol", true);
2881
                rl_privacy_protocol.setVisibility(View.GONE);
2882
                break;
2883
            case R.id.private_protocol_web:
2884
                intent = new Intent(getApplication(), IntegralDescriptionActivity.class);
2885
                intent.putExtra("url", "http://evcharge.cc/pc/agreement.html");
2886
                startActivity(intent);
2887
                break;
2888
            case R.id.rl_search:
2847
            case R.id.rl_search:
2889
                if (isListShow == false) {
2848
                if (isListShow == false) {
2890
                    windowLayout.setVisibility(View.GONE);
2849
                    windowLayout.setVisibility(View.GONE);

BIN
app/src/main/res/drawable-hdpi/private_protocol_bg.png


BIN
app/src/main/res/drawable-hdpi/private_protocol_btn.png


BIN
app/src/main/res/drawable-mdpi/private_protocol_bg.png


BIN
app/src/main/res/drawable-mdpi/private_protocol_btn.png


BIN
app/src/main/res/drawable-xhdpi/private_protocol_bg.png


BIN
app/src/main/res/drawable-xhdpi/private_protocol_btn.png


BIN
app/src/main/res/drawable-xxhdpi/private_protocol_bg.png


BIN
app/src/main/res/drawable-xxhdpi/private_protocol_btn.png


BIN
app/src/main/res/drawable-xxxhdpi/private_protocol_bg.png


BIN
app/src/main/res/drawable-xxxhdpi/private_protocol_btn.png


+ 0 - 47
app/src/main/res/layout/activity_main_map.xml

1790
            android:src="@drawable/icon_adbutton2_0" />
1790
            android:src="@drawable/icon_adbutton2_0" />
1791
    </com.zhy.autolayout.AutoRelativeLayout>
1791
    </com.zhy.autolayout.AutoRelativeLayout>
1792
    <!-- 首页弹出广告布局 end -->
1792
    <!-- 首页弹出广告布局 end -->
1793
    <!-- 首页首次启动弹出隐私协议 start -->
1794
    <androidx.constraintlayout.widget.ConstraintLayout
1795
        android:id="@+id/rl_privacy_protocol"
1796
        android:layout_width="match_parent"
1797
        android:layout_height="match_parent"
1798
        android:background="@drawable/bg_black2_0"
1799
        android:visibility="gone">
1800
1801
        <androidx.constraintlayout.widget.ConstraintLayout
1802
            android:layout_width="wrap_content"
1803
            android:layout_height="wrap_content"
1804
            app:layout_constraintBottom_toBottomOf="parent"
1805
            app:layout_constraintLeft_toLeftOf="parent"
1806
            app:layout_constraintRight_toRightOf="parent"
1807
            app:layout_constraintTop_toTopOf="parent">
1808
1809
            <ImageView
1810
                android:layout_width="wrap_content"
1811
                android:layout_height="wrap_content"
1812
                android:src="@drawable/private_protocol_bg"
1813
                app:layout_constraintBottom_toBottomOf="parent"
1814
                app:layout_constraintLeft_toLeftOf="parent"
1815
                app:layout_constraintRight_toRightOf="parent"
1816
                app:layout_constraintTop_toTopOf="parent" />
1817
1818
            <ImageView
1819
                android:id="@+id/private_protocol_sure_and_go"
1820
                android:layout_width="wrap_content"
1821
                android:layout_height="wrap_content"
1822
                android:layout_marginBottom="15dp"
1823
                android:src="@drawable/private_protocol_btn"
1824
                app:layout_constraintBottom_toBottomOf="parent"
1825
                app:layout_constraintLeft_toLeftOf="parent"
1826
                app:layout_constraintRight_toRightOf="parent" />
1827
1828
            <Button
1829
                android:id="@+id/private_protocol_web"
1830
                android:layout_width="120dp"
1831
                android:layout_height="36dp"
1832
                android:layout_marginLeft="15dp"
1833
                android:layout_marginBottom="15dp"
1834
                android:background="@color/transparent"
1835
                app:layout_constraintBottom_toTopOf="@+id/private_protocol_sure_and_go"
1836
                app:layout_constraintLeft_toLeftOf="parent" />
1837
        </androidx.constraintlayout.widget.ConstraintLayout>
1838
    </androidx.constraintlayout.widget.ConstraintLayout>
1839
    <!-- 首页首次启动弹出隐私协议 end -->
1840
</RelativeLayout>
1793
</RelativeLayout>