服务协议和隐么政策

app/src/main/java/com/rehome/zhdcoa/Contans.java

@@ -151,6 +151,9 @@ public class Contans {
         public static final String PHONE_INFO = "phone_info";
         public static final String AF_PASS_WORD = "password_af";//密码
         public static final String SAVE_USER_AND_PASSWORD = "save_user_and_password";//登录页面 记住我 开关状态控制
+
+        public static final String SAVE_CB_AGREEMENT_CHECK = "SAVE_CB_AGREEMENT_CHECK";//登录页面 记住我 开关状态控制
+
         public static final String AI_ACCOUNT = "ZH_AF_Admin";
         //public static final String AI_PWD = "UmVob21lLnpoYWZAMjEwNg=="; //Rehome.zhaf@2106
         public static final String AI_PWD_ENCODE = "M5QxhfKZyK9aFvudob1ZiltJFKO8ubX35u2E960W+Bhk9fJjDmumC/iZk1M0udZtpnq/Y33F7nV4mXG6PGRLoLPLZS8X4fK2Kv1mXqLZOS8y0lrqQbgy2r7WFVM7oKKvOZhAbZwtgW/KJjgyQork+dAMb4dOTNGK7uCeaKded7st+nJ/MVyWgWaZaLf24JYBy95ZBYMX2KUMVHrz8DetHE+zg6KhmD00+wTBFMuTNzxDP90kFV3tFJJF9kqxk3i5nARc5oUMQdlQwuP8v/f45ObPFjCPXv3NYnRrfE+EpkBSyYYKaN2POs/+wV5dxVvuXDfopnQOHQSLwkArPXNM3w==";

app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt

@@ -1,15 +1,26 @@
 package com.rehome.zhdcoa.ui.activity
 
+
+//import com.yanzhenjie.permission.AndPermission
+//import com.yanzhenjie.permission.runtime.Permission
+
+
+import android.animation.ObjectAnimator
+import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Process
+import android.os.VibrationEffect
+import android.os.Vibrator
 import android.provider.Settings
 import android.text.TextUtils
 import android.util.Log
 import android.view.View
+import android.view.animation.AccelerateDecelerateInterpolator
+import android.widget.CheckBox
 import android.widget.CompoundButton
 import android.widget.RadioGroup
 import android.widget.Toast
@@ -24,16 +35,12 @@ import com.rehome.zhdcoa.bean.UserInfoBean
 import com.rehome.zhdcoa.databinding.ActivityLoginBinding
 import com.rehome.zhdcoa.ui.toastview.toastviewbymyself
 import com.rehome.zhdcoa.utils.*
-
-
 import com.xiaomi.mipush.sdk.MiPushClient
-//import com.yanzhenjie.permission.AndPermission
-//import com.yanzhenjie.permission.runtime.Permission
-
-
 import com.yolanda.nohttp.NoHttp
 import com.yolanda.nohttp.RequestMethod
 import com.yolanda.nohttp.rest.Response
+import java.io.File
+import java.util.Objects
 
 
 class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
@@ -70,6 +77,13 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
             }
         })
 
+        val agreementCheck = SPUtils.get(
+            context,
+            Contans.SP.SAVE_CB_AGREEMENT_CHECK,
+            java.lang.Boolean.FALSE
+        ) as Boolean
+        binding.cbAgreement.isChecked = agreementCheck
+
         networkCheckType = SPUtils.get(this, Contans.NETWORK_CHECK_TYPE, "") as String
 
         if (networkCheckType != "") {
@@ -125,6 +139,13 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
                 }
             }
         })
+        binding.cbAgreement.setOnCheckedChangeListener(CompoundButton.OnCheckedChangeListener { buttonView, isChecked ->
+            SPUtils.put(
+                context,
+                Contans.SP.SAVE_CB_AGREEMENT_CHECK,
+                binding.cbAgreement.isChecked
+            )
+        })
 
     }
 
@@ -166,8 +187,9 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 //            binding.etUsername.setText("310492")
 //            binding.etPassword.setText("Dudu520520+")
 
-//        binding.etUsername.setText("310673")
+            //陈坚标
-//        binding.etPassword.setText("Abcd@1234")
+            binding.etUsername.setText("310063")
+            binding.etPassword.setText("ZHPs@040909")
 
 
         }
@@ -215,6 +237,49 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
         }
 
     private fun appLogin() {
+        if (!binding.cbAgreement.isChecked) {
+            //showToast("请阅读并同意服务协议和隐")
+            toastviewbymyself.makeText(context, "请阅读并同意服务协议和隐", Toast.LENGTH_LONG)
+                .show()
+//            val vibrator = getSystemService(VIBRATOR_SERVICE) as Vibrator
+//            // 判断手机硬件是否有振动器
+//            if(vibrator!=null&&vibrator.hasVibrator()){
+//                vibrator.vibrate(250);  // 设置手机振动
+//            }
+            //vibrator.cancel();// 关闭振动
+
+            val vibrator = context.getSystemService(Vibrator::class.java)
+
+            // Requires VIBRATE permission
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    //vibrator.vibrate(VibrationEffect.createPredefined(VibrationEffect.EFFECT_CLICK))
+                    val timings: LongArray = longArrayOf(50, 50, 50, 50)
+                    val amplitudes: IntArray = intArrayOf(77, 79, 84, 99)
+                    val repeatIndex = -1 // Do not repeat.
+                    vibrator.vibrate(
+                        VibrationEffect.createWaveform(
+                            timings,
+                            amplitudes,
+                            repeatIndex
+                        )
+                    )
+
+                    ObjectAnimator.ofFloat(binding.llLeftRight, "translationX", -20f, 20f).apply {
+                        duration = 60
+                        repeatCount = 4
+                        repeatMode = ValueAnimator.REVERSE
+                    }.start()
+
+                }
+            } else {
+                if (vibrator != null && vibrator.hasVibrator()) {
+                    vibrator.vibrate(250);  // 设置手机振动
+                }
+            }
+
+            return
+        }
         val json: String = getPhoneInfo()
         //val json: String = "Ms97MbjVaypr+CF04BTQ+Y7hbYp+orLZbXM2u+I+PZKSPSSaqR1dcuM3tsig3UpJ7s2qEw5DsJcVd0t4eJM79ABUFWW/0Nplhx37+6jR2YVaSJgA30L0O2FbuyG7SOjP0qfISNaN1L8eC3a7W5oFPpHxkZdxUf5sxJIQHA2c6lCI+Mo/BUgU1MgTIjM3puiWx99mvxOyl9k2oLZUjcjMOygzNUYYD21SQYQ6dtvdVz3iAtqeJ+0EVCtScPXePG/CH/s0Ti/VS54/KSrlRVfdn5s2pHqw5fd2BZX+ZGtIWTGpWb+Wt1ZtrPXPdv/r1Zx84Zcw0EqKicieeuYpfUH+eg==";
 
@@ -256,6 +321,13 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
                                     Contans.SP.OLD_PWD,
                                     RSAUtils.encryptBASE64StrLocal(binding.etPassword.text.toString())
                                 )
+                                if (binding.cbAgreement.isChecked) {
+                                    SPUtils.put(
+                                        context,
+                                        Contans.SP.SAVE_CB_AGREEMENT_CHECK,
+                                        binding.cbAgreement.isChecked
+                                    )
+                                }
                                 if (binding.swRememberPwd.isChecked) {
                                     SPUtils.put(
                                         context,

app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java

@@ -206,7 +206,7 @@ public class WztpScActivity extends BaseActivity2 {
 
 
     private ProgressDialog progressDialog;
-    private WaitDialog dialog;
+    //private WaitDialog dialog;
 
     private List<Wztpscinfo.Wztp> wztps;
 
@@ -1097,7 +1097,7 @@ public class WztpScActivity extends BaseActivity2 {
                                 if (!TextUtils.isEmpty(fjtEndName)) {
                                     scData("2", 2, fjtEndName);
                                 } else {
-                                    dialog.dismiss();
+                                    //dialog.dismiss();
                                     tvMs.setText("");
                                     etHgtm.setText("");
                                     ll.setVisibility(View.GONE);
@@ -1126,13 +1126,13 @@ public class WztpScActivity extends BaseActivity2 {
                                 etHgtm.setText("");
                                 fjtEndName = "";
                                 ivFjt.setImageBitmap(null);
-                                dialog.dismiss();
+                                //dialog.dismiss();
 
                                 ll.setVisibility(View.GONE);
 
                             } else {
                                 showToast("上传附件图失败");
-                                dialog.dismiss();
+                                //dialog.dismiss();
                             }
                         }
                         break;
@@ -1142,7 +1142,7 @@ public class WztpScActivity extends BaseActivity2 {
                 showToast("暂无数据");
                 tvMs.setText("");
                 e.printStackTrace();
-                dialog.dismiss();
+                //dialog.dismiss();
             }
 
         }

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

@@ -83,14 +83,51 @@
 
 
         </LinearLayout>
+        <LinearLayout
+            android:id="@+id/ll_left_right"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_gravity="center"
+            android:gravity="start|center">
+
+            <CheckBox
+                android:id="@+id/cb_agreement"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:text=""
+                android:textSize="35px" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/serviceAgreement"
+                android:text="已阅读并同意"/>
+            <TextView
+                android:id="@+id/tv_service_agreement"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/colorPrimaryDark"
+                style="@style/serviceAgreement"
+                android:text="服务协议"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/serviceAgreement"
+                android:text="和"/>
+            <TextView
+                android:id="@+id/tv_privacy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/colorPrimaryDark"
+                style="@style/serviceAgreement"
+                android:text="隐私保护"/>
 
+        </LinearLayout>
 
         <Switch
             android:id="@+id/sw_remember_pwd"
             android:layout_width="wrap_content"
             android:layout_height="40dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
             android:shadowColor="@color/gray"
             android:switchMinWidth="40dp"
             android:switchPadding="10dp"

app/src/main/res/values/styles.xml

@@ -158,4 +158,8 @@
     <style name="dagerAddTextStyle">
         <item name="android:textSize">12sp</item>
     </style>
+    <!-- 服务协议样式-->
+    <style name="serviceAgreement">
+        <item name="android:textSize">12sp</item>
+    </style>
 </resources>