diff --git a/app/build.gradle b/app/build.gradle index 600562d..bdafc4f 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -91,6 +91,7 @@ dependencies { implementation libs.circleimageview implementation libs.photoviewer implementation libs.appupdate + //腾讯APP崩溃分析 implementation libs.crashreport implementation libs.xui implementation libs.eventbus @@ -118,9 +119,6 @@ dependencies { implementation files('libs/SangforSDK.aar') //W3蓝牙传感器SDK implementation files('libs/blemanager.aar') - implementation libs.circleimageview - //腾讯APP崩溃分析 - implementation libs.crashreport //第三方库图片选择器 diff --git a/app/libs/zxing.jar b/app/libs/zxing.jar deleted file mode 100755 index c069965..0000000 Binary files a/app/libs/zxing.jar and /dev/null differ 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 d02f169..366f6ba 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,13 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etPassword.setText("A000000a.") //ceshi1 - binding.etUsername.setText("ceshi1") - binding.etPassword.setText("A000000a.") +// binding.etUsername.setText("ceshi01") +// binding.etPassword.setText("CS01hwf.") + + //黄文飞 + binding.etUsername.setText("RH00002") + binding.etPassword.setText("RH20251029.") + //瑞洪 RH00002/王总 RH00002/chao工 RH00003/范红波 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 92cec60..619039e 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 @@ -333,7 +333,7 @@ public class HomeFragment extends BaseFragment { break; case 4: //巡检 - if((firstDeparment!=null&&firstDeparment.equals("运行部"))||(firstDeparment!=null&&firstDeparment.equals("承包商"))||(username!=null&&username.equals("371522"))||(username!=null&&username.equals("ceshi1"))||(username!=null&&username.equals("RH00001"))){ + if((firstDeparment!=null&&firstDeparment.equals("运行部"))||(firstDeparment!=null&&firstDeparment.equals("承包商"))||(username!=null&&username.equals("371522"))||(username!=null&&username.equals("ceshi1"))||(username!=null&&username.equals("RH00001"))||(username!=null&&username.equals("RH00020"))){ Intent intentXj= new Intent(mActivity, XscbglActivity.class); intentXj.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); startActivity(intentXj); @@ -343,7 +343,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("RH00001"))){ + 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("RH00001"))||(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);