From 5c38dcb0290044f3ac45eadecdf6f8d5f474dc12 Mon Sep 17 00:00:00 2001 From: wenfei Date: Mon, 19 Jan 2026 18:11:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=A2=84=E8=AD=A6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E5=8A=A0?= =?UTF-8?q?=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/rehome/zhdcoa/Contans.java | 2 +- .../bean/DeviceAlarmLoginResultBean.java | 13 +++++++++ .../bean/DeviceAlarmLoginResultDataBean.java | 22 ++++++++++++++ .../ui/activity/DeviceAlarmInfoActivity.kt | 14 ++++----- .../zhdcoa/ui/activity/LoginActivity.kt | 13 +++++++-- .../utils/AuthenticationLoginAIUtils.java | 29 +++++++++++++++---- app/src/main/res/layout/activity_login.xml | 4 ++- 7 files changed, 80 insertions(+), 17 deletions(-) create mode 100644 app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmLoginResultBean.java create mode 100644 app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmLoginResultDataBean.java diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index ace4159..0f552a3 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/app/src/main/java/com/rehome/zhdcoa/Contans.java @@ -529,7 +529,7 @@ public class Contans { //设备状态智能监测及分析平台 登录 public final static String DeviceAlermInfoLoginUrl = "dserver/user/login"; - public final static String DeviceAlermInfoLoginRsaUrl = "dserver/user/loginRsa"; + public final static String DeviceAlermInfoLoginRsaUrl = "dserver/user/loginRsaUpAndDown"; //设备预警信息列表 //http://192.168.2.28:1700/dserver/warning/page?v=1765422183414&keyword=&pageNo=1&pageSize=10 public final static String DeviceAlermInfoListUrl = "dserver/warning/page"; diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmLoginResultBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmLoginResultBean.java new file mode 100644 index 0000000..de55fb8 --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmLoginResultBean.java @@ -0,0 +1,13 @@ +package com.rehome.zhdcoa.bean; + +public class DeviceAlarmLoginResultBean extends AIBaseBean{ + private String data; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } +} diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmLoginResultDataBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmLoginResultDataBean.java new file mode 100644 index 0000000..81ef575 --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmLoginResultDataBean.java @@ -0,0 +1,22 @@ +package com.rehome.zhdcoa.bean; + +public class DeviceAlarmLoginResultDataBean { + private String token; + private String msg; + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } +} diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoActivity.kt index f42f825..d865927 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoActivity.kt @@ -105,7 +105,7 @@ class DeviceAlarmInfoActivity : BaseActivityOaToolbarViewBinding if (token != null && token == "") { showToast("设备状态智能监测及分析平台登录失败") } else { - //getWorkRiskListData() //登录成功 + getAlermListData() } } } catch (e: Exception) { 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 0fd11dc..57e68d9 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 @@ -72,6 +72,15 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { java.lang.Boolean.TRUE ) as Boolean binding.swRememberPwd.isChecked = saveUserAndPassword + if(!isApkInDebug(context)){ + binding.textWjmm.visibility=View.VISIBLE + binding.tvTip1.visibility=View.VISIBLE + binding.tvTip2.visibility=View.VISIBLE + }else{ + binding.textWjmm.visibility=View.GONE + binding.tvTip1.visibility=View.GONE + binding.tvTip2.visibility=View.GONE + } binding.swRememberPwd.setOnCheckedChangeListener(CompoundButton.OnCheckedChangeListener { _, isChecked -> if (isChecked) { @@ -228,8 +237,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (isApkInDebug(context)) { // 管理员 -// binding.etUsername.setText("ZHPS_Admin") -// binding.etPassword.setText("Rehome.zhps@996") + binding.etUsername.setText("ZHPS_Admin") + binding.etPassword.setText("Rehome.zhps@996") //公司内网215管理员 diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginAIUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginAIUtils.java index 5db68ef..760671f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginAIUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginAIUtils.java @@ -7,6 +7,8 @@ import android.content.pm.ApplicationInfo; import android.text.TextUtils; import android.util.Log; import com.rehome.zhdcoa.Contans; +import com.rehome.zhdcoa.bean.DeviceAlarmLoginResultBean; +import com.rehome.zhdcoa.bean.DeviceAlarmLoginResultDataBean; import com.rehome.zhdcoa.bean.UserAuthenticationAIBean; import com.yolanda.nohttp.NoHttp; import com.yolanda.nohttp.RequestMethod; @@ -338,16 +340,16 @@ public class AuthenticationLoginAIUtils { public static void authenticationDeviceAlermInfoRsaShowProgress(Activity mActivity, String account, String password, OnAuthenticationLoginListener listener) { - Request request = NoHttp.createStringRequest(Contans.IP + Contans.DeviceAlermInfoLoginUrl, RequestMethod.POST); + Request request = NoHttp.createStringRequest(Contans.IP + Contans.DeviceAlermInfoLoginRsaUrl, RequestMethod.POST); Map params = new HashMap<>(); params.put("username", account); params.put("password", password); String json = GsonUtils.GsonString(params); - //showLog(json); + //showLog(json,mActivity); String jsonEncrypt = RSAUtils.encryptBASE64Str(json); - //showLog(jsonEncrypt); + showLog(jsonEncrypt,mActivity); request.setDefineRequestBodyForJson(jsonEncrypt); if (Contans.IP.equals(Contans.IP_EXTRANET)) { @@ -373,11 +375,26 @@ public class AuthenticationLoginAIUtils { showLog(result,mActivity); if(!TextUtils.isEmpty(result)){ - UserAuthenticationAIBean bean = GsonToBean(result, UserAuthenticationAIBean.class); + DeviceAlarmLoginResultBean bean = GsonToBean(result, DeviceAlarmLoginResultBean.class); if (bean != null) { if (bean.isSuccess()&&bean.getCode()==20000) {//登录成功 - SPUtils.put(mActivity, Contans.AUTHENTICATIONLOGINTOKENAI, bean.getData().getToken()); - listener.onAuthenticationSuccess(true, bean.getData().getToken()); + if(!TextUtils.isEmpty(bean.getData())){ + String jsonDecode = RSAUtils.decryptBASE64StrClient(bean.getData()); + if (TextUtils.isEmpty(jsonDecode)) { + //解密失败 + showLog("APP解密失败",mActivity); + listener.onAuthenticationSuccess(false, ""); + } else { + //showLog(jsonDecode,mActivity); + DeviceAlarmLoginResultDataBean beanDecode = GsonToBean(jsonDecode, DeviceAlarmLoginResultDataBean.class); + if(beanDecode!=null&&beanDecode.getMsg()!=null&&"登录成功".equals(beanDecode.getMsg())){ + listener.onAuthenticationSuccess(true, beanDecode.getToken()); + }else{ + showLog("账号或密码错误",mActivity); + listener.onAuthenticationSuccess(false, ""); + } + } + } } else { if (bean.getFlag() == -1) { if (bean.getMsg() != null && bean.getMsg().equals("用户未注销")) { diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 9c7a6b3..88a9a9c 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -162,6 +162,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="10dp" android:textSize="16sp" + android:checked="true" android:text="内网" />