进出审批字段修改、添加二维码扫描查看记录

cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java

@@ -31,4 +31,5 @@ public class BaseUrlApi {
     public static final int TOOLS_ROLLCALL = 144;//点名
     public static final int TOOLS_TOOLS_MSG = 155;//工具记录查询
     public static final int TOOLS_CRIMINAL_INFO = 166;//罪犯信息
+    public static final int CHECK_RECORD_CODE = 177;//罪犯信息
 }

cm_utils/src/main/res/layout/base_activity.xml

@@ -90,13 +90,14 @@
 
             <ImageView
                 android:id="@+id/iv_app_img"
-                android:layout_width="30dp"
+                android:layout_width="25dp"
-                android:layout_height="30dp"
+                android:layout_height="25dp"
                 tools:src="@drawable/ic_back_white" />
 
             <ImageView
                 android:id="@+id/iv_app_into"
                 android:layout_width="30dp"
+                android:visibility="gone"
                 android:layout_height="30dp"
                 android:src="@drawable/ic_arrow_right_white" />
         </LinearLayout>

modulecheck/build.gradle

@@ -54,6 +54,7 @@ dependencies {
     implementation "com.android.support.constraint:constraint-layout:$rootProject.ext.gConstraint_layout"
     implementation project(':cm_utils')
     implementation project(':camera')
+    implementation project(':zxinglib')
     //Arouter
     annotationProcessor "com.alibaba:arouter-compiler:$rootProject.ext.gRouterCompileVersion"
     //butterknife

modulecheck/src/main/AndroidManifest.xml

@@ -5,45 +5,59 @@
     <application>
         <activity
             android:name=".activitys.enteroutexamine.CheckRegisterCarActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activitys.enteroutexamine.CheckIntoRecordActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activitys.enteroutexamine.FlowTransactActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activitys.enteroutexamine.CheckRecordDetailActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activitys.enteroutexamine.CheckRecordListActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activitys.enteroutexamine.CarDetailActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activitys.enteroutexamine.PersonDetailActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activitys.enteroutexamine.AddCarActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activitys.enteroutexamine.AddPersonActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activitys.enteroutexamine.CheckCarLibActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activitys.enteroutexamine.CheckPersonLibActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activitys.enteroutexamine.CheckExamineActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activitys.enteroutexamine.CheckRegisterActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activitys.enteroutexamine.CheckHomeActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan|stateHidden" />
     </application>
 

modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckHomeActivity.java

@@ -1,5 +1,10 @@
 package com.sucstepsoft.modulecheck.activitys.enteroutexamine;
 
+import android.app.Activity;
+import android.content.Intent;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.view.View;
 import android.widget.GridView;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -9,12 +14,16 @@ import com.google.gson.reflect.TypeToken;
 import com.sucstepsoft.cm_utils.constant.PathConfig;
 import com.sucstepsoft.cm_utils.core.beans.FuncBean;
 import com.sucstepsoft.cm_utils.core.beans.UserLoginBean;
+import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
 import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
 import com.sucstepsoft.cm_utils.core.widget.views.FuncBtnAdapter;
+import com.sucstepsoft.cm_utils.utils.ScannerGunManager;
 import com.sucstepsoft.cm_utils.utils.ToastUtils;
 import com.sucstepsoft.cm_utils.utils.UserInfoSPUtils;
 import com.sucstepsoft.modulecheck.R;
 import com.sucstepsoft.modulecheck.R2;
+import com.sucstepsoft.modulesupertools.common.Constants;
+import com.yzq.zxinglibrary.bean.ZxingConfig;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -33,9 +42,11 @@ public class CheckHomeActivity extends BaseActivity {
     GridView mGvFunc;
     private Unbinder mBind;
     private FuncBtnAdapter mFuncAdapter;
-    private int[] btnImgs = new int[]{R.drawable.ic_check_register, R.drawable.ic_check_register, R.drawable.ic_check_person_lib, R.drawable.ic_check_car_lib, R.drawable.ic_check_record_list, R.drawable.ic_check_examine};
+    private int[] btnImgs = new int[]{R.drawable.ic_check_register, R.drawable.ic_check_register, R.drawable.ic_check_person_lib, R.drawable.ic_check_car_lib, R.drawable.ic_check_record_list,
+            R.drawable.ic_check_examine};
     private String[] mTitles = new String[]{"人员进出登记", "车辆进出登记", "人员信息库", "车辆信息库", "进监记录", "我的审批"};
     private UserLoginBean.DataBean.MenuConfigIdListBean mBean;
+    private ScannerGunManager mScannerGunManager;
 
     @Override
     protected int setLayoutId() {
@@ -46,8 +57,25 @@ public class CheckHomeActivity extends BaseActivity {
     public void initData() {
         mBind = ButterKnife.bind(this);
         refreshView(STATE_LOAD_SUCCESS);
+        mLlImg.setVisibility(View.VISIBLE);
+        mIvImg.setBackgroundResource(R.drawable.ic_barcode_scanner);
+        mIvImg.setOnClickListener(v -> openCameraScanner());
         mTvBaseTitle.setText(getResources().getString(R.string.check_title));
         buildBtnRes();
+        mScannerGunManager = new ScannerGunManager(content -> {
+            if (!TextUtils.isEmpty(content)) {
+                content = content.trim();
+                if (content.startsWith(Constants.CHECK_RECORD)) {
+                    content = content.substring(1);
+                    ARouter.getInstance()
+                            .build(PathConfig.PATH_MODULE_CHECK_RECORD_DETAIL)
+                            .withString("id", content)
+                            .navigation();
+                } else {
+                    ToastUtils.showShort("二维码格式错误,非进监记录.");
+                }
+            }
+        });
         String menuStr = UserInfoSPUtils.getMenuConfig();
         Type type = new TypeToken<List<UserLoginBean.DataBean.MenuConfigIdListBean>>() {
         }.getType();
@@ -63,6 +91,42 @@ public class CheckHomeActivity extends BaseActivity {
         }
     }
 
+    private void openCameraScanner() {
+        ZxingConfig config = new ZxingConfig();
+        config.setReactColor(com.sucstepsoft.modulesupertools.R.color.colorAccent);//设置扫描框四个角的颜色 默认为白色
+        config.setFrameLineColor(com.sucstepsoft.modulesupertools.R.color.colorAccent);//设置扫描框边框颜色 默认无色
+        config.setScanLineColor(com.sucstepsoft.modulesupertools.R.color.colorAccent);//设置扫描线的颜色 默认白色
+        config.setFullScreenScan(false);//是否全屏扫描  默认为true  设为false则只会在扫描框中扫描
+        config.setShowAlbum(false);
+        ARouter.getInstance()
+                .build(PathConfig.PATH_MODULE_ZXING_SCAN)
+                .withSerializable("zxingConfig", config)
+                .navigation(mActivity, BaseUrlApi.CHECK_RECORD_CODE);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        if (resultCode == Activity.RESULT_OK) {
+            switch (requestCode) {
+                case BaseUrlApi.CHECK_RECORD_CODE:
+                    String result = data.getStringExtra("result");
+                    if (!TextUtils.isEmpty(result)) {
+                        if (result.startsWith(Constants.CHECK_RECORD)) {
+                            result = result.substring(1);
+                            ARouter.getInstance()
+                                    .build(PathConfig.PATH_MODULE_CHECK_RECORD_DETAIL)
+                                    .withString("id", result)
+                                    .navigation();
+                        }
+                    } else {
+                        ToastUtils.showShort("请重新扫描.");
+                    }
+                    break;
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
     /**
      * 构建按钮数据
      */

modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRecordDetailActivity.java

@@ -103,6 +103,10 @@ public class CheckRecordDetailActivity extends BaseActivity {
     LinearLayout mLlEpiInfo;
     @BindView(R2.id.tv_pro)
     TextView mTvPro;
+    @BindView(R2.id.ll_in_prison_area)
+    LinearLayout mLlInPrisonArea;
+    @BindView(R2.id.ll_cop)
+    LinearLayout mLlCop;
     private Unbinder mBind;
     private String mId;
 
@@ -245,10 +249,12 @@ public class CheckRecordDetailActivity extends BaseActivity {
             mTvEndTime.setText(data.getEndTime());//授权结束时间
             mTvStartTime.setText(data.getStartTime());//授权开始时间
             mTvManagerUser.setText(data.getGuideUserName());//"带领人员 : " +
-            mTvFieldName.setText(data.getFieldnNames());//"进入监区:" +
+
             //TODO 防疫措施
             if ("1".equals(data.getType())) {
                 //车辆进出
+                mLlInPrisonArea.setVisibility(View.VISIBLE);
+                mTvFieldName.setText(data.getFieldnNames());//"进入监区:" +
                 if (UserInfoSPUtils.getCarIsShow()) {
                     mLlEpiInfo.setVisibility(View.VISIBLE);
                     mTvInfo.setText(UserInfoSPUtils.getCarParams() + ":" + data.getInform());
@@ -256,6 +262,7 @@ public class CheckRecordDetailActivity extends BaseActivity {
                     mLlEpiInfo.setVisibility(View.GONE);
                 }
             } else {
+                mLlInPrisonArea.setVisibility(View.GONE);
                 //人员进出
                 if (UserInfoSPUtils.getPersonIsShow()) {
                     mLlEpiInfo.setVisibility(View.VISIBLE);
@@ -289,11 +296,11 @@ public class CheckRecordDetailActivity extends BaseActivity {
                 mTvType.setText("未知");
             } else {
                 if ("1".equals(data.getType())) {
+                    mLlCop.setVisibility(View.VISIBLE);
                     mRlvTools.setVisibility(View.GONE);
-                    mTvColHint.setText("司机、随车特警、带领民警、车合照");
+                    mTvColHint.setText("驾驶员大头照");
                     mTvTools.setText( data.getCarryTools());//"装载货物 : " +
                     mTvType.setText("车辆进出");
-                    mTvCop.setVisibility(View.VISIBLE);
                     if (!TextUtils.isEmpty(data.getCertificatesPhotoPath())) {
                         mTvColCarHint.setVisibility(View.VISIBLE);
                         mTvColCarHint.setText("车辆证件照(货物来源证明)");
@@ -322,12 +329,12 @@ public class CheckRecordDetailActivity extends BaseActivity {
                         mTvCop.setText("无");
                     }
                 } else {
+                    mLlCop.setVisibility(View.GONE);
                     mIvCarCard.setVisibility(View.GONE);
                     mTvColCarHint.setVisibility(View.GONE);
-                    mTvColHint.setText("外来人员、带领民警合照");
+                    mTvColHint.setText("人员大头照");
                     mTvTools.setText( data.getCarryTools());
                     mTvType.setText("人员进出");
-                    mTvCop.setVisibility(View.GONE);
                     mRlvTools.setVisibility(View.VISIBLE);
                     //TODO 携带工具数据回显
                     if (data.getCarryToolsPhoto() != null && data.getCarryToolsPhoto().size() > 0) {

modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRegisterActivity.java

@@ -187,7 +187,7 @@ public class CheckRegisterActivity extends BaseActivity {
     private AddPhotoBean mCurrentBean;
     private String mPhotoIds = "";
     private String mPicPath;
-    private String isNeedInto = "0";
+    private String isNeedInto = "1";
 
     @Override
     protected int setLayoutId() {
@@ -247,8 +247,8 @@ public class CheckRegisterActivity extends BaseActivity {
                 }
             };
             //默认带领人选择当前登录人
-            mTvLeadCop.setText(UserInfoSPUtils.getName());
+//            mTvLeadCop.setText(UserInfoSPUtils.getName());
-            mLeadId = UserInfoSPUtils.getUserId();
+//            mLeadId = UserInfoSPUtils.getUserId();
             mRlvPerson.setLayoutManager(manager);
             mRlvPerson.setAdapter(mPersonAdapter);
             mBtnAddCar.setVisibility(View.GONE);
@@ -1120,7 +1120,8 @@ public class CheckRegisterActivity extends BaseActivity {
      */
     private void checkComplete() {
         if (checkInfo()) {
-            showIsNeed();
+//            showIsNeed();
+            toSaveInfo();
         }
     }
 
@@ -1210,9 +1211,9 @@ public class CheckRegisterActivity extends BaseActivity {
         params.put("type", mType + "");
         params.put("startTime", startTime);
         params.put("endTime", endTime);
-        params.put("fieldIds", mFields);
+//        params.put("fieldIds", mFields);//进出监区
         params.put("carryTools", carry);
-        params.put("guideUserId", mLeadId);
+        params.put("guideUserId", UserInfoSPUtils.getUserId());//带领人 默认当前登录人
         params.put("photoRecord", mPhotoId);
         params.put("production", isNeedInto);//是否需要进入生产区域
         StringBuffer sb = new StringBuffer();
@@ -1264,16 +1265,16 @@ public class CheckRegisterActivity extends BaseActivity {
                 return false;
             }
         }
-        if (TextUtils.isEmpty(mLeadId)) {
+//        if (TextUtils.isEmpty(mLeadId)) {
-            ToastUtils.showShort("请选择带领人员");
+//            ToastUtils.showShort("请选择带领人员");
-            return false;
+//            return false;
-        }
+//        }
-        if (TextUtils.isEmpty(mFields)) {
+//        if (TextUtils.isEmpty(mFields)) {
-            ToastUtils.showShort("请选择进入的监区");
+//            ToastUtils.showShort("请选择进入的监区");
-            return false;
+//            return false;
-        }
+//        }
         if (TextUtils.isEmpty(mPhotoId)) {
-            ToastUtils.showShort("请上传进监人员与带领民警的合照");
+            ToastUtils.showShort("请上传人员大头照");
             return false;
         }
         String trim = mEtCarry.getText().toString().trim();

modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRegisterCarActivity.java

@@ -162,7 +162,7 @@ public class CheckRegisterCarActivity extends BaseActivity {
     private String mCarCardPhotoId;
     private int mTakePhotoType = 0;
     private String mBeanId;
-    private String isNeedInto = "0";
+    private String isNeedInto = "1";
 
     @Override
     protected int setLayoutId() {
@@ -1076,8 +1076,8 @@ public class CheckRegisterCarActivity extends BaseActivity {
      */
     private void checkComplete() {
         if (checkInfo()) {
-            showIsNeed();
+//            showIsNeed();
-//            toSaveInfo();
+            toSaveInfo();
         }
     }
 
@@ -1122,10 +1122,10 @@ public class CheckRegisterCarActivity extends BaseActivity {
             ToastUtils.showShort("请选择进出车辆");
             return false;
         }
-        if (TextUtils.isEmpty(mLeadId)) {
+//        if (TextUtils.isEmpty(mLeadId)) {
-            ToastUtils.showShort("请选择带领民警");
+//            ToastUtils.showShort("请选择带领民警");
-            return false;
+//            return false;
-        }
+//        }
 //        if (TextUtils.isEmpty(mCopId)) {
 //            ToastUtils.showShort("请选择随车特警");
 //            return false;
@@ -1135,7 +1135,7 @@ public class CheckRegisterCarActivity extends BaseActivity {
             return false;
         }
         if (TextUtils.isEmpty(mPhotoCarId)) {
-            ToastUtils.showShort("请上传司机、特警、带领民警及车辆照片");
+            ToastUtils.showShort("请上传驾驶员大头照");
             return false;
         }
         String trim = mEtCarCarry.getText().toString().trim();
@@ -1234,9 +1234,9 @@ public class CheckRegisterCarActivity extends BaseActivity {
         params.put("type", "1");//进出类型 1车辆  2人员
         params.put("startTime", startTime);
         params.put("endTime", endTime);
-        params.put("fieldIds", mFields);
+        params.put("fieldIds", mFields);//带领民警
         params.put("carryTools", carry);
-        params.put("guideUserId", mLeadId);
+        params.put("guideUserId", UserInfoSPUtils.getUserId());//带领民警
         params.put("production", isNeedInto);//是否需要进入生产区域
         if (!TextUtils.isEmpty(mCarCardPhotoId)) {
             params.put("certificatesPhotoId", mCarCardPhotoId);

modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/FlowTransactActivity.java

@@ -251,8 +251,8 @@ public class FlowTransactActivity extends BaseActivity {
             mTvCause.setText("进出事由 : " + baseBean.getCause());
             mTvEndTime.setText("授权结束时间 : " + baseBean.getEndTime());
             mTvStartTime.setText("授权开始时间 : " + baseBean.getStartTime());
-            mTvManagerUser.setText("带领人员 : " + baseBean.getGuideUserName());
+            mTvManagerUser.setText("审核民警 : " + baseBean.getGuideUserName());
-            mTvFieldName.setText("进入监区 : " + baseBean.getFieldnNames());
+
             if ("1".equals(baseBean.getProduction())) {
                 mTvPro.setText("是否需要进入生产区域:需要进入");
             } else {
@@ -286,8 +286,10 @@ public class FlowTransactActivity extends BaseActivity {
                 mTvType.setText("进出类型 : 未知");
             } else {
                 if ("1".equals(baseBean.getType())) {
+                    mTvFieldName.setVisibility(View.VISIBLE);
+                    mTvFieldName.setText("进入监区 : " + baseBean.getFieldnNames());
                     mRlvTools.setVisibility(View.GONE);
-                    mTvColHint.setText("司机、随车特警、带领民警、车合照");
+                    mTvColHint.setText("驾驶员大头照");
                     mTvType.setText("进出类型 : 车辆进出");
                     mTvTools.setText("装载货物 : " + baseBean.getCarryTools());
                     mTvCop.setVisibility(View.VISIBLE);
@@ -326,9 +328,10 @@ public class FlowTransactActivity extends BaseActivity {
                         mTvInfo.setVisibility(View.GONE);
                     }
                 } else {
+                    mTvFieldName.setVisibility(View.GONE);
                     mIvCarCard.setVisibility(View.GONE);
                     mTvColCarHint.setVisibility(View.GONE);
-                    mTvColHint.setText("司机、带领民警照");
+                    mTvColHint.setText("人员大头照");
                     mTvCop.setVisibility(View.GONE);
                     mTvTools.setText("携带工具 : " + baseBean.getCarryTools());
                     if (baseBean.getCarryToolsPhoto() != null && baseBean.getCarryToolsPhoto().size() > 0) {

modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/adapter/enterexamine/CheckRecordAdapter.java

@@ -32,7 +32,7 @@ public class CheckRecordAdapter extends BaseRecyclerAdapter<CheckRecordBean, Che
 
     @Override
     public void bindHolder(CheckRecordHolder holder, int i) {
-        holder.mTvLead.setText("带领人员 : " + mData.get(i).getGuideUserName());
+        holder.mTvLead.setText("审核民警 : " + mData.get(i).getGuideUserName());
         holder.mTvStartTime.setText("授权开始时间 : " + mData.get(i).getStartTime());
         holder.mTvEndTime.setText("授权结束时间 : " + mData.get(i).getEndTime());
         holder.mTvExcuse.setText("进出事由 : " + mData.get(i).getCause());

modulecheck/src/main/res/layout/activity_check_record_detail.xml

@@ -37,8 +37,8 @@
                     <TextView
                         style="@style/item_title_wrap"
                         android:layout_gravity="center_vertical"
-                        android:textColor="@color/text_gray_66"
+                        android:text="进出类型"
-                        android:text="进出类型" />
+                        android:textColor="@color/text_gray_66" />
 
 
                     <TextView
@@ -50,6 +50,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
                     android:orientation="vertical">
 
                     <TextView
@@ -76,8 +77,8 @@
                     <TextView
                         style="@style/item_title_wrap"
                         android:layout_gravity="center_vertical"
-                        android:textColor="@color/text_gray_66"
+                        android:text="授权开始时间"
-                        android:text="授权开始时间" />
+                        android:textColor="@color/text_gray_66" />
 
 
                     <TextView
@@ -91,8 +92,8 @@
                     <TextView
                         style="@style/item_title_wrap"
                         android:layout_gravity="center_vertical"
-                        android:textColor="@color/text_gray_66"
+                        android:text="授权结束时间"
-                        android:text="授权结束时间" />
+                        android:textColor="@color/text_gray_66" />
 
 
                     <TextView
@@ -106,23 +107,25 @@
                     <TextView
                         style="@style/item_title_wrap"
                         android:layout_gravity="center_vertical"
-                        android:textColor="@color/text_gray_66"
+                        android:text="审核民警"
-                        android:text="带领民警" />
+                        android:textColor="@color/text_gray_66" />
 
 
                     <TextView
                         android:id="@+id/tv_manager_user"
                         style="@style/sel_text_show"
-                        android:hint="带领民警" />
+                        android:hint="审核民警" />
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_white_bottom_border">
+                <LinearLayout
+                    android:id="@+id/ll_cop"
+                    style="@style/item_white_bottom_border">
 
                     <TextView
                         style="@style/item_title_wrap"
                         android:layout_gravity="center_vertical"
-                        android:textColor="@color/text_gray_66"
+                        android:text="随车特警"
-                        android:text="随车特警" />
+                        android:textColor="@color/text_gray_66" />
 
 
                     <TextView
@@ -136,8 +139,8 @@
                     <TextView
                         style="@style/item_title_wrap"
                         android:layout_gravity="center_vertical"
-                        android:textColor="@color/text_gray_66"
+                        android:text="携带工具/装载货物"
-                        android:text="携带工具/装载货物" />
+                        android:textColor="@color/text_gray_66" />
 
 
                     <TextView
@@ -163,8 +166,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:padding="5dp"
-                        android:textColor="@color/text_gray_66"
                         android:text="卫生防疫措施"
+                        android:textColor="@color/text_gray_66"
                         android:textSize="@dimen/text_18" />
 
                     <TextView
@@ -178,13 +181,15 @@
                 </LinearLayout>
 
 
-                <LinearLayout style="@style/item_white_bottom_border">
+                <LinearLayout
+                    style="@style/item_white_bottom_border"
+                    android:visibility="gone">
 
                     <TextView
                         style="@style/item_title_wrap"
                         android:layout_gravity="center_vertical"
-                        android:textColor="@color/text_gray_66"
+                        android:text="是否进入生产区域"
-                        android:text="是否进入生产区域" />
+                        android:textColor="@color/text_gray_66" />
 
 
                     <TextView
@@ -195,13 +200,15 @@
                 </LinearLayout>
 
 
-                <LinearLayout style="@style/item_white_bottom_border_ver">
+                <LinearLayout
+                    android:id="@+id/ll_in_prison_area"
+                    style="@style/item_white_bottom_border_ver">
 
                     <TextView
                         style="@style/item_title_wrap"
                         android:layout_gravity="center_vertical"
-                        android:textColor="@color/text_gray_66"
+                        android:text="进入监区"
-                        android:text="进入监区" />
+                        android:textColor="@color/text_gray_66" />
 
 
                     <TextView
@@ -217,8 +224,8 @@
                     <TextView
                         style="@style/item_title_wrap"
                         android:layout_gravity="center_vertical"
-                        android:textColor="@color/text_gray_66"
+                        android:text="审批状态"
-                        android:text="审批状态" />
+                        android:textColor="@color/text_gray_66" />
 
 
                     <TextView

modulecheck/src/main/res/layout/activity_check_register.xml

@@ -93,7 +93,7 @@
                         android:hint="请选择授权结束时间" />
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_white_bottom_border">
+                <LinearLayout style="@style/item_white_bottom_border" android:visibility="gone">
 
                     <TextView
                         style="@style/item_title_wrap"
@@ -158,7 +158,7 @@
                 </LinearLayout>
 
 
-                <LinearLayout style="@style/item_white_bottom_border">
+                <LinearLayout style="@style/item_white_bottom_border" android:visibility="gone">
 
                     <TextView
                         style="@style/item_title_wrap"
@@ -257,7 +257,7 @@
                     android:layout_marginLeft="10dp"
                     android:gravity="center"
                     android:padding="5dp"
-                    android:text="请上传进监人员与带领民警合照"
+                    android:text="人员大头照"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_15" />
 

modulecheck/src/main/res/layout/activity_check_register_car.xml

@@ -94,7 +94,7 @@
                 </LinearLayout>
 
 
-                <LinearLayout style="@style/item_white_bottom_border">
+                <LinearLayout style="@style/item_white_bottom_border" android:visibility="gone">
 
                     <TextView
                         style="@style/item_title_wrap"
@@ -182,7 +182,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:hint="请上传司机、随车特警、带领民警、车合照"
+                    android:hint="驾驶员大头照"
                     android:padding="5dp" />
 
 

modulecheck/src/main/res/layout/activity_flow_transact.xml

@@ -99,7 +99,7 @@
                     android:background="@drawable/shape_input_white_bg"
                     android:drawablePadding="10dp"
                     android:gravity="left"
-                    android:hint="带领民警:"
+                    android:hint="审核民警:"
                     android:padding="8dp"
                     android:textSize="@dimen/text_18" />
 
@@ -153,6 +153,7 @@
                     android:layout_marginTop="5dp"
                     android:layout_marginRight="10dp"
                     android:background="@drawable/shape_input_white_bg"
+                    android:visibility="gone"
                     android:drawablePadding="10dp"
                     android:gravity="left"
                     android:hint="是否需要进入生产区域:"

modulemain/src/main/res/layout/item_funcation.xml

@@ -45,7 +45,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="12dp"
-        android:textColor="@color/white"
+        android:textColor="@color/black"
         android:textSize="18sp"
         tools:text="智慧党建" />
 

modulesupertools/src/main/AndroidManifest.xml

@@ -5,14 +5,18 @@
     <uses-permission android:name="android.permission.CAMERA" />
 
     <application>
-        <activity android:name=".activity.infosearch.CountDetailActivity"></activity>
+        <activity
+            android:name=".activity.infosearch.CountDetailActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
         <activity
             android:name=".activity.infosearch.SearchCountActivity"
             android:configChanges="fontScale|keyboard|keyboardHidden|locale|orientation|screenLayout|uiMode|screenSize|navigation" />
         <activity
             android:name=".activity.infosearch.SearchAreaListActivity"
             android:configChanges="fontScale|keyboard|keyboardHidden|locale|orientation|screenLayout|uiMode|screenSize|navigation" />
-        <activity android:name=".activity.room_manager.WebFloorActivity" />
+        <activity
+            android:name=".activity.room_manager.WebFloorActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
         <activity
             android:name=".activity.inspection.DeviceRecordDetailActivity"
             android:configChanges="fontScale|keyboard|keyboardHidden|locale|orientation|screenLayout|uiMode|screenSize|navigation" />
@@ -123,12 +127,24 @@
         <activity
             android:name=".activity.criminal.RecordPlayActivity"
             android:configChanges="orientation|keyboardHidden|screenSize" />
-        <activity android:name=".activity.criminal.VideoListActivity" />
+        <activity
-        <activity android:name=".activity.criminal.CriminalPulseActivity" />
+            android:name=".activity.criminal.VideoListActivity"
-        <activity android:name=".activity.infosearch.RollCallDetailActivity" /> <!-- <activity android:name=".activity.room_manager.BerthBuildingActivity" /> -->
+            android:configChanges="orientation|keyboardHidden|screenSize" />
-        <activity android:name=".activity.DutyConnectActivity" />
+        <activity
-        <activity android:name=".activity.DutyAssActivity" />
+            android:name=".activity.criminal.CriminalPulseActivity"
-        <activity android:name=".activity.infosearch.WorkHandoverActivity" />
+            android:configChanges="orientation|keyboardHidden|screenSize" />
+        <activity
+            android:name=".activity.infosearch.RollCallDetailActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" /> <!-- <activity android:name=".activity.room_manager.BerthBuildingActivity" /> -->
+        <activity
+            android:name=".activity.DutyConnectActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
+        <activity
+            android:name=".activity.DutyAssActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
+        <activity
+            android:name=".activity.infosearch.WorkHandoverActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
         <activity
             android:name=".activity.criminal.LocalRecordListActivity"
             android:configChanges="orientation|keyboardHidden|screenSize" />

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/common/Constants.java

@@ -20,6 +20,7 @@ public class Constants {
     public static String ROLLCALL_TYPE = "e";//点名类型
     public static String TOOL_GRANT_RECORD = "f";//工具发放信息
     public static String HOLDALL = "g";//工具回收信息
+    public static String CHECK_RECORD = "h";//进监记录
     public static String DEVICE_INFO = "i";
     /**
      * 项目地址