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 a49ee03..76b38cf 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 @@ -209,8 +209,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etPassword.setText("A000000a.") //ceshi1 -// binding.etUsername.setText("ceshi1") -// binding.etPassword.setText("A000000a.") + binding.etUsername.setText("ceshi1") + binding.etPassword.setText("A000000a.") //瑞洪 RH00002/王总 RH00002/chao工 RH00003/范红波 @@ -663,6 +663,10 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { ) ) { + showLog("----------一级部门----------") + showLog(userInfo.firstDeparment) + showLog("----------二级部门----------") + showLog(userInfo.secondDeparment) SPUtils.put( context, Contans.SP.OLD_PWD, 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 c8fa62a..aaf764e 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 @@ -158,6 +158,7 @@ public class SbxdjglActivity extends BaseActivity2 { param.put("bzmc", ""); } param.put("Action", "DJ_DJGL_GET"); + param.put("YHID", username); if(!TextUtils.isEmpty(firstDeparment)){ if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){ 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 ba5d43c..b0128b2 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 @@ -286,6 +286,7 @@ public class XzjhFragment extends BaseFragment { param.put("bzmc", ""); } param.put("Action", "DJ_DJGL_GET"); + param.put("YHID", username); if(!TextUtils.isEmpty(firstDeparment)){ if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){ @@ -665,6 +666,7 @@ public class XzjhFragment extends BaseFragment { param.put("bzmc", ""); } param.put("Action", "DJ_DJGL_GET"); + param.put("YHID", username); if(!TextUtils.isEmpty(firstDeparment)){ if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){ 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 6cf9636..08241cc 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 @@ -8,6 +8,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Environment; import android.os.Handler; +import android.os.Looper; import android.text.TextUtils; import android.util.Base64; import android.view.View; @@ -168,7 +169,7 @@ public class HomeFragment extends BaseFragment { startActivity(intentWaitFor); } }); - new Handler().postDelayed(new Runnable() { + new Handler(Looper.getMainLooper()).postDelayed(new Runnable() { @Override public void run() { //隐藏掉 本平台为非涉密平台,严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息 @@ -210,6 +211,17 @@ public class HomeFragment extends BaseFragment { @Override public void onResume() { super.onResume(); + if (this.isAdded() && this.isVisible()&&ll_tip.getVisibility()==View.VISIBLE) { + // Fragment存在且可见,可以安全访问 + new Handler(Looper.getMainLooper()).postDelayed(new Runnable() { + @Override + public void run() { + //隐藏掉 本平台为非涉密平台,严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息 + //showLog("隐藏掉 本平台为非涉密平台,严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息") + ll_tip.setVisibility(View.GONE); + } + }, 5000); + } getWaitForToDo(); }