From e282544547f45dfb9e6ab9d97c15158b48f9d9b4 Mon Sep 17 00:00:00 2001 From: wenfei Date: Mon, 5 Jan 2026 14:13:33 +0800 Subject: [PATCH] 1.2.8 release --- app/build.gradle | 4 ++-- .../rehome/dywoa/ui/activity/LoginActivity.kt | 19 +++++++++++++++++-- .../ui/activity/sbxdjgl/SbxdjglActivity.java | 2 +- .../ui/activity/sbxdjgl/XzjhFragment.java | 4 ++-- .../dywoa/ui/fragment/HomeFragment.java | 2 +- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b7c042c..73fca0e 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.rehome.dywoa" minSdk 24 targetSdk 36 - versionCode 28 - versionName "1.2.7" + versionCode 29 + versionName "1.2.8" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt index 3e0181a..996c971 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt @@ -210,8 +210,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etPassword.setText("A000000a.") //ceshi1 - binding.etUsername.setText("ceshi1") - binding.etPassword.setText("CS20251119.") +// binding.etUsername.setText("ceshi1") +// binding.etPassword.setText("CS20251119.") //黄文飞 // binding.etUsername.setText("RH00002") @@ -220,6 +220,13 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etUsername.setText("972526") // binding.etPassword.setText("Wq20001221.") +// binding.etUsername.setText("TD00046") +// binding.etPassword.setText("A000000a.") + +// binding.etUsername.setText("371523") +// binding.etPassword.setText("A000000a.") + + //瑞洪 RH00002/王总 RH00002/chao工 RH00003/范红波 @@ -945,6 +952,14 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { startActivity(intent) finish() } + if((!TextUtils.isEmpty(userInfo.firstDeparment))&&(userInfo.firstDeparment.equals("生产科技部"))){ + showToast("生产科技部仓管为了支持点检功能，支持离线登录，有效期一天。") + App.getInstance().userInfo = userInfo + val intent = Intent(context, HomeActivity::class.java) + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + startActivity(intent) + finish() + } } } else { Log.i("login", userInfo.statusMsg) diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java index c9d593a..b10f1a8 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java @@ -169,7 +169,7 @@ public class SbxdjglActivity extends BaseActivity2 { param.put("YHID", username); if(!TextUtils.isEmpty(firstDeparment)){ - if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){ + if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("生产科技部")||firstDeparment.equals("粤电服大亚湾项目部")){ if(username!=null&&username.equals("RH00002")&&firstDeparment.equals("承包商")){ showLog("RH00002 test account"); }else{ diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java index 66e6324..2f3c41a 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java @@ -289,7 +289,7 @@ public class XzjhFragment extends BaseFragment { param.put("YHID", username); if(!TextUtils.isEmpty(firstDeparment)){ - if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){ + if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("生产科技部")||firstDeparment.equals("粤电服大亚湾项目部")){ if(username!=null&&username.equals("RH00002")&&firstDeparment.equals("承包商")){ showLog("RH00002 test account"); }else{ @@ -673,7 +673,7 @@ public class XzjhFragment extends BaseFragment { param.put("YHID", username); if(!TextUtils.isEmpty(firstDeparment)){ - if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){ + if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("生产科技部")||firstDeparment.equals("粤电服大亚湾项目部")){ if(username!=null&&username.equals("RH00002")&&firstDeparment.equals("承包商")){ showLog("RH00002 test account"); }else{ diff --git a/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java b/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java index 35e8577..a76b614 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java @@ -304,7 +304,7 @@ public class HomeFragment extends BaseFragment { break; case 5: //点检 - if((firstDeparment!=null&&firstDeparment.equals("设备部"))||(firstDeparment!=null&&firstDeparment.equals("粤电服大亚湾项目部"))||(firstDeparment!=null&&firstDeparment.equals("承包商"))||(username!=null&&username.equals("371522"))||(username!=null&&username.equals("ceshi1"))||(username!=null&&username.equals("RH00002"))||(username!=null&&username.equals("RH00020"))){ + if((firstDeparment!=null&&firstDeparment.equals("设备部"))||(firstDeparment!=null&&firstDeparment.equals("粤电服大亚湾项目部"))||(firstDeparment!=null&&firstDeparment.equals("生产科技部"))||(firstDeparment!=null&&firstDeparment.equals("承包商"))||(username!=null&&username.equals("371522"))||(username!=null&&username.equals("ceshi1"))||(username!=null&&username.equals("RH00002"))||(username!=null&&username.equals("RH00020"))){ Intent intentDj= new Intent(mActivity, SbxdjglActivity.class); intentDj.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); intentDj.putExtra("edit",false);