diff --git a/app/src/main/java/com/rehome/zhdcoa/App.java b/app/src/main/java/com/rehome/zhdcoa/App.java index e49d9bf..2e4ac1a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/App.java +++ b/app/src/main/java/com/rehome/zhdcoa/App.java @@ -165,14 +165,14 @@ public class App extends LitePalApplication { * 初始化深信服注销监听回调 * 初始化深信服dp,sp转px的工具类 */ - if (isApkInDebug(base)) { - initSdk(base); - GlobalListenerManager.getInstance().init(base); - DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density); - } -// initSdk(base); -// GlobalListenerManager.getInstance().init(base); -// DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density); +// if (isApkInDebug(base)) { +// initSdk(base); +// GlobalListenerManager.getInstance().init(base); +// DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density); +// } + initSdk(base); + GlobalListenerManager.getInstance().init(base); + DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density); } public void clearUser() { 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 e87d121..30178cd 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 @@ -207,15 +207,15 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { SFUemSDK.getInstance().logout() showToast(R.string.str_vpn_logout) } - if (isApkInDebug(this)) { - binding.tvVpnLogin.visibility=View.INVISIBLE - binding.tvVpnLogout.visibility=View.VISIBLE - binding.rb3.visibility=View.VISIBLE - }else{ - binding.tvVpnLogin.visibility=View.GONE - binding.tvVpnLogout.visibility=View.GONE - binding.rb3.visibility=View.GONE - } +// if (isApkInDebug(this)) { +// binding.tvVpnLogin.visibility=View.INVISIBLE +// binding.tvVpnLogout.visibility=View.VISIBLE +// binding.rb3.visibility=View.VISIBLE +// }else{ +// binding.tvVpnLogin.visibility=View.GONE +// binding.tvVpnLogout.visibility=View.GONE +// binding.rb3.visibility=View.GONE +// } } @SuppressLint("SetTextI18n") @@ -272,7 +272,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { //马 // binding.etUsername.setText("310482") -// binding.etPassword.setText("Maying2008!") +// binding.etPassword.setText("ZHps@2468") + // 生产岗位 卢高波 可以进入巡视抄表 // binding.etUsername.setText("310492") // binding.etPassword.setText("Dudu520520@") diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java index 2544238..6719297 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java @@ -1064,6 +1064,8 @@ public class WztpScActivity extends BaseActivity2 { resetData(); ll.setVisibility(View.VISIBLE); if (!TextUtils.isEmpty(itemWztp.getXlturl())) { + showLog("-------------getXlturl------------"); + showLog(itemWztp.getXlturl()); Glide.with(context) .load(itemWztp.getXlturl()) .dontAnimate() @@ -1077,6 +1079,8 @@ public class WztpScActivity extends BaseActivity2 { } } if (!TextUtils.isEmpty(itemWztp.getImgurl())) { + showLog("-------------getImgurl------------"); + showLog(itemWztp.getImgurl()); Glide.with(context) .load(itemWztp.getImgurl()) .dontAnimate() @@ -1090,6 +1094,8 @@ public class WztpScActivity extends BaseActivity2 { } } if (!TextUtils.isEmpty(itemWztp.getVideoimg())) { + showLog("-------------getVideoimg------------"); + showLog(itemWztp.getVideoimg()); Glide.with(context) .load(itemWztp.getVideoimg()) .dontAnimate() diff --git a/app/src/main/res/layout/activity_weather.xml b/app/src/main/res/layout/activity_weather.xml index 310beb1..9388250 100644 --- a/app/src/main/res/layout/activity_weather.xml +++ b/app/src/main/res/layout/activity_weather.xml @@ -25,8 +25,8 @@ @@ -129,8 +129,8 @@ android:layout_width="match_parent" android:layout_height="120dp" android:layout_weight="2" - android:paddingBottom="10dp" - android:paddingTop="10dp" + android:paddingBottom="6dp" + android:paddingTop="6dp" android:orientation="vertical"> @@ -272,7 +272,7 @@ @@ -376,7 +376,7 @@ @@ -485,7 +485,7 @@ @@ -590,7 +590,7 @@