hwf453
/
DYWOA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.2.8 release

Browse Source
master
wenfei 3 weeks ago
parent 87c8b39680
commit e282544547
5 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
app/build.gradle
Unescape Escape View File

@ -10,8 +10,8 @@ android {
applicationId "com.rehome.dywoa" applicationId "com.rehome.dywoa"
minSdk 24 minSdk 24
targetSdk 36 targetSdk 36
versionCode 28 versionCode 29
versionName "1.2.7" versionName "1.2.8"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
//每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装

19
app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt
Unescape Escape View File

@ -210,8 +210,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
// binding.etPassword.setText("A000000a.") // binding.etPassword.setText("A000000a.")
//ceshi1 //ceshi1
binding.etUsername.setText("ceshi1") // binding.etUsername.setText("ceshi1")
binding.etPassword.setText("CS20251119.") // binding.etPassword.setText("CS20251119.")
//黄文飞 //黄文飞
// binding.etUsername.setText("RH00002") // binding.etUsername.setText("RH00002")
@ -220,6 +220,13 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
// binding.etUsername.setText("972526") // binding.etUsername.setText("972526")
// binding.etPassword.setText("Wq20001221.") // binding.etPassword.setText("Wq20001221.")
// binding.etUsername.setText("TD00046")
// binding.etPassword.setText("A000000a.")
// binding.etUsername.setText("371523")
// binding.etPassword.setText("A000000a.")
//瑞洪 RH00002/王总 RH00002/chao工 RH00003/范红波 //瑞洪 RH00002/王总 RH00002/chao工 RH00003/范红波
@ -945,6 +952,14 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
startActivity(intent) startActivity(intent)
finish() 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 { } else {
Log.i("login", userInfo.statusMsg) Log.i("login", userInfo.statusMsg)

2
app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java
Unescape Escape View File

@ -169,7 +169,7 @@ public class SbxdjglActivity extends BaseActivity2 {
param.put("YHID", username); param.put("YHID", username);
if(!TextUtils.isEmpty(firstDeparment)){ 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("承包商")){ if(username!=null&&username.equals("RH00002")&&firstDeparment.equals("承包商")){
showLog("RH00002 test account"); showLog("RH00002 test account");
}else{ }else{

4
app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java
Unescape Escape View File

@ -289,7 +289,7 @@ public class XzjhFragment extends BaseFragment {
param.put("YHID", username); param.put("YHID", username);
if(!TextUtils.isEmpty(firstDeparment)){ 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("承包商")){ if(username!=null&&username.equals("RH00002")&&firstDeparment.equals("承包商")){
showLog("RH00002 test account"); showLog("RH00002 test account");
}else{ }else{
@ -673,7 +673,7 @@ public class XzjhFragment extends BaseFragment {
param.put("YHID", username); param.put("YHID", username);
if(!TextUtils.isEmpty(firstDeparment)){ 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("承包商")){ if(username!=null&&username.equals("RH00002")&&firstDeparment.equals("承包商")){
showLog("RH00002 test account"); showLog("RH00002 test account");
}else{ }else{

2
app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java
Unescape Escape View File

@ -304,7 +304,7 @@ public class HomeFragment extends BaseFragment {
break; break;
case 5: 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); Intent intentDj= new Intent(mActivity, SbxdjglActivity.class);
intentDj.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); intentDj.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
intentDj.putExtra("edit",false); intentDj.putExtra("edit",false);

Write Preview
Loading…
Cancel
Save