安全检查UI开发-以及首页api对接

HttpCoreLibrary/src/main/java/com/rc/httpcore/HttpConfig.kt

@@ -8,7 +8,8 @@ class HttpConfig {
 //        var API_BASE_URL = "http://192.168.1.43/labSystem/"
 //        var API_BASE_URL = "https://lab.zjznai.com/appTest/" //1.88
 //        var API_BASE_URL = "http://lab.zjznai.com/labSystem/" //环测
-        var API_BASE_URL = "http://lab.zjznai.com/zhlabSystem/" //演示环境
+//        var API_BASE_URL = "http://lab.zjznai.com/zhlabSystem/" //演示环境
+        var API_BASE_URL = "http://192.168.1.43/api/" //V3版本新登录环境
 //        var API_DETAILS_URL = "http://lab.zjznai.com/labSystem" //环测课程id生成i二维码得地址
         var API_DETAILS_URL = "http://lab.zjznai.com/zhlabSystem" //演示环境id生成i二维码得地址
 //        var API_DETAILS_URL = "https://lab.zjznai.com/appTest" //1.88

HttpCoreLibrary/src/main/java/com/rc/httpcore/client/ApiRepository.kt

@@ -378,6 +378,20 @@ object ApiRepository {
             .observeOn(AndroidSchedulers.mainThread())
     }
 
+    fun titleLists(map: Map<String, Any>): Observable<TitleListsBean> {
+        return mClientFactory.createLabClient()
+            .titleLists(map)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+    }
+
+    fun checkPlanData(planId: String): Observable<StartCheBean> {
+        return mClientFactory.createLabClient()
+            .findCheckPlan(planId)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+    }
+
     fun getCountAppList(flg: Int): Observable<CountAppBean> {
         return mClientFactory.createLabClient()
             .getCountAppList(flg)

HttpCoreLibrary/src/main/java/com/rc/httpcore/client/ChemicalClient.kt

@@ -113,6 +113,12 @@ interface ChemicalClient {
      */
     fun getCheckSetGentles(): Observable<UserIdentityBean>
 
+    fun titleLists(map: Map<String, Any>): Observable<TitleListsBean>
+
+    fun findCheckPlan(planId:String): Observable<StartCheBean>
+
+    fun dropLists(map: Map<String, Any>): Observable<StartCheBean>
+
     fun getCountAppList(flg: Int): Observable<CountAppBean>
 
     /**

HttpCoreLibrary/src/main/java/com/rc/httpcore/client/retrofit/ApiService.java

@@ -49,7 +49,9 @@ import com.rc.httpcore.vo.response.FileRespBean;
 import com.rc.httpcore.vo.response.HazardBook;
 import com.rc.httpcore.vo.response.LearnLoginVo;
 import com.rc.httpcore.vo.response.LockRespBean;
+import com.rc.httpcore.vo.response.StartCheBean;
 import com.rc.httpcore.vo.response.SubInfoVo;
+import com.rc.httpcore.vo.response.TitleListsBean;
 
 import org.w3c.dom.Node;
 
@@ -80,13 +82,13 @@ public interface ApiService {
     Observable<CommonDataResponse<List<ChemicalRightBean>>> getListNoPage(@Query("deptId") int deptId);
 
     @GET("chemical/hxpCabinet/getAppNoauthList")
-    Observable<CommonDataResponse<List<AppNoAuthList>>> getAppNoAuthList(@Query("subId") int subId, @Query("cabinetName") String cabinetName,@Query("searchValue") String searchValue);
+    Observable<CommonDataResponse<List<AppNoAuthList>>> getAppNoAuthList(@Query("subId") int subId, @Query("cabinetName") String cabinetName, @Query("searchValue") String searchValue);
 
     @GET("chemical/hxpTakeStock/appList")
     Observable<CommonListResponse<InventoryList>> getAppList(@QueryMap Map<String, Object> map);
 
     @GET("chemical/hxpTakeStockDetail/appList")
-    Observable<CommonListResponse<InventoryList>> getDetailAppList(@Query("takeStockId") int takeStockId,@Query("searchValue") String searchValue,@Query("pageNum") int pageNum, @Query("pageSize") int pageSize);
+    Observable<CommonListResponse<InventoryList>> getDetailAppList(@Query("takeStockId") int takeStockId, @Query("searchValue") String searchValue, @Query("pageNum") int pageNum, @Query("pageSize") int pageSize);
 
     @GET("system/dict/data/type/chemical_shape")
     Observable<CommonListResponse<InventoryList>> getTypeChemicalShape();
@@ -111,9 +113,21 @@ public interface ApiService {
     Observable<CommonResponse> getHxpTakeStockCommit(@Body InventorySubmissionVo body);
 
     //登录后 查询用户身份 是否是检查着 或 整改着
-    @GET("security/checkSet/getGentle")
+    @GET("security/dataStatistics/getUserIdentity")
     Observable<CommonDataResponse<UserIdentityBean>> getCheckSetGentles();
 
+    @POST("/api/security/mobCheckPlan/titleList")
+    Observable<CommonDataResponse<TitleListsBean>> titleLists(@Body RequestBody body);
+
+
+    //根据id查询计划方法
+    @GET("/api/security/mobCheckPlan/findCheckPlan")
+    Observable<CommonDataResponse<StartCheBean>> findCheckPlan(@Query("planId") String planId);
+
+    @POST("system/dept/dropList")
+    Observable<CommonDataResponse<StartCheBean>> dropLists(@Body RequestBody body);
+
+
     //根据检查者查询 检查信息
     @GET("zd-security/DataStatistics/countApp")
     Observable<CommonDataResponse<CountAppBean>> getCountAppList(@Query("flg") int flg);
@@ -127,7 +141,7 @@ public interface ApiService {
 
     //随手拍--管理
     @GET("security/checkClap/appList")
-    Observable<CommonDataResponse<HandManVo>> getCheckClapAppList(@Query("rectifyStatus") int rectifyStatus,@Query("pageNum") int pageNum, @Query("pageSize") int pageSize);
+    Observable<CommonDataResponse<HandManVo>> getCheckClapAppList(@Query("rectifyStatus") int rectifyStatus, @Query("pageNum") int pageNum, @Query("pageSize") int pageSize);
 
     //随手拍-记录
     @GET("security/checkClap/mylist")
@@ -174,6 +188,16 @@ public interface ApiService {
     @POST("auth/pda/pwdLogin")
     Observable<CommonDataResponse<LearnLoginVo>> padPwdLogin(@Body RequestBody body);
 
+
+    /**
+     * 账号密码登录
+     *
+     * @param body
+     * @return
+     */
+    @POST("auth/terminalLogin")
+    Observable<CommonDataResponse<LearnLoginVo>> terminalLogin(@Body RequestBody body);
+
     /**
      * 刷卡登录
      *
@@ -301,7 +325,7 @@ public interface ApiService {
 
     //获取隐患次数
     @GET("zd-security/checkHazard/countHazardNum")
-    Observable<CommonDataResponse<String>> getCountHazardNum(@Query("subId") String subId,@Query("hazardCheckPro") String hazardCheckPro);
+    Observable<CommonDataResponse<String>> getCountHazardNum(@Query("subId") String subId, @Query("hazardCheckPro") String hazardCheckPro);
 
 
     /**

HttpCoreLibrary/src/main/java/com/rc/httpcore/client/retrofit/ChemicalRetrofit.kt

@@ -280,12 +280,12 @@ class ChemicalRetrofit : ChemicalClient {
         val gson = Gson()
         val toJson = gson.toJson(map)
         val body = RequestBody.create(MediaType.parse("application/json"), toJson)
-        return apiService.padPwdLogin(body).map { response ->
+        return apiService.terminalLogin(body).map { response ->
             if (!response.isSuccess()) {
                 throw NetException(response.code, response.msg)
             }
-            Log.d("login=============", response.data?.access_token)
-            HttpClient.token = response.data?.access_token
+            Log.d("login=============", response.data?.token)
+            HttpClient.token = response.data?.token
             return@map response.data
         }
     }
@@ -449,6 +449,41 @@ class ChemicalRetrofit : ChemicalClient {
             }
     }
 
+    override fun titleLists(map: Map<String, Any>): Observable<TitleListsBean> {
+        val gson = Gson()
+        val toJson = gson.toJson(map)
+        val body = RequestBody.create(MediaType.parse("application/json"), toJson)
+        return apiService.titleLists(body)
+            .map { response ->
+                if (!response.isSuccess()) {
+                    throw NetException(response.code, response.msg)
+                }
+                return@map response.data
+            }
+    }
+
+    override fun findCheckPlan(planId: String): Observable<StartCheBean> {
+        return apiService.findCheckPlan(planId)
+            .map { response ->
+                if (!response.isSuccess()) {
+                    throw NetException(response.code, response.msg)
+                }
+                return@map response.data
+            }
+    }
+
+    override fun dropLists(map: Map<String, Any>): Observable<StartCheBean> {
+        val gson = Gson()
+        val toJson = gson.toJson(map)
+        val body = RequestBody.create(MediaType.parse("application/json"), toJson)
+        return apiService.dropLists(body).map { response ->
+            if (!response.isSuccess()) {
+                throw NetException(response.code, response.msg)
+            }
+            return@map response.data
+        }
+    }
+
     override fun getCountAppList(flg: Int): Observable<CountAppBean> {
         return apiService.getCountAppList(flg).map { response ->
             if (!response.isSuccess()) {

HttpCoreLibrary/src/main/java/com/rc/httpcore/vo/StartCheckingBean.kt

@@ -0,0 +1,15 @@
+package com.rc.httpcore.vo
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class StartCheckingBean(
+    val checkCategory: Int=0,
+    val checkTypeName: String,
+    val crossCheck: Boolean,
+    val planId: String?,
+    val planTitle: String,
+    val subjectNum: Int,
+    val checkName: String
+): Parcelable

HttpCoreLibrary/src/main/java/com/rc/httpcore/vo/UserIdentityBean.kt

@@ -4,4 +4,17 @@ package com.rc.httpcore.vo
 //applyGentle:false       //检查者身份
 //myApplyGentle:false      //自查身份检查者
 //rectifyGentle:false      //整改身份
-data class UserIdentityBean(val adminGentle:Boolean,val applyGentle:Boolean,val myApplyGentle:Boolean,val rectifyGentle:Boolean)
+//data class UserIdentityBean(val adminGentle:Boolean,val applyGentle:Boolean,
+//                            val myApplyGentle:Boolean,val rectifyGentle:Boolean)
+data class UserIdentityBean(
+    val schoolAdmin: Boolean, //校级管理员
+    val collegeAdmin: Boolean, //院级管理员
+    val schoolGroup: Boolean,  //校级督导组
+    val collegeGroup: Boolean, //院级督导组
+    val groupIds: List<String>, //督导组
+    //一下是老参数
+    val adminGentle: Boolean,
+    val applyGentle: Boolean,
+    val myApplyGentle: Boolean,
+    val rectifyGentle: Boolean
+)

HttpCoreLibrary/src/main/java/com/rc/httpcore/vo/response/CheckPlanSetDto.kt

@@ -0,0 +1,14 @@
+package com.rc.httpcore.vo.response
+
+data class CheckPlanSetDto(
+    val checkBasisIds: String,
+    val checkBasisName: Any,
+    val checkName: String,
+    val checkNum: Any,
+    val checkSetProgress: Int,
+    val checkStartTime: String,
+    val overdueUnrectify: Boolean,
+    val planId: String,
+    val planSetId: String,
+    val rectifyDeadline: String
+)

HttpCoreLibrary/src/main/java/com/rc/httpcore/vo/response/CheckPlanSetVo.kt

@@ -0,0 +1,18 @@
+package com.rc.httpcore.vo.response
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class CheckPlanSetVo(
+    val checkBasisId: String?,
+    val checkBasisName: String,
+    val checkName: String,  //计划名称
+    val checkNum: String?,
+    val checkSetProgress: Int,
+    val checkStartTime: String,
+    val overdueUnrectify: Boolean,
+    val planId: String,
+    val planSetId: String,
+    val rectifyDeadline: String
+): Parcelable

HttpCoreLibrary/src/main/java/com/rc/httpcore/vo/response/LearnLoginVo.java

@@ -18,4 +18,10 @@ public class LearnLoginVo {
     public boolean cabinetLock; // 是否设置柜锁
     public boolean isManager; // 是否管理员
 
+    public String  account;
+    public int  accountType;
+    public String  userName;
+    public String  userId;
+    public String  token;
+
 }

HttpCoreLibrary/src/main/java/com/rc/httpcore/vo/response/RecordBean.kt

@@ -0,0 +1,13 @@
+package com.rc.httpcore.vo.response
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class RecordBean(val checkCategory: Int,
+                       val checkPlanSetVoList: List<CheckPlanSetVo>,
+                       val checkTypeName: String,
+                       val crossCheck: Boolean,
+                       val planId: String?,
+                       val planTitle: String,
+                       val subjectNum: Int): Parcelable

HttpCoreLibrary/src/main/java/com/rc/httpcore/vo/response/StartCheBean.kt

@@ -0,0 +1,34 @@
+package com.rc.httpcore.vo.response
+
+data class StartCheBean(
+    val checkCategory: Int,
+    val checkDemand: String,
+    val checkGroupId: String,
+    val checkGroupName: String,
+    val checkNum: Int,
+    val checkPlanSetDtoList: List<CheckPlanSetDto>,
+    val checkProgress: Int,
+    val checkRange: Int,
+    val checkTypeName: String,
+    val checkTypeValue: String,
+    val checkWay: Any,
+    val createName: String,
+    val crossCheck: Boolean,
+    val cycleEndTime: String,
+    val cycleStartTime: String,
+    val hazardNum: Int,
+    val isAttachment: Boolean,
+    val multipleRectificationsNum: Int,
+    val notRectificationNum: Int,
+    val overdueStatus: Boolean,
+    val planId: String,
+    val planStatus: Int,
+    val planTitle: String,
+    val ratio: String,
+    val rectificationNum: Int,
+    val rectifyProgress: Int,
+    val subIds: String,
+    val subjectNum: Int,
+    val updateName: String,
+    val uploadDtoList: List<Any>
+)

HttpCoreLibrary/src/main/java/com/rc/httpcore/vo/response/TitleListsBean.kt

@@ -0,0 +1,15 @@
+package com.rc.httpcore.vo.response
+
+data class TitleListsBean(
+    val countId: Any,
+    val current: Int,
+    val maxLimit: Any,
+    val optimizeCountSql: Boolean,
+    val orders: List<Any>,
+    val pages: Int,
+    val records: List<RecordBean>,
+    val searchCount: Boolean,
+    val size: Int,
+    val total: Int
+)
+

app/src/main/AndroidManifest.xml

@@ -62,7 +62,15 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning,LockedOrientationActivity">
-        <activity android:name="com.zhong.inspection.ui.newui.CasualShootingActivity"></activity>
+        <activity android:name="com.zhong.inspection.ui.newui.ReportTwoActivity"></activity>
+        <activity android:name="com.zhong.inspection.ui.newui.CasuallyActivity" />
+        <activity android:name="com.zhong.inspection.ui.newui.PlanningSituationActivity" />
+        <activity android:name="com.zhong.inspection.ui.newui.DangerRecordActivity" />
+        <activity android:name="com.zhong.inspection.ui.newui.InspectionItemsActivity" />
+        <activity android:name="com.zhong.inspection.ui.newui.PlanDetailsActivity" />
+        <activity android:name="com.zhong.inspection.ui.newui.StartCheckingActivity" />
+        <activity android:name="com.zhong.inspection.ui.newui.SecurityChecTwokActivity" />
+        <activity android:name="com.zhong.inspection.ui.newui.CasualShootingActivity" />
         <activity android:name="com.zhong.inspection.ui.PotentialSafetyHazardTwoActivity" />
         <activity android:name="com.zhong.inspection.ui.SecurityScanActivity" />
         <activity android:name="com.zhong.inspection.ui.VagueActivity" />

app/src/main/java/com/zhong/inspection/ui/CourseDetailsActivity.kt

@@ -86,7 +86,7 @@ class CourseDetailsActivity : BaseCountDownActivity<ActivityCourseDetailsBinding
         viewBinding.rvRecyclerView.layoutManager = LinearLayoutManager(this)
         viewBinding.rvRecyclerView.adapter = inListAdapter
 
-//        itemClassAdapter.setNewInstance(null)//上课照片-加载数据
+//        itemClassAdapter.setNewInstance(null)//上课照片-加载数据`
         inListAdapter.setNewInstance(null)//签到名单-加载数据
 
     }

app/src/main/java/com/zhong/inspection/ui/MainActivity.kt

@@ -34,6 +34,8 @@ import com.zhong.inspection.InspectionApp
 import com.zhong.inspection.base.BaseCountDownActivity
 import com.zhong.inspection.ui.adapter.MainRecyclerAdapter
 import com.zhong.inspection.ui.bean.HomeBean
+import com.zhong.inspection.ui.newui.CasuallyActivity
+import com.zhong.inspection.ui.newui.SecurityChecTwokActivity
 import com.zhong.inspection.util.ConfLogoSp
 import com.zhong.inspection.util.T
 import com.zhong.inspection.util.UiManager
@@ -62,7 +64,7 @@ class MainActivity : BaseCountDownActivity<ActivityMainBinding>() {
     @SuppressLint("ClickableViewAccessibility")
     override fun initViews(savedInstanceState: Bundle?) {
         super.initViews(savedInstanceState)
-        getCheckSetGentles()
+        getCheckSetGentles()  //获取身份后期使用
         getTxtInfo()
         initTitle()
     }
@@ -140,32 +142,32 @@ class MainActivity : BaseCountDownActivity<ActivityMainBinding>() {
         createItemDecoration()?.let { viewBinding.rvView.addItemDecoration(it) }
         viewBinding.rvView.adapter = mAdapter
         mAdapter.setNewInstance(listItems)
+
         mAdapter.setOnItemClickListener { adapter, view, position ->
             RcLog.info("==========${position}")
             when (position) {
                 0 -> {
-                    //安全检查
-                    val map = mutableMapOf<String, Int>()
-                    RcLog.info("=========存储之后的a权限信息${ConfLogoSp.getGentles(this)}")
-                    val gentles = ConfLogoSp.getGentles(this)
-
-//                    map["mgentle"] = mGentle
-                    map["mgentle"] = gentles!!.toInt()
-                    RcLog.info("=============当前身份=========$mGentle  当前本地获取到得权限 ${gentles!!.toInt()}")
-                    //mGentle 0 既是检查者也是整改者  1检查者  2 整改者 3 都可显示整改者 只能看不能操作
-//                    finish()
-                    if (mGentle == 0 || mGentle == 1 || mGentle == 3) {
-                        UiManager.switcher(this, map, SecurityCheckActivity::class.java)//跳转检查者
-                        finish()
-                    } else if (mGentle == 2) {
-                        //                       UiManager.switcher(this, map, PotentialSafetyHazardActivity::class.java)
-                        //跳转整改着
-                        UiManager.switcher(this, map, PotentialSafetyHazardTwoActivity::class.java)
-                        finish()
-                    } else {
-                        showToast("暂无权限")
-                    }
-//                    UiManager.switcher(this, RectifierActivity::class.java)//跳转整改着
+//                    //安全检查
+//                    val map = mutableMapOf<String, Int>()
+//                    RcLog.info("=========存储之后的a权限信息${ConfLogoSp.getGentles(this)}")
+//                    val gentles = ConfLogoSp.getGentles(this)
+//
+////                    map["mgentle"] = mGentle
+//                    map["mgentle"] = gentles!!.toInt()
+//                    RcLog.info("=============当前身份=========$mGentle  当前本地获取到得权限 ${gentles!!.toInt()}")
+//                    //mGentle 0 既是检查者也是整改者  1检查者  2 整改者 3 都可显示整改者 只能看不能操作
+////                    finish()
+//                    if (mGentle == 0 || mGentle == 1 || mGentle == 3) {
+//                        UiManager.switcher(this, map, SecurityCheckActivity::class.java)//跳转检查者
+//                        finish()
+//                    } else if (mGentle == 2) {
+//                        //跳转整改着
+//                        UiManager.switcher(this, map, PotentialSafetyHazardTwoActivity::class.java)
+//                        finish()
+//                    } else {
+//                        showToast("暂无权限")
+//                    }
+                    UiManager.switcher(this, SecurityChecTwokActivity::class.java)
                 }
                 1 -> {
                     //安全培训
@@ -225,11 +227,11 @@ class MainActivity : BaseCountDownActivity<ActivityMainBinding>() {
 //        viewBinding.toolBar.tvTitle.text = "实验室安全智能监测与控制系统"
         viewBinding.toolBar.tvTitle.text = "实验室安全智能监测与管控系统"
         viewBinding.toolBar.tvIconRight.visibility = View.INVISIBLE
-        if (InspectionApp.sLearnLoginVo!!.nickName != null) {
+        if (InspectionApp.sLearnLoginVo!!.userName != null) {
             viewBinding.toolBar.userName.visibility = View.VISIBLE
             viewBinding.toolBar.imgClose.visibility = View.VISIBLE
             viewBinding.toolBar.tvIconLeft.visibility = View.GONE
-            viewBinding.toolBar.userName.text = "${InspectionApp.sLearnLoginVo!!.nickName}"
+            viewBinding.toolBar.userName.text = "${InspectionApp.sLearnLoginVo!!.userName}"
         }
 
     }
@@ -403,25 +405,25 @@ class MainActivity : BaseCountDownActivity<ActivityMainBinding>() {
         val disposable = ApiRepository.getCheckSetGentles()
             .subscribe({ data ->
                 dismissLoading()
-                if (data != null) {
-                    if (data.applyGentle && data.rectifyGentle || data.myApplyGentle && data.rectifyGentle) {
-                        //既是检查者也是整改者  巡查检查着
-                        mGentle = 0
-                    } else if (data.applyGentle) {
-                        //检查者
-                        mGentle = 1
-                    } else if (data.rectifyGentle) {
-                        //整改者
-                        mGentle = 2
-                    } else if (data.myApplyGentle) {
-                        //自查检查者
-                        mGentle = 3 //自查检查者
-                    }
+//                if (data != null) {
+//                    if (data.applyGentle && data.rectifyGentle || data.myApplyGentle && data.rectifyGentle) {
+//                        //既是检查者也是整改者  巡查检查着
+//                        mGentle = 0
+//                    } else if (data.applyGentle) {
+//                        //检查者
+//                        mGentle = 1
+//                    } else if (data.rectifyGentle) {
+//                        //整改者
+//                        mGentle = 2
+//                    } else if (data.myApplyGentle) {
+//                        //自查检查者
+//                        mGentle = 3 //自查检查者
+//                    }
+//
+//                    ConfLogoSp.saveGentles(this, mGentle)
+//                    RcLog.info("=========存储之后的权限信息${ConfLogoSp.getGentles(this)}")
+//                }
 
-                    ConfLogoSp.saveGentles(this, mGentle)
-                    RcLog.info("=========存储之后的权限信息${ConfLogoSp.getGentles(this)}")
-                }
-//                finish()
             }, { throwable ->
                 dismissLoading()
                 showNetError(throwable)

app/src/main/java/com/zhong/inspection/ui/MenuActivity.kt

@@ -1,23 +1,16 @@
 package com.zhong.inspection.ui
 
 import android.Manifest
-import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import com.blankj.utilcode.util.GsonUtils
 import com.bumptech.glide.Glide
-import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.bumptech.glide.request.RequestOptions
-import com.google.gson.Gson
-import com.makeramen.roundedimageview.RoundedImageView
 import com.rc.httpcore.HttpConfig
 import com.rc.httpcore.client.ApiRepository
 import com.tbruyelle.rxpermissions2.RxPermissions
-import com.zhong.handheldinspection.R
 import com.zhong.handheldinspection.databinding.ActivityMenuBinding
 import com.zhong.inspection.base.BaseCountDownActivity
 import com.zhong.inspection.util.ConfLogoSp

app/src/main/java/com/zhong/inspection/ui/PasswordLoginActivity.kt

@@ -10,6 +10,7 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.bumptech.glide.request.RequestOptions
+import com.rc.core.log.RcLog
 import com.rc.httpcore.HttpConfig
 import com.rc.httpcore.client.ApiRepository
 import com.zhong.handheldinspection.databinding.ActivityPasswordLoginBinding
@@ -18,6 +19,7 @@ import com.zhong.inspection.base.BaseCountDownActivity
 import com.zhong.inspection.util.ConfLogoSp
 import com.zhong.inspection.util.T
 import com.zhong.inspection.util.UiManager
+import java.security.MessageDigest
 
 /**
  * 密码登录
@@ -50,12 +52,15 @@ class PasswordLoginActivity : BaseCountDownActivity<ActivityPasswordLoginBinding
                 .into(viewBinding.imgView)
         }
     }
+    //zd 123456
 
     private fun pwdLogin(no: String, pwd: String) {
         showLoading("加载中...")
         var map = mutableMapOf<String, String>()
-        map["username"] = no
-        map["password"] = pwd
+        map["account"] = no
+        val encrypt = encrypt(pwd)
+        RcLog.info("=======加密后$encrypt")
+        map["password"] = encrypt
         val disposableRight = ApiRepository.padPwdLogin(map)
             .subscribe({ data ->
                 dismissLoading()
@@ -69,4 +74,10 @@ class PasswordLoginActivity : BaseCountDownActivity<ActivityPasswordLoginBinding
             })
         addDisposable(disposableRight)
     }
+
+    private fun encrypt(pwd: String): String {
+        val digest = MessageDigest.getInstance("MD5")
+        val hashBytes = digest.digest(pwd.toByteArray())
+        return hashBytes.joinToString("") { "%02x".format(it) }
+    }
 }

app/src/main/java/com/zhong/inspection/ui/adapter/CheckBatchAdapter.kt

@@ -0,0 +1,17 @@
+package com.zhong.inspection.ui.adapter
+
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.rc.httpcore.vo.response.CheckPlanSetVo
+import com.zhong.handheldinspection.R
+
+class CheckBatchAdapter :
+    BaseQuickAdapter<CheckPlanSetVo, BaseViewHolder>(R.layout.item_batch_ialog) {
+
+    override fun convert(holder: BaseViewHolder, item: CheckPlanSetVo) {
+        holder.setText(R.id.checkName, "${item.checkName}")
+        holder.setText(R.id.checkStartTime, "开始检查日期：${item.checkStartTime}")
+        holder.setText(R.id.checkProgress, "检查进度${item.checkSetProgress}%")
+    }
+
+}

app/src/main/java/com/zhong/inspection/ui/adapter/InspectionTPlanAdapter.kt

@@ -0,0 +1,15 @@
+package com.zhong.inspection.ui.adapter
+
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.rc.httpcore.vo.response.RecordBean
+import com.zhong.handheldinspection.R
+
+class InspectionTPlanAdapter :
+    BaseQuickAdapter<RecordBean, BaseViewHolder>(R.layout.item_chek_two) {
+
+    override fun convert(holder: BaseViewHolder, item: RecordBean) {
+        holder.setText(R.id.planTitle, "${item.planTitle}")
+    }
+
+}

app/src/main/java/com/zhong/inspection/ui/newui/CasualShootingActivity.kt

@@ -7,8 +7,7 @@ import com.zhong.inspection.base.BaseCountDownActivity
 
 class CasualShootingActivity : BaseCountDownActivity<ActivityCasualShootingBinding>() {
 
-    override fun createViewBinding()=ActivityCasualShootingBinding.inflate(LayoutInflater.from(this))
-
-    
+    override fun createViewBinding() =
+        ActivityCasualShootingBinding.inflate(LayoutInflater.from(this))
 
 }

app/src/main/java/com/zhong/inspection/ui/newui/CasuallyActivity.kt

@@ -0,0 +1,20 @@
+package com.zhong.inspection.ui.newui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import com.zhong.handheldinspection.databinding.ActivityCasuallyBinding
+import com.zhong.inspection.base.BaseCountDownActivity
+
+// 新版随手拍   reView
+class CasuallyActivity : BaseCountDownActivity<ActivityCasuallyBinding>() {
+
+    override fun createViewBinding()= ActivityCasuallyBinding.inflate(LayoutInflater.from(this))
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        //用于--上报记录  隐藏提交按钮
+        viewBinding.reView
+    }
+
+
+}

app/src/main/java/com/zhong/inspection/ui/newui/DangerRecordActivity.kt

@@ -0,0 +1,29 @@
+package com.zhong.inspection.ui.newui
+
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import com.zhong.handheldinspection.databinding.ActivityDangerRecordBinding
+import com.zhong.inspection.base.BaseCountDownActivity
+import com.zhong.inspection.util.UiManager
+
+//隐患记录
+class DangerRecordActivity : BaseCountDownActivity<ActivityDangerRecordBinding>() {
+
+
+    override fun createViewBinding() =
+        ActivityDangerRecordBinding.inflate(LayoutInflater.from(this))
+
+    override fun initViews(savedInstanceState: Bundle?) {
+        super.initViews(savedInstanceState)
+        //需要跳转的页面
+        UiManager.switcher(this, PlanningSituationActivity::class.java)
+    }
+
+    override fun initData() {
+        super.initData()
+
+
+    }
+
+}

app/src/main/java/com/zhong/inspection/ui/newui/InspectionItemsActivity.kt

@@ -0,0 +1,42 @@
+package com.zhong.inspection.ui.newui
+
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.widget.TextView
+import com.google.android.material.tabs.TabLayout
+import com.zhong.handheldinspection.databinding.ActivityInspectionItemsBinding
+import com.zhong.inspection.base.BaseCountDownActivity
+import com.zhong.inspection.ui.adapter.TabFragmentPagerAdapter
+
+//检查项 InspectionItemsActivity
+class InspectionItemsActivity : BaseCountDownActivity<ActivityInspectionItemsBinding>() {
+
+    private var mSpinnerDate = arrayOf("待检查", "检查中", "已检查")
+
+    override fun createViewBinding() =
+        ActivityInspectionItemsBinding.inflate(LayoutInflater.from(this))
+
+    override fun initData() {
+        super.initData()
+    }
+
+    override fun initViews(savedInstanceState: Bundle?) {
+        super.initViews(savedInstanceState)
+        val tabView = viewBinding.tabView
+        for (i in mSpinnerDate.indices) {
+            val tab: TabLayout.Tab = tabView.newTab()
+            if (tab != null) {
+                val view = TextView(this)
+                view.text = mSpinnerDate[i]
+                view.gravity = Gravity.CENTER
+                tab.customView = view
+                view.rootView.tag = i
+            }
+            tabView.addTab(tab)
+        }
+    }
+
+
+
+}

app/src/main/java/com/zhong/inspection/ui/newui/PlanDetailsActivity.kt

@@ -0,0 +1,13 @@
+package com.zhong.inspection.ui.newui
+
+import android.view.LayoutInflater
+import com.zhong.handheldinspection.databinding.ActivityPlanDetailsBinding
+import com.zhong.inspection.base.BaseCountDownActivity
+
+//V3 计划详情
+class PlanDetailsActivity : BaseCountDownActivity<ActivityPlanDetailsBinding>() {
+
+    override fun createViewBinding() = ActivityPlanDetailsBinding.inflate(LayoutInflater.from(this))
+
+
+}

app/src/main/java/com/zhong/inspection/ui/newui/PlanningSituationActivity.kt

@@ -0,0 +1,24 @@
+package com.zhong.inspection.ui.newui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import com.zhong.handheldinspection.databinding.ActivityPlanningSituationBinding
+import com.zhong.inspection.base.BaseCountDownActivity
+
+//计划详情
+class PlanningSituationActivity : BaseCountDownActivity<ActivityPlanningSituationBinding>() {
+
+
+    override fun createViewBinding() =
+        ActivityPlanningSituationBinding.inflate(LayoutInflater.from(this))
+
+    override fun initViews(savedInstanceState: Bundle?) {
+        super.initViews(savedInstanceState)
+
+    }
+
+    override fun initData() {
+        super.initData()
+    }
+
+}

app/src/main/java/com/zhong/inspection/ui/newui/ReportTwoActivity.kt

@@ -0,0 +1,12 @@
+package com.zhong.inspection.ui.newui
+
+import android.view.LayoutInflater
+import com.zhong.handheldinspection.databinding.ActivityReportTwoBinding
+import com.zhong.inspection.base.BaseCountDownActivity
+
+//上报记录
+class ReportTwoActivity : BaseCountDownActivity<ActivityReportTwoBinding>() {
+
+    override fun createViewBinding() = ActivityReportTwoBinding.inflate(LayoutInflater.from(this))
+
+}

app/src/main/java/com/zhong/inspection/ui/newui/SecurityChecTwokActivity.kt

@@ -0,0 +1,189 @@
+package com.zhong.inspection.ui.newui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.rc.core.log.RcLog
+import com.rc.httpcore.client.ApiRepository
+import com.rc.httpcore.vo.CourseListBean
+import com.rc.httpcore.vo.StartCheckingBean
+import com.rc.httpcore.vo.response.RecordBean
+import com.scwang.smart.refresh.footer.ClassicsFooter
+import com.scwang.smart.refresh.header.ClassicsHeader
+import com.zhong.handheldinspection.R
+import com.zhong.handheldinspection.databinding.ActivitySecurityChecTwokBinding
+import com.zhong.inspection.base.BaseCountDownActivity
+import com.zhong.inspection.ui.HandyRectificationDetailsActivity
+import com.zhong.inspection.ui.adapter.HardwareManagementAdapter
+import com.zhong.inspection.ui.adapter.InspectionTPlanAdapter
+import com.zhong.inspection.util.UiManager
+import com.zhong.inspection.widget.CheckBatchDialogView
+import java.util.*
+
+//安全检查
+class SecurityChecTwokActivity : BaseCountDownActivity<ActivitySecurityChecTwokBinding>() {
+    private val mAdapter by lazy { InspectionTPlanAdapter() }
+    private var page: Int = 1
+    private var pageSize: Int = 2
+    private var mCheckCategory: Int = 1           //1校院巡查 2自查
+    private var recordBean = mutableListOf<RecordBean>()
+
+    override fun createViewBinding() =
+        ActivitySecurityChecTwokBinding.inflate(LayoutInflater.from(this))
+
+    override fun initViews(savedInstanceState: Bundle?) {
+        super.initViews(savedInstanceState)
+
+        viewBinding.linSchoolLevel.setOnClickListener {
+            mCheckCategory = 1
+            viewBinding.tv1.setTextColor(ContextCompat.getColor(this, R.color.purple_0040C1))
+            viewBinding.tv2.setTextColor(ContextCompat.getColor(this, R.color.purple_5E8CE8))
+
+            viewBinding.tv3.setTextColor(ContextCompat.getColor(this, R.color.purple_333333))
+            viewBinding.tv4.setTextColor(ContextCompat.getColor(this, R.color.purple_999))
+
+            viewBinding.tv5.setTextColor(ContextCompat.getColor(this, R.color.purple_333333))
+            viewBinding.tv6.setTextColor(ContextCompat.getColor(this, R.color.purple_999))
+            getLists()
+        }
+
+        viewBinding.linCollegeSelf.setOnClickListener {
+            mCheckCategory = 2
+            viewBinding.tv1.setTextColor(ContextCompat.getColor(this, R.color.purple_333333))
+            viewBinding.tv2.setTextColor(ContextCompat.getColor(this, R.color.purple_999))
+
+            viewBinding.tv3.setTextColor(ContextCompat.getColor(this, R.color.purple_0040C1))
+            viewBinding.tv4.setTextColor(ContextCompat.getColor(this, R.color.purple_5E8CE8))
+
+            viewBinding.tv5.setTextColor(ContextCompat.getColor(this, R.color.purple_333333))
+            viewBinding.tv6.setTextColor(ContextCompat.getColor(this, R.color.purple_999))
+            getLists()
+        }
+
+        viewBinding.linPhoto.setOnClickListener {
+            viewBinding.tv1.setTextColor(ContextCompat.getColor(this, R.color.purple_333333))
+            viewBinding.tv2.setTextColor(ContextCompat.getColor(this, R.color.purple_999))
+
+            viewBinding.tv3.setTextColor(ContextCompat.getColor(this, R.color.purple_333333))
+            viewBinding.tv4.setTextColor(ContextCompat.getColor(this, R.color.purple_999))
+
+            viewBinding.tv5.setTextColor(ContextCompat.getColor(this, R.color.purple_0040C1))
+            viewBinding.tv6.setTextColor(ContextCompat.getColor(this, R.color.purple_5E8CE8))
+            UiManager.switcher(this, CasuallyActivity::class.java)
+        }
+
+
+    }
+
+    override fun initData() {
+        super.initData()
+        //底部弹框
+
+        viewBinding.rvRecyclerView?.layoutManager = LinearLayoutManager(this)
+        viewBinding.rvRecyclerView?.adapter = mAdapter
+        mAdapter.setOnItemClickListener { adapter, view, position ->
+            val checkPlanSetVoList = mAdapter.data[position].checkPlanSetVoList
+            if (checkPlanSetVoList != null) {
+                if (checkPlanSetVoList.size != 1) {
+                    var cheDialog =
+                        CheckBatchDialogView(
+                            this,
+                            checkPlanSetVoList,
+                            object : CheckBatchDialogView.IDialogClick {
+                                override fun clickCallAffirm(position: Int) {
+                                    val recordBeans = mAdapter.data[position]
+                                    var map = mutableMapOf<String, Any>()
+                                    var ben = StartCheckingBean(
+                                        checkCategory = recordBeans.checkCategory,
+                                        checkTypeName = recordBeans.checkTypeName,
+                                        crossCheck = recordBeans.crossCheck,
+                                        planId = recordBeans.checkPlanSetVoList[position].planId,
+                                        planTitle = recordBeans.checkPlanSetVoList[position].checkName,
+                                        subjectNum = recordBeans.subjectNum,
+                                        checkName = recordBeans.checkTypeName,
+                                    )
+                                    map["modes"] = ben
+                                    UiManager.switcher(
+                                        this@SecurityChecTwokActivity,
+                                        map,
+                                        StartCheckingActivity::class.java
+                                    )
+                                }
+                            })
+                    cheDialog.show()
+                } else {
+                    val recordBeans = mAdapter.data[position]
+                    var ben = StartCheckingBean(
+                        checkCategory = recordBeans.checkCategory,
+                        checkTypeName = recordBeans.checkTypeName,
+                        crossCheck = recordBeans.crossCheck,
+                        planId = recordBeans.checkPlanSetVoList[0].planId,
+                        planTitle = recordBeans.checkPlanSetVoList[0].checkName,
+                        subjectNum = recordBeans.subjectNum,
+                        checkName = recordBeans.checkTypeName,
+                    )
+                    var map = mutableMapOf<String, Any>()
+                    map["modes"] = ben
+                    UiManager.switcher(this, map, StartCheckingActivity::class.java)
+                }
+            } else {
+                showToast("暂无批次")
+            }
+
+        }
+
+        viewBinding.refreshLayout.setRefreshHeader(ClassicsHeader(this))
+        viewBinding.refreshLayout.setRefreshFooter(ClassicsFooter(this))
+        viewBinding.refreshLayout.setOnRefreshListener {
+            it.finishRefresh(200)
+            getLists()
+        }
+        viewBinding.refreshLayout.setOnLoadMoreListener {
+            it.finishLoadMore(200)
+            titleLists()
+        }
+        titleLists()
+    }
+
+    private fun getLists() {
+        recordBean.clear()
+        page = 1
+        titleLists()
+    }
+
+    private fun titleLists() {
+        var mapOfs = mutableMapOf<String, Any>()
+        mapOfs["checkCategory"] = mCheckCategory
+        mapOfs["page"] = page
+        mapOfs["pageSize"] = pageSize
+        showLoading("查询中...")
+        val disposable = ApiRepository.titleLists(mapOfs)
+            .subscribe({ data ->
+                dismissLoading()
+                onLoadMoreDate(data.records)
+            }, { throwable ->
+                dismissLoading()
+                showNetError(throwable)
+                throwable.printStackTrace()
+            })
+        addDisposable(disposable)
+    }
+
+    /**
+     * 下拉加载数据
+     */
+    private fun onLoadMoreDate(rows: List<RecordBean>) {
+        if (page == 1) {
+            recordBean.addAll(rows)
+            mAdapter.setNewInstance(rows.toMutableList())//加载数据
+        } else {
+            if (rows != null) {
+                recordBean.addAll(rows)
+                mAdapter.setList(recordBean)
+            }
+        }
+        page++
+    }
+
+}

app/src/main/java/com/zhong/inspection/ui/newui/StartCheckingActivity.kt

@@ -0,0 +1,88 @@
+package com.zhong.inspection.ui.newui
+
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import com.rc.core.log.RcLog
+import com.rc.httpcore.bean.CheckRectifyApply
+import com.rc.httpcore.client.ApiRepository
+import com.rc.httpcore.vo.StartCheckingBean
+import com.rc.httpcore.vo.response.CheckPlanSetVo
+import com.rc.httpcore.vo.response.RecordBean
+import com.rc.httpcore.vo.response.StartCheBean
+import com.zhong.handheldinspection.databinding.ActivityStartCheckingBinding
+import com.zhong.inspection.base.BaseCountDownActivity
+import com.zhong.inspection.util.UiManager
+
+class StartCheckingActivity : BaseCountDownActivity<ActivityStartCheckingBinding>() {
+
+    override fun createViewBinding() =
+        ActivityStartCheckingBinding.inflate(LayoutInflater.from(this))
+
+    override fun initViews(savedInstanceState: Bundle?) {
+        super.initViews(savedInstanceState)
+        viewBinding.relClick.setOnClickListener {
+            UiManager.switcher(this, PlanDetailsActivity::class.java)
+
+            //适配器 跳转  后期使用 使用adapter
+            UiManager.switcher(this, InspectionItemsActivity::class.java)
+
+            //待检查 跳转 adapter
+            UiManager.switcher(this, DangerRecordActivity::class.java)
+        }
+
+    }
+
+    override fun initData() {
+        super.initData()
+        val checkBean = intent.getParcelableExtra<StartCheckingBean>("modes")
+        RcLog.info("=====${checkBean?.planId}")
+        viewBinding.planTitle.text = "${checkBean.planTitle}"
+        if (checkBean.crossCheck) {
+            viewBinding.crossCheck.visibility = View.VISIBLE
+        }
+
+        if (checkBean.checkCategory == 1) {
+            viewBinding.checkTypeValue.text = "校院巡查"
+        } else {
+            viewBinding.checkTypeValue.text = "自查"
+        }
+
+        viewBinding.tvXceo.text = "${checkBean.checkName}"
+        initTitle(checkBean.checkTypeName)
+    }
+
+    private fun initTitle(checkName: String) {
+        viewBinding.toolBar.tvIconLeft.setOnClickListener {
+            finish()
+        }
+        viewBinding.toolBar.tvTitle.text = "$checkName"
+        viewBinding.toolBar.tvIconRight.visibility = View.INVISIBLE
+    }
+
+
+    private fun checkPlanData(planId: String) {
+        showLoading("查询中...")
+        val disposable = ApiRepository.checkPlanData(planId)
+            .subscribe({ data ->
+                dismissLoading()
+                upViews(data)
+            }, { throwable ->
+                dismissLoading()
+                showNetError(throwable)
+                throwable.printStackTrace()
+            })
+        addDisposable(disposable)
+    }
+
+    private fun upViews(data: StartCheBean) {
+        viewBinding.planTitle.text = "${data.planTitle}"
+        if (data.checkTypeValue != null) {
+            if (data.checkTypeValue == "1") {
+                viewBinding.checkTypeValue.visibility = View.VISIBLE
+            }
+        }
+    }
+
+}

app/src/main/java/com/zhong/inspection/widget/CheckBatchDialogView.kt

@@ -0,0 +1,48 @@
+package com.zhong.inspection.widget
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.Gravity
+import android.view.WindowManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.rc.httpcore.vo.response.CheckPlanSetVo
+import com.zhong.handheldinspection.R
+import com.zhong.inspection.ui.adapter.CheckBatchAdapter
+
+//检查批次  列表
+class CheckBatchDialogView(private val ct: Context, private val checkPlanSetVo: List<CheckPlanSetVo>, private val iDialogClick: IDialogClick) :
+    Dialog(ct) {
+    private val mAdapter by lazy { CheckBatchAdapter() }
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.check_batch_dialog)
+//        setCancelable(false) //点击外部不可dismiss
+        // 设置 Dialog 的窗口属性
+        window?.apply {
+            val params = attributes
+            params.width = WindowManager.LayoutParams.MATCH_PARENT
+            params.gravity = Gravity.BOTTOM
+            attributes = params
+            setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        }
+
+        val reView = findViewById<RecyclerView>(R.id.rvView)
+        reView.layoutManager = LinearLayoutManager(ct)
+        reView.adapter = mAdapter
+        mAdapter.setNewInstance(checkPlanSetVo.toMutableList())
+        mAdapter.setOnItemClickListener { adapter, view, position ->
+            iDialogClick.clickCallAffirm(position)
+        }
+
+    }
+
+
+    interface IDialogClick {
+        fun clickCallAffirm(position: Int)
+    }
+
+}

app/src/main/java/com/zhong/inspection/widget/ProjectSelectionView.kt

@@ -1,4 +0,0 @@
-package com.zhong.inspection.widget
-
-class ProjectSelectionView {
-}

app/src/main/res/drawable/bgm_one.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#ff0183fa" />
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="10dp"
+        android:topLeftRadius="10dp"
+        android:topRightRadius="0dp" />
+
+</shape>

app/src/main/res/drawable/bgm_tv_dai.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#330183fa" />
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="15dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp" />
+</shape>

app/src/main/res/drawable/but_ti_jiao.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+
+    <solid android:color="@color/purple_fa" />
+    <corners
+        android:bottomLeftRadius="250dp"
+        android:bottomRightRadius="250dp"
+        android:topLeftRadius="250dp"
+        android:topRightRadius="250dp" />
+
+
+</shape>

app/src/main/res/drawable/button_ren_wu.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Selected state -->
+    <item android:state_checked="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#ff0183fa" />
+            <corners
+                android:bottomLeftRadius="40dp"
+                android:bottomRightRadius="0dp"
+                android:topLeftRadius="40dp"
+                android:topRightRadius="0dp" />
+        </shape>
+    </item>
+    <!-- Default state -->
+    <item android:state_checked="false">
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffffff" />
+            <corners
+                android:bottomLeftRadius="40dp"
+                android:bottomRightRadius="0dp"
+                android:topLeftRadius="40dp"
+                android:topRightRadius="0dp" />
+        </shape>
+    </item>
+</selector>

app/src/main/res/drawable/button_ren_wu_rign.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Selected state -->
+    <item android:state_checked="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#ff0183fa" />
+            <corners
+                android:bottomLeftRadius="0dp"
+                android:bottomRightRadius="40dp"
+                android:topLeftRadius="0dp"
+                android:topRightRadius="40dp" />
+        </shape>
+    </item>
+    <!-- Default state -->
+    <item android:state_checked="false">
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffffff" />
+            <corners android:bottomLeftRadius="0dp" android:bottomRightRadius="40dp" android:topLeftRadius="0dp" android:topRightRadius="40dp" />
+        </shape>
+    </item>
+</selector>

app/src/main/res/drawable/button_ren_wu_tu.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item  android:color="@color/white" android:state_checked="true" />
+    <item android:color="@color/purple_333333" />
+</selector>

app/src/main/res/drawable/button_ren_wu_zhong.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Selected state -->
+    <item android:state_checked="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#ff0183fa" />
+            <corners
+                android:bottomLeftRadius="0dp"
+                android:bottomRightRadius="0dp"
+                android:topLeftRadius="0dp"
+                android:topRightRadius="0dp" />
+        </shape>
+    </item>
+    <!-- Default state -->
+    <item android:state_checked="false">
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffffff" />
+            <corners android:bottomLeftRadius="0dp"
+                android:bottomRightRadius="0dp"
+                android:topLeftRadius="0dp"
+                android:topRightRadius="0dp" />
+        </shape>
+    </item>
+</selector>

app/src/main/res/drawable/button_text_color_yi_ji.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item  android:color="@color/purple_ff00" android:state_checked="true" />
+    <item android:color="#FF666666" />
+</selector>

app/src/main/res/drawable/ic_bgm_jian_cha.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#330183FA" android:alpha="0.2"/>
+    <corners android:radius="3dp" />
+</shape>

app/src/main/res/drawable/radio_button_bgm_yi_ji.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Selected state -->
+    <item android:state_checked="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="25dp" />
+            <stroke android:width="0.5dp" android:color="#FF0000" />
+            <solid android:color="@color/purple_33FF0000" />
+        </shape>
+    </item>
+    <!-- Default state -->
+    <item android:state_checked="false">
+        <shape android:shape="rectangle">
+            <corners android:radius="25dp" />
+            <stroke android:width="0.5dp" android:color="@color/purple_e0" />
+            <solid android:color="@color/purple_f5" />
+        </shape>
+    </item>
+</selector>

app/src/main/res/drawable/text_nei_rong.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#fff5f5f5" />
+    <corners
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="10dp"
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp" />
+
+</shape>

app/src/main/res/layout/activity_casually.xml

@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/purple_f5"
+    tools:context="com.zhong.inspection.ui.newui.CasuallyActivity">
+
+    <include
+        android:id="@+id/tool_bar"
+        layout="@layout/title_toolbar" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tool_bar"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_weight="1"
+                android:background="@drawable/button_ren_wu"
+                android:button="@android:color/transparent"
+                android:checked="true"
+                android:gravity="center"
+                android:text="隐患上报"
+                android:textColor="@drawable/button_ren_wu_tu" />
+
+            <RadioButton
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_weight="1"
+                android:background="@drawable/button_ren_wu_rign"
+                android:button="@android:color/transparent"
+                android:gravity="center"
+                android:text="上报记录"
+                android:textColor="@drawable/button_ren_wu_tu" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:background="@color/white"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="实验室名称（房间号）"
+                    android:textColor="@color/black" />
+
+                <ImageView
+                    android:id="@+id/img"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@mipmap/icm_xyzc_smewm1x" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="16dp"
+                    android:layout_toLeftOf="@+id/img"
+                    android:background="@mipmap/icm_xyzc_ss1x" />
+
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:background="@color/purple_e0" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="学院单位名称"
+                    android:textColor="@color/black" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:text="化工学院" />
+
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:background="@color/purple_e0" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="4dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="实验室名称（房间号）"
+                    android:textColor="@color/black" />
+
+                <ImageView
+                    android:id="@+id/img_let"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@mipmap/icon_left" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toLeftOf="@+id/img_let"
+                    android:text="模糊搜索检查项" />
+
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:background="@color/purple_e0" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:paddingLeft="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="检查隐患"
+                    android:textColor="@color/black" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:background="@color/purple_e0" />
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <EditText
+                    android:id="@+id/ed_input"
+                    android:layout_width="match_parent"
+                    android:layout_height="75dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="10dp"
+                    android:background="@drawable/ic_bgm_edit_user"
+                    android:gravity="start"
+                    android:hint="请填写整改措施"
+                    android:padding="6dp"
+                    android:textSize="14sp" />
+            </RelativeLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="10dp"
+                android:background="@color/white" />
+        </LinearLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/reView"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/item_shang_bao" />
+
+    </LinearLayout>
+
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginBottom="20dp"
+        android:background="@drawable/but_ti_jiao"
+        android:text="提交"
+        android:textColor="@color/white" />
+
+
+</RelativeLayout>

app/src/main/res/layout/activity_danger_record.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/purple_f5"
+    android:orientation="vertical"
+    tools:context="com.zhong.inspection.ui.newui.DangerRecordActivity">
+
+    <include
+        android:id="@+id/tool_bar"
+        layout="@layout/title_toolbar" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:background="@color/purple_fff7e0c4"
+        android:gravity="center"
+        android:text="此检查项在当前实验室累计出现 3 次隐患"
+        android:textColor="@color/purple_FF8C00" />
+
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/refreshLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="12dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="12dp"
+        android:layout_marginBottom="6dp"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <com.scwang.smart.refresh.header.ClassicsHeader
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            tools:itemCount="10"
+            tools:listitem="@layout/item_danger_record" />
+
+        <com.scwang.smart.refresh.footer.ClassicsFooter
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+
+
+</LinearLayout>

app/src/main/res/layout/activity_inspection_items.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/purple_f5"
+    android:orientation="vertical"
+    tools:context="com.zhong.inspection.ui.newui.InspectionItemsActivity">
+
+
+    <include
+        android:id="@+id/tool_bar"
+        layout="@layout/title_toolbar" />
+
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:background="@color/purple_330183FA"
+        android:gravity="center"
+        android:text="第一次检查"
+        android:textColor="@color/purple_fa" />
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tabView"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/white"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <RelativeLayout
+            android:id="@+id/rel_view"
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_marginLeft="10dp"
+            android:layout_weight="0.4"
+            android:background="@drawable/ic_menu_bgm">
+
+            <TextView
+                android:id="@+id/tvCoolName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="6dp"
+                android:text="检查指标"
+                android:textSize="12sp" />
+
+            <ImageView
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@mipmap/icon_kzjc_zk" />
+        </RelativeLayout>
+
+
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_weight="0.7"
+            android:background="@drawable/ic_menu_bgm">
+
+            <ImageView
+                android:id="@+id/imgSele"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="6dp"
+                android:background="@mipmap/icon_sou_suo"
+                android:padding="15dp" />
+
+            <EditText
+                android:id="@+id/ed_cont"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@+id/imgSele"
+                android:background="@null"
+                android:hint="模糊搜索检查项"
+                android:textSize="12sp" />
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="10dp"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bgm_tv_dai"
+            android:paddingLeft="13dp"
+            android:paddingTop="5dp"
+            android:paddingRight="15dp"
+            android:paddingBottom="5dp"
+            android:text="待检查共2项"
+            android:textColor="@color/purple_fa"
+            android:textSize="12sp" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/reView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="15dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="15dp"
+            tools:listitem="@layout/item_inspection" />
+
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/layout/activity_password_login.xml

@@ -71,10 +71,10 @@
                 android:id="@+id/ed_no"
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
-                android:hint="请输入账号"
                 android:background="@drawable/ic_bgm_edit_user"
-                android:paddingLeft="35dp"
-                />
+                android:text="3003"
+                android:hint="请输入账号"
+                android:paddingLeft="35dp" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -97,9 +97,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
                 android:background="@drawable/ic_bgm_edit_user"
-                android:paddingLeft="35dp"
                 android:hint="请输入密码"
-                />
+                android:text="zd123456"
+                android:paddingLeft="35dp" />
         </RelativeLayout>
 
         <Button

app/src/main/res/layout/activity_plan_details.xml

@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/purple_f5"
+    android:orientation="vertical"
+    tools:context="com.zhong.inspection.ui.newui.PlanDetailsActivity">
+
+    <include
+        android:id="@+id/tool_bar"
+        layout="@layout/title_toolbar" />
+
+    <RelativeLayout
+        android:id="@+id/relClick"
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="15dp"
+        android:background="@drawable/ic_img_bgm"
+        android:paddingLeft="10dp">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="30dp"
+            android:text="计划标题计划计划标题计划计划标题计划计划标题计划计划标题计划"
+            android:textColor="@color/black" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="8dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ic_bgm_jian_cha"
+                android:padding="6dp"
+                android:text="校级检查"
+                android:textColor="@color/purple_fa"
+                android:textSize="10sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:background="@drawable/ic_bgm_jian_cha"
+                android:padding="6dp"
+                android:text="全面检查"
+                android:textColor="@color/purple_fa"
+                android:textSize="10sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:background="@drawable/ic_bgm_jian_cha"
+                android:padding="6dp"
+                android:text="逐项检查"
+                android:textColor="@color/purple_fa"
+                android:textSize="10sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:background="@drawable/ic_bgm_jian_cha"
+                android:padding="6dp"
+                android:text="交叉检查"
+                android:textColor="@color/purple_fa"
+                android:textSize="10sp" />
+        </LinearLayout>
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="15dp"
+        android:background="@drawable/ic_img_bgm"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="35dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="检查周期"
+                android:textColor="@color/black" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="2024-04-01至2024-08-31" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="@color/purple_e0" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="35dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="检查范围"
+                android:textColor="@color/black" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="共33间实验室" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="@color/purple_e0" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="35dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="检查组织"
+                android:textColor="@color/black" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="督导组名称" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="@color/purple_e0" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="35dp"
+            android:layout_marginLeft="10dp"
+            android:gravity="center_vertical"
+            android:text="检查要求"
+            android:textColor="@color/black" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="14dp"
+            android:background="@drawable/text_nei_rong"
+            android:padding="12dp"
+            android:text="内容内容内容内容内容内容内容内容内内容内容内容内容内容内容内容内容内容内容内内容内容内容内容容内容内容内容" />
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="35dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:text="材料附件"
+            android:textColor="@color/black" />
+
+        <ImageView
+            android:id="@+id/img"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_gravity="center"
+            android:background="@mipmap/icon_left" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="4dp"
+            android:layout_toLeftOf="@+id/img"
+            android:text="2个"
+            android:textColor="@color/purple_fa" />
+
+    </RelativeLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginBottom="15dp"
+        tools:listitem="@layout/item_plan_details" />
+
+
+</LinearLayout>

app/src/main/res/layout/activity_planning_situation.xml

@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/purple_f5"
+    android:orientation="vertical"
+    tools:context="com.zhong.inspection.ui.newui.PlanningSituationActivity">
+
+    <include
+        android:id="@+id/tool_bar"
+        layout="@layout/title_toolbar" />
+
+    <RelativeLayout
+        android:id="@+id/relClick"
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="15dp"
+        android:background="@drawable/ic_img_bgm"
+        android:paddingLeft="10dp">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="30dp"
+            android:text="计划标题计划计划标题计划计划标题计划计划标题计划计划标题计划"
+            android:textColor="@color/black"
+            android:textSize="12sp" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="8dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ic_bgm_jian_cha"
+                android:padding="6dp"
+                android:text="校级检查"
+                android:textColor="@color/purple_fa"
+                android:textSize="10sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:background="@drawable/ic_bgm_jian_cha"
+                android:padding="6dp"
+                android:text="全面检查"
+                android:textColor="@color/purple_fa"
+                android:textSize="10sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:background="@drawable/ic_bgm_jian_cha"
+                android:padding="6dp"
+                android:text="逐项检查"
+                android:textColor="@color/purple_fa"
+                android:textSize="10sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:background="@drawable/ic_bgm_jian_cha"
+                android:padding="6dp"
+                android:text="交叉检查"
+                android:textColor="@color/purple_fa"
+                android:textSize="10sp" />
+        </LinearLayout>
+
+
+        <ImageView
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_gravity="center"
+            android:background="@mipmap/icon_left" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="15dp"
+        android:background="@drawable/ic_img_bgm"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingLeft="10dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1.1.1"
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="检查项检查项检查项检查检查项检查..."
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+
+        </RelativeLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="＜ 1.1 检查项检查项检查项检查项检查项检查项 ＜"
+            android:textSize="12sp" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="30dp">
+
+        <ImageView
+            android:id="@+id/imga"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:background="@mipmap/icon_left" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@+id/imga"
+            android:text="此检查项在当前实验室累计出现19次隐患"
+            android:textSize="12sp" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="15dp"
+        android:background="@drawable/ic_img_bgm"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:paddingLeft="10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="检查要点"
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+
+            <ImageView
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="center"
+                android:background="@mipmap/icon_left" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="@color/purple_e0" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:paddingLeft="10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="检查隐患"
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:text="不符合"
+                android:textColor="@color/purple_FF8C00"
+                android:textSize="12sp" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="@color/purple_e0" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="6dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="14dp"
+            android:background="@drawable/text_nei_rong"
+            android:padding="8dp"
+            android:text="内容内容内容内容内容内容内容内容内内容内容内容内容内容内容内容内容内容内容内内容内容内容内容容内容内容内容"
+            android:textSize="12sp" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="75dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="@color/purple_e0" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:paddingLeft="10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="姓名："
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:text="李瑶瑶"
+                android:textSize="12sp" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="@color/purple_e0" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:paddingLeft="10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="检查时间："
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:text="2024-01-01"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="15dp"
+        android:background="@drawable/ic_img_bgm"
+        android:orientation="vertical"
+        android:paddingLeft="10dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="30dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="隐患整改"
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+
+            <ImageView
+                android:id="@+id/imgy"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="center"
+                android:background="@mipmap/icon_left" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/imgy"
+                android:text="已整改"
+                android:textColor="@color/purple_16B531"
+                android:textSize="12sp" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="30dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="复查验证"
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+
+            <ImageView
+                android:id="@+id/imgf"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="center"
+                android:background="@mipmap/icon_left" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/imgf"
+                android:text="退回整改"
+                android:textColor="@color/purple_FF8C00"
+                android:textSize="12sp" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="30dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="隐患整改"
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+
+            <ImageView
+                android:id="@+id/imgb"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="center"
+                android:background="@mipmap/icon_left" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/imgb"
+                android:text="已整改"
+                android:textColor="@color/purple_16B531"
+                android:textSize="12sp" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="30dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="复查验证"
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+
+            <ImageView
+                android:id="@+id/imgyc"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="center"
+                android:background="@mipmap/icon_left" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/imgyc"
+                android:text="复查完毕"
+                android:textColor="@color/purple_16B531"
+                android:textSize="12sp" />
+
+        </RelativeLayout>
+
+
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/layout/activity_report_two.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.zhong.inspection.ui.newui.ReportTwoActivity">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/reView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</RelativeLayout>

app/src/main/res/layout/activity_security_chec_twok.xml

@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/purple_f5"
+    android:orientation="vertical"
+    tools:context="com.zhong.inspection.ui.newui.SecurityChecTwokActivity">
+
+    <include
+        android:id="@+id/tool_bar"
+        layout="@layout/title_toolbar" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="152dp"
+            android:background="@mipmap/img_bannerx" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="110dp"
+            android:layout_marginLeft="12dp"
+            android:layout_marginTop="95dp"
+            android:layout_marginRight="12dp"
+            android:background="@drawable/ic_img_bgm"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:id="@+id/linSchoolLevel"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:background="@mipmap/icon_aqjc_xjjcx" />
+
+                <TextView
+                    android:id="@+id/tv1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:text="校级检查"
+                    android:textColor="@color/purple_0040C1"
+                    android:textSize="11sp" />
+
+                <TextView
+                    android:id="@+id/tv2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:text="学校检查计划"
+                    android:textColor="@color/purple_5E8CE8"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="0.5dp"
+                android:layout_height="15dp"
+                android:layout_gravity="center"
+                android:background="@color/purple_d8" />
+
+            <LinearLayout
+                android:id="@+id/linCollegeSelf"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:background="@mipmap/icon_aqjc_xxzcx" />
+
+                <TextView
+                    android:id="@+id/tv3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:text="学院自查"
+                    android:textColor="@color/purple_333333"
+                    android:textSize="11sp" />
+
+                <TextView
+                    android:id="@+id/tv4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:text="学院自查计划"
+                    android:textColor="@color/purple_999"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="0.5dp"
+                android:layout_height="15dp"
+                android:layout_gravity="center"
+                android:background="@color/purple_d8" />
+
+            <LinearLayout
+                android:id="@+id/linPhoto"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:background="@mipmap/icon_aqjc_ssp1x" />
+
+                <TextView
+                    android:id="@+id/tv5"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:text="随手拍"
+                    android:textColor="@color/purple_333333"
+                    android:textSize="11sp" />
+
+                <TextView
+                    android:id="@+id/tv6"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:text="隐患上报整改"
+                    android:textColor="@color/purple_999"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+        </LinearLayout>
+    </RelativeLayout>
+
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/refreshLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:layout_marginBottom="6dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <com.scwang.smart.refresh.header.ClassicsHeader
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            tools:itemCount="10"
+            tools:listitem="@layout/item_chek_two" />
+
+        <com.scwang.smart.refresh.footer.ClassicsFooter
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+
+
+</LinearLayout>

app/src/main/res/layout/activity_start_checking.xml

@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/purple_f5"
+    android:orientation="vertical"
+    tools:context="com.zhong.inspection.ui.newui.StartCheckingActivity">
+
+    <include
+        android:id="@+id/tool_bar"
+        layout="@layout/title_toolbar" />
+
+    <RelativeLayout
+        android:id="@+id/relClick"
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="15dp"
+        android:background="@drawable/ic_img_bgm"
+        android:paddingLeft="10dp">
+
+        <TextView
+            android:id="@+id/planTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="30dp"
+            android:textColor="@color/black" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="8dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tvXceo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ic_bgm_jian_cha"
+                android:padding="6dp"
+                android:text="校级检查"
+                android:textColor="@color/purple_fa"
+                android:textSize="10sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/checkTypeValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:background="@drawable/ic_bgm_jian_cha"
+                android:padding="6dp"
+                android:text="全面检查"
+                android:textColor="@color/purple_fa"
+                android:textSize="10sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:background="@drawable/ic_bgm_jian_cha"
+                android:padding="6dp"
+                android:text="逐项检查"
+                android:textColor="@color/purple_fa"
+                android:textSize="10sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/crossCheck"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:background="@drawable/ic_bgm_jian_cha"
+                android:padding="6dp"
+                android:text="交叉检查"
+                android:textColor="@color/purple_fa"
+                android:textSize="10sp"
+                android:visibility="gone" />
+        </LinearLayout>
+
+
+        <ImageView
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_gravity="center"
+            android:background="@mipmap/icon_left" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="15dp"
+        android:background="@color/white"
+        android:orientation="horizontal">
+
+        <RadioButton
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:background="@drawable/button_ren_wu"
+            android:button="@android:color/transparent"
+            android:checked="true"
+            android:gravity="center"
+            android:text="检查任务"
+            android:textColor="@drawable/button_ren_wu_tu" />
+
+        <View
+            android:layout_width="0.5dp"
+            android:layout_height="15dp"
+            android:layout_gravity="center"
+            android:background="@color/purple_d8" />
+
+        <RadioButton
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:background="@drawable/button_ren_wu_zhong"
+            android:button="@android:color/transparent"
+            android:gravity="center"
+            android:text="复查验证"
+            android:textColor="@drawable/button_ren_wu_tu" />
+
+        <View
+            android:layout_width="0.5dp"
+            android:layout_height="15dp"
+            android:layout_gravity="center"
+            android:background="@color/purple_d8" />
+
+        <RadioButton
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:background="@drawable/button_ren_wu_rign"
+            android:button="@android:color/transparent"
+            android:gravity="center"
+            android:text="隐患整改"
+            android:textColor="@drawable/button_ren_wu_tu" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="105dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="10dp"
+            android:background="@color/white"
+            android:orientation="horizontal">
+
+            <RelativeLayout
+                android:id="@+id/rel_view"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_weight="0.4"
+                android:background="@drawable/ic_menu_bgm">
+
+                <TextView
+                    android:id="@+id/tvCoolName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="6dp"
+                    android:text="学院"
+                    android:textSize="12sp" />
+
+                <ImageView
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@mipmap/icon_kzjc_zk" />
+            </RelativeLayout>
+
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="10dp"
+                android:layout_weight="0.7"
+                android:background="@drawable/ic_menu_bgm">
+
+                <ImageView
+                    android:id="@+id/imgSele"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="6dp"
+                    android:background="@mipmap/icon_sou_suo"
+                    android:padding="15dp" />
+
+                <EditText
+                    android:id="@+id/ed_cont"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="5dp"
+                    android:layout_toRightOf="@+id/imgSele"
+                    android:background="@null"
+                    android:hint="实验室/房间号"
+                    android:textSize="12sp" />
+
+                <ImageView
+                    android:id="@+id/tvClear"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="6dp"
+                    android:background="@mipmap/icm_xyzc_smewm1x"
+                    android:gravity="center_vertical" />
+
+            </RelativeLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:layout_width="60dp"
+                android:layout_height="30dp"
+                android:background="@drawable/radio_button_bgm_yi_ji"
+                android:button="@android:color/transparent"
+                android:checked="true"
+                android:gravity="center"
+                android:text="一级"
+                android:textColor="@drawable/button_text_color_yi_ji" />
+
+            <RadioButton
+                android:layout_width="60dp"
+                android:layout_height="30dp"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/radio_button_bgm_yi_ji"
+                android:button="@android:color/transparent"
+                android:gravity="center"
+                android:text="二级"
+                android:textColor="@drawable/button_text_color_yi_ji" />
+
+            <RadioButton
+                android:layout_width="60dp"
+                android:layout_height="30dp"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/radio_button_bgm_yi_ji"
+                android:button="@android:color/transparent"
+                android:gravity="center"
+                android:text="三级"
+                android:textColor="@drawable/button_text_color_yi_ji" />
+
+            <RadioButton
+                android:layout_width="60dp"
+                android:layout_height="30dp"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/radio_button_bgm_yi_ji"
+                android:button="@android:color/transparent"
+                android:gravity="center"
+                android:text="四级"
+                android:textColor="@drawable/button_text_color_yi_ji" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/refreshLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="10dp"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <com.scwang.smart.refresh.header.ClassicsHeader
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            tools:itemCount="10"
+            tools:listitem="@layout/item_st_check" />
+
+        <com.scwang.smart.refresh.footer.ClassicsFooter
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+
+
+</LinearLayout>

app/src/main/res/layout/check_batch_dialog.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="240dp"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="35dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="检查批次"
+            android:textColor="@color/black" />
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="@color/purple_e0" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="15dp"
+        tools:listitem="@layout/item_batch_ialog" />
+
+</LinearLayout>

app/src/main/res/layout/item_batch_ialog.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="55dp"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="54dp">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/checkName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="第3次检查"
+                android:textColor="@color/black" />
+
+            <TextView
+                android:id="@+id/checkStartTime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:text="开始检查日期：2024-04-01"
+                android:textColor="@color/purple_6"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/checkProgress"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="4dp"
+                android:text="检查进度0%" />
+
+            <ImageView
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="center"
+                android:background="@mipmap/icon_left" />
+        </LinearLayout>
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="@color/purple_e0" />
+
+
+</LinearLayout>

app/src/main/res/layout/item_chek_two.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="40dp"
+    android:background="@color/white"
+    android:orientation="horizontal">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:background="@mipmap/ic_launcher" />
+
+        <TextView
+            android:id="@+id/planTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="6dp"
+            android:ellipsize="end"
+            android:maxEms="15"
+            android:maxLines="1"
+            android:text="计划标题计划标题计划标题计划标"
+            android:textColor="@color/black" />
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="18dp"
+        android:layout_height="18dp"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center"
+        android:background="@mipmap/icon_left" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_alignParentBottom="true"
+        android:background="@color/purple_e0" />
+
+</RelativeLayout>

app/src/main/res/layout/item_danger_record.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="40dp"
+    android:background="@color/white">
+
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="10dp"
+        android:text="检查时间"
+        android:textSize="12sp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="6dp"
+        android:layout_marginRight="10dp"
+        android:layout_toLeftOf="@+id/img"
+        android:ellipsize="end"
+        android:maxEms="15"
+        android:maxLines="1"
+        android:text="2024-1-9"
+        android:textColor="@color/purple_333333"
+        android:textSize="12sp" />
+
+    <ImageView
+        android:id="@+id/img"
+        android:layout_width="18dp"
+        android:layout_height="18dp"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center"
+        android:layout_marginRight="6dp"
+        android:background="@mipmap/icon_left" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_alignParentBottom="true"
+        android:background="@color/purple_e0" />
+
+</RelativeLayout>

app/src/main/res/layout/item_inspection.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/text_nei_rong"
+        android:gravity="center"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
+
+        <ImageView
+            android:id="@+id/imgs"
+            android:layout_width="17dp"
+            android:layout_height="17dp"
+            android:layout_marginLeft="10dp"
+            android:background="@mipmap/ic_launcher" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="6dp"
+            android:layout_marginRight="10dp"
+            android:layout_toRightOf="@+id/imgs"
+            android:text="1.1.1三级检查项目条款全显示三级检查项目条款检查项目条款检查项目条款全显示三级检查项目检查项目条款 检查项目条款条款全显示三级检查项目条款"
+            android:textColor="@color/black"
+            android:textSize="12sp" />
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="40dp">
+
+        <TextView
+            android:id="@+id/tvTalk"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@+id/img"
+            android:text="此检查项在当前实验室累计出现9次隐患"
+            android:textColor="@color/black"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:id="@+id/img"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_gravity="center"
+            android:background="@mipmap/icon_left" />
+
+    </RelativeLayout>
+
+
+</LinearLayout>

app/src/main/res/layout/item_plan_details.xml

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="10dp"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/ic_img_bgm"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/tv1"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:background="@drawable/bgm_one"
+                android:gravity="center"
+                android:text="1"
+                android:textColor="@color/white" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/tv1"
+                android:layout_marginLeft="14dp"
+                android:text="第一次检查"
+                android:textColor="@color/black" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/tv1"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="15dp"
+                android:text="进行中"
+                android:textColor="@color/purple_fa" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_marginTop="8dp"
+            android:background="@color/purple_e0" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="35dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="14dp"
+                android:text="检查开始日期"
+                android:textColor="@color/black" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="14dp"
+                android:text="2024-09-06" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="@color/purple_e0" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="35dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="14dp"
+                android:text="整改期限"
+                android:textColor="@color/black" />
+
+            <TextView
+                android:id="@+id/tvDate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="14dp"
+                android:text="|  2024-09-06" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="6dp"
+                android:layout_centerVertical="true"
+                android:textColor="@color/purple_FF8C00"
+                android:layout_toLeftOf="@+id/tvDate"
+                android:text="逾期未完成整改关闭实验室" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="@color/purple_e0" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="35dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="14dp"
+                android:text="检查依据"
+                android:textColor="@color/black" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="14dp"
+                android:text="全部检查项" />
+        </RelativeLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>

app/src/main/res/layout/item_shang_bao.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:layout_marginTop="10dp"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:gravity="center">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="实验室名称（房间号）"
+            android:textColor="@color/black" />
+
+        <ImageView
+            android:id="@+id/img"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="6dp"
+            android:background="@mipmap/icon_left" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@+id/img"
+            android:text="待整改"
+            android:textColor="@color/purple_fa" />
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="@color/purple_e0" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="40dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:text="上报时间" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="9dp"
+            android:text="2024/08/03" />
+
+    </RelativeLayout>
+
+
+</LinearLayout>

app/src/main/res/layout/item_st_check.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="40dp"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center"
+            android:layout_marginLeft="15dp"
+            android:background="@mipmap/icm_xyzc_111x" />
+
+        <TextView
+            android:layout_width="260dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dp"
+            android:text="ceshihdisa"
+            android:textColor="@color/black" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="待检查3项"
+            android:textColor="@color/purple_fa" />
+
+        <ImageView
+            android:layout_width="21dp"
+            android:layout_height="21dp"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp" />
+    </LinearLayout>
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_alignParentBottom="true"
+        android:background="@color/purple_e0" />
+
+</RelativeLayout>

app/src/main/res/values/colors.xml

@@ -25,5 +25,13 @@
     <color name="purple_2fd331">#2FD331</color>
     <color name="purple_ff0183fa">#ff0183fa</color>
     <color name="purple_ff7f50">#FFDAB9</color>
+    <color name="purple_0040C1">#0040C1</color>
+    <color name="purple_5E8CE8">#5E8CE8</color>
+    <color name="purple_333333">#333333</color>
+    <color name="purple_33FF0000">#33FF0000</color>
+    <color name="purple_FF8C00">#FF8C00</color>
+    <color name="purple_330183FA">#330183FA</color>
+    <color name="purple_fff7e0c4">#fff7e0c4</color>
+    <color name="purple_16B531">#16B531</color>
 
 </resources>