添加危化品清单

2 years ago · 8c10f7d10a
parent c4d1c71250
commit 8c10f7d10a
12 changed files with 480 additions and 19 deletions
--- a/app/src/main/java/com/rehome/zhdcoa/Api.java
+++ b/app/src/main/java/com/rehome/zhdcoa/Api.java
@ -768,6 +768,15 @@ public interface Api {
    @POST("CBS/WHP/Api/GetHWPSQByID.ashx")
    Call<DagerEnterApplyBean> getHWPSQByID(@Query("ID") String ID);

+    /**
+     * 获取危化品清单列表数据
+     * @param MAINID
+     * @return
+     */
+    @GET("CBS/WHP/Api/GetHWPSQ_QDList.ashx")
+    Call<WhpListItemListBean> getHwpListByID(@Query("MAINID") String MAINID);
+
+
 //    @GET("PubFile/Data/GetVerificationCode.ashx")
 //    Call<YzmBean> getyzm(@Query("userid") String userid,
 //                         @Query("telphone") String telphone,
--- a/app/src/main/java/com/rehome/zhdcoa/Contans.java
+++ b/app/src/main/java/com/rehome/zhdcoa/Contans.java
@ -26,11 +26,11 @@ public class Contans {

    public static String IP_INTRANET = "http://10.19.0.72:8081/";

-    public static String BASE_URL_EXTRANET = "http://219.131.195.3:8082/";//app外网服务器，对应内网ip:  172.16.25.75
-    public static String IP_EXTRANET = "http://219.131.195.3:8081/";
+//    public static String BASE_URL_EXTRANET = "http://219.131.195.3:8082/";//app外网服务器，对应内网ip:  172.16.25.75
+//    public static String IP_EXTRANET = "http://219.131.195.3:8081/";

-//    public static String BASE_URL_EXTRANET = "http://192.168.2.215:8082/";//app公司内网开发服务器
-//    public static String IP_EXTRANET = "http://192.168.2.215:9005/";
+    public static String BASE_URL_EXTRANET = "http://192.168.2.215:8082/";//app公司内网开发服务器
+    public static String IP_EXTRANET = "http://192.168.2.215:9005/";



--- a/app/src/main/java/com/rehome/zhdcoa/adapter/WhpListAdapter.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/adapter/WhpListAdapter.kt
@ -0,0 +1,45 @@
+package com.rehome.zhdcoa.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.rehome.zhdcoa.base.BaseViewBindingAdapter
+import com.rehome.zhdcoa.bean.WhpListItemBean
+import com.rehome.zhdcoa.databinding.AdapterWhpListBinding
+
+/**
+ *   Create By HuangWenFei
+ *   创建日期：2023-07-28 16:45
+ *   描述：
+ */
+class WhpListAdapter (var context: Context,var data: MutableList<WhpListItemBean>,var mCallBack: CallBack ) : BaseViewBindingAdapter<AdapterWhpListBinding>(context) {
+
+
+    interface CallBack {
+        fun deleteClick(position: Int)
+    }
+    override fun getCount(): Int {
+        return data.count()
+    }
+
+    override fun getItem(position: Int): Any {
+        return data[position]
+    }
+
+    override fun getItemId(position: Int): Long {
+        return position.toLong()
+    }
+
+    override fun handleData(position: Int, binding: AdapterWhpListBinding) {
+        val item: WhpListItemBean = data[position]
+        binding.tvHSPMC.text = item.hspmc
+        binding.tvWSLB.text = item.wslb
+        binding.tvSYBM.text = item.sybm
+        binding.tvDelete.setOnClickListener {
+            mCallBack.deleteClick(position)
+        }
+    }
+
+    override fun getBinding(inflater: LayoutInflater, parent: ViewGroup?) = AdapterWhpListBinding.inflate(inflater, parent, false)
+
+}
--- a/app/src/main/java/com/rehome/zhdcoa/bean/WhpListItemBean.java
+++ b/app/src/main/java/com/rehome/zhdcoa/bean/WhpListItemBean.java
@ -0,0 +1,151 @@
+package com.rehome.zhdcoa.bean;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Create By HuangWenFei
+ * 创建日期：2023-07-28 14:43
+ * 描述： 危化品清单
+ */
+public class WhpListItemBean implements Parcelable {
+    private String ID;
+    private String MAINID;
+    private String HSPMC;
+    private String WSLB;
+    private String SYBM;
+    private String ZRR;
+    private String SRCL;
+    private String CCDD;
+    private String RT;
+    private String MSDS;
+
+    public WhpListItemBean(){
+
+    }
+    protected WhpListItemBean(Parcel in) {
+        MAINID = in.readString();
+        HSPMC = in.readString();
+        WSLB = in.readString();
+        SYBM = in.readString();
+        ZRR = in.readString();
+        SRCL = in.readString();
+        CCDD = in.readString();
+        RT = in.readString();
+        MSDS = in.readString();
+        ID = in.readString();
+    }
+
+    public static final Creator<WhpListItemBean> CREATOR = new Creator<WhpListItemBean>() {
+        @Override
+        public WhpListItemBean createFromParcel(Parcel in) {
+            return new WhpListItemBean(in);
+        }
+
+        @Override
+        public WhpListItemBean[] newArray(int size) {
+            return new WhpListItemBean[size];
+        }
+    };
+
+    public String getID() {
+        return ID;
+    }
+
+    public void setID(String ID) {
+        this.ID = ID;
+    }
+
+    public String getMAINID() {
+        return MAINID;
+    }
+
+    public void setMAINID(String MAINID) {
+        this.MAINID = MAINID;
+    }
+
+    public String getHSPMC() {
+        return HSPMC;
+    }
+
+    public void setHSPMC(String HSPMC) {
+        this.HSPMC = HSPMC;
+    }
+
+    public String getWSLB() {
+        return WSLB;
+    }
+
+    public void setWSLB(String WSLB) {
+        this.WSLB = WSLB;
+    }
+
+    public String getSYBM() {
+        return SYBM;
+    }
+
+    public void setSYBM(String SYBM) {
+        this.SYBM = SYBM;
+    }
+
+    public String getZRR() {
+        return ZRR;
+    }
+
+    public void setZRR(String ZRR) {
+        this.ZRR = ZRR;
+    }
+
+    public String getSRCL() {
+        return SRCL;
+    }
+
+    public void setSRCL(String SRCL) {
+        this.SRCL = SRCL;
+    }
+
+    public String getCCDD() {
+        return CCDD;
+    }
+
+    public void setCCDD(String CCDD) {
+        this.CCDD = CCDD;
+    }
+
+    public String getRT() {
+        return RT;
+    }
+
+    public void setRT(String RT) {
+        this.RT = RT;
+    }
+
+    public String getMSDS() {
+        return MSDS;
+    }
+
+    public void setMSDS(String MSDS) {
+        this.MSDS = MSDS;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        dest.writeString(this.MAINID);
+        dest.writeString(this.HSPMC);
+        dest.writeString(this.WSLB);
+        dest.writeString(this.SYBM);
+        dest.writeString(this.ZRR);
+        dest.writeString(this.SRCL);
+        dest.writeString(this.CCDD);
+        dest.writeString(this.RT);
+        dest.writeString(this.MSDS);
+        dest.writeString(this.ID);
+    }
+}
--- a/app/src/main/java/com/rehome/zhdcoa/bean/WhpListItemListBean.java
+++ b/app/src/main/java/com/rehome/zhdcoa/bean/WhpListItemListBean.java
@ -0,0 +1,20 @@
+package com.rehome.zhdcoa.bean;
+
+import java.util.List;
+
+/**
+ * Create By HuangWenFei
+ * 创建日期：2023-07-28 15:33
+ * 描述：获取危化品清单列表数据
+ */
+public class WhpListItemListBean  extends DagerEnterApplyBaseBean {
+    private List<WhpListItemBean> Datas;
+
+    public List<WhpListItemBean> getDatas() {
+        return Datas;
+    }
+
+    public void setDatas(List<WhpListItemBean> datas) {
+        Datas = datas;
+    }
+}
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt
@ -4,15 +4,19 @@ import android.content.Intent
 import android.text.TextUtils
 import android.util.Log
 import android.view.View
+import android.widget.AdapterView
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import com.google.gson.Gson
 import com.rehome.zhdcoa.Contans
+import com.rehome.zhdcoa.adapter.WhpListAdapter
 import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding
 import com.rehome.zhdcoa.base.BaseCallBack
 import com.rehome.zhdcoa.bean.DagerEnterApplyBean
 import com.rehome.zhdcoa.bean.GetAuditBean
 import com.rehome.zhdcoa.bean.StaffInfoBean
+import com.rehome.zhdcoa.bean.WhpListItemBean
+import com.rehome.zhdcoa.bean.WhpListItemListBean
 import com.rehome.zhdcoa.databinding.ActivityAddDagerEnterApplyBinding
 import com.rehome.zhdcoa.utils.HttpUtils
 import com.rehome.zhdcoa.weiget.DateTimeMinutePickDialog
@ -29,6 +33,10 @@ class AddDagerEnterApplyActivity :
    private var departmentName: String? = null
    private var isEdit = false;
    private var id: String? = null;
+    private val whpList: MutableList<WhpListItemBean> = mutableListOf()
+    private val whpDeleteList: MutableList<WhpListItemBean> = mutableListOf()
+
+    private lateinit var adapter: WhpListAdapter

    private val userInfos: ArrayList<StaffInfoBean.StaffInfo> = ArrayList()
    override fun getViewBinding() = ActivityAddDagerEnterApplyBinding.inflate(layoutInflater)
@ -80,10 +88,38 @@ class AddDagerEnterApplyActivity :
    }

    override fun initData() {
+        setAdapter()
        if (isEdit) {
            getHWPSQByID()
        }
+    }
+
+    private fun setAdapter() {
+        adapter = WhpListAdapter(context, whpList, object : WhpListAdapter.CallBack {
+            override fun deleteClick(position: Int) {
+
+            }

+        })
+        binding.lv.adapter = adapter
+        binding.lv.onItemClickListener = AdapterView.OnItemClickListener { parent: AdapterView<*>?, view: View?, position: Int, id: Long ->
+                val item = whpList[position]
+//                if( item.istj==0){
+//                    //已保存，未提交，进入新增/编辑页面
+//                    //编辑危化品入厂申请
+//                    val intent = Intent(context, AddDagerEnterApplyActivity::class.java)
+//                    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+//                    intent.putExtra("isEdit",true)
+//                    intent.putExtra("id",item.id)
+//                    startActivity(intent)
+//                }else{
+//                    //已提交，进入审核页面
+//                    val intent = Intent(context, DagerEnterApplyDetailActivity::class.java)
+//                    intent.putExtra("id", item.id)
+//                    intent.putExtra("DepartmentNameId", item.dcfzbz)
+//                    startActivity(intent)
+//                }
+            }
    }

    //创建一个ActivityResultLauncher
@ -118,29 +154,29 @@ class AddDagerEnterApplyActivity :
        }
    }

-
-    //http://192.168.2.215:8082/CBS/WHP/Api/GetHWPSQByID.ashx?ID=6966abb3-8150-4170-9e8a-9e81a6dbe07d
    //获取一条危化品数据
    private fun getHWPSQByID() {

-        HttpUtils.getApi().getHWPSQByID(id!!).enqueue(object : BaseCallBack<DagerEnterApplyBean>(context) {
+        HttpUtils.getApi().getHWPSQByID(id!!)
+            .enqueue(object : BaseCallBack<DagerEnterApplyBean>(context) {
                override fun onSuccess(
                    call: Call<DagerEnterApplyBean>?,
                    response: retrofit2.Response<DagerEnterApplyBean>?
                ) {
                    val bean = response?.body()
-                    if (bean!=null&&bean.isFlag) {
-                        Log.i("app", Gson().toJson(bean))
-                        if(bean.datas!=null&&bean.datas.size>0){
-                            val rowsBean:DagerEnterApplyBean.RowsBean = bean.datas[0]
-                            binding.ilDinnerApply.content=rowsBean.name
-                            binding.ilTravelAddress.content=rowsBean.sqgys
-                            binding.ilTravelsRemark.content=rowsBean.xmname
-                            binding.ilStartTime.content=rowsBean.sqsj
-                            binding.ilDinnerUnit.content=rowsBean.dcfzbzname
+                    if (bean != null && bean.isFlag) {
+                        showToast(Gson().toJson(bean))
+                        if (bean.datas != null && bean.datas.size > 0) {
+                            val rowsBean: DagerEnterApplyBean.RowsBean = bean.datas[0]
+                            binding.ilDinnerApply.content = rowsBean.name
+                            binding.ilTravelAddress.content = rowsBean.sqgys
+                            binding.ilTravelsRemark.content = rowsBean.xmname
+                            binding.ilStartTime.content = rowsBean.sqsj
+                            binding.ilDinnerUnit.content = rowsBean.dcfzbzname
                            departmentId = rowsBean.dcfzbz
                            departmentName = rowsBean.dcfzbzname
                            id = rowsBean.id
+                            getHwpListByID()
                        }

                    }
@ -152,4 +188,28 @@ class AddDagerEnterApplyActivity :
            })
    }

+    //获取危化品清单数据
+    private fun getHwpListByID() {
+
+        HttpUtils.getApi().getHwpListByID(id!!)
+            .enqueue(object : BaseCallBack<WhpListItemListBean>(context) {
+                override fun onSuccess(
+                    call: Call<WhpListItemListBean>?,
+                    response: retrofit2.Response<WhpListItemListBean>?
+                ) {
+                    val bean = response?.body()
+                    if (bean != null && bean.isFlag) {
+                        showToast(Gson().toJson(bean))
+                        if (bean.datas != null && bean.datas.size > 0) {
+                            whpList.addAll(bean.datas)
+                            adapter.notifyDataSetChanged()
+                        }
+                    }
+                }
+
+                override fun onError(call: Call<WhpListItemListBean>?, t: Throwable?) {
+
+                }
+            })
+    }
 }
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyListActivity.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyListActivity.kt
@ -1,17 +1,32 @@
 package com.rehome.zhdcoa.ui.activity


+import android.text.TextUtils
+import android.widget.Toast
 import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding
+import com.rehome.zhdcoa.bean.WhpListItemBean
 import com.rehome.zhdcoa.databinding.ActivityAddDagerEnterApplyListBinding
+import com.rehome.zhdcoa.ui.toastview.toastviewbymyself

-class AddDagerEnterApplyListActivity : BaseActivityOaToolbarViewBinding<ActivityAddDagerEnterApplyListBinding>() {
+class AddDagerEnterApplyListActivity :
+    BaseActivityOaToolbarViewBinding<ActivityAddDagerEnterApplyListBinding>() {
    override fun getViewBinding() = ActivityAddDagerEnterApplyListBinding.inflate(layoutInflater)

    override fun getToolbar() = binding.toolbarView.toolbar

    override fun initView() {
-        initToolbar("危化品入厂申请", "下一步") {
-
+        initToolbar("危化品入厂申请", "保存") {
+            if (checkForm()) {
+                val item: WhpListItemBean = WhpListItemBean();
+                item.hspmc = binding.ilHSPMC.content
+                item.wslb = binding.ilWSLB.content
+                item.sybm = binding.ilSYBM.content
+                item.zrr = binding.ilZRR.content
+                item.srcl = binding.ilSRCL.content
+                item.ccdd = binding.ilCCDD.content
+                item.rt = binding.ilRT.content
+                item.msds = binding.ilMSDS.content
+            }
        }

    }
@ -20,4 +35,39 @@ class AddDagerEnterApplyListActivity : BaseActivityOaToolbarViewBinding<Activity

    }

+    private fun checkForm(): Boolean {
+        if (TextUtils.isEmpty(binding.ilHSPMC.content)) {
+            showToast("危险化学品名称必填")
+            return false
+        }
+        if (TextUtils.isEmpty(binding.ilWSLB.content)) {
+            showToast("危险类别必填")
+            return false
+        }
+        if (TextUtils.isEmpty(binding.ilSYBM.content)) {
+            showToast("使用部门必填")
+            return false
+        }
+        if (TextUtils.isEmpty(binding.ilZRR.content)) {
+            showToast("责任人必填")
+            return false
+        }
+        if (TextUtils.isEmpty(binding.ilSRCL.content)) {
+            showToast("现有储量必填")
+            return false
+        }
+        if (TextUtils.isEmpty(binding.ilCCDD.content)) {
+            showToast("储存地点必填")
+            return false
+        }
+        if (TextUtils.isEmpty(binding.ilRT.content)) {
+            showToast("用途必填")
+            return false
+        }
+        if (TextUtils.isEmpty(binding.ilMSDS.content)) {
+            showToast("MSDS是否配备必填")
+            return false
+        }
+        return true
+    }
 }
--- a/app/src/main/java/com/rehome/zhdcoa/utils/RSAUtils.java
+++ b/app/src/main/java/com/rehome/zhdcoa/utils/RSAUtils.java
@ -32,6 +32,7 @@ public class RSAUtils {

    public static final String public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnRh8MAqfpBZffouPsU3hToRZl3soo2ntYU4psQtc72QOvnprQ6Ua6UBY0WqemCJF/KxQ8p+vY7/r5eZ97Fw7Sq40PQTNKvyxFQuMGRAO8xTahSn2/79KViq7mVVLm2UAH8QaFmq7rJJbkCif3I1yiFMqzOF41ak231GF8eD62gr9+DFLiR1UKjv+/qXG4UjFQM6pa0cD1kAOsoYz0dSQlHFMbOaVf+VEWxSqFjKPiep6bYoViTlMRkdLqbUbHr/xk67C8lGqWO7wnB32T0+fYwnFWF952OJ9kov9oSnvOFXa+NwlAe7m2hZtFnW/NoBX1WxkQ6zTTTxJb8sRNft7qQIDAQAB";
    public static final String private_key = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCdGHwwCp+kFl9+i4+xTeFOhFmXeyijae1hTimxC1zvZA6+emtDpRrpQFjRap6YIkX8rFDyn69jv+vl5n3sXDtKrjQ9BM0q/LEVC4wZEA7zFNqFKfb/v0pWKruZVUubZQAfxBoWaruskluQKJ/cjXKIUyrM4XjVqTbfUYXx4PraCv34MUuJHVQqO/7+pcbhSMVAzqlrRwPWQA6yhjPR1JCUcUxs5pV/5URbFKoWMo+J6nptihWJOUxGR0uptRsev/GTrsLyUapY7vCcHfZPT59jCcVYX3nY4n2Si/2hKe84Vdr43CUB7ubaFm0Wdb82gFfVbGRDrNNNPElvyxE1+3upAgMBAAECggEAOcphHRc7ZRSp6paStMoOoWDEyJoQ+BSms84aPjwM4y/u0JmeThM11CrMwbU0RIkPMAV//dFKpypaMIfbOREw6qctJmlWxIKS7kgCMNIcfcXlIWmvqKOJSCuOObkMCE1ef1EXu7ll8vUgY+bd8DfEs2vM6fPkDM2kFwEZgkKeZYlkFcLLy8V701seLtNzbPaqAUa44S6m0DVH7gojad8+Ni/XsdNzSrd8Y2930M8LVZoOTLrwskJaF2v/WvjM3blOtHxLqDfXfD4uRm12b1SNzPx2djlL6vNptwbpYAtPOYol8W0LxJH2AHbTrUFv/KJdyuD4NVGSnGpYtWzD7QQetQKBgQDLqfaiq0uHQerAc3M30pOZSDF8PtiBd1jdqFoOVhuADkp4LPXm54s5evEi2r3tl4x8cAvUo6WaxDlG3IFO0POLcZY+Xf2sMhwMAxiwWqLVRGirjr6QAfnmWAToqqyh8brxNti4MC3X/yudrd6x/VJ1lQ3Pooiihf4Ir74QuY7wqwKBgQDFdwbFou07bQmxCElgC5MF78Aevn5JzsniGU2RhpxG7ajf2T9n6AjtVfvYLy6iYsfLm6RGC2uofBjMgL920ePXBSDv0fk1UEVoR/vCtspyCLBVXELdSS5DCnux1F15vKAJZQyODGyEv0d8h97qKRaq14EW75e9vPx4ahxXgaiM+wKBgGE0AonK9aZdmJw3veMDtvxuj2e8WvsXqitIwYqcIE3zBCntU4PcOP+7JMG84u816JAvrgXUASMnyip+7ZxfcA26rbmghIUd+XLmO29YIuVk3AwdeegjeVEt61Hcu74jMFUWF0N5gzfXCsscA/Cxdhy2gjv6V/oxt3gP4Mf8uDM3AoGAJMVhcXRBkQtg/qJ4Z3ZATp6yvAblJYFofr4Pf8X9XAftpqGh+QtwfiHA4CUJHhwe8H9vO8vspFdXlt1yygGT1/qQg5gqPA9SnXSqITxAvrN3gq3HlcWG490T462UKpNBif5TNDCEFMQ536q9jAVSv0WaOFctfpuuuA2qcXEnnfkCgYEAuFWzis7ICtcZTr8CZOC7FeVL6URzI1akwRlHDHRUrNRCTf47HGUG9bCC6N+v6ex7TD2XlaB0g3U9XXjYRyk9T2AWfgzPvgvw7H+tI9r+9yyDlUbb2pvaKdVQIgCnJ6Hg7Qw7MuwzjEiXLF7HMy5CFnrVnHAjYrNe1Gqgo0v3rsY=";
+
    public static final String public_key_local = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/lhQRyFMV5LLJz9jFjY+ZW/79wEuujDJjy8YxlxqfST+FUUOytH46fLRd5m4s4Nj7L03hssz0H0M1pKiUzUzp6ulSC8GH2/uZzBq47agre9bW0A+Uu0IiCwfOc0J1L1UlLm/wWRGW0Sw51OHYAs99irjhxdGFOVv/mS9FzzxmBRFOwUXFD8iXyEKI8xkteyHGniKRwBYoWR32kQw7H/Mnpamo1fCrHA6Dg55CBeIEkg2oyPGKzvhkPVopJzj9zukW8w2F0iR5ll0QBl7XzGyy3EHmIsYsod3LSIh1g5A2zsscJ0ouorKGLwY1LK06a34JTkYz5p7lx6Nn6589Re8GwIDAQAB";
    public static final String private_key_local = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD+WFBHIUxXkssnP2MWNj5lb/v3AS66MMmPLxjGXGp9JP4VRQ7K0fjp8tF3mbizg2PsvTeGyzPQfQzWkqJTNTOnq6VILwYfb+5nMGrjtqCt71tbQD5S7QiILB85zQnUvVSUub/BZEZbRLDnU4dgCz32KuOHF0YU5W/+ZL0XPPGYFEU7BRcUPyJfIQojzGS17IcaeIpHAFihZHfaRDDsf8yelqajV8KscDoODnkIF4gSSDajI8YrO+GQ9WiknOP3O6RbzDYXSJHmWXRAGXtfMbLLcQeYixiyh3ctIiHWDkDbOyxwnSi6isoYvBjUsrTprfglORjPmnuXHo2frnz1F7wbAgMBAAECggEAakyCkJfMDjWdjjOht+DHxyE8TwlBfDNzqdHnKs/o+ZCCWGVaP03uF+iRvsiSNwRMuN6D3GQErbf1q5/xE5GCmyrTkw2EI5NmMd48bhsfoFIO/l4lLgc+r5qxGjklSLIwLVBMYgkElpRo0uVICM3qAX3/RbBma8lQOyPjG1kvJ31L/xYN4DbfOfumqs3Eb06ZNvPEP0BnbbVFp6NiOcBvLipQxrhnMob5MDyPWEjcBeV/IssK3ZvrzjsqF1Ckz8KNUKGfDq4DHM7YzkLBySDIiOZHSBfimzc8fxtDFZpMOOBbEZJ0sGlTeftv5Zd0KHWD0OBWBeSHeVFRBc5RCPO38QKBgQD/rPC5Jr2Sgp3tKrRyEztYZrce0ecYvsxYZRgQpSxLF+rd8Z8ftH/MHPEdnYZjLWFPDrd+R3eEEr5B2t2sfKUWE/PA97RvSp/Uqv0xKoetX8JopeZ6X/3PRb9bQFWRe2dPBSA5mKx8MIOIhfr2qjdepDF+Lejn4pCFDSs8BLpPbQKBgQD+qvDlusQ1IvBi19DnKqx3iLvgHFHYb/GcrFzqfQZewGZLH7yoBo4zXZLT2Np+DW7K8IC3JOLNhLrvD1V8+bmOwW84Foo62Gvm1GPm8nxbgTCqg+ns5bV0xoHXdN1v4dAgeOBqYrIFkmSfxpB4usij8yFMZkN7PNZ3KwQYqZYcpwKBgQDS+qKqJo3ImIA5dUPx3mzaRehWRl+sy8VULBfvpF0omlP1Ua09PHU4uak+Bv8eWBQ0aLCCQ/cbxVu6fCDwdOrFjTFXyw/Zxnqdw3urVq0fJCYItN27nfqTT7rYUf5KTsqxKkmtPY8X6/Ced/DgGxYVwugUd036C7u2D2fd3wjfAQKBgQCfHkduAofde3sfByFrjmo8NZ7NpGQvC6K29asIiB2Wzjgb8DR797yZs3muC+xYniP/gM2roMxlBO2XuMj9UTrzS0Emlk6//cFNdJ8HCbNRqSKzJ8DdV5lM4Ur3R/mjkj/sShpN3mTEvndIrVRPWsVKSvsfNTYsphKKWsIwdqVoOQKBgQD5ibg09UHs0dHiaOn0lKsUFb25q+ylu4NLIU6gh/xi7sJ2huRA2gElPwkUsCIzH+/TTiIdvs1WuoBCvvCWL6a7xchN1+nve2fw4ohNHWupcTNWX1k1pNFHXjhtaUMes7zTTy6wBDbkbM7yTQLtB8/VMzMpuzg6UZPw3Hv8sIOz+w==";
    public static final String public_key_mqtt = "MIIEIjANBgkqhkiG9w0BAQEFAAOCBA8AMIIECgKCBAEAujmJWv1QTJU1uS/t0Tj0ms9dPuYtZeuxCCAvc93/6JvxAON6UyfniL4hScOzwDqR74GsOtYC5O1JNi4VGn4XU6XKt30o+/cCJeSaynmcVRBnkbjpo4pvE/97//GEwHbhPSsHRv2GmURx/wEZKGhlAceMu3xMs1slhD2gmGlfoZTdMULUN7xIbN5wgwZbcGs+XD+eaGEkE6xOyJdthKnsoYq+7lsfl0668231374zIDMSYCkcES5v86jr0HG4TVYymBbD33/WAJ0ISyBP+LMboasw62QoVrwPYXkWIqfiFFHwpi/TqyjJef8bM4bUuW2vqfFCMRZb23NKIseSvjgJu62FlQAPFgw8U5/i1yRGyFJPryJP0dJS07uv5k+J5iSKabvjp0RWkVLwgUzctQKjJhx+cE9bOPXgAGp7dczumjMPlOVm7AGEsAAlDNHNcDksKssy91kl3tkkj987/0P534TehtKvZ43W2XoOSyA0nPxfb/hxb6cLo3D1OD9Favc5WkSUgnYS8Kc+wwOPpUl8eveGLWjbdd8tFGpq8jW2Nrrk584zqu6OqgE9BqHC4NwnMkd1ZmwVBC7aUB+BuVgKxb+lRXRzoYOeCYYdn4Rg0yEdSJcCTwEEwJqouAD/eCkj2KVpz2lTr1zut8w4oDwk9BYe/9R5fz9/yE+M06MAG60ys4Ac0IpfERQP8VP3a+JuTZGPvan/CSq4nGdvd/+R+aZHcQUJDXk1YzSPZFezrLIVZQe0u0HbIIfPhLHmEwCAXzhM1Ise4xC8XHOytlJw3drkNAsJN9sZ9UePLZMEkggLYgzsgSZ11tRgObA/OXPW4/fd71RO/MZmH9DLv7blCkLomTKinKDiO7MsQvjIQaDKgOVX8Db8UvVcolZLHy48c6vUbJFVXRo2ds/1MK5sgDBNGzNTX/QkPuQS+IDnh4g4edbU0tfwTzkcawHShMza+QQfcHRu5hgpurGv4CApcVWIZn49T/ElJMbSSQczbF6f08piXs8hlyUYBhFjdQJNp3Imuii2c1M10rOGn1PHR0yIay6+L1toDn6ASJksY1FCNSkzpv5utykEKf0Hq2+HX0Wi1Umdl/tndqBVXygSgi4SSu/j5iZtSnjwb1DxQKvO5LLNxxdtEJLsEpQii5LlWr7MjkcsR7zHhzzkqWIAsIbaiwuasMcRkYbAjYFcIH4mSZCTACvsTDxm+hB0GxVmGEfEgknphVm0Yqa7/NXcz9bL856ez5IemmiavfntBS8uhet3m4FYa0FolJF0YdlJa0LCXW/QQYa/PltBFx9xY9nveEp08f+DXUPzJ+0puX3qxLIMyazTfM4mWgxxPmMQOFTNwGwtNGMP6Ncbd6V4oQIDAQAB";
--- a/app/src/main/res/drawable/textdelete.xml
+++ b/app/src/main/res/drawable/textdelete.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#fff" />
+    <stroke
+        android:width="1dip"
+        android:color="@color/red" />
+    <corners android:radius="3dp" />
+</shape>
--- a/app/src/main/res/layout/activity_add_dager_enter_apply.xml
+++ b/app/src/main/res/layout/activity_add_dager_enter_apply.xml
@ -68,6 +68,14 @@
                app:must="true"
                app:tv_title="危化品清单" />

+            <com.rehome.zhdcoa.weiget.ListViewForScrollView
+                android:id="@+id/lv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="50dp"
+                android:divider="@color/gray"
+                android:dividerHeight="1px" />
+
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="120px"
--- a/app/src/main/res/layout/adapter_whp_list.xml
+++ b/app/src/main/res/layout/adapter_whp_list.xml
@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:id="@+id/tv_HSPMC"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:text="李勇波"
+            android:textColor="#333333"
+            android:textSize="15sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="12dp"
+            android:contentDescription=""
+            android:src="@drawable/arrow_right" />
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#dddddd" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="2"
+            android:orientation="vertical">
+
+            <LinearLayout
+                style="@style/dagerListMarginTopStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="0dp">
+
+                <TextView
+                    style="@style/dagerListLeftStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="危险类别:" />
+
+                <TextView
+                    android:id="@+id/tv_WSLB"
+                    style="@style/dagerListRightStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/dagerListMarginTopStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    style="@style/dagerListLeftStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="使用部门:" />
+
+                <TextView
+                    android:id="@+id/tv_SYBM"
+                    style="@style/dagerListRightStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="7">
+
+            <TextView
+                android:id="@+id/tv_delete"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:background="@drawable/textdelete"
+                android:gravity="center"
+                android:padding="5dp"
+                android:text="@string/whp_delete"
+                android:textColor="@color/red" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -48,6 +48,7 @@
    <string name="tv_tempProductionTeamCount">短期生产队伍数量</string>
    <string name="todost">TODOST</string>
    <string name="tv_xlt_img_video_upsj">上传时间:</string>
+    <string name="whp_delete">删除</string>


 </resources>