设备预警信息 登录接口加密

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";

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;
+    }
+}

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;
+    }
+}

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

@@ -105,7 +105,7 @@ class DeviceAlarmInfoActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceA
         }
 
         binding.btnQuery.setOnClickListener {
-            authenticationLoginDeviceAlermInfo()
+            authenticationLoginDeviceAlermInfoRsa()
         }
 
         binding.lv.setInterface(LoadListView.ILoadListener {
@@ -116,7 +116,7 @@ class DeviceAlarmInfoActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceA
     }
 
     override fun initData() {
-        authenticationLoginDeviceAlermInfo()
+        authenticationLoginDeviceAlermInfoRsa()
     }
 
 
@@ -132,7 +132,7 @@ class DeviceAlarmInfoActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceA
                     showLog(qrCodeStr)
                     if(!TextUtils.isEmpty(qrCodeStr)){
                         //刷新列表数据
-                        authenticationLoginDeviceAlermInfo()
+                        authenticationLoginDeviceAlermInfoRsa()
                     }
                 }
             }
@@ -156,8 +156,8 @@ class DeviceAlarmInfoActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceA
                 if (token != null && token == "") {
                     showToast("设备状态智能监测及分析平台登录失败")
                 } else {
-                    getAlermListData()
                     //登录成功
+                    getAlermListData()
                 }
             }
         } catch (e: Exception) {
@@ -174,16 +174,16 @@ class DeviceAlarmInfoActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceA
                 Contans.SP.DeviceAlermInfoPwd,
                 RSAAndroid.publicRsaKeyLocal
             )
-            showLog(userName)
-            showLog(strPublicDecode)
+//            showLog(userName)
+//            showLog(strPublicDecode)
             AuthenticationLoginAIUtils.authenticationDeviceAlermInfoRsaShowProgress(
                 this, userName, strPublicDecode
             ) { _, token ->
                 if (token != null && token == "") {
                     showToast("设备状态智能监测及分析平台登录失败")
                 } else {
-                    //getWorkRiskListData()
                     //登录成功
+                    getAlermListData()
                 }
             }
         } catch (e: Exception) {

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

@@ -72,6 +72,15 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
             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<ActivityLoginBinding>() {
 
         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管理员

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<String> request = NoHttp.createStringRequest(Contans.IP + Contans.DeviceAlermInfoLoginUrl, RequestMethod.POST);
+        Request<String> request = NoHttp.createStringRequest(Contans.IP + Contans.DeviceAlermInfoLoginRsaUrl, RequestMethod.POST);
 
         Map<String, String> 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("用户未注销")) {

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="内网" />
 
             <RadioButton
@@ -171,7 +172,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="10dp"
                 android:textSize="16sp"
-                android:checked="true"
                 android:text="外网" />
 
             <RadioButton
@@ -223,6 +223,7 @@
         </LinearLayout>
 
         <TextView
+            android:id="@+id/tv_tip1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -231,6 +232,7 @@
             android:textSize="16sp" />
 
         <TextView
+            android:id="@+id/tv_tip2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"