修改显示文字

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.0.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"1.0.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

build.gradle

@@ -39,8 +39,8 @@ ext {
     gCompileSdkVersion = 28
     gMinSdkVersion = 16
     gTargetSdkVersion = 28
-    gVersionCode = 2
+    gVersionCode = 6
-    gVersionName = '1.0.1'
+    gVersionName = '1.0.5'
     //Router编译版本
     gRouterApiVersion = '1.4.1'
     gRouterCompileVersion = '1.2.2'

cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java

@@ -23,6 +23,8 @@ public class PathConfig {
     public static final String MODULE_SYS_C = "systemConfig";
     public static final String MODULE_VISITOR = "visitor";
     public static final String MODULE_PATROL = "patrol";
+
+    public static final String MODULE_MINE= "mine";
     public static final String PROJECT_NAME = "yijianguan";//===项目名称==
     public static final String ACTION_SYSTEM_MESSAGE = "com.sucstepsoft.hs.message";
     public static final int PATROL_SECTOR_INDEX = 3;//巡更点NFC使用的扇区

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

@@ -9,13 +9,13 @@ package com.sucstepsoft.cm_utils.core.retrofit_net;
 public class BaseUrlApi {
     //==========================项目地址======================
 //    public static final String IP = "http://15.1.127.100:8080/";//TODO 正式IP
-    public static final String IP = "http://192.168.0.115:8080/";//TODO 测试IP
+    public static final String IP = "http://192.168.219.7:8080/";//TODO 测试IP
-//    public static final String IP = "http://192.168.0.115:8083/";//TODO 测试IP
+//    public static final String IP = "http://121.36.71.250:58083/";//TODO 测试IP
     // public static final String PROJECT_NAME = "prison_management/";
     public static final String PROJECT_NAME = "prison/";
     //    public static final String PROJECT_NAME = "prison_war_exploded/";
     //==================Socket地址==================
-    public static final String BASE_SOCKET = "http://15.1.127.100:8887";//TODO 正式Socket
+    public static final String BASE_SOCKET = "http://192.168.219.7:8887";//TODO 正式Socket
     //    public static final String BASE_SOCKET = "http://192.168.43.176:8887";//TODO 测试Socket
     public static final String BASE_URL = IP + PROJECT_NAME;
     public static final String APP_VERSION = BASE_URL + "appCmVersionManagement/getAppVersion";

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

@@ -175,6 +175,7 @@ public class CheckRecordDetailActivity extends BaseActivity {
                             mData = baseBean.getList();
                             mAdapter.setData(mData);
                             if ("1".equals(baseBean.getData().getType())) {
+                                //车辆
                                 mAdapter.addOnItemClickListener(bean -> {
                                     if (TextUtils.isEmpty(bean.getBatchNumber())) {
                                         ToastUtils.showShort("数据有误");
@@ -182,6 +183,16 @@ public class CheckRecordDetailActivity extends BaseActivity {
                                         showCarDetail(bean.getId(), bean.getBatchNumber());
                                     }
                                 });
+                            }else{
+                                //人员
+                                mAdapter.addOnItemClickListener(bean -> {
+                                    ArrayList<String> list = new ArrayList<>();
+                                    list.add(bean.getFrontPhotoPath());
+                                    ARouter.getInstance()
+                                            .build(PathConfig.PATH_MODULE_CMUTILS_PHOTO_SHOW)
+                                            .withStringArrayList("imgUrls", list)
+                                            .navigation();
+                                });
                             }
                         }
                     }
@@ -298,7 +309,7 @@ public class CheckRecordDetailActivity extends BaseActivity {
                 if ("1".equals(data.getType())) {
                     mLlCop.setVisibility(View.VISIBLE);
                     mRlvTools.setVisibility(View.GONE);
-                    mTvColHint.setText("驾驶员大头照");
+                    mTvColHint.setText("驾驶员照片");
                     mTvTools.setText( data.getCarryTools());//"装载货物 : " +
                     mTvType.setText("车辆进出");
                     if (!TextUtils.isEmpty(data.getCertificatesPhotoPath())) {
@@ -332,7 +343,7 @@ public class CheckRecordDetailActivity extends BaseActivity {
                     mLlCop.setVisibility(View.GONE);
                     mIvCarCard.setVisibility(View.GONE);
                     mTvColCarHint.setVisibility(View.GONE);
-                    mTvColHint.setText("人员大头照");
+                    mTvColHint.setText("人员照片");
                     mTvTools.setText( data.getCarryTools());
                     mTvType.setText("人员进出");
                     mRlvTools.setVisibility(View.VISIBLE);

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

@@ -1274,7 +1274,7 @@ public class CheckRegisterActivity extends BaseActivity {
 //            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

@@ -495,7 +495,7 @@ public class CheckRegisterCarActivity extends BaseActivity {
 
 
     /**
-     * 显示随车特警
+     * 显示随车民警
      */
     private void showCarCopPicker() {
         mCarCopView = new CustomPickerBuilder(mActivity, (p1, p2, p3, v) -> {
@@ -542,7 +542,7 @@ public class CheckRegisterCarActivity extends BaseActivity {
                             mCopId = mLeadBean.getUserId();
                             mCarCopView.dismiss();
                         } else {
-                            ToastUtils.showShort("请选择随车特警.");
+                            ToastUtils.showShort("请选择随车民警.");
                         }
                     });
                     mTvCancel.setText("取消");
@@ -1127,7 +1127,7 @@ public class CheckRegisterCarActivity extends BaseActivity {
 //            return false;
 //        }
 //        if (TextUtils.isEmpty(mCopId)) {
-//            ToastUtils.showShort("请选择随车特警");
+//            ToastUtils.showShort("请选择随车民警");
 //            return false;
 //        }
         if (TextUtils.isEmpty(mFields)) {
@@ -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();

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

@@ -107,6 +107,8 @@ public class FlowTransactActivity extends BaseActivity {
     TextView mTvInfo;
     @BindView(R2.id.tv_pro)
     TextView mTvPro;
+    @BindView(R2.id.ll_examine)
+    LinearLayout mLlExamine;//审核人
     private Unbinder mBind;
     private List<ProcessBean> mProcessBeans = new ArrayList<>();
     private FlowProcessAdapter mAdapter;
@@ -141,6 +143,7 @@ public class FlowTransactActivity extends BaseActivity {
             mBtnPass.setOnClickListener(v -> doCompleteExamine(2));//通过
             mBtnRebut.setOnClickListener(v -> doCompleteExamine(1));//驳回
             mBtnBlank.setOnClickListener(v -> doCompleteExamine(0));//作废
+            mLlExamine.setOnClickListener(v -> showExaminePerson());//选择审核人
         }
         mLlRecord.setVisibility(View.GONE);
         mArbVideo.setHasRecordPromission(true);
@@ -149,6 +152,13 @@ public class FlowTransactActivity extends BaseActivity {
         });
     }
 
+    /**
+     * 选择审核人
+     */
+    private void showExaminePerson() {
+
+    }
+
     /**
      * 完成审批
      *
@@ -289,7 +299,7 @@ public class FlowTransactActivity extends BaseActivity {
                     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);
@@ -316,9 +326,9 @@ public class FlowTransactActivity extends BaseActivity {
                         mIvCarCard.setVisibility(View.GONE);
                     }
                     if (!TextUtils.isEmpty(baseBean.getFollowCarUserName())) {
-                        mTvCop.setText("随车特警 : " + baseBean.getFollowCarUserName());
+                        mTvCop.setText("随车民警 : " + baseBean.getFollowCarUserName());
                     } else {
-                        mTvCop.setText("随车特警 : 无");
+                        mTvCop.setText("随车民警 : 无");
                     }
                     //防疫
                     if (UserInfoSPUtils.getCarIsShow()) {
@@ -331,7 +341,7 @@ public class FlowTransactActivity extends BaseActivity {
                     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/res/layout/activity_check_record_detail.xml

@@ -124,14 +124,14 @@
                     <TextView
                         style="@style/item_title_wrap"
                         android:layout_gravity="center_vertical"
-                        android:text="随车特警"
+                        android:text="随车民警"
                         android:textColor="@color/text_gray_66" />
 
 
                     <TextView
                         android:id="@+id/tv_cop"
                         style="@style/sel_text_show"
-                        android:hint="随车特警" />
+                        android:hint="随车民警" />
                 </LinearLayout>
 
                 <LinearLayout style="@style/item_white_bottom_border_ver">
@@ -267,7 +267,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:padding="5dp"
-                    tools:text="请上传司机、随车特警、带领民警、车合照" />
+                    tools:text="请上传司机、随车民警、带领民警、车合照" />
 
                 <ImageView
                     android:id="@+id/ic_car_cred"

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

@@ -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

@@ -118,7 +118,7 @@
                     <TextView
                         style="@style/item_title_wrap"
                         android:layout_gravity="center_vertical"
-                        android:text="随车特警" />
+                        android:text="随车民警" />
 
                     <ImageView
                         style="@style/style_hint_star"
@@ -127,7 +127,7 @@
                     <TextView
                         android:id="@+id/tv_car_cop"
                         style="@style/sel_text_arrow"
-                        android:hint="请选择随车特警" />
+                        android:hint="请选择随车民警" />
 
 
                 </LinearLayout>
@@ -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

@@ -113,7 +113,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,12 +153,12 @@
                     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="是否需要进入生产区域:"
                     android:padding="8dp"
-                    android:textSize="@dimen/text_18" />
+                    android:textSize="@dimen/text_18"
+                    android:visibility="gone" />
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/rlv_tools"
@@ -199,7 +199,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="15dp"
                     android:padding="5dp"
-                    tools:text="请上传司机、随车特警、带领民警、车合照" />
+                    tools:text="请上传司机、随车民警、带领民警、车合照" />
 
                 <ImageView
                     android:id="@+id/iv_photo"
@@ -306,6 +306,30 @@
             android:padding="5dp"
             android:textSize="18sp" />
 
+        <LinearLayout
+            android:id="@+id/ll_examine"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shape_input_white_bg"
+            android:orientation="horizontal"
+            android:padding="10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="审核人:"
+                android:textSize="18sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:drawableRight="@drawable/ic_arrow_sort_gray"
+                android:gravity="right"
+                android:hint="请选择审核人"
+                android:textColor="@color/black"
+                android:textSize="18sp" />
+        </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView 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="wrap_content"
+    app:cardBackgroundColor="#c4c6c8"
+    app:cardCornerRadius="10dp"
+    app:cardElevation="10dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+
+
+                <TextView
+                    android:id="@+id/et_search"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:text="指定审核人"
+                    android:textColor="@color/text_blue"
+                    android:paddingLeft="10dp"
+                    android:textSize="@dimen/text_18" />
+
+                <TextView
+                    android:id="@+id/tv_finish"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="10dp"
+                    android:gravity="center"
+                    android:padding="10dp"
+                    android:text="确定"
+                    android:textColor="@color/titleBar"
+                    android:textSize="@dimen/text_18" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <com.jcodecraeer.xrecyclerview.XRecyclerView
+            android:id="@+id/rlv_choose"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white" />
+        <!--此部分需要完整复制过去，删减或者更改ID会导致初始化找不到内容而报空-->
+        <LinearLayout
+            android:id="@+id/optionspicker"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/transparent"
+            android:orientation="horizontal">
+
+            <com.contrarywind.view.WheelView
+                android:id="@+id/options1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <com.contrarywind.view.WheelView
+                android:id="@+id/options2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <com.contrarywind.view.WheelView
+                android:id="@+id/options3"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</android.support.v7.widget.CardView>

modulemain/src/main/java/com/sucstepsoft/modulemain/adapter/MainFuncationAdapter.java

@@ -13,6 +13,7 @@ import com.bumptech.glide.request.RequestOptions;
 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.BaseRecyclerAdapter;
+import com.sucstepsoft.cm_utils.utils.LogUtils;
 import com.sucstepsoft.modulemain.R;
 
 import java.util.List;
@@ -32,14 +33,26 @@ public class MainFuncationAdapter extends BaseRecyclerAdapter<UserLoginBean.UseA
     @Override
     public void bindHolder(FunctionHolder holder, int i) {
         if (!TextUtils.isEmpty(mData.get(i).getAppPhotoPath())) {
-            Glide.with(mContext)
+            if ("mine".equals(mData.get(i).getId())) {
-                    .load(BaseUrlApi.BASE_URL + mData.get(i).getAppPhotoPath())
+                Glide.with(mContext)
-                    .apply(new RequestOptions()
+                        .load(R.drawable.ic_mine_main_icon)
-                            .error(R.drawable.ic_party)
+                        .apply(new RequestOptions()
-                            .placeholder(R.drawable.ic_party)
+                                .error(R.drawable.ic_party)
-                            .override(130)
+                                .placeholder(R.drawable.ic_party)
-                            .fitCenter())
+                                .override(130)
-                    .into(holder.mIvButton);
+                                .fitCenter())
+                        .into(holder.mIvButton);
+            } else {
+                Glide.with(mContext)
+                        .load(BaseUrlApi.BASE_URL + mData.get(i).getAppPhotoPath())
+                        .apply(new RequestOptions()
+                                .error(R.drawable.ic_party)
+                                .placeholder(R.drawable.ic_party)
+                                .override(130)
+                                .fitCenter())
+                        .into(holder.mIvButton);
+            }
+
         } else {
             holder.mIvButton.setImageResource(R.drawable.ic_supervision_big);
         }

modulemain/src/main/java/com/sucstepsoft/modulemain/base/MainActivity.java

@@ -93,7 +93,7 @@ public class MainActivity extends BaseActivity {
         //TODO 开启
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             startForegroundService(new Intent(this, SockService.class));
-        }else{
+        } else {
             startService(new Intent(this, SockService.class));
         }
         mGson = new Gson();
@@ -354,11 +354,18 @@ public class MainActivity extends BaseActivity {
 
     private void buildFunction() {
         String appList = UserInfoSPUtils.getAppList();
+        LogUtils.e(appList);
         if (!TextUtils.isEmpty(appList)) {
             Gson gson = new Gson();
             Type type = new TypeToken<List<UserLoginBean.UseAppList>>() {
             }.getType();
             mAppLists = gson.fromJson(appList, type);
+            UserLoginBean.UseAppList mineBean = new UserLoginBean.UseAppList();
+            mineBean.setName("个人中心");
+            mineBean.setId("mine");
+            mineBean.setAppPhotoPath("R.drawable.ic_mine_main_icon");
+            mineBean.setBgColor("#5EBEF2");
+            mAppLists.add(mineBean);
             if (mAppLists != null && mAppLists.size() > 0) {
                 mMainFuncationAdapter = new MainFuncationAdapter(mActivity, mAppLists);
                 mRlvFunction.setLayoutManager(new GridLayoutManager(mActivity, 2));
@@ -385,6 +392,9 @@ public class MainActivity extends BaseActivity {
                 case PathConfig.MODULE_PRISON: //"priosn";监管掌上通
                     jumpActivity(PathConfig.PATH_MODULE_TOOLS_HOME);
                     break;
+                case PathConfig.MODULE_MINE:
+                    jumpActivity(PathConfig.PATH_MODULE_TOOLS_PERSON);
+                    break;
                 case PathConfig.MODULE_CHECK://"check";//设备巡检平台
                     ToastUtils.showShort("待开发");
                     break;

modulemain/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/DutyAssActivity.java

@@ -77,7 +77,7 @@ public class DutyAssActivity extends BaseActivity {
         super.initData();
         mBind = ButterKnife.bind(this);
         refreshView(STATE_LOAD_SUCCESS);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         mId = getIntent().getStringExtra("id");
         if (!TextUtils.isEmpty(mId)) {
             doRequestWorkDetail(mId);

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/LocalRecordPlayActivity.java

@@ -40,7 +40,7 @@ public class LocalRecordPlayActivity extends BaseActivity {
     @Override
     public void initData() {
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         refreshView(STATE_LOAD_SUCCESS);
         String filePath = getIntent().getStringExtra("filePath");
         String name = getIntent().getStringExtra("name");

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/RecordPlayActivity.java

@@ -44,7 +44,7 @@ public class RecordPlayActivity extends BaseActivity {
     @Override
     public void initData() {
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         refreshView(STATE_LOAD_SUCCESS);
         String filePath = getIntent().getStringExtra("filePath");
         String name = getIntent().getStringExtra("name");

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/VideoListActivity.java

@@ -68,7 +68,7 @@ public class VideoListActivity extends BaseActivity {
     public void initData() {
         mBind = ButterKnife.bind(this);
         refreshView(STATE_LOAD_SUCCESS);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         mCId = getIntent().getStringExtra("cId");
         mCriminalName = getIntent().getStringExtra("name");
         mAdapter = new VideoRecordAdapter(this, mDatas);

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/CallRecordActivity.java

@@ -85,7 +85,7 @@ public class CallRecordActivity extends BaseActivity {
     public void initData() {
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         refreshView(STATE_LOAD_SUCCESS);
         Gson mGson = new Gson();
         String fieldList = UserInfoSPUtils.getFieldList();

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/CountDetailActivity.java

@@ -52,7 +52,7 @@ public class CountDetailActivity extends BaseActivity {
     public void initData() {
         super.initData();
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         refreshView(STATE_LOAD_SUCCESS);
         mCriminals = (ArrayList<CountBean.CriminalListBean>) getIntent().getSerializableExtra("criminals");
         if (mCriminals != null && mCriminals.size() > 0) {

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/DutyRecordActivity.java

@@ -83,7 +83,7 @@ public class DutyRecordActivity extends BaseActivity {
     public void initData() {
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         refreshView(STATE_LOAD_SUCCESS);
         Gson mGson = new Gson();
         String menuConfig = UserInfoSPUtils.getMenuConfig();

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/RollCallDetailActivity.java

@@ -55,7 +55,7 @@ public class RollCallDetailActivity extends BaseActivity {
     public void initData() {
         mBind = ButterKnife.bind(this);
         refreshView(STATE_LOAD_SUCCESS);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         String id = getIntent().getStringExtra("id");
         if (TextUtils.isEmpty(id)) {
             ToastUtils.showShort("数据有误.");

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaActivity.java

@@ -42,7 +42,7 @@ public class SearchAreaActivity extends BaseActivity {
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         mBind = ButterKnife.bind(this);
         refreshView(STATE_LOAD_SUCCESS);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         mAdapter = new SearchAreaListAdapter(mActivity, list);
         mRlvAreas.setLayoutManager(new LinearLayoutManager(mActivity));
         mRlvAreas.setAdapter(mAdapter);

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaCountActivity.java

@@ -58,7 +58,7 @@ public class SearchAreaCountActivity extends BaseActivity {
     public void initData() {
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         refreshView(STATE_LOAD_SUCCESS);
         String fieldId = getIntent().getStringExtra("fieldId");
         String deposit = getIntent().getStringExtra("deposit");

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaDetaileActivity.java

@@ -59,7 +59,7 @@ public class SearchAreaDetaileActivity extends BaseActivity {
     public void initData() {
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         String curName = getIntent().getStringExtra("curName");
         mFieldId = getIntent().getStringExtra("field_prison_id");
         refreshView(STATE_LOAD_SUCCESS);

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaListActivity.java

@@ -46,7 +46,7 @@ public class SearchAreaListActivity extends BaseActivity {
         super.initData();
         mBind = ButterKnife.bind(this);
         refreshView(STATE_LOAD_LOADING);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         String fieldId = getIntent().getStringExtra("fieldId");
         String query = getIntent().getStringExtra("query");
         if (!TextUtils.isEmpty(fieldId) && !TextUtils.isEmpty(query)) {

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchCountActivity.java

@@ -39,7 +39,7 @@ public class SearchCountActivity extends BaseActivity {
         super.initData();
         mBind = ButterKnife.bind(this);
         refreshView(STATE_LOAD_LOADING);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         mAdapter = new TodayCountAdapter(mActivity, mDatas);
         mAdapter.addOnItemClickListener((countBean, pos) -> {
             if (countBean.getCriminalList() != null && countBean.getCriminalList().size() > 0) {

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/WorkHandoverActivity.java

@@ -69,7 +69,7 @@ public class WorkHandoverActivity extends BaseActivity {
     public void initData() {
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         Gson mGson = new Gson();
         String fieldList = UserInfoSPUtils.getFieldList();
         Type type = new TypeToken<List<UserLoginBean.DataBean.FieldIdListBean>>() {

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/learn/ShouCeMainActivity.java

@@ -48,7 +48,7 @@ public class ShouCeMainActivity extends BaseActivity {
         mBind = ButterKnife.bind(this);
         refreshView(STATE_LOAD_SUCCESS);
         refreshState(14);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         mAdapter = new VadeAdapter(mActivity, mDatas);
         mAdapter.addOnItemClickListener(listBean -> {
             Intent intent = new Intent(mActivity, ShouCeActivity.class);

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/rollcall_manager/YingJiDianMingActivity.java

@@ -94,7 +94,7 @@ public class YingJiDianMingActivity extends BaseActivity {
     public void initData() {
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         refreshView(STATE_LOAD_SUCCESS);
         mWaitAdapter = new RollCallAdapter(this, currentAreaList);
         mAlreadyAdapter = new RollCallAdapter(this, alreadyList);

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/BuJuGuanLiActivity.java

@@ -46,7 +46,7 @@ public class BuJuGuanLiActivity extends BaseActivity {
     public void initData() {
         mBind = ButterKnife.bind(this);
         String fieldId = UserInfoSPUtils.getFieldId();
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         refreshView(STATE_LOAD_LOADING);
         mAdapter = new BerthBuildingAdapter(mActivity, mData);
         mRlvBuilding.setLayoutManager(new LinearLayoutManager(mActivity));

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/Floor2Activity.java

@@ -73,7 +73,7 @@ public class Floor2Activity extends BaseActivity {
     @Override
     public void initData() {
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         refreshView(STATE_LOAD_LOADING);
         String id = getIntent().getStringExtra("id");
         if (!TextUtils.isEmpty(id)) {

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/PlantActivity.java

@@ -45,7 +45,7 @@ public class PlantActivity extends BaseActivity {
     @Override
     public void initData() {
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         String id = getIntent().getStringExtra("id");
         if (TextUtils.isEmpty(id)) {
             ToastUtils.showShort("数据有误,请稍后重试.");

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/PostBuJuActivity.java

@@ -49,7 +49,7 @@ public class PostBuJuActivity extends BaseActivity {
     @Override
     public void initData() {
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         refreshState(15);
         refreshView(STATE_LOAD_SUCCESS);
         getBuilding();

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/RoomScrollActivity.java

@@ -30,7 +30,7 @@ public class RoomScrollActivity extends BaseActivity {
     @Override
     public void initData() {
         bind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         //当前点击的是哪个房间
         //需要创建多少个fragment
         refreshView(STATE_LOAD_SUCCESS);

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/WebFloorActivity.java

@@ -76,7 +76,7 @@ public class WebFloorActivity extends BaseActivity {
         super.initData();
         mBind = ButterKnife.bind(this);
         refreshView(STATE_LOAD_SUCCESS);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         mTvPublish.setVisibility(View.GONE);
         wvContent = new WebView(getApplicationContext());
         String id = getIntent().getStringExtra("id");

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuHuiShou2Activity.java

@@ -100,7 +100,7 @@ public class GongJuHuiShou2Activity extends BaseActivity {
         id = getIntent().getStringExtra("id");
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         refreshState(14);
         refreshView(STATE_LOAD_SUCCESS);
         mAdapter = new ToolRecAdapter(mActivity, mData);

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuHuiShouActivity.java

@@ -65,7 +65,7 @@ public class GongJuHuiShouActivity extends BaseActivity {
     public void initData() {
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         refreshView(STATE_LOAD_SUCCESS);
         mScannerGunManager = new ScannerGunManager(content -> {
             if (content.startsWith(Constants.TOOL_GRANT_RECORD)) {

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuMessageActivity.java

@@ -75,7 +75,7 @@ public class GongJuMessageActivity extends BaseActivity {
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         super.initData();
         mBind = ButterKnife.bind(this);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         refreshView(STATE_LOAD_SUCCESS);
         mAdapter = new RecordToolsRecyclerAdapter(mActivity, mToolsList);
         rlvTools.setLayoutManager(new LinearLayoutManager(mActivity));

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GrantToolsActivity.java

@@ -103,7 +103,7 @@ public class GrantToolsActivity extends BaseActivity {
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         mBind = ButterKnife.bind(this);
         refreshView(STATE_LOAD_SUCCESS);
-        mTvBaseTitle.setText("监管掌上通");
+        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
         mPrintUtils = new PrintUtils(mActivity);
         mGson = new Gson();
     }

modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/views/activitys/PersonalActivity.java

@@ -65,7 +65,8 @@ public class PersonalActivity extends BaseActivity {
     public void initData() {
         mBind = ButterKnife.bind(this);
         refreshView(STATE_LOAD_SUCCESS);
-        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
+//        mTvBaseTitle.setText(getResources().getString(R.string.tools_title));
+        mTvBaseTitle.setText("狱务掌上通");
         addView();
     }
 

modulesupertools/src/main/res/layout/activity_personal.xml

@@ -133,6 +133,7 @@
             android:layout_marginTop="20dp"
             android:layout_marginRight="20dp"
             android:background="@drawable/select_btn_ok"
+            android:visibility="gone"
             android:text="个人测评"
             android:textColor="#fff" />
 
@@ -174,6 +175,7 @@
         android:id="@+id/iv_person_close"
         android:layout_width="30dp"
         android:layout_height="30dp"
+        android:visibility="gone"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginRight="5dp"

modulesupertools/src/main/res/values/strings.xml

@@ -4,7 +4,7 @@
     <string name="printer">打印机</string>
     <string name="chinesecolon">：</string>
     <string name="printtext">打印文本</string>
-    <string name="tools_title">监管掌上通</string>
+    <string name="tools_title">智慧监管</string>
     <string name="holder_name">持有人:%1$s</string>
     <string name="number">警&#160;&#160;号:%1$s</string>
     <string name="printtext1dbarcode">文本一维码</string>

modulesupertools/src/main/res/values/styles.xml

@@ -10,7 +10,6 @@
 
     <style name="CustomTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowFullscreen">false</item>
-        <item name="android:windowBackground">@drawable/login_back</item>
         <item name="android:typeface">monospace</item>
     </style>
     <!--创建沉浸式状态栏-->