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

手动添加作业风险信息 全部完成

Browse Source
master
wenfei 4 months ago
parent 7e85c90124
commit c5d67ef94a
13 changed files with 502 additions and 263 deletions
Show Stats Download Patch File Download Diff File

1
app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -1130,7 +1130,6 @@
android:windowSoftInputMode="adjustResize|stateHidden" /> <!-- 作业风险清单 --> android:windowSoftInputMode="adjustResize|stateHidden" /> <!-- 作业风险清单 -->
<activity <activity
android:name=".ui.activity.CustomDialogChangeLevelActivity" android:name=".ui.activity.CustomDialogChangeLevelActivity"
android:screenOrientation="portrait"
android:theme="@android:style/Theme.Dialog" /> android:theme="@android:style/Theme.Dialog" />
<activity <activity
android:name=".ui.activity.WorkTickerSelectListActivity" android:name=".ui.activity.WorkTickerSelectListActivity"

12
app/src/main/java/com/rehome/zhdcoa/adapter/WorkRiskListReportAdapter.java
Unescape Escape View File

@ -37,8 +37,18 @@ public class WorkRiskListReportAdapter extends BaseViewBindingAdapter<AdapterWor
binding.tvHbsj.setText(item.getReportTime()); binding.tvHbsj.setText(item.getReportTime());
binding.tvLevel.setText(item.getLevel()); binding.tvLevel.setText(item.getLevel());
binding.tvHbnr.setText(item.getContent()); binding.tvHbnr.setText(item.getContent());
if(item.getType()!=null){
if("ticket".equals(item.getType())){
binding.tvType.setText("工作票");
}
if("assisting".equals(item.getType())){
binding.tvType.setText("辅助工作");
}
if("custom".equals(item.getType())){
binding.tvType.setText("手动添加");
}
}
} }
} }
@Override @Override

10
app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskListReportBean.java
Unescape Escape View File

@ -81,6 +81,8 @@ public class WorkRiskListReportBean extends AIRiskListBaseBean{
private String content; private String content;
private String level; private String level;
private String type;
private List<AttachmentListBean> attachmentList; private List<AttachmentListBean> attachmentList;
public int getId() { public int getId() {
@ -147,6 +149,14 @@ public class WorkRiskListReportBean extends AIRiskListBaseBean{
this.level = level; this.level = level;
} }
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public List<AttachmentListBean> getAttachmentList() { public List<AttachmentListBean> getAttachmentList() {
return attachmentList; return attachmentList;
} }

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

@ -3,8 +3,10 @@ package com.rehome.zhdcoa.ui.activity
import android.app.Activity import android.app.Activity
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.pm.ActivityInfo
import android.content.pm.ApplicationInfo import android.content.pm.ApplicationInfo
import android.graphics.Color import android.graphics.Color
import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.text.TextUtils import android.text.TextUtils
import android.util.Log import android.util.Log
@ -40,6 +42,9 @@ class CustomDialogChangeLevelActivity : Activity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
if (Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
}
//必须在调用setContentView()之前调用requestWindowFeature() //必须在调用setContentView()之前调用requestWindowFeature()
//requestWindowFeature(Window.FEATURE_LEFT_ICON);//要标题栏显示图标 //requestWindowFeature(Window.FEATURE_LEFT_ICON);//要标题栏显示图标
//全屏操作,一定要放在加载根view之前 //全屏操作,一定要放在加载根view之前

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

@ -412,6 +412,7 @@ class MainActivity : BaseActivityOaToolbarViewBinding<ActivityMainBinding>() {
override fun onSucceed(what: Int, response: Response<String?>?) { override fun onSucceed(what: Int, response: Response<String?>?) {
val jsonResult = response?.get() val jsonResult = response?.get()
showLog("---------update app-------->") showLog("---------update app-------->")
showLog(url)
showLog(jsonResult) showLog(jsonResult)
val jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult) val jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult)
showLog(jsonDecode) showLog(jsonDecode)

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

@ -103,7 +103,8 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding<ActivityWorkRiskLi
//工作情况汇报 //工作情况汇报
val intent = Intent(context, WorkRiskListHuiBaoActivity::class.java) val intent = Intent(context, WorkRiskListHuiBaoActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
intent.putExtra("type",item.level) intent.putExtra("level",item.level)
intent.putExtra("type",item.type)
intent.putExtra("id",item.id) intent.putExtra("id",item.id)
startActivity(intent) startActivity(intent)
} }

16
app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListHuiBaoActivity.java
Unescape Escape View File

@ -203,8 +203,9 @@ public class WorkRiskListHuiBaoActivity extends BaseActivity {
private ArrayList<String> finalList = new ArrayList<>(); private ArrayList<String> finalList = new ArrayList<>();
private String level;
private String type; private String type;
private String id; private String id;
@ -227,10 +228,16 @@ public class WorkRiskListHuiBaoActivity extends BaseActivity {
public void initView() { public void initView() {
username = App.getInstance().getUserInfo().getManid(); username = App.getInstance().getUserInfo().getManid();
Intent intent = getIntent(); Intent intent = getIntent();
level = intent.getStringExtra("level");
type = intent.getStringExtra("type"); type = intent.getStringExtra("type");
//id = intent.getStringExtra("id"); //id = intent.getStringExtra("id");
id = String.valueOf(intent.getIntExtra("id",0)); id = String.valueOf(intent.getIntExtra("id",0));
showLog("-----level----");
showLog(level);
showLog("-----type----");
showLog(type);
findView(); findView();
@ -255,10 +262,6 @@ public class WorkRiskListHuiBaoActivity extends BaseActivity {
@Override @Override
public void initData() { public void initData() {
if(!TextUtils.isEmpty(type)){
//et_kks.setText(kksCode);
}
} }
public void authenticationLoginAI() { public void authenticationLoginAI() {
@ -317,7 +320,8 @@ public class WorkRiskListHuiBaoActivity extends BaseActivity {
showLog(username); showLog(username);
request.add("reporterNo", username); request.add("reporterNo", username);
request.add("level", type); request.add("level", level);
request.add("type", type);
request.add("ticketId", id); request.add("ticketId", id);
request.add("content",etMs.getText().toString().trim()); request.add("content",etMs.getText().toString().trim());

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

@ -40,7 +40,7 @@ class WorkRiskListHuiBaoDetailActivity : BaseActivityOaToolbarViewBinding<Activi
finish() finish()
} }
var itemStr = intent.getStringExtra("item")!! val itemStr = intent.getStringExtra("item")!!
item = GsonUtils.GsonToBean(itemStr,WorkRiskListReportBean.WorkRiskListReportDataListBean::class.java) item = GsonUtils.GsonToBean(itemStr,WorkRiskListReportBean.WorkRiskListReportDataListBean::class.java)
} }
@ -51,6 +51,17 @@ class WorkRiskListHuiBaoDetailActivity : BaseActivityOaToolbarViewBinding<Activi
binding.tvHbsj.text = item.reportTime binding.tvHbsj.text = item.reportTime
binding.tvLevel.text = item.level binding.tvLevel.text = item.level
binding.etMs.setText(item.content) binding.etMs.setText(item.content)
if (item.type != null) {
if ("ticket" == item.type) {
binding.tvType.text = "工作票"
}
if ("assisting" == item.type) {
binding.tvType.text = "辅助工作"
}
if ("custom" == item.type) {
binding.tvType.text = "手动添加"
}
}
//WorkRiskListReportAttachmentAdapter //WorkRiskListReportAttachmentAdapter

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

@ -88,9 +88,7 @@ class WorkTickerCustomAddActivity : BaseActivityOaToolbarViewBinding<ActivityWor
override fun initView() { override fun initView() {
initToolbar("手动添加作业风险信息", "") {
}
launcherResult = createActivityResultLauncher() launcherResult = createActivityResultLauncher()
isEdit = intent.getBooleanExtra("isEdit",false) isEdit = intent.getBooleanExtra("isEdit",false)
@ -125,6 +123,9 @@ class WorkTickerCustomAddActivity : BaseActivityOaToolbarViewBinding<ActivityWor
if(isEdit){ if(isEdit){
showLog("--------------------custom item--------------------------") showLog("--------------------custom item--------------------------")
initToolbar("修改作业风险信息", "") {
}
val gson = Gson() val gson = Gson()
val itemStr = intent.getStringExtra("item")!! val itemStr = intent.getStringExtra("item")!!
showLog(itemStr) showLog(itemStr)
@ -204,6 +205,10 @@ class WorkTickerCustomAddActivity : BaseActivityOaToolbarViewBinding<ActivityWor
} }
} }
} }
}else{
initToolbar("手动添加作业风险信息", "") {
}
} }
@ -233,13 +238,20 @@ class WorkTickerCustomAddActivity : BaseActivityOaToolbarViewBinding<ActivityWor
if(checkCanSubmit()){ if(checkCanSubmit()){
val dialog = CommitDialog(context, object : CommitDialogListener { val dialog = CommitDialog(context, object : CommitDialogListener {
override fun confirm() { override fun confirm() {
authenticationLoginAISubmit() if(isEdit){
authenticationLoginAIUpdate()
}else{
authenticationLoginAISubmit()
}
} }
override fun cancel() { override fun cancel() {
} }
}) })
dialog.setTvMsg("您确定要提交手动添加的作业风险信息吗?") dialog.setTvMsg("您确定要提交手动添加的作业风险信息吗?")
if(isEdit){
dialog.setTvMsg("您确定要修改作业风险信息吗?")
}
dialog.show() dialog.show()
} }
} }
@ -500,6 +512,29 @@ class WorkTickerCustomAddActivity : BaseActivityOaToolbarViewBinding<ActivityWor
} }
} }
private fun authenticationLoginAIUpdate() {
try {
//AI三维登录接口
val userName = Contans.SP.AI_ACCOUNT
//String strPrivateEncode=RSAAndroid.encryptByPrivateKeyForSpiltStr(Contans.SP.AI_PWD,RSAAndroid.privateRsaKeyLocal);
val strPublicDecode = RSAAndroid.decryptByPublicKeyForSpiltStr(
Contans.SP.AI_PWD_ENCODE,
RSAAndroid.publicRsaKeyLocal
)
AuthenticationLoginAIUtils.authenticationAILoginShowProgress(
this, userName, strPublicDecode
) { _, token ->
if (token != null && token == "") {
showToast("AI三维平台登录失败")
} else {
updateWorkTicketData()
}
}
} catch (e: Exception) {
e.printStackTrace()
}
}
private fun getSubmitJsonData(): String { private fun getSubmitJsonData(): String {
val param = HashMap<String, Any>() val param = HashMap<String, Any>()
param["major"] = items[binding.spinnerZy.selectedItemPosition] param["major"] = items[binding.spinnerZy.selectedItemPosition]
@ -529,6 +564,36 @@ class WorkTickerCustomAddActivity : BaseActivityOaToolbarViewBinding<ActivityWor
return json return json
} }
private fun getUpdateJsonData(): String {
val param = HashMap<String, Any>()
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() { private fun submitWorkTicketData() {
val request = NoHttp.createStringRequest( val request = NoHttp.createStringRequest(
Contans.BASE_URL_AI_3D_SERVER + Contans.DAYLY_SUBMIT_CUSTOM_WORK_TICKET, Contans.BASE_URL_AI_3D_SERVER + Contans.DAYLY_SUBMIT_CUSTOM_WORK_TICKET,
@ -583,4 +648,50 @@ class WorkTickerCustomAddActivity : BaseActivityOaToolbarViewBinding<ActivityWor
return true; return true;
} }
private fun updateWorkTicketData() {
val request = NoHttp.createStringRequest(
Contans.BASE_URL_AI_3D_SERVER + Contans.DAYLY_UPDATE_CUSTOM_WORK_TICKET,
RequestMethod.POST
)
val json: String = getUpdateJsonData()
request.setDefineRequestBodyForJson(json)
if (Contans.BASE_URL_AI_3D_SERVER == Contans.BASE_URL_AI_3D_SERVER_EXTRANET) {
val socketFactory = NohttpUtils.getSSLSocketFactory(context)
if (socketFactory != null) {
request.sslSocketFactory = socketFactory
request.hostnameVerifier = HostnameVerifier { _, _ -> true }
}
}
NohttpUtils.getInstance().add(this, 0, request, object : HttpListener<String?> {
override fun onSucceed(what: Int, response: Response<String?>?) {
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<String?>?) {
}
})
}
} }

30
app/src/main/res/layout/activity_work_risk_list_hui_bao_detail.xml
Unescape Escape View File

@ -110,19 +110,43 @@
style="@style/dagerDetailLeftStyle" style="@style/dagerDetailLeftStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="12sp" android:text="类型:" />
<TextView
android:id="@+id/tv_type"
style="@style/dagerDetailRightStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
style="@style/dagerDetailLeftStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="汇报时间:" /> android:text="汇报时间:" />
<TextView <TextView
android:id="@+id/tv_hbsj" android:id="@+id/tv_hbsj"
style="@style/dagerDetailRightStyle" style="@style/dagerDetailRightStyle"
android:textSize="12sp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

526
app/src/main/res/layout/activity_work_ticker_custom_add.xml
Unescape Escape View File

@ -10,297 +10,337 @@
android:id="@+id/toolbarView" android:id="@+id/toolbarView"
layout="@layout/layout_base" /> layout="@layout/layout_base" />
<LinearLayout <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:background="#dddddd"
android:padding="3dp"
android:minHeight="12dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:gravity="center"
android:minHeight="25dp"
android:text="开始时间:"
android:textSize="18sp" />
<TextView
android:id="@+id/tv_st"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:minHeight="25dp"
android:textColor="@color/colorPrimaryDark"
android:text=""
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#dddddd"
android:padding="3dp"
android:minHeight="12dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:gravity="center"
android:minHeight="25dp"
android:text="结束时间:"
android:textSize="18sp" />
<TextView
android:id="@+id/tv_et"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:minHeight="25dp"
android:textColor="@color/colorPrimaryDark"
android:text=""
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#dddddd"
android:padding="3dp"
android:gravity="center_vertical"
android:minHeight="30px">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:gravity="center"
android:minHeight="25dp"
android:text="风险等级:"
android:textSize="18sp" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="80dp" android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="300dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:background="#dddddd"
android:orientation="horizontal"> android:minHeight="12dp"
android:padding="3dp">
<RadioButton <TextView
android:id="@+id/rb1" android:layout_width="wrap_content"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_margin="3dp"
android:checked="true" android:gravity="center"
android:text="A" android:minHeight="25dp"
android:textColor="#666666" android:text="开始时间:"
android:textSize="18sp" /> android:textSize="18sp" />
<RadioButton <TextView
android:id="@+id/rb2" android:id="@+id/tv_st"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="3dp"
android:layout_weight="1" android:layout_weight="1"
android:text="B" android:gravity="center_vertical"
android:textColor="#666666" android:minHeight="25dp"
android:text=""
android:textColor="@color/colorPrimaryDark"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#dddddd"
android:minHeight="12dp"
android:padding="3dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:gravity="center"
android:minHeight="25dp"
android:text="结束时间:"
android:textSize="18sp" /> android:textSize="18sp" />
<RadioButton <TextView
android:id="@+id/rb3" android:id="@+id/tv_et"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="3dp"
android:layout_weight="1" android:layout_weight="1"
android:text="C1" android:gravity="center_vertical"
android:textColor="#666666" android:minHeight="25dp"
android:text=""
android:textColor="@color/colorPrimaryDark"
android:textSize="18sp" /> android:textSize="18sp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="300dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:background="#dddddd"
android:layout_marginTop="10dp" android:gravity="center_vertical"
android:orientation="horizontal"> android:minHeight="30px"
android:padding="3dp">
<RadioButton <TextView
android:id="@+id/rb4" android:layout_width="wrap_content"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_margin="3dp"
android:text="C2" android:gravity="center"
android:textColor="#666666" android:minHeight="25dp"
android:text="风险等级:"
android:textSize="18sp" /> android:textSize="18sp" />
<RadioButton <LinearLayout
android:id="@+id/rb5" android:layout_width="match_parent"
style="@style/Widget.AppCompat.CompoundButton.RadioButton" android:layout_height="80dp"
android:layout_width="0dp" android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb1"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:checked="true"
android:text="A"
android:textColor="#666666"
android:textSize="18sp" />
<RadioButton
android:id="@+id/rb2"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="B"
android:textColor="#666666"
android:textSize="18sp" />
<RadioButton
android:id="@+id/rb3"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="C1"
android:textColor="#666666"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb4"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="C2"
android:textColor="#666666"
android:textSize="18sp" />
<RadioButton
android:id="@+id/rb5"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="C3"
android:textColor="#666666"
android:textSize="18sp" />
<RadioButton
android:id="@+id/rb6"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="低风险"
android:textColor="#666666"
android:textSize="18sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#dddddd"
android:gravity="center_vertical"
android:minHeight="12dp"
android:padding="3dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_marginStart="3dp"
android:text="C3" android:layout_marginTop="3dp"
android:textColor="#666666" android:layout_marginBottom="3dp"
android:gravity="center"
android:minHeight="25dp"
android:text="专业"
android:textSize="18sp"
android:visibility="invisible" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginBottom="3dp"
android:gravity="center"
android:minHeight="25dp"
android:text="专业:"
android:textSize="18sp" /> android:textSize="18sp" />
<RadioButton <Spinner
android:id="@+id/rb6" android:id="@+id/spinner_zy"
style="@style/Widget.AppCompat.CompoundButton.RadioButton" style="@style/spriner_first"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1" android:layout_weight="1"
android:text="低风险" android:gravity="center"
android:textColor="#666666" android:padding="5dp"
android:textSize="18sp" /> android:textSize="18sp" />
</LinearLayout> </LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#dddddd"
android:padding="3dp"
android:gravity="center_vertical"
android:minHeight="12dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_marginTop="3dp"
android:layout_marginBottom="3dp"
android:gravity="center"
android:visibility="invisible"
android:minHeight="25dp"
android:text="专业"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginBottom="3dp"
android:gravity="center"
android:minHeight="25dp"
android:text="专业:"
android:textSize="18sp" />
<Spinner
android:id="@+id/spinner_zy"
style="@style/editTextTheme"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:layout_weight="1"
android:gravity="center"
android:padding="5dp"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#dddddd"
android:padding="3dp"
android:gravity="center_vertical"
android:minHeight="30px">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:gravity="center"
android:minHeight="25dp"
android:text="工作内容:"
android:textSize="18sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="120dp" android:layout_height="wrap_content"
android:layout_margin="10dp" android:background="#dddddd"
android:gravity="center"> android:gravity="center_vertical"
<EditText android:minHeight="30px"
android:id="@+id/et_ms" android:padding="3dp">
style="@style/editTextTheme"
android:layout_width="match_parent" <TextView
android:layout_height="110dp" android:layout_width="wrap_content"
android:gravity="top|start" android:layout_height="wrap_content"
android:inputType="textMultiLine" android:layout_margin="3dp"
android:gravity="center"
android:minHeight="25dp"
android:text="工作内容:"
android:textSize="18sp" /> android:textSize="18sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="120dp"
android:layout_margin="10dp"
android:gravity="center">
<EditText
android:id="@+id/et_ms"
style="@style/editTextTheme"
android:layout_width="match_parent"
android:layout_height="110dp"
android:gravity="top|start"
android:inputType="textMultiLine"
android:textSize="18sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
</LinearLayout> <include
<include android:id="@+id/item_head"
android:id="@+id/item_head" layout="@layout/item_work_risk_list_tip_head"
layout="@layout/item_work_risk_list_tip_head"
android:layout_width="match_parent"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:layout_marginTop="10dp"
android:layout_height="wrap_content" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:layout_marginBottom="5dp"
android:layout_weight="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ListView
android:id="@+id/lv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:divider="#00000000" android:layout_marginStart="5dp"
android:dividerHeight="0px"/> android:layout_marginTop="10dp"
<LinearLayout android:layout_marginEnd="5dp" />
<FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#dddddd" android:layout_marginStart="5dp"
android:padding="3dp" android:layout_marginEnd="5dp"
android:gravity="center_vertical" android:layout_marginBottom="5dp">
android:minHeight="12dp">
<TextView <LinearLayout
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="3dp" android:orientation="vertical">
android:layout_weight="1"
android:gravity="center|end" <com.rehome.zhdcoa.weiget.ListViewForScrollView
android:minHeight="25dp" android:id="@+id/lv"
android:text="危害后果及防范措施" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="#00000000"
android:dividerHeight="0px" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#dddddd"
android:gravity="center_vertical"
android:minHeight="12dp"
android:padding="3dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:layout_weight="1"
android:gravity="center|end"
android:minHeight="25dp"
android:text="危害后果及防范措施"
android:textSize="18sp" />
<ImageButton
android:id="@+id/iv_add"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_margin="3dp"
android:contentDescription="addicon"
android:gravity="center_vertical"
android:src="@drawable/add_gray" />
</LinearLayout>
</LinearLayout>
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/colorPrimary"
android:orientation="vertical">
<TextView
android:id="@+id/tv_submit"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="提交"
android:textColor="@color/white"
android:textSize="18sp" /> android:textSize="18sp" />
<ImageButton
android:id="@+id/iv_add"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_margin="3dp"
android:contentDescription="addicon"
android:gravity="center_vertical"
android:src="@drawable/add_gray" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</FrameLayout> </ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/colorPrimary"
android:orientation="vertical">
<TextView
android:id="@+id/tv_submit"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="@color/white"
android:gravity="center"
android:textSize="18sp"
android:text="提交"/>
</LinearLayout>
</LinearLayout> </LinearLayout>

23
app/src/main/res/layout/adapter_work_risk_list_report.xml
Unescape Escape View File

@ -106,13 +106,11 @@
style="@style/dagerDetailLeftStyle" style="@style/dagerDetailLeftStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="12sp" android:text="类型:" />
android:text="汇报时间:" />
<TextView <TextView
android:id="@+id/tv_hbsj" android:id="@+id/tv_type"
style="@style/dagerDetailRightStyle" style="@style/dagerDetailRightStyle"
android:textSize="12sp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />
@ -125,6 +123,23 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView
style="@style/dagerDetailLeftStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="汇报时间:" />
<TextView
android:id="@+id/tv_hbsj"
style="@style/dagerDetailRightStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView <TextView
style="@style/dagerDetailLeftStyle" style="@style/dagerDetailLeftStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"

8
app/src/main/res/values/styles.xml
Unescape Escape View File

@ -22,6 +22,14 @@
<item name="android:layout_height">70px</item> <item name="android:layout_height">70px</item>
</style> </style>
<style name="spriner_first">
<item name="android:padding">10px</item>
<item name="android:background">@drawable/bg_edittext</item>
<item name="android:textColor">#bb000000</item>
<item name="android:textSize">18sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="editTextThemePanDian"> <style name="editTextThemePanDian">
<item name="android:padding">10px</item> <item name="android:padding">10px</item>
<item name="android:layout_margin">10px</item> <item name="android:layout_margin">10px</item>

Write Preview
Loading…
Cancel
Save