diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eb30e14..f643103 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1130,7 +1130,6 @@
android:windowSoftInputMode="adjustResize|stateHidden" />
attachmentList;
public int getId() {
@@ -147,6 +149,14 @@ public class WorkRiskListReportBean extends AIRiskListBaseBean{
this.level = level;
}
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
public List getAttachmentList() {
return attachmentList;
}
diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/CustomDialogChangeLevelActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/CustomDialogChangeLevelActivity.kt
index a257465..a218225 100644
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/CustomDialogChangeLevelActivity.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/CustomDialogChangeLevelActivity.kt
@@ -3,8 +3,10 @@ package com.rehome.zhdcoa.ui.activity
import android.app.Activity
import android.content.Context
import android.content.Intent
+import android.content.pm.ActivityInfo
import android.content.pm.ApplicationInfo
import android.graphics.Color
+import android.os.Build
import android.os.Bundle
import android.text.TextUtils
import android.util.Log
@@ -40,6 +42,9 @@ class CustomDialogChangeLevelActivity : Activity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ if (Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+ }
//必须在调用setContentView()之前调用requestWindowFeature()
//requestWindowFeature(Window.FEATURE_LEFT_ICON);//要标题栏显示图标
//全屏操作,一定要放在加载根view之前
diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt
index e9418f0..56fe1b8 100644
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt
@@ -412,6 +412,7 @@ class MainActivity : BaseActivityOaToolbarViewBinding() {
override fun onSucceed(what: Int, response: Response?) {
val jsonResult = response?.get()
showLog("---------update app-------->")
+ showLog(url)
showLog(jsonResult)
val jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult)
showLog(jsonDecode)
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 1894690..8b3cfd1 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
@@ -103,7 +103,8 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding finalList = new ArrayList<>();
-
+ private String level;
private String type;
+
private String id;
@@ -227,10 +228,16 @@ public class WorkRiskListHuiBaoActivity extends BaseActivity {
public void initView() {
username = App.getInstance().getUserInfo().getManid();
Intent intent = getIntent();
+ level = intent.getStringExtra("level");
type = intent.getStringExtra("type");
//id = intent.getStringExtra("id");
id = String.valueOf(intent.getIntExtra("id",0));
+ showLog("-----level----");
+ showLog(level);
+ showLog("-----type----");
+ showLog(type);
+
findView();
@@ -255,10 +262,6 @@ public class WorkRiskListHuiBaoActivity extends BaseActivity {
@Override
public void initData() {
-
- if(!TextUtils.isEmpty(type)){
- //et_kks.setText(kksCode);
- }
}
public void authenticationLoginAI() {
@@ -317,7 +320,8 @@ public class WorkRiskListHuiBaoActivity extends BaseActivity {
showLog(username);
request.add("reporterNo", username);
- request.add("level", type);
+ request.add("level", level);
+ request.add("type", type);
request.add("ticketId", id);
request.add("content",etMs.getText().toString().trim());
diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListHuiBaoDetailActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListHuiBaoDetailActivity.kt
index e78bd45..1bbe2c5 100644
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListHuiBaoDetailActivity.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListHuiBaoDetailActivity.kt
@@ -40,7 +40,7 @@ class WorkRiskListHuiBaoDetailActivity : BaseActivityOaToolbarViewBinding
+ if (token != null && token == "") {
+ showToast("AI三维平台登录失败")
+ } else {
+ updateWorkTicketData()
+ }
+ }
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ }
+
private fun getSubmitJsonData(): String {
val param = HashMap()
param["major"] = items[binding.spinnerZy.selectedItemPosition]
@@ -529,6 +564,36 @@ class WorkTickerCustomAddActivity : BaseActivityOaToolbarViewBinding()
+ param["major"] = items[binding.spinnerZy.selectedItemPosition]
+ param["jobNo"] = userInfo!!.manid
+ param["content"] = binding.etMs.text.toString().trim()
+ param["id"] = item.id
+
+ if(binding.rb1.isChecked){
+ param["level"] = "A"
+ }else if(binding.rb2.isChecked){
+ param["level"] = "B"
+ }else if(binding.rb3.isChecked){
+ param["level"] = "C1"
+ }else if(binding.rb4.isChecked){
+ param["level"] = "C2"
+ }else if(binding.rb5.isChecked){
+ param["level"] = "C3"
+ }else if(binding.rb6.isChecked){
+ param["level"] = "低风险"
+ }
+
+ param["startTime"]= binding.tvSt.text.toString().trim()
+ param["endTime"]= binding.tvEt.text.toString().trim()
+ param["hazardList"]= workRiskLevelTipListBeanList
+
+ val json = GsonUtils.GsonString(param)
+ showLog(json)
+ return json
+ }
+
private fun submitWorkTicketData() {
val request = NoHttp.createStringRequest(
Contans.BASE_URL_AI_3D_SERVER + Contans.DAYLY_SUBMIT_CUSTOM_WORK_TICKET,
@@ -583,4 +648,50 @@ class WorkTickerCustomAddActivity : BaseActivityOaToolbarViewBinding true }
+ }
+ }
+
+ NohttpUtils.getInstance().add(this, 0, request, object : HttpListener {
+
+ override fun onSucceed(what: Int, response: Response?) {
+ val result = response?.get()
+ showLog("----------------")
+ showLog(result)
+ val bean = GsonUtils.GsonToBean(
+ result,
+ AIBaseBean::class.java
+ )
+ if (bean != null && bean.isSuccess) {
+ //提交成功
+ val confirmDialog = ConfirmDialog(
+ context, "修改作业风险信息成功"
+ ) { finish() }
+ confirmDialog.setTvTitle("提示")
+ confirmDialog.setCancelable(true)
+ confirmDialog.show()
+ }else{
+ showToast("修改作业风险信息失败")
+ }
+ }
+
+ override fun onFailed(what: Int, response: Response?) {
+
+ }
+ })
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_work_risk_list_hui_bao_detail.xml b/app/src/main/res/layout/activity_work_risk_list_hui_bao_detail.xml
index 1f74a9c..cd6a2b6 100644
--- a/app/src/main/res/layout/activity_work_risk_list_hui_bao_detail.xml
+++ b/app/src/main/res/layout/activity_work_risk_list_hui_bao_detail.xml
@@ -110,19 +110,43 @@
style="@style/dagerDetailLeftStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="12sp"
+ android:text="类型:" />
+
+
+
+
+
+
+
+
+
-
diff --git a/app/src/main/res/layout/activity_work_ticker_custom_add.xml b/app/src/main/res/layout/activity_work_ticker_custom_add.xml
index db7b02c..b0e3b33 100644
--- a/app/src/main/res/layout/activity_work_ticker_custom_add.xml
+++ b/app/src/main/res/layout/activity_work_ticker_custom_add.xml
@@ -10,297 +10,337 @@
android:id="@+id/toolbarView"
layout="@layout/layout_base" />
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="wrap_content">
+
+
+
+ android:background="#dddddd"
+ android:minHeight="12dp"
+ android:padding="3dp">
-
-
+
+
+
+
+
-
+ android:background="#dddddd"
+ android:gravity="center_vertical"
+ android:minHeight="30px"
+ android:padding="3dp">
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/adapter_work_risk_list_report.xml b/app/src/main/res/layout/adapter_work_risk_list_report.xml
index 23a511d..8bb5d5f 100644
--- a/app/src/main/res/layout/adapter_work_risk_list_report.xml
+++ b/app/src/main/res/layout/adapter_work_risk_list_report.xml
@@ -106,13 +106,11 @@
style="@style/dagerDetailLeftStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="12sp"
- android:text="汇报时间:" />
+ android:text="类型:" />
@@ -125,6 +123,23 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
+
+
+
+
+
+
70px
+
+