From d23b9c54f35de2cde50c5994bc589b25899e7134 Mon Sep 17 00:00:00 2001
From: jinyuer <454386664@qq.com>
Date: Mon, 13 Dec 2021 15:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E7=A7=81=E5=90=88=E8=A7=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |   4 +
 .../com/sl/house_property/LoginActivity.java  |  90 +++++++++++--
 .../com/sl/house_property/LogoActivity.java   | 122 ++++++++++++++++--
 .../com/sl/house_property/MainActivity.java   |  46 +++++--
 .../com/sl/house_property/MyApplication.java  |  61 ++++-----
 app/src/main/res/layout/activity_login.xml    |  14 +-
 app/src/main/res/layout/dialog_initmate.xml   |  87 +++++++++++++
 .../mipmap-xhdpi/icon_publish_selected.png    | Bin 0 -> 958 bytes
 .../mipmap-xhdpi/icon_publish_selected2.png   | Bin 0 -> 928 bytes
 9 files changed, 359 insertions(+), 65 deletions(-)
 create mode 100644 app/src/main/res/layout/dialog_initmate.xml
 create mode 100644 app/src/main/res/mipmap-xhdpi/icon_publish_selected.png
 create mode 100644 app/src/main/res/mipmap-xhdpi/icon_publish_selected2.png

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9a51d79..12583cf 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,10 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_login.xml" value="0.3614583333333333" />
+        <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_logo.xml" value="0.3614583333333333" />
+        <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_main.xml" value="0.3614583333333333" />
+        <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/dialog_initmate.xml" value="0.3614583333333333" />
         <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/fragment_discovery.xml" value="0.3614583333333333" />
         <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/fragment_main.xml" value="0.3614583333333333" />
         <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/item_discovery.xml" value="0.3614583333333333" />
diff --git a/app/src/main/java/com/sl/house_property/LoginActivity.java b/app/src/main/java/com/sl/house_property/LoginActivity.java
index 922dc22..2e70a32 100644
--- a/app/src/main/java/com/sl/house_property/LoginActivity.java
+++ b/app/src/main/java/com/sl/house_property/LoginActivity.java
@@ -2,12 +2,18 @@ package com.sl.house_property;
 
 import android.app.ProgressDialog;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.text.SpannableStringBuilder;
+import android.text.TextPaint;
+import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+
 import com.cutil.RegexUtils;
 import com.google.gson.Gson;
 import com.google.gson.internal.LinkedTreeMap;
@@ -61,7 +67,7 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
         mDataBinding.gotoregister.setOnClickListener(this);
         //获取当前日期
         String gettimetwo = DateUtilss.gettimetwo();
-        Log.e("当前日期",gettimetwo);
+        Log.e("当前日期", gettimetwo);
 //        if(gettimetwo.equals("2021年04月02日")||gettimetwo.equals("2021年04月03日")||gettimetwo.equals("2021年04月04日")||gettimetwo.equals("2021年04月05日")||gettimetwo.equals("2021年04月06日")){
 //            mDataBinding.rlzhuce.setVisibility(View.GONE);
 //            mDataBinding.lyfuwu.setVisibility(View.VISIBLE);
@@ -71,6 +77,66 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
 //            mDataBinding.lyfuwu.setVisibility(View.VISIBLE);
 //            mDataBinding.lyyinsi.setVisibility(View.VISIBLE);
 //        }
+
+        String str = "我已阅读并同意《隐私政策》和《用户协议";
+        SpannableStringBuilder ssb = new SpannableStringBuilder();
+        ssb.append(str);
+        int v1 = str.indexOf("《");
+        ssb.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(@NonNull View widget) {
+                if (mDataBinding.tvYs.isSelected()) {
+                    mDataBinding.tvYs.setSelected(false);
+
+                    Drawable drawable = getResources().getDrawable(R.mipmap.icon_publish_selected2);
+                    drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
+                    mDataBinding.tvYs.setCompoundDrawables(drawable, null, null, null);
+
+                } else {
+                    mDataBinding.tvYs.setSelected(true);
+                    Drawable drawable = getResources().getDrawable(R.mipmap.icon_publish_selected);
+                    drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
+                    mDataBinding.tvYs.setCompoundDrawables(drawable, null, null, null);
+                }
+            }
+
+            @Override
+            public void updateDrawState(@NonNull TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setUnderlineText(false);
+            }
+        }, 0, v1, 0);
+
+        int start = str.indexOf("《");
+        ssb.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(@NonNull View widget) {
+                //隐私政策
+                WebActivitytwo.runActivity(LoginActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
+            }
+
+            @Override
+            public void updateDrawState(@NonNull TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(getResources().getColor(R.color.red));
+                ds.setUnderlineText(false);
+            }
+        }, start, start + 6, 0);
+        int end = str.lastIndexOf("《");
+        ssb.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(@NonNull View widget) {
+                //用户协议
+                WebActivitytwo.runActivity(LoginActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
+            }
+
+            @Override
+            public void updateDrawState(@NonNull TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(getResources().getColor(R.color.red));
+                ds.setUnderlineText(false);
+            }
+        }, end, end + 6, 0);
     }
 
     @Override
@@ -85,9 +151,14 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
                 startActivity(intent2);
                 break;
             case R.id.logintext:
+                if (!mDataBinding.tvYs.isSelected()) {
+                    setToast("请先阅读并勾选同意用户协议和隐私政策");
+                    return;
+                }
+
                 String phone = mDataBinding.phone.getText().toString().trim();
                 String password = mDataBinding.pwd.getText().toString().trim();
-                if (phone.length() <1) {
+                if (phone.length() < 1) {
                     setToast("请输入手机号码");
                     return;
                 }
@@ -158,7 +229,7 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
                         LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
                         String s = gs.toJson(adta);
                         RegisterUser user = gs.fromJson(s, RegisterUser.class);//把JSON字符串转为对象
-                        JPushInterface.setAlias(getApplicationContext(),0,user.getUserid());
+                        JPushInterface.setAlias(getApplicationContext(), 0, user.getUserid());
                         Config.getInstance(LoginActivity.this).putUser(user);
                         Config.getInstance(LoginActivity.this).put("username", mDataBinding.phone.getText().toString().trim());
 
@@ -176,7 +247,6 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
                         getpammar(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0);
 
 
-
                         break;
 
                 }
@@ -188,7 +258,7 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
             @Override
             public void call(Throwable throwable) {
                 progressDialog.dismiss();
-                setToast( getString(R.string.getdatafailure));
+                setToast(getString(R.string.getdatafailure));
                 throwable.printStackTrace();
             }
         });
@@ -220,12 +290,12 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
                         Type type = new TypeToken<ArrayList<MyHouseEntity>>() {
                         }.getType();
                         final ArrayList<MyHouseEntity> list = new Gson().fromJson(s, type);
-                        if(list.size()==0){
+                        if (list.size() == 0) {
                             SPUtils.setSP(LoginActivity.this, DoConfig.FANGCHAN_DATA, "0");
-                            Log.e("fuzhi","0");
-                        }else {
+                            Log.e("fuzhi", "0");
+                        } else {
                             SPUtils.setSP(LoginActivity.this, DoConfig.FANGCHAN_DATA, "1");
-                            Log.e("fuzhi","1");
+                            Log.e("fuzhi", "1");
 
                         }
                         if (!Config.getInstance(LoginActivity.this).getBoolean("MainTabActivity", false)) {
@@ -249,6 +319,7 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
 
         addSubscription(subscription);
     }
+
     /**
      * 用户协议
      *
@@ -259,6 +330,7 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
 //        startActivity(intent);
         WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
     }
+
     /**
      * 隐私政策
      *
diff --git a/app/src/main/java/com/sl/house_property/LogoActivity.java b/app/src/main/java/com/sl/house_property/LogoActivity.java
index cbe80b6..6d78f1c 100644
--- a/app/src/main/java/com/sl/house_property/LogoActivity.java
+++ b/app/src/main/java/com/sl/house_property/LogoActivity.java
@@ -1,14 +1,28 @@
 package com.sl.house_property;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.SpannableStringBuilder;
+import android.text.TextPaint;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
 
 import com.cutil.ScreenUtils;
 import com.sl.house_property.f2.FeeActivity;
+import com.tencent.bugly.Bugly;
 
+import cn.jpush.android.api.JPushInterface;
 import tools.Config;
 
 
@@ -28,21 +42,107 @@ public class LogoActivity extends Activity{
         tipLP.topMargin = (int) (screenHigh*0.28);
         tipImage.setLayoutParams(tipLP);
 
-        imaloder.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                finish();
-                if( (Config.getInstance(LogoActivity.this).getUser()==null)){
-                    Intent intent =new Intent(LogoActivity.this,LoginActivity.class);
-                    startActivity(intent);
-                }else {
-                    startActivity( new Intent(LogoActivity.this, MainTabActivity.class));
+
+        if (getSharedPreferences("first", Context.MODE_PRIVATE).getInt("first", 0) == 1) {
+            imaloder.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    finish();
+                    if( (Config.getInstance(LogoActivity.this).getUser()==null)){
+                        Intent intent =new Intent(LogoActivity.this,LoginActivity.class);
+                        startActivity(intent);
+                    }else {
+                        startActivity( new Intent(LogoActivity.this, MainTabActivity.class));
+                    }
+
+
+                }
+            },delaytime);
+
+        } else {
+            startDialog();
+        }
+
+    }
+
+
+    private void startDialog() {
+        AlertDialog alertDialog = new AlertDialog.Builder(this).create();
+        alertDialog.show();
+        alertDialog.setCancelable(false);
+        Window window = alertDialog.getWindow();
+        if (window != null) {
+
+            window.setContentView(R.layout.dialog_initmate);
+
+            window.setGravity(Gravity.CENTER);
+            TextView tvContent = window.findViewById(R.id.tv_content);
+            TextView tvCancel = window.findViewById(R.id.tv_cancel);
+            TextView tvAgree = window.findViewById(R.id.tv_agree);
+            String str =
+                    "    感谢您对沃克智慧社区的支持!我们非常重视您的个人信息和隐私保护。为了更好地保障您的个人权益，在您使用我们的产品前，请务必审慎阅读《隐私政策》和《用户协议》内的所有条款。如您同意以上协议内容，请点击“同意”，开始使用我们的产品和服务!";
+            SpannableStringBuilder ssb = new SpannableStringBuilder();
+            ssb.append(str);
+            int start = str.indexOf("《");
+            ssb.setSpan(new ClickableSpan() {
+                @Override
+                public void onClick(@NonNull View widget) {
+                    //隐私政策
+                    WebActivitytwo.runActivity(LogoActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
                 }
 
+                @Override
+                public void updateDrawState(@NonNull TextPaint ds) {
+                    super.updateDrawState(ds);
+                    ds.setColor(getResources().getColor(R.color.red));
+                    ds.setUnderlineText(false);
+                }
+            }, start, start + 6, 0);
+            int end = str.lastIndexOf("《");
+            ssb.setSpan(new ClickableSpan() {
+                @Override
+                public void onClick(@NonNull View widget) {
+                    //用户协议
+                    WebActivitytwo.runActivity(LogoActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
+                }
 
-            }
-        },delaytime);
+                @Override
+                public void updateDrawState(@NonNull TextPaint ds) {
+                    super.updateDrawState(ds);
+                    ds.setColor(getResources().getColor(R.color.red));
+                    ds.setUnderlineText(false);
+                }
+            }, end, end + 6, 0);
 
+            tvContent.setMovementMethod(LinkMovementMethod.getInstance());
+            tvContent.setText(ssb, TextView.BufferType.SPANNABLE);
+            tvCancel.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    alertDialog.cancel();
+                    finish();
+
+                }
+            });
+
+            tvAgree.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    getSharedPreferences("first", Context.MODE_PRIVATE).edit().putInt("first", 1).apply();
+                    JPushInterface.init(getApplication());
+                    Bugly.init(getApplication(),"d45325664f",false);
+                    alertDialog.cancel();
+                    finish();
+                    if( (Config.getInstance(LogoActivity.this).getUser()==null)){
+                        Intent intent =new Intent(LogoActivity.this,LoginActivity.class);
+                        startActivity(intent);
+                    }else {
+                        startActivity( new Intent(LogoActivity.this, MainTabActivity.class));
+                    }
+                }
+            });
+        }
 
     }
 }
diff --git a/app/src/main/java/com/sl/house_property/MainActivity.java b/app/src/main/java/com/sl/house_property/MainActivity.java
index 941633c..3b88cdf 100644
--- a/app/src/main/java/com/sl/house_property/MainActivity.java
+++ b/app/src/main/java/com/sl/house_property/MainActivity.java
@@ -1,25 +1,41 @@
 package com.sl.house_property;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+
+import androidx.annotation.NonNull;
 import androidx.viewpager.widget.ViewPager;
+
+import android.text.SpannableStringBuilder;
+import android.text.TextPaint;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.GestureDetector;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.Window;
 import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.bugly.Bugly;
 
 import java.util.ArrayList;
 
 import adapter.StartViewpagerAdapter;
+import cn.jpush.android.api.JPushInterface;
 import tools.Config;
 import utils.ConfigTitiles;
 import utils.SetBigMap;
+
 /*gradlew compileDebug --stacktrace*/
 /*gradlew compileDebugSources --stacktrace -info*/
 public class MainActivity extends Activity {
@@ -31,22 +47,28 @@ public class MainActivity extends Activity {
 
     private ImageView point1;
     private ImageView point2;
+
     // private ImageView point3;
     public double getPagerScroCHaged() {
-        return pagerScroCHaged;}
+        return pagerScroCHaged;
+    }
+
     public void setPagerScroCHaged(double pagerScroCHaged) {
         this.pagerScroCHaged = pagerScroCHaged;
     }
+
     private double pagerScroCHaged = 0.0;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_main);
-        Log.d("Main","main");
-
+        Log.d("Main", "main");
         onceOrNot();
+
     }
+
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -55,13 +77,14 @@ public class MainActivity extends Activity {
                 case 20000:
 
                     if (welcomepage.getCurrentItem() == 1) {
-                        startActivity(new Intent( MainActivity.this,LogoActivity.class));
+                        startActivity(new Intent(MainActivity.this, LogoActivity.class));
                         finish();
                     }
                     break;
             }
         }
     };
+
     private void onceOrNot() {
         // TODO Auto-generated method stub
         int once = Config.getInstance(MainActivity.this).getInt(ConfigTitiles.ONCEORNOT, 0);
@@ -72,10 +95,11 @@ public class MainActivity extends Activity {
         } else {
             //onceStart();
             otherStart();
-          return;
+            return;
         }
 
     }
+
     private void onceStart() {
         // TODO Auto-generated method stub
         mGestureDetector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() {
@@ -131,7 +155,7 @@ public class MainActivity extends Activity {
                 .showImageOnLoading(R.drawable.ic_circle_progress_imageloading)
                 .build();
         ImageLoader.getInstance().*/
-        Bitmap bitmap= SetBigMap.readBitMap(MainActivity.this,R.mipmap.bg);
+        Bitmap bitmap = SetBigMap.readBitMap(MainActivity.this, R.mipmap.bg);
         image1.setImageBitmap(bitmap);
         View view2 = inflater.inflate(R.layout.welcome_image, null);
         final ImageView image2 = (ImageView) view2.findViewById(R.id.myImage);
@@ -146,10 +170,10 @@ public class MainActivity extends Activity {
         viewlist.add(view1);
         viewlist.add(view2);
 
-        new Runnable(){
+        new Runnable() {
             @Override
             public void run() {
-                Bitmap  bitmap2= SetBigMap.readBitMap(MainActivity.this,R.mipmap.bg);
+                Bitmap bitmap2 = SetBigMap.readBitMap(MainActivity.this, R.mipmap.bg);
                 image2.setImageBitmap(bitmap2);
             }
         }.run();
@@ -209,14 +233,18 @@ public class MainActivity extends Activity {
 
     private void otherStart() {
         // TODO Auto-generated method stub
-        Intent intent = new Intent(       MainActivity.this, LogoActivity.class);
+        Intent intent = new Intent(MainActivity.this, LogoActivity.class);
         startActivity(intent);
         finish();
     }
+
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {//分发事件
         super.dispatchTouchEvent(ev);
         //productGestureDetector 是 GestureDetector对象
         return mGestureDetector.onTouchEvent(ev);
     }
+
+
+
 }
diff --git a/app/src/main/java/com/sl/house_property/MyApplication.java b/app/src/main/java/com/sl/house_property/MyApplication.java
index e6f8249..5d7c22e 100644
--- a/app/src/main/java/com/sl/house_property/MyApplication.java
+++ b/app/src/main/java/com/sl/house_property/MyApplication.java
@@ -42,37 +42,40 @@ import utils.NineImageLoader;
  * Created by 90432 on 2018/1/15.
  */
 
-public class MyApplication extends Application{
-   //private static final String TAG = "JIGUANG-Example";
+public class MyApplication extends Application {
+    //private static final String TAG = "JIGUANG-Example";
     private static final String TAG = MyApplication.class.getSimpleName();
     public static Context context;
-  protected static MyApplication instance;
+    protected static MyApplication instance;
     public JCVideoPlayerStandard VideoPlaying;
-     /* private HttpNet httpNet;
-    public static Handler getTheErrorHandler;
-    public static boolean mainonce;
+
+    /* private HttpNet httpNet;
+   public static Handler getTheErrorHandler;
+   public static boolean mainonce;
 
 */
-     public static Context getContext() {
-         return context;
+    public static Context getContext() {
+        return context;
 
-     }
-     @Override
-     protected void attachBaseContext(Context base) {
-         super.attachBaseContext(base);
-         MultiDex.install(this);
-     }
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        MultiDex.install(this);
+    }
 
     public static MyApplication getApp() {
         return instance;
     }
-    public void  existActivitys() {
-        for(Activity act :activityList){
+
+    public void existActivitys() {
+        for (Activity act : activityList) {
             act.finish();
         }
     }
 
-    public void addActivitys(Activity activity ) {
+    public void addActivitys(Activity activity) {
         activityList.add(activity);
     }
 
@@ -85,12 +88,15 @@ public class MyApplication extends Application{
         super.onCreate();
         instance = this;
         initOkGo();
-        JPushInterface.init(this);
-        JPushInterface.setDebugMode(true);
-//
+
 //        CrashHandler crashHandler = CrashHandler.getInstance();
 //  crashHandler.init(this);
-        Bugly.init(this,"d45325664f",false);
+        if (getSharedPreferences("first", Context.MODE_PRIVATE).getInt("first", 0) == 1) {
+            JPushInterface.init(this);
+            JPushInterface.setDebugMode(false);
+            Bugly.init(this, "d45325664f", false);
+        }
+
 //        System.setProperty("http.proxyHost", "haotian.hoheng.cn");
 //        System.setProperty("http.proxyPort", "8080");
 
@@ -107,7 +113,6 @@ public class MyApplication extends Application{
     public static final String KEY_EXTRAS = "extras";
 
 
-
     public void exit() {
         for (Activity act : activityList) {
             act.finish();
@@ -116,18 +121,6 @@ public class MyApplication extends Application{
     }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
     private void initOkGo() {
         //---------这里给出的是示例代码,告诉你可以这么传,实际使用的时候,根据需要传,不需要就不传-------------//
         HttpHeaders headers = new HttpHeaders();
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index b51b0b4..20ce855 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -97,14 +97,24 @@
                         android:background="@null"
                         android:hint="请输入密码" />
                 </LinearLayout>
-
+                <TextView
+                    android:id="@+id/tv_ys"
+                    android:layout_marginTop="16dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:text="我已阅读并同意隐私政策和用户协议"
+                    android:drawablePadding="5dp"
+                    android:gravity="center_vertical"
+                    android:drawableLeft="@mipmap/icon_publish_selected2"
+                    android:layout_marginLeft="20dip"
+                    />
                 <TextView
                     android:id="@+id/logintext"
                     android:layout_width="match_parent"
                     android:layout_height="45dp"
                     android:layout_marginLeft="20dip"
                     android:layout_marginRight="20dip"
-                    android:layout_marginTop="45dip"
+                    android:layout_marginTop="20dip"
                     android:background="@drawable/selector_common_btn"
                     android:gravity="center"
                     android:text="登录"
diff --git a/app/src/main/res/layout/dialog_initmate.xml b/app/src/main/res/layout/dialog_initmate.xml
new file mode 100644
index 0000000..104ee25
--- /dev/null
+++ b/app/src/main/res/layout/dialog_initmate.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:background="@color/background_color_white"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:background="@color/background_color_white"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="25dp"
+            android:padding="5dp"
+            android:text="用户协议与隐私权限说明"
+            android:textColor="#282828"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+
+        <!--        <ScrollView-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:paddingTop="20dp"-->
+        <!--            android:paddingBottom="20dp">-->
+
+        <TextView
+            android:id="@+id/tv_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:lineSpacingMultiplier="1.2"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            android:textColor="#282828"
+            android:textSize="16sp" />
+        <!--     </ScrollView>-->
+
+        <View
+            android:id="@+id/view_1"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#E7E7E7" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tv_cancel"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:padding="12dp"
+                android:text="拒绝"
+                android:layout_gravity="center"
+                android:textColor="@color/text2"
+                android:textStyle="bold" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:background="#E7E7E7" />
+
+            <TextView
+                android:id="@+id/tv_agree"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/view_1"
+                android:layout_toRightOf="@+id/view_2"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:padding="12dp"
+                android:text="同 意"
+                android:layout_gravity="center"
+                android:textColor="@color/text2"
+                android:textStyle="bold" />
+        </LinearLayout>
+    </LinearLayout>
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xhdpi/icon_publish_selected.png b/app/src/main/res/mipmap-xhdpi/icon_publish_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6d715d9ab5d3d0b5727d7c5eb9c31193a1552b8
GIT binary patch
literal 958
zcmV;v13~<WP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH15-&vK~#7F<(NHe
z(?Ar*|L2B}1(6YTX*vNCEvW=ztLVVMK$|XI5ECGQghVGK1Z@)vVx&k&Wq=7-U?`M<
zk-`QGX@#JjFbjgss0<KXAMZK-N@6?yN`lnC6xnxvj(>W0_ujn&{&NXrq~e?`c-z&A
zP?3QW0TN6eITQ_v2_aCDKq27ItB|OY&5P=cc#Z^$1;}7V4%2jdnSS{=?-Hm=A6pSy
zsKoJZWWeEhSxyAzugcntC`U1D3s}4@3x<v*zD1TIk1AUjYv;{Sz~U`gGz`2(HePEL
zLF#>&{B%uJgG@xv;9P0Cg0Ub-UqEYE8LoitNK<r-_zkz>XWeBu7DtCAzXvUV)@m)F
z`zj9KkaNwQ4MS`V?HBY;Jk*0U)SBJV;6bTl4!u?0=rd!jqeejBI6A03yMfckfFlDT
zMgr4jDz%ieZ-(Y&2_2k!{q)I)XXv`O-adH`_@?=q=JlMJ6jr$5c#v);&?PuiGT2^`
zE{o!^&o-5Xz|FiQ@BIvYt%PPkL<H=QkyrNb1D>9D;WmHQ;g(n1yeQnMW&$>EHiNV<
z1-!aMA3aACepk3HF9i0SZO3qDA4Pz(G;&i8IDk=QuRiw7ovC2E@xzU9ycig6;|F3Z
z7U1F=_x>os&Yx<v;V|OuPXiYl@X34N{#&=rp7O$690jhNKnq-(1raJI)lm+XQD0(^
z3!`qE=M_VE`!>D<)6bH_(T>|>%X#`#L=4o6mKSXx_M}$~$DZ5#gQRlyhVBqc#HzX&
z(mUL?*qc)iQo(`7vK7#v(hxDlklwKI_+35DrIyE8&K$H#O5SS4-r|oB*RRWKNH3~W
z)@H?^-E=%??!hD$kU$KU2^`FnyW(v(gc&LW@6ts>5A~M{dvCh|FpU?p5FMqI*P99_
z->Qyc;s<nScN3_lxo68alhksUL^p?;;A(Wr;P=QEaQ&)KxtK<GAT>T+SPwV?3CzV@
z>06L0I;YT61y<X`qXSfm?(9q<U#;oEp0gGC`0WrC)rvqF>7~(XUHCXFDp8DM9bmFI
zcTnvt>g8zx@nnMiqFAeX3iEbKd`3M~krOn7OQIf*f<lriIj_=h)4*yRu+)IfI%w4p
gwmx4MU$GtZ4>R;MluCZELI3~&07*qoM6N<$f`7cQy8r+H

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/icon_publish_selected2.png b/app/src/main/res/mipmap-xhdpi/icon_publish_selected2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b621e08b86643e59e427fc8546f77df57799a442
GIT binary patch
literal 928
zcmV;R17G}!P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH12suRK~#7F<(Tb}
z+At7?7mfl*1@To7r-GQ@%wVV>*TK<&O$FgPxKv;a!|x*%gj5ixf=~b-c^4$#B80K|
z&@hvC#$yS~*28M0)r#oORii5@NfJ-id%a#pSI}92fN3@w4S%!Qgs66LdDf5DYIC%i
zqnLI&oe`a(N`MSjuh;wN_!-q^m3IM};l0^vwHj2hZfU?YP2&?_nJ704+A-`P48xd8
z=p-Qf7Oa*4&Nm)q=;&2h<rl27Fy3oEJUo1&oeLbe0b6vvUbjwJvvvZ`M<;KzZ;ctQ
z7(VrbDrh_&Kj9WhPz4Fb-khoeTHqG=V2q)8p$i08iD30u{ItLbw2nd6j=*^e&f|KS
ze_BQ6_Z8%4+i=%yAF#l+t_8<p5Vjh<Pb^*?5?k8?K%T86{G^N{UjW%daXYzq5>6(Q
z$ZWSa#LD!)bzS+~fNm&Eo<45hRF#MNQLYGk76e=*;Ido8v9KBpX}2=4I6^(k=jIRx
zq8yVWadgpT7^cr_sIKRLFm=9|D(ihGN5YWKNK6=9{sABq>H-}0tiXPW(C4cz!_{(@
zx@aInnRCG9aw#KIR~K?X3~LU^v6b9QuCtylYypkU=E4m8E~NU*bbUIVe&o9?k~oJe
zQl0Kx_Xc>d$<0F@*1?S~W0HJu?T2cE`&ZWyVYY12f|)4$<XD`9>9R_+wvvD&(fA8F
zmdX&f;%rctb3hDhDjGkLdv!(sxv``LnOggu2cHPYkyO6o5#{@U^Z<}21x!2Cb-DF&
zpu8{666J%vWd`w(6C!QJKy4;(Dsu-fw_aodnpT7&&hF?&;t-4e<R&>b(+g`>hkx}`
z?{3N_*yq5R$r*g_(QIdpB%ET>dosf(3vcG>)rD}rEpxQBwE~K?Fo)!1O8Lu0V!t+X
zVwH1ew)SO?J`ysHD{zaerUXbS1Kc9KABdj|PZdrADoFDbAP42t09T6HKertoarlCD
z0<`&Rd4FDHxzd1ImNOMo3)<gHddJ!UZdf*@t$KjzsRcYJ0H7i;SnZ|CPU-A3YFIRc
zMZ28KSk4Z$GTLoIMz%A=n*y5BIfPcb-Tp)WgZ=?Ha>ObMW$kqU0000<MNUMnLSTZE
CkfP=Q

literal 0
HcmV?d00001