旧隐私协议去除

app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@@ -335,9 +335,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    public static RelativeLayout paoRl;
    public static LinearLayout rl_control;
    private RelativeLayout rela, ll_comment, rl_ad, rl_grade, rl_search, ll_paoxiang, rl_charging_notice;
    private ConstraintLayout rl_privacy_protocol;
    private ImageView private_protocol_sure_and_go;
    private Button private_protocol_web;
    private RelativeLayout tv_notice, tv_citynotice, rl_mapList, ll_tab_find;
    private LinearLayout ll_paogo, ll_title, ll_open, tab_me, tab_screen;
    public static LinearLayout ll_tuijian, ll_top_right;
@@ -429,7 +426,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                    break;
                //获取版本号及首页广告
                case 2:
                    boolean showedPrivateProtocol = sharedPreferencesUtil.hasKey("cdz_private_protocol");
                    try {
                        String data = JsonUtils.getKeyResult(msg.obj.toString(), "data");
                        if (!data.equals("")) {
@@ -444,30 +440,18 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                            }
                            String adin = JsonUtils.getKeyResult(data, "adin");
                            if (null == adin) {
                                if (!showedPrivateProtocol) {
                                    rl_privacy_protocol.setVisibility(View.VISIBLE);
                                }
                            } else {
                            if (null != adin) {
                                List<Adin> listAdin = JsonUtils.parseToObjectList(adin, Adin.class);
                                System.out.print("size:" + listAdin.size());
                                if (listAdin.size() > 0) {
                                    sav.initData(listAdin);
                                    if (!showedPrivateProtocol) {
                                        rl_privacy_protocol.setVisibility(View.VISIBLE);
                                    } else {
                                        rl_ad.setVisibility(View.VISIBLE);
                                        for (Adin item : listAdin) {
                                            if (item.getAdvertiser().equals("1")) {
                                                loadDmpData();
                                                break;
                                            }
                                    rl_ad.setVisibility(View.VISIBLE);
                                    for (Adin item : listAdin) {
                                        if (item.getAdvertiser().equals("1")) {
                                            loadDmpData();
                                            break;
                                        }
                                    }
                                } else {
                                    if (!showedPrivateProtocol) {
                                        rl_privacy_protocol.setVisibility(View.VISIBLE);
                                    }
                                }
                            }
@@ -491,16 +475,9 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                                }
                            }
                        } else {
                            if (!showedPrivateProtocol) {
                                rl_privacy_protocol.setVisibility(View.VISIBLE);
                            }
                        }
                    } catch (Exception e) {
                        e.printStackTrace();
                        if (!showedPrivateProtocol) {
                            rl_privacy_protocol.setVisibility(View.VISIBLE);
                        }
                    }
@@ -1408,15 +1385,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        //首页广告关闭按钮
        iv_clear = (ImageView) findViewById(R.id.iv_clear);
        iv_clear.setOnClickListener(this);
        // 首页隐私协议
        rl_privacy_protocol = findViewById(R.id.rl_privacy_protocol);
        rl_privacy_protocol.setOnClickListener(this);
        private_protocol_sure_and_go = findViewById(R.id.private_protocol_sure_and_go);
        private_protocol_sure_and_go.setOnClickListener(this);
        private_protocol_web = findViewById(R.id.private_protocol_web);
        private_protocol_web.setOnClickListener(this);
        tv_citynotice = (RelativeLayout) findViewById(R.id.tv_citynotice);
        tv_citynotice.setOnClickListener(new View.OnClickListener() {
@@ -2876,15 +2844,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
            case R.id.iv_clear:
                rl_ad.setVisibility(View.GONE);
                break;
            case R.id.private_protocol_sure_and_go:
                sharedPreferencesUtil.putBoolean("cdz_private_protocol", true);
                rl_privacy_protocol.setVisibility(View.GONE);
                break;
            case R.id.private_protocol_web:
                intent = new Intent(getApplication(), IntegralDescriptionActivity.class);
                intent.putExtra("url", "http://evcharge.cc/pc/agreement.html");
                startActivity(intent);
                break;
            case R.id.rl_search:
                if (isListShow == false) {
                    windowLayout.setVisibility(View.GONE);

app/src/main/res/layout/activity_main_map.xml

@@ -1790,51 +1790,4 @@
            android:src="@drawable/icon_adbutton2_0" />
    </com.zhy.autolayout.AutoRelativeLayout>
    <!-- 首页弹出广告布局 end -->
    <!-- 首页首次启动弹出隐私协议 start -->
    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/rl_privacy_protocol"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:background="@drawable/bg_black2_0"
        android:visibility="gone">
        <androidx.constraintlayout.widget.ConstraintLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintLeft_toLeftOf="parent"
            app:layout_constraintRight_toRightOf="parent"
            app:layout_constraintTop_toTopOf="parent">
            <ImageView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:src="@drawable/private_protocol_bg"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintLeft_toLeftOf="parent"
                app:layout_constraintRight_toRightOf="parent"
                app:layout_constraintTop_toTopOf="parent" />
            <ImageView
                android:id="@+id/private_protocol_sure_and_go"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginBottom="15dp"
                android:src="@drawable/private_protocol_btn"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintLeft_toLeftOf="parent"
                app:layout_constraintRight_toRightOf="parent" />
            <Button
                android:id="@+id/private_protocol_web"
                android:layout_width="120dp"
                android:layout_height="36dp"
                android:layout_marginLeft="15dp"
                android:layout_marginBottom="15dp"
                android:background="@color/transparent"
                app:layout_constraintBottom_toTopOf="@+id/private_protocol_sure_and_go"
                app:layout_constraintLeft_toLeftOf="parent" />
        </androidx.constraintlayout.widget.ConstraintLayout>
    </androidx.constraintlayout.widget.ConstraintLayout>
    <!-- 首页首次启动弹出隐私协议 end -->
</RelativeLayout>