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

Compare commits

base: hwf453:03f300b6a9d85f36ecc4b4659511fdaf1383e58f
Branches Tags
hwf453:master
...
compare: hwf453:c152bcb7a31cca07d78f534e13075980d335e208
Branches Tags
hwf453:master

3 Commits
03f300b6a9 ... c152bcb7a3

Author SHA1 Message Date
wenfei c152bcb7a3 正式环境 去掉 aTrust选项 18 hours ago
wenfei 4017cf541c 正式环境 去掉 aTrust选项 18 hours ago
wenfei 0fba9493a1 change git remote 18 hours ago
7 changed files with 51 additions and 37 deletions
Show Stats

2
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);
NoHttp.initialize(this);
MultiDex.install(this);
//MultiDex.install(this);
NoHttp.setDefaultConnectTimeout(6 * 1000);
NoHttp.setDefaultReadTimeout(60 * 1000);
initUser();

37
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三维可视化安防平台登录 电厂外网
}
} else {
binding.rg.check(R.id.rb2)
SPUtils.put(this, Contans.NETWORK_CHECK_TYPE, "外网")
Contans.IP = Contans.IP_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内网
// binding.rg.check(R.id.rb2)
// SPUtils.put(this, Contans.NETWORK_CHECK_TYPE, "外网")
// Contans.IP = Contans.IP_EXTRANET //运行IP外网
// Contans.BASE_URL = Contans.BASE_URL_EXTRANET //行政IP外网
// 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_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 ->
@ -216,6 +216,10 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
binding.tvVpnLogout.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")
@ -237,8 +241,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
if (isApkInDebug(context)) {
// 管理员
binding.etUsername.setText("ZHPS_Admin")
binding.etPassword.setText("Rehome.zhps@996")
// binding.etUsername.setText("ZHPS_Admin")
// binding.etPassword.setText("Rehome.zhps@996")
// binding.etUsername.setText("310249")
// binding.etPassword.setText("GZgs#@0249")
@ -272,7 +276,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
//马
// binding.etUsername.setText("310482")
// binding.etPassword.setText("Maying2008!")
// binding.etPassword.setText("ZHps@2468")
// 生产岗位 卢高波 可以进入巡视抄表
// binding.etUsername.setText("310492")
// binding.etPassword.setText("Dudu520520@")

6
app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java
Unescape Escape View File

@ -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()

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

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

20
app/src/main/res/layout/activity_weather.xml
Unescape Escape View File

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

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

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

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

@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
#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