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 0000000..22ea01d Binary files /dev/null and b/modulemain/src/main/res/drawable-xhdpi/ic_mine_main_icon.png differ diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/DutyAssActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/DutyAssActivity.java index 65bd3c2..e25d61f 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/DutyAssActivity.java +++ b/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); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/LocalRecordPlayActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/LocalRecordPlayActivity.java index 1646c6a..2daf69e 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/LocalRecordPlayActivity.java +++ b/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"); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/RecordPlayActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/RecordPlayActivity.java index d3e0621..a7fc553 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/RecordPlayActivity.java +++ b/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"); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/VideoListActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/VideoListActivity.java index f733bf0..05e4e29 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/VideoListActivity.java +++ b/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); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/CallRecordActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/CallRecordActivity.java index 595de9b..5472435 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/CallRecordActivity.java +++ b/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(); diff --git a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/CountDetailActivity.java b/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/CountDetailActivity.java index ba5013e..cef0bd1 100755 --- a/modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/CountDetailActivity.java +++ b/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) 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 6866b32..0000000 Binary files a/modulesupertools/src/main/res/drawable-xxhdpi/login_back.jpg and /dev/null differ 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 @@