From 445875d4542a105ee061d965758774f5f631cf18 Mon Sep 17 00:00:00 2001 From: hwf453 Date: Mon, 4 Mar 2024 17:39:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=8F=E8=AE=AE=E5=92=8C?= =?UTF-8?q?=E9=9A=90=E4=B9=88=E6=94=BF=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/rehome/zhdcoa/Contans.java | 3 + .../zhdcoa/ui/activity/LoginActivity.kt | 88 +++++++++++++++++-- .../zhdcoa/ui/activity/WztpScActivity.java | 10 +-- app/src/main/res/layout/activity_login.xml | 41 ++++++++- app/src/main/res/values/styles.xml | 4 + 5 files changed, 131 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index f72adfe..06f08e3 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/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=="; diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index 91ff931..c6bef58 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/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() { @@ -70,6 +77,13 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { } }) + 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() { } } }) + 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() { // 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() { } 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() { 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, diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java index 5ee1dbf..445c041 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java +++ b/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 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(); } } diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index b5cc1b0..3eb8dd4 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -83,14 +83,51 @@ + + + + + + + + 12sp + +