change git remote

master
wenfei 3 months ago committed by hwf452
parent 03f300b6a9
commit 0fba9493a1

@ -165,14 +165,14 @@ public class App extends LitePalApplication {
* *
* dpsppx * dpsppx
*/ */
if (isApkInDebug(base)) { // if (isApkInDebug(base)) {
initSdk(base); // initSdk(base);
GlobalListenerManager.getInstance().init(base); // GlobalListenerManager.getInstance().init(base);
DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density); // DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density);
} // }
// initSdk(base); initSdk(base);
// GlobalListenerManager.getInstance().init(base); GlobalListenerManager.getInstance().init(base);
// DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density); DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density);
} }
public void clearUser() { public void clearUser() {

@ -207,15 +207,15 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
SFUemSDK.getInstance().logout() SFUemSDK.getInstance().logout()
showToast(R.string.str_vpn_logout) showToast(R.string.str_vpn_logout)
} }
if (isApkInDebug(this)) { // if (isApkInDebug(this)) {
binding.tvVpnLogin.visibility=View.INVISIBLE // binding.tvVpnLogin.visibility=View.INVISIBLE
binding.tvVpnLogout.visibility=View.VISIBLE // binding.tvVpnLogout.visibility=View.VISIBLE
binding.rb3.visibility=View.VISIBLE // binding.rb3.visibility=View.VISIBLE
}else{ // }else{
binding.tvVpnLogin.visibility=View.GONE // binding.tvVpnLogin.visibility=View.GONE
binding.tvVpnLogout.visibility=View.GONE // binding.tvVpnLogout.visibility=View.GONE
binding.rb3.visibility=View.GONE // binding.rb3.visibility=View.GONE
} // }
} }
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
@ -272,7 +272,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
//马 //马
// binding.etUsername.setText("310482") // binding.etUsername.setText("310482")
// binding.etPassword.setText("Maying2008!") // binding.etPassword.setText("ZHps@2468")
// 生产岗位 卢高波 可以进入巡视抄表 // 生产岗位 卢高波 可以进入巡视抄表
// binding.etUsername.setText("310492") // binding.etUsername.setText("310492")
// binding.etPassword.setText("Dudu520520@") // binding.etPassword.setText("Dudu520520@")

@ -1064,6 +1064,8 @@ public class WztpScActivity extends BaseActivity2 {
resetData(); resetData();
ll.setVisibility(View.VISIBLE); ll.setVisibility(View.VISIBLE);
if (!TextUtils.isEmpty(itemWztp.getXlturl())) { if (!TextUtils.isEmpty(itemWztp.getXlturl())) {
showLog("-------------getXlturl------------");
showLog(itemWztp.getXlturl());
Glide.with(context) Glide.with(context)
.load(itemWztp.getXlturl()) .load(itemWztp.getXlturl())
.dontAnimate() .dontAnimate()
@ -1077,6 +1079,8 @@ public class WztpScActivity extends BaseActivity2 {
} }
} }
if (!TextUtils.isEmpty(itemWztp.getImgurl())) { if (!TextUtils.isEmpty(itemWztp.getImgurl())) {
showLog("-------------getImgurl------------");
showLog(itemWztp.getImgurl());
Glide.with(context) Glide.with(context)
.load(itemWztp.getImgurl()) .load(itemWztp.getImgurl())
.dontAnimate() .dontAnimate()
@ -1090,6 +1094,8 @@ public class WztpScActivity extends BaseActivity2 {
} }
} }
if (!TextUtils.isEmpty(itemWztp.getVideoimg())) { if (!TextUtils.isEmpty(itemWztp.getVideoimg())) {
showLog("-------------getVideoimg------------");
showLog(itemWztp.getVideoimg());
Glide.with(context) Glide.with(context)
.load(itemWztp.getVideoimg()) .load(itemWztp.getVideoimg())
.dontAnimate() .dontAnimate()

@ -25,8 +25,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="120dp" android:layout_height="120dp"
android:paddingBottom="10dp" android:paddingBottom="6dp"
android:paddingTop="10dp" android:paddingTop="6dp"
android:layout_weight="2" android:layout_weight="2"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
@ -59,7 +59,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="24dp" android:layout_height="30dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:gravity="center_vertical"> android:gravity="center_vertical">
@ -129,8 +129,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="120dp" android:layout_height="120dp"
android:layout_weight="2" android:layout_weight="2"
android:paddingBottom="10dp" android:paddingBottom="6dp"
android:paddingTop="10dp" android:paddingTop="6dp"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -162,7 +162,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="24dp" android:layout_height="30dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:gravity="center_vertical"> android:gravity="center_vertical">
@ -272,7 +272,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="24dp" android:layout_height="30dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:gravity="center_vertical"> android:gravity="center_vertical">
@ -376,7 +376,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="24dp" android:layout_height="30dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:gravity="center_vertical"> android:gravity="center_vertical">
@ -485,7 +485,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="24dp" android:layout_height="30dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:gravity="center_vertical"> android:gravity="center_vertical">
@ -590,7 +590,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="24dp" android:layout_height="30dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:gravity="center_vertical"> android:gravity="center_vertical">

Loading…
Cancel
Save