From 1cdd0e31453faf81d421b294e6802b97fad1562f Mon Sep 17 00:00:00 2001 From: hwf453 Date: Mon, 15 Jan 2024 10:49:14 +0800 Subject: [PATCH] 20240115 --- .../ui/activity/ActivityFactoryWorkerInfo.java | 6 +++--- .../com/rehome/zhdcoa/ui/activity/LoginActivity.kt | 13 ++++++++++++- .../com/rehome/zhdcoa/ui/activity/XzjhFragment.java | 6 ++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfo.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfo.java index 7da88b0..036c8cb 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfo.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfo.java @@ -150,9 +150,9 @@ public class ActivityFactoryWorkerInfo extends BaseActivity { String account = Contans.SP.AI_ACCOUNT; //String strPrivateEncode=RSAAndroid.encryptByPrivateKeyForSpiltStr(Contans.SP.AI_PWD,RSAAndroid.privateRsaKeyLocal); String strPublicDecode = RSAAndroid.decryptByPublicKeyForSpiltStr(Contans.SP.AI_PWD_ENCODE, RSAAndroid.publicRsaKeyLocal); -// showLog("-----------"); -// showLog(account); -// showLog(strPublicDecode); + showLog("-----------"); + showLog(account); + showLog(strPublicDecode); AuthenticationLoginAIUtils.authenticationAILogin(ActivityFactoryWorkerInfo.this, account, strPublicDecode, new OnAuthenticationLoginListener() { @Override 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 b852900..91ff931 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 @@ -156,7 +156,18 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { } if (BuildConfig.LOG_ERROR) { - + // 管理员 + binding.etUsername.setText("ZHPS_Admin") + binding.etPassword.setText("Rehome.zhps@996") + +// binding.etUsername.setText("310386") +// binding.etPassword.setText("Zhps$cc0386") + // 生产岗位 卢高波 +// binding.etUsername.setText("310492") +// binding.etPassword.setText("Dudu520520+") + +// binding.etUsername.setText("310673") +// binding.etPassword.setText("Abcd@1234") } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java index 89ad572..333e276 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java @@ -2,6 +2,8 @@ package com.rehome.zhdcoa.ui.activity; import android.content.ContentValues; import android.content.DialogInterface; +import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; import android.widget.Button; @@ -11,6 +13,7 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; import com.rehome.zhdcoa.App; +import com.rehome.zhdcoa.BuildConfig; import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.DBModel.Ajhjh; import com.rehome.zhdcoa.DBModel.AjhjhxzrwList; @@ -255,6 +258,9 @@ public class XzjhFragment extends BaseFragment { Request request = NoHttp.createStringRequest(Contans.IP + Contans.DJJHDLB); request.add("jhid", UiUtlis.encoder(jhid)); + showLog("--------->>>>>>>>>>>>"); + showLog(Contans.IP + Contans.DJJHDLB); + if(App.getInstance().getUserInfo()!=null&&App.getInstance().getUserInfo().getToken()!=null){ String token = App.getInstance().getUserInfo().getToken(); String credential = "Bearer " + token;