diff --git a/app/build.gradle b/app/build.gradle index e411fa7..c60e73d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,14 +7,14 @@ plugins { android { namespace 'com.rehome.zhdcoa' - compileSdk 35 + compileSdk 36 defaultConfig { applicationId "com.rehome.zhdcoa" minSdk 24 - targetSdk 35 - versionCode 22 - versionName "2.3.8" + targetSdk 36 + versionCode 23 + versionName "2.3.9" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities,防止相同的在同一个手机上无法同时安装 diff --git a/app/src/main/java/com/rehome/zhdcoa/adapter/WorkTickerSelectListAdapter.java b/app/src/main/java/com/rehome/zhdcoa/adapter/WorkTickerSelectListAdapter.java index 14c9369..aec81e9 100644 --- a/app/src/main/java/com/rehome/zhdcoa/adapter/WorkTickerSelectListAdapter.java +++ b/app/src/main/java/com/rehome/zhdcoa/adapter/WorkTickerSelectListAdapter.java @@ -1,6 +1,7 @@ package com.rehome.zhdcoa.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -34,6 +35,9 @@ public class WorkTickerSelectListAdapter extends BaseViewBindingAdapter hazardList; private boolean checked;//0:未选中,1:已选中 @@ -97,5 +101,21 @@ public class WorkRiskLevelListBean extends AIBaseBean{ public void setChecked(boolean checked) { this.checked = checked; } + + public String getMajor() { + return major; + } + + public void setMajor(String major) { + this.major = major; + } + + public String getJobNo() { + return jobNo; + } + + public void setJobNo(String jobNo) { + this.jobNo = jobNo; + } } } 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 9883f8e..7150734 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 @@ -174,8 +174,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { 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") //公司内网215管理员 // binding.etUsername.setText("ZHPS_Admin") diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt index 7675ddc..0a89866 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt @@ -3,6 +3,7 @@ package com.rehome.zhdcoa.ui.activity import android.content.Intent import android.text.TextUtils import android.view.View +import android.widget.TextView import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import com.rehome.zhdcoa.Contans @@ -10,6 +11,8 @@ import com.rehome.zhdcoa.R import com.rehome.zhdcoa.adapter.WorkRiskLevelListAdapter import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding import com.rehome.zhdcoa.bean.WorkRiskLevelListBean +import com.rehome.zhdcoa.completionUtil.ReplaceSpan +import com.rehome.zhdcoa.completionUtil.ReplaceSpan.OnClickListener import com.rehome.zhdcoa.databinding.ActivityWorkRiskListBinding import com.rehome.zhdcoa.utils.AuthenticationLoginAIUtils import com.rehome.zhdcoa.utils.GsonUtils @@ -43,6 +46,7 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding = mutableListOf() private var dataC3: MutableList = mutableListOf() private var dataLowRisk: MutableList = mutableListOf() + private var isNetworkNormal = false private lateinit var launcherResultQRCode: ActivityResultLauncher @@ -54,11 +58,15 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding?, _: View?, position: Int, _: Long -> -// val item = datas[position] -// if(item.hazardList!=null&&item.hazardList.size>0){ -// //进入风险提示页面 -// val intent = Intent(context, WorkRiskListTipActivity::class.java) -// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) -// intent.putExtra("hazardList", GsonUtils.GsonString(item.hazardList)) -// startActivity(intent) -// }else{ -// showToast("无清单提示数据") -// } -// } + binding.llRefresh.setOnClickListener { authenticationLoginAI() } //格式化日期的对象(转化成习惯的时间格式) val sdFormat = SimpleDateFormat("yyyy.MM.dd") @@ -168,6 +164,7 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding if (token != null && token == "") { showToast("AI三维平台登录失败") + isNetworkNormal = false } else { getWorkRiskListData() } @@ -204,6 +201,7 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding 0) { binding.tvNodata.visibility = View.GONE @@ -253,11 +251,13 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding?) { - + isNetworkNormal = false } }) } diff --git a/app/src/main/res/layout/activity_work_risk_list.xml b/app/src/main/res/layout/activity_work_risk_list.xml index 26eb25e..2420ba5 100644 --- a/app/src/main/res/layout/activity_work_risk_list.xml +++ b/app/src/main/res/layout/activity_work_risk_list.xml @@ -298,15 +298,43 @@ android:layout_width="match_parent" android:layout_height="50dp" android:background="@color/colorPrimary" - android:orientation="vertical"> - + + + + + + android:background="#524658" /> + + + \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_work_ticket_select_list.xml b/app/src/main/res/layout/adapter_work_ticket_select_list.xml index 5df57cf..cc04f67 100644 --- a/app/src/main/res/layout/adapter_work_ticket_select_list.xml +++ b/app/src/main/res/layout/adapter_work_ticket_select_list.xml @@ -83,6 +83,20 @@ android:layout_weight="0.7" android:text="风险等级" /> + + +