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

正式环境 去掉 aTrust选项

Browse Source
master
wenfei 3 months ago committed by hwf452
parent 0fba9493a1
commit 4017cf541c
5 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File

18
app/src/main/java/com/rehome/zhdcoa/App.java
Unescape Escape View File

@ -88,7 +88,7 @@ public class App extends LitePalApplication {
//refWatcher = LeakCanary.install(this); //refWatcher = LeakCanary.install(this);
NoHttp.initialize(this); NoHttp.initialize(this);
MultiDex.install(this); //MultiDex.install(this);
NoHttp.setDefaultConnectTimeout(6 * 1000); NoHttp.setDefaultConnectTimeout(6 * 1000);
NoHttp.setDefaultReadTimeout(60 * 1000); NoHttp.setDefaultReadTimeout(60 * 1000);
initUser(); initUser();
@ -165,14 +165,14 @@ public class App extends LitePalApplication {
* 初始化深信服注销监听回调 * 初始化深信服注销监听回调
* 初始化深信服dp，sp转px的工具类 * 初始化深信服dp，sp转px的工具类
*/ */
// 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() {

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

@ -128,21 +128,21 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
Contans.BASE_URL_AI_3D_SERVER_INTRANET //AI三维可视化安防平台登录 电厂外网 Contans.BASE_URL_AI_3D_SERVER_INTRANET //AI三维可视化安防平台登录 电厂外网
} }
} else { } else {
binding.rg.check(R.id.rb2) // binding.rg.check(R.id.rb2)
SPUtils.put(this, Contans.NETWORK_CHECK_TYPE, "外网") // SPUtils.put(this, Contans.NETWORK_CHECK_TYPE, "外网")
Contans.IP = Contans.IP_EXTRANET //运行IP外网 // Contans.IP = Contans.IP_EXTRANET //运行IP外网
Contans.BASE_URL = Contans.BASE_URL_EXTRANET //行政IP外网 // Contans.BASE_URL = Contans.BASE_URL_EXTRANET //行政IP外网
Contans.BASE_URL_COMPANY_SERVER =
Contans.BASE_URL_COMPANY_SERVER_EXTRANET //智慧安防平台登录 电厂外网
Contans.BASE_URL_AI_3D_SERVER =
Contans.BASE_URL_AI_3D_SERVER_EXTRANET //AI三维可视化安防平台登录 电厂外网
// binding.rg.check(R.id.rb3)
// Contans.IP = Contans.IP_INTRANET //运行IP内网
// Contans.BASE_URL = Contans.BASE_URL_INTRANET //行政IP内网
// Contans.BASE_URL_COMPANY_SERVER = // Contans.BASE_URL_COMPANY_SERVER =
// Contans.BASE_URL_COMPANY_SERVER_INTRANET //智慧安防平台登录 电厂内网 // Contans.BASE_URL_COMPANY_SERVER_EXTRANET //智慧安防平台登录 电厂外网
// Contans.BASE_URL_AI_3D_SERVER = // Contans.BASE_URL_AI_3D_SERVER =
// Contans.BASE_URL_AI_3D_SERVER_INTRANET //AI三维可视化安防平台登录 电厂外网 // Contans.BASE_URL_AI_3D_SERVER_EXTRANET //AI三维可视化安防平台登录 电厂外网
binding.rg.check(R.id.rb3)
Contans.IP = Contans.IP_INTRANET //运行IP内网
Contans.BASE_URL = Contans.BASE_URL_INTRANET //行政IP内网
Contans.BASE_URL_COMPANY_SERVER =
Contans.BASE_URL_COMPANY_SERVER_INTRANET //智慧安防平台登录 电厂内网
Contans.BASE_URL_AI_3D_SERVER =
Contans.BASE_URL_AI_3D_SERVER_INTRANET //AI三维可视化安防平台登录 电厂外网
} }
binding.rg.setOnCheckedChangeListener(RadioGroup.OnCheckedChangeListener { _, checkedId -> binding.rg.setOnCheckedChangeListener(RadioGroup.OnCheckedChangeListener { _, checkedId ->
@ -207,15 +207,19 @@ 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
// } }
// binding.tvVpnLogin.visibility=View.INVISIBLE
// binding.tvVpnLogout.visibility=View.VISIBLE
// binding.rb3.visibility=View.VISIBLE
} }
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
@ -237,8 +241,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
if (isApkInDebug(context)) { if (isApkInDebug(context)) {
// 管理员 // 管理员
binding.etUsername.setText("ZHPS_Admin") // binding.etUsername.setText("ZHPS_Admin")
binding.etPassword.setText("Rehome.zhps@996") // binding.etPassword.setText("Rehome.zhps@996")
// binding.etUsername.setText("310249") // binding.etUsername.setText("310249")
// binding.etPassword.setText("GZgs#@0249") // binding.etPassword.setText("GZgs#@0249")

1
app/src/main/res/layout/activity_login.xml
Unescape Escape View File

@ -180,6 +180,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="16sp" android:textSize="16sp"
android:checked="true"
android:text="aTrust" /> android:text="aTrust" />
</RadioGroup> </RadioGroup>

18
app/src/main/res/layout/activity_work_risk_list_hui_bao.xml
Unescape Escape View File

@ -57,9 +57,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="90dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:background="@drawable/radius" android:background="@drawable/radius"
android:minHeight="90dp"
android:orientation="vertical"> android:orientation="vertical">
<CheckBox <CheckBox
@ -67,20 +67,22 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:visibility="gone"
android:text="是否裁剪图片" android:text="是否裁剪图片"
android:textColor="#53575e" android:textColor="#53575e"
android:textSize="14sp" /> android:textSize="14sp"
android:visibility="gone" />
<CheckBox <CheckBox
android:id="@+id/cb_compress" android:id="@+id/cb_compress"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"
android:visibility="gone"
android:checked="true" android:checked="true"
android:gravity="center_vertical"
android:text="是否压缩图片" android:text="是否压缩图片"
android:textColor="#53575e" android:textColor="#53575e"
android:textSize="14sp" /> android:textSize="14sp"
android:visibility="gone" />
<CheckBox <CheckBox
android:id="@+id/cb_editor" android:id="@+id/cb_editor"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -88,9 +90,9 @@
android:checked="true" android:checked="true"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="是否开启图片编辑" android:text="是否开启图片编辑"
android:visibility="gone"
android:textColor="#53575e" android:textColor="#53575e"
android:textSize="14sp" /> android:textSize="14sp"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycle" android:id="@+id/recycle"

3
gradle/wrapper/gradle-wrapper.properties vendored
Unescape Escape View File

@ -4,4 +4,5 @@ distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
#distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip #distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip #distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
Write Preview
Loading…
Cancel
Save