From 9d49d842832c803ab117d6ae41c83c94c83e770f Mon Sep 17 00:00:00 2001 From: itgaojian Date: Tue, 2 Jul 2024 10:36:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E6=96=87?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/release/output.json | 2 +- build.gradle | 4 +- .../cm_utils/constant/PathConfig.java | 2 + .../core/retrofit_net/BaseUrlApi.java | 6 +- .../CheckRecordDetailActivity.java | 15 ++- .../CheckRegisterActivity.java | 2 +- .../CheckRegisterCarActivity.java | 8 +- .../enteroutexamine/FlowTransactActivity.java | 18 +++- .../layout/activity_check_record_detail.xml | 6 +- .../res/layout/activity_check_register.xml | 2 +- .../layout/activity_check_register_car.xml | 6 +- .../res/layout/activity_flow_transact.xml | 32 ++++++- .../layout/picker_custom_examine_person.xml | 89 ++++++++++++++++++ .../adapter/MainFuncationAdapter.java | 29 ++++-- .../modulemain/base/MainActivity.java | 12 ++- .../drawable-v24/ic_launcher_foreground.xml | 34 ------- .../res/drawable-xhdpi/ic_mine_main_icon.png | Bin 0 -> 5159 bytes .../activity/DutyAssActivity.java | 2 +- .../criminal/LocalRecordPlayActivity.java | 2 +- .../activity/criminal/RecordPlayActivity.java | 2 +- .../activity/criminal/VideoListActivity.java | 2 +- .../infosearch/CallRecordActivity.java | 2 +- .../infosearch/CountDetailActivity.java | 2 +- .../infosearch/DutyRecordActivity.java | 2 +- .../infosearch/RollCallDetailActivity.java | 2 +- .../infosearch/SearchAreaActivity.java | 2 +- .../infosearch/SearchAreaCountActivity.java | 2 +- .../infosearch/SearchAreaDetaileActivity.java | 2 +- .../infosearch/SearchAreaListActivity.java | 2 +- .../infosearch/SearchCountActivity.java | 2 +- .../infosearch/WorkHandoverActivity.java | 2 +- .../activity/learn/ShouCeMainActivity.java | 2 +- .../YingJiDianMingActivity.java | 2 +- .../room_manager/BuJuGuanLiActivity.java | 2 +- .../activity/room_manager/Floor2Activity.java | 2 +- .../activity/room_manager/PlantActivity.java | 2 +- .../room_manager/PostBuJuActivity.java | 2 +- .../room_manager/RoomScrollActivity.java | 2 +- .../room_manager/WebFloorActivity.java | 2 +- .../tool_manager/GongJuHuiShou2Activity.java | 2 +- .../tool_manager/GongJuHuiShouActivity.java | 2 +- .../tool_manager/GongJuMessageActivity.java | 2 +- .../tool_manager/GrantToolsActivity.java | 2 +- .../views/activitys/PersonalActivity.java | 3 +- .../main/res/drawable-xxhdpi/login_back.jpg | Bin 48219 -> 0 bytes .../src/main/res/layout/activity_personal.xml | 2 + .../src/main/res/values/strings.xml | 2 +- .../src/main/res/values/styles.xml | 1 - 48 files changed, 227 insertions(+), 100 deletions(-) create mode 100755 modulecheck/src/main/res/layout/picker_custom_examine_person.xml delete mode 100755 modulemain/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 modulemain/src/main/res/drawable-xhdpi/ic_mine_main_icon.png delete mode 100755 modulesupertools/src/main/res/drawable-xxhdpi/login_back.jpg diff --git a/app/release/output.json b/app/release/output.json index 773d283..35c69c4 100644 --- a/app/release/output.json +++ b/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":{}}] \ No newline at end of file +[{"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":{}}] \ No newline at end of file diff --git a/build.gradle b/build.gradle index df5f534..0ea9b6c 100755 --- a/build.gradle +++ b/build.gradle @@ -39,8 +39,8 @@ ext { gCompileSdkVersion = 28 gMinSdkVersion = 16 gTargetSdkVersion = 28 - gVersionCode = 2 - gVersionName = '1.0.1' + gVersionCode = 6 + gVersionName = '1.0.5' //Router编译版本 gRouterApiVersion = '1.4.1' gRouterCompileVersion = '1.2.2' diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java index d0bf672..297b59c 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java +++ b/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使用的扇区 diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java index 2474d08..dd002a6 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java +++ b/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.0.115:8083/";//TODO 测试IP + public static final String IP = "http://192.168.219.7:8080/";//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"; diff --git a/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRecordDetailActivity.java b/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRecordDetailActivity.java index c591b5c..b792abf 100755 --- a/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRecordDetailActivity.java +++ b/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 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); diff --git a/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRegisterActivity.java b/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRegisterActivity.java index 406e18f..4f22711 100755 --- a/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRegisterActivity.java +++ b/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(); diff --git a/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRegisterCarActivity.java b/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRegisterCarActivity.java index 6ffe499..095ede9 100755 --- a/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRegisterCarActivity.java +++ b/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(); diff --git a/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/FlowTransactActivity.java b/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/FlowTransactActivity.java index 04ed248..1f050dd 100755 --- a/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/FlowTransactActivity.java +++ b/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 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) { diff --git a/modulecheck/src/main/res/layout/activity_check_record_detail.xml b/modulecheck/src/main/res/layout/activity_check_record_detail.xml index a11ac35..c2aaa7b 100755 --- a/modulecheck/src/main/res/layout/activity_check_record_detail.xml +++ b/modulecheck/src/main/res/layout/activity_check_record_detail.xml @@ -124,14 +124,14 @@ + android:hint="随车民警" /> @@ -267,7 +267,7 @@ android:layout_height="wrap_content" android:gravity="center" android:padding="5dp" - tools:text="请上传司机、随车特警、带领民警、车合照" /> + tools:text="请上传司机、随车民警、带领民警、车合照" /> diff --git a/modulecheck/src/main/res/layout/activity_check_register_car.xml b/modulecheck/src/main/res/layout/activity_check_register_car.xml index 139d2e3..cb8bf88 100755 --- a/modulecheck/src/main/res/layout/activity_check_register_car.xml +++ b/modulecheck/src/main/res/layout/activity_check_register_car.xml @@ -118,7 +118,7 @@ + android:text="随车民警" /> + android:hint="请选择随车民警" /> @@ -182,7 +182,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:hint="驾驶员大头照" + android:hint="驾驶员照片" android:padding="5dp" /> diff --git a/modulecheck/src/main/res/layout/activity_flow_transact.xml b/modulecheck/src/main/res/layout/activity_flow_transact.xml index 66b2361..e26a82a 100755 --- a/modulecheck/src/main/res/layout/activity_flow_transact.xml +++ b/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" /> + tools:text="请上传司机、随车民警、带领民警、车合照" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modulemain/src/main/java/com/sucstepsoft/modulemain/adapter/MainFuncationAdapter.java b/modulemain/src/main/java/com/sucstepsoft/modulemain/adapter/MainFuncationAdapter.java index fc8209f..0fd66b2 100755 --- a/modulemain/src/main/java/com/sucstepsoft/modulemain/adapter/MainFuncationAdapter.java +++ b/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= 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>() { }.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; diff --git a/modulemain/src/main/res/drawable-v24/ic_launcher_foreground.xml b/modulemain/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100755 index 1f6bb29..0000000 --- a/modulemain/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_mine_main_icon.png b/modulemain/src/main/res/drawable-xhdpi/ic_mine_main_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..22ea01d51e1bb39eeea9a3fa5006ee12ed488766 GIT binary patch literal 5159 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 getIntent().getSerializableExtra("criminals"); if (mCriminals != null && mCriminals.size() > 0) { diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/DutyRecordActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/DutyRecordActivity.java index 29cb649..352cc04 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/DutyRecordActivity.java +++ b/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(); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/RollCallDetailActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/RollCallDetailActivity.java index c48ef83..1bab27d 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/RollCallDetailActivity.java +++ b/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("数据有误."); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaActivity.java index 44089f3..30d04b3 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaActivity.java +++ b/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); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaCountActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaCountActivity.java index 0946902..008a6d2 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaCountActivity.java +++ b/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"); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaDetaileActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaDetaileActivity.java index 583a4b4..f519021 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaDetaileActivity.java +++ b/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); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaListActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaListActivity.java index 85e9d24..73a9ea6 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaListActivity.java +++ b/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)) { diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchCountActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchCountActivity.java index d35c61c..a936d58 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchCountActivity.java +++ b/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) { diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/WorkHandoverActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/WorkHandoverActivity.java index 90e504d..a0552da 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/WorkHandoverActivity.java +++ b/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>() { diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/learn/ShouCeMainActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/learn/ShouCeMainActivity.java index fabe502..6537195 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/learn/ShouCeMainActivity.java +++ b/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); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/rollcall_manager/YingJiDianMingActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/rollcall_manager/YingJiDianMingActivity.java index 23891d5..9bfaa9e 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/rollcall_manager/YingJiDianMingActivity.java +++ b/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); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/BuJuGuanLiActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/BuJuGuanLiActivity.java index 3ea9e95..20c002e 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/BuJuGuanLiActivity.java +++ b/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)); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/Floor2Activity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/Floor2Activity.java index 7f85ef8..6aa9c99 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/Floor2Activity.java +++ b/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)) { diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/PlantActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/PlantActivity.java index 7e24f3d..5b0e897 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/PlantActivity.java +++ b/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("数据有误,请稍后重试."); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/PostBuJuActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/PostBuJuActivity.java index 8a631d2..a55fdf5 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/PostBuJuActivity.java +++ b/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(); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/RoomScrollActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/RoomScrollActivity.java index 24fa1e8..8f85de7 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/RoomScrollActivity.java +++ b/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); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/WebFloorActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/WebFloorActivity.java index a7cac98..29e782f 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/WebFloorActivity.java +++ b/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"); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuHuiShou2Activity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuHuiShou2Activity.java index 285b225..11a61ca 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuHuiShou2Activity.java +++ b/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); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuHuiShouActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuHuiShouActivity.java index 120fcb5..7c927a2 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuHuiShouActivity.java +++ b/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)) { diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuMessageActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuMessageActivity.java index eef5a75..2959d1d 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuMessageActivity.java +++ b/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)); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GrantToolsActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GrantToolsActivity.java index a290d5b..0c6b9a3 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GrantToolsActivity.java +++ b/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(); } diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/views/activitys/PersonalActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/views/activitys/PersonalActivity.java index 0fd78f0..efea3ef 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/views/activitys/PersonalActivity.java +++ b/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(); } diff --git a/modulesupertools/src/main/res/drawable-xxhdpi/login_back.jpg b/modulesupertools/src/main/res/drawable-xxhdpi/login_back.jpg deleted file mode 100755 index 6866b32b131fd3c63e845997e80859159a66f333..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48219 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 diff --git a/modulesupertools/src/main/res/layout/activity_personal.xml b/modulesupertools/src/main/res/layout/activity_personal.xml index 9d1a29a..66ee562 100755 --- a/modulesupertools/src/main/res/layout/activity_personal.xml +++ b/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" diff --git a/modulesupertools/src/main/res/values/strings.xml b/modulesupertools/src/main/res/values/strings.xml index 5c76f04..a1a9bbd 100755 --- a/modulesupertools/src/main/res/values/strings.xml +++ b/modulesupertools/src/main/res/values/strings.xml @@ -4,7 +4,7 @@ 打印机 ： 打印文本 - 监管掌上通 + 智慧监管 持有人:%1$s 警  号:%1$s 文本一维码 diff --git a/modulesupertools/src/main/res/values/styles.xml b/modulesupertools/src/main/res/values/styles.xml index 8efae70..a43113f 100755 --- a/modulesupertools/src/main/res/values/styles.xml +++ b/modulesupertools/src/main/res/values/styles.xml @@ -10,7 +10,6 @@