gaojian/supervision
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: gaojian:main
Branches Tags
gaojian:main
gaojian:hsyj
...
pull from: gaojian:hsyj
Branches Tags
gaojian:hsyj
gaojian:main

3 Commits
main ... hsyj

Author SHA1 Message Date
itgaojian163
c296c98562 页面修改 2024-07-12 17:29:35 +08:00
itgaojian
9d49d84283 修改显示文字 2024-07-02 10:36:17 +08:00
itgaojian
8992f5c3ca 进出审批字段修改、添加二维码扫描查看记录 2024-04-11 18:01:59 +08:00
90 changed files with 1452 additions and 560 deletions
Show Stats Expand all files Collapse all files

10
.idea/deploymentTargetDropDown.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<value>
<entry key="app">
<State />
</entry>
</value>
</component>
</project>

10
.idea/migrations.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectMigrations">
<option name="MigrateToGradleLocalJavaHome">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</component>
</project>

8
.idea/misc.xml
View File

@ -4,10 +4,18 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations>
</component>
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_13" default="true" project-jdk-name="13" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
<component name="VisualizationToolProject">
<option name="state">
<ProjectState>
<option name="scale" value="0.5" />
</ProjectState>
</option>
</component>
</project>

2
app/release/output.json
View File

@ -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":9,"versionName":"1.0.9","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

4
build.gradle
View File

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

2
cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
View File

@ -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使用的扇区

7
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
View File

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

BIN
cm_utils/src/main/res/drawable-xhdpi/ic_img_default.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

387
cm_utils/src/main/res/layout/base_activity.xml
View File

@ -1,194 +1,195 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<!-- ===========标题============= -->
<RelativeLayout
android:id="@+id/rl_base_app_activity_title_back"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/titleBar">
<RelativeLayout
android:id="@+id/rl_app_back"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:gravity="center">
<Button
android:id="@+id/ib_app_back"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerInParent="true"
android:background="@drawable/ic_back_white"
android:scaleType="centerInside" />
<ImageView
android:id="@+id/iv_app_back"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerInParent="true"
android:scaleType="fitXY" />
</RelativeLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_app_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:clickable="true"
android:ellipsize="end"
android:maxEms="15"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
tools:text="内蒙" />
</LinearLayout>
<TextView
android:id="@+id/tv_app_publish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:clickable="true"
android:padding="5dp"
android:textColor="@color/white"
android:textSize="18sp"
android:visibility="gone"
tools:text="@string/app_name" />
<LinearLayout
android:id="@+id/ll_app_img"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/iv_app_img"
android:layout_width="30dp"
android:layout_height="30dp"
tools:src="@drawable/ic_back_white" />
<ImageView
android:id="@+id/iv_app_into"
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@drawable/ic_arrow_right_white" />
</LinearLayout>
</RelativeLayout>
<!-- ===========内容============= -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_notify"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_nootify_point"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@drawable/ic_nofify_point_red" />
<TextView
android:id="@+id/tv_notify"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
android:singleLine="true"
android:text="无未读消息"
android:textSize="@dimen/text_18" />
</RelativeLayout>
<FrameLayout
android:id="@+id/fl_app_content"
android:layout_width="match_parent"
android:layout_height="match_parent">
</FrameLayout>
</LinearLayout>
<!--<com.nightonke.boommenu.BoomMenuButton-->
<!--android:id="@+id/bb_menu"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_alignParentRight="true"-->
<!--android:layout_alignParentBottom="true"-->
<!--android:layout_marginRight="10dp"-->
<!--android:layout_marginBottom="10dp"-->
<!--app:bmb_dimColor="@color/fab_bg_color"-->
<!--app:bmb_highlightedColor="@android:color/holo_blue_bright"-->
<!--app:bmb_normalColor="@android:color/holo_blue_dark" />-->
<!-- ===========提示============= -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<ProgressBar
android:id="@+id/pb_app_loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading" />
<ImageView
android:id="@+id/iv_app_empty_data"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerInParent="true"
android:background="@drawable/ic_empty_data" />
<TextView
android:id="@+id/tv_app_error_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:clickable="true"
android:textColor="@color/black"
tools:text="加载数据失败" />
</LinearLayout>
</RelativeLayout>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<!-- ===========标题============= -->
<RelativeLayout
android:id="@+id/rl_base_app_activity_title_back"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/titleBar">
<RelativeLayout
android:id="@+id/rl_app_back"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:gravity="center">
<Button
android:id="@+id/ib_app_back"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerInParent="true"
android:background="@drawable/ic_back_white"
android:scaleType="centerInside" />
<ImageView
android:id="@+id/iv_app_back"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerInParent="true"
android:scaleType="fitXY" />
</RelativeLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_app_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:clickable="true"
android:ellipsize="end"
android:maxEms="15"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
tools:text="内蒙" />
</LinearLayout>
<TextView
android:id="@+id/tv_app_publish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:clickable="true"
android:padding="5dp"
android:textColor="@color/white"
android:textSize="18sp"
android:visibility="gone"
tools:text="@string/app_name" />
<LinearLayout
android:id="@+id/ll_app_img"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/iv_app_img"
android:layout_width="25dp"
android:layout_height="25dp"
tools:src="@drawable/ic_back_white" />
<ImageView
android:id="@+id/iv_app_into"
android:layout_width="30dp"
android:visibility="gone"
android:layout_height="30dp"
android:src="@drawable/ic_arrow_right_white" />
</LinearLayout>
</RelativeLayout>
<!-- ===========内容============= -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_notify"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_nootify_point"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@drawable/ic_nofify_point_red" />
<TextView
android:id="@+id/tv_notify"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
android:singleLine="true"
android:text="无未读消息"
android:textSize="@dimen/text_18" />
</RelativeLayout>
<FrameLayout
android:id="@+id/fl_app_content"
android:layout_width="match_parent"
android:layout_height="match_parent">
</FrameLayout>
</LinearLayout>
<!--<com.nightonke.boommenu.BoomMenuButton-->
<!--android:id="@+id/bb_menu"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_alignParentRight="true"-->
<!--android:layout_alignParentBottom="true"-->
<!--android:layout_marginRight="10dp"-->
<!--android:layout_marginBottom="10dp"-->
<!--app:bmb_dimColor="@color/fab_bg_color"-->
<!--app:bmb_highlightedColor="@android:color/holo_blue_bright"-->
<!--app:bmb_normalColor="@android:color/holo_blue_dark" />-->
<!-- ===========提示============= -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<ProgressBar
android:id="@+id/pb_app_loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading" />
<ImageView
android:id="@+id/iv_app_empty_data"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerInParent="true"
android:background="@drawable/ic_empty_data" />
<TextView
android:id="@+id/tv_app_error_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:clickable="true"
android:textColor="@color/black"
tools:text="加载数据失败" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>

1
modulecheck/build.gradle
View File

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

14
modulecheck/src/main/AndroidManifest.xml
View File

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

2
modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/AddPersonActivity.java
View File

@ -122,7 +122,7 @@ public class AddPersonActivity extends BaseActivity {
mKey = getIntent().getIntExtra("key", -1);
//从添加车辆页面进入
mCarId = getIntent().getStringExtra("carId");
initReadCard();
// TODO initReadCard();
}
/**

66
modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckHomeActivity.java
View File

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

38
modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckIntoRecordActivity.java
View File

@ -116,25 +116,25 @@ public class CheckIntoRecordActivity extends BaseActivity {
mTvBaseTitle.setText("进监记录");
refreshView(STATE_LOAD_SUCCESS);
refreshState(123);
uiHandler = new MyHandler(this);
// 设备注册
mNfcAdapter = NfcAdapter.getDefaultAdapter(getApplicationContext());
// 判断设备是否可用
if (mNfcAdapter == null) {
ToastUtils.showShort("该设备不支持nfc!");
return;
}
if ((null != mNfcAdapter) && !mNfcAdapter.isEnabled()) {
ToastUtils.showShort("请在系统设置中先启用NFC功能");
startActivity(new Intent(Settings.ACTION_NFC_SETTINGS));
finish();
return;
}
mNfcPendingIntent = PendingIntent.getActivity(this, 0, new Intent(this,
getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
mNFCReaderHelper = new NFCReaderHelper(getApplicationContext(), uiHandler, appKey,
appSecret, true);
// TODO uiHandler = new MyHandler(this);
// // 设备注册
// mNfcAdapter = NfcAdapter.getDefaultAdapter(getApplicationContext());
// // 判断设备是否可用
// if (mNfcAdapter == null) {
// ToastUtils.showShort("该设备不支持nfc!");
// return;
// }
// if ((null != mNfcAdapter) && !mNfcAdapter.isEnabled()) {
// ToastUtils.showShort("请在系统设置中先启用NFC功能");
// startActivity(new Intent(Settings.ACTION_NFC_SETTINGS));
// finish();
// return;
// }
// mNfcPendingIntent = PendingIntent.getActivity(this, 0, new Intent(this,
// getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
//
// mNFCReaderHelper = new NFCReaderHelper(getApplicationContext(), uiHandler, appKey,
// appSecret, true);
mBtnSearch.setOnClickListener(v -> {
String identity = mEtSearch.getText().toString().trim();
if (!TextUtils.isEmpty(identity) && IDCard.IDCardValidate(identity)) {

87
modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRecordDetailActivity.java
View File

@ -73,12 +73,14 @@ public class CheckRecordDetailActivity extends BaseActivity {
TextView mTvEndTime;
@BindView(R2.id.tv_manager_user)
TextView mTvManagerUser;
@BindView(R2.id.iv_photo)
ImageView mIvPhoto;
// @BindView(R2.id.iv_photo)
// ImageView mIvPhoto;
// @BindView(R2.id.tv_per)
// TextView mTvPer;
@BindView(R2.id.tv_status)
TextView mTvStatus;
@BindView(R2.id.rlv_photo)
RecyclerView mRlvPhoto;
@BindView(R2.id.rlv_list)
RecyclerView mRlvList;
@BindView(R2.id.tv_field_name)
@ -103,6 +105,10 @@ public class CheckRecordDetailActivity extends BaseActivity {
LinearLayout mLlEpiInfo;
@BindView(R2.id.tv_pro)
TextView mTvPro;
@BindView(R2.id.ll_in_prison_area)
LinearLayout mLlInPrisonArea;
@BindView(R2.id.ll_cop)
LinearLayout mLlCop;
private Unbinder mBind;
private String mId;
@ -171,6 +177,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("数据有误");
@ -178,6 +185,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();
});
}
}
}
@ -245,10 +262,12 @@ public class CheckRecordDetailActivity extends BaseActivity {
mTvEndTime.setText(data.getEndTime());//授权结束时间
mTvStartTime.setText(data.getStartTime());//授权开始时间
mTvManagerUser.setText(data.getGuideUserName());//"带领人员 : " +
mTvFieldName.setText(data.getFieldnNames());//"进入监区:" +
//TODO 防疫措施
if ("1".equals(data.getType())) {
//车辆进出
mLlInPrisonArea.setVisibility(View.VISIBLE);
mTvFieldName.setText(data.getFieldnNames());//"进入监区:" +
if (UserInfoSPUtils.getCarIsShow()) {
mLlEpiInfo.setVisibility(View.VISIBLE);
mTvInfo.setText(UserInfoSPUtils.getCarParams() + ":" + data.getInform());
@ -256,6 +275,7 @@ public class CheckRecordDetailActivity extends BaseActivity {
mLlEpiInfo.setVisibility(View.GONE);
}
} else {
mLlInPrisonArea.setVisibility(View.GONE);
//人员进出
if (UserInfoSPUtils.getPersonIsShow()) {
mLlEpiInfo.setVisibility(View.VISIBLE);
@ -270,33 +290,50 @@ public class CheckRecordDetailActivity extends BaseActivity {
} else {
mTvPro.setText("无需进入");
}
Glide.with(mActivity)
.load(BaseUrlApi.BASE_URL + data.getPhotoRecordPath())
.apply(new RequestOptions()
.error(R.drawable.ic_car_person_default)
.placeholder(R.drawable.ic_car_person_default))
.into(mIvPhoto);
mIvPhoto.setOnClickListener(v -> {
ArrayList<String> list = new ArrayList<>();
list.add(data.getPhotoRecordPath());
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_CMUTILS_PHOTO_SHOW)
.withStringArrayList("imgUrls", list)
.navigation();
});
// TODO Glide.with(mActivity)
// .load(BaseUrlApi.BASE_URL + data.getPhotoRecordPath())
// .apply(new RequestOptions()
// .error(R.drawable.ic_car_person_default)
// .placeholder(R.drawable.ic_car_person_default))
// .into(mIvPhoto);
// mIvPhoto.setOnClickListener(v -> {
// ArrayList<String> list = new ArrayList<>();
// list.add(data.getPhotoRecordPath());
// ARouter.getInstance()
// .build(PathConfig.PATH_MODULE_CMUTILS_PHOTO_SHOW)
// .withStringArrayList("imgUrls", list)
// .navigation();
// });
if (data.getPhotoRecordIdList() != null && data.getPhotoRecordIdList().size() > 0) {
mRlvPhoto.setVisibility(View.VISIBLE);
List<String> photos = new ArrayList();
for (int i = 0; i < data.getPhotoRecordIdList().size(); i++) {
photos.add(data.getPhotoRecordIdList().get(i).getPath());
}
BaseShowPhotoAdapter photoAdapter = new BaseShowPhotoAdapter(mActivity, photos);
GridLayoutManager manager = new GridLayoutManager(mActivity, 4, GridLayoutManager.VERTICAL,
false);
mRlvPhoto.setLayoutManager(manager);
mRlvPhoto.setAdapter(photoAdapter);
photoAdapter.addOnItemClickListener(photoBean -> ARouter.getInstance().build(PathConfig.PATH_MODULE_CMUTILS_PHOTO_SHOW)
.withSerializable("imgUrls", new ArrayList<>(photoAdapter.getData()))
.navigation());
} else {
mRlvPhoto.setVisibility(View.GONE);
}
if (TextUtils.isEmpty(data.getType())) {
mTvType.setText("未知");
} else {
if ("1".equals(data.getType())) {
mLlCop.setVisibility(View.VISIBLE);
mRlvTools.setVisibility(View.GONE);
mTvColHint.setText("司机、随车特警、带领民警、车合照");
mTvTools.setText( data.getCarryTools());//"装载货物 : " +
mTvColHint.setText("车辆以及车辆货物照片");
mTvTools.setText(data.getCarryTools());//"装载货物
mTvType.setText("车辆进出");
mTvCop.setVisibility(View.VISIBLE);
if (!TextUtils.isEmpty(data.getCertificatesPhotoPath())) {
mTvColCarHint.setVisibility(View.VISIBLE);
mTvColCarHint.setText("车辆证件照(货物来源证明)");
mTvColCarHint.setText("车辆证件照");
mIvCarCard.setVisibility(View.VISIBLE);
Glide.with(mActivity)
.load(BaseUrlApi.BASE_URL + data.getCertificatesPhotoPath())
@ -317,17 +354,17 @@ public class CheckRecordDetailActivity extends BaseActivity {
mIvCarCard.setVisibility(View.GONE);
}
if (!TextUtils.isEmpty(data.getFollowCarUserName())) {
mTvCop.setText( data.getFollowCarUserName());
mTvCop.setText(data.getFollowCarUserName());
} else {
mTvCop.setText("无");
}
} else {
mLlCop.setVisibility(View.GONE);
mIvCarCard.setVisibility(View.GONE);
mTvColCarHint.setVisibility(View.GONE);
mTvColHint.setText("外来人员、带领民警合照");
mTvTools.setText( data.getCarryTools());
mTvColHint.setText("人员照片");
mTvTools.setText(data.getCarryTools());
mTvType.setText("人员进出");
mTvCop.setVisibility(View.GONE);
mRlvTools.setVisibility(View.VISIBLE);
//TODO 携带工具数据回显
if (data.getCarryToolsPhoto() != null && data.getCarryToolsPhoto().size() > 0) {

30
modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRecordListActivity.java
View File

@ -10,6 +10,7 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.Switch;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
@ -27,6 +28,7 @@ import com.sucstepsoft.cm_utils.core.retrofit_net.conver.RxTransformer;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.core.widget.views.ItemSplitDivider;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.TimeUtils;
import com.sucstepsoft.modulecheck.R;
import com.sucstepsoft.modulecheck.R2;
import com.sucstepsoft.modulecheck.data.beans.CheckRecordBean;
@ -36,6 +38,7 @@ import com.sucstepsoft.modulecheck.widget.adapter.enterexamine.CheckRecordAdapte
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -81,6 +84,10 @@ public class CheckRecordListActivity extends BaseActivity {
Button mBtnOpenSearch;
@BindView(R2.id.dl_content)
DrawerLayout mDlContent;
@BindView(R2.id.tv_all)
TextView mTvAll;
@BindView(R2.id.sw_change)
Switch mSwChange;
private Unbinder mBind;
private int mType = -1;
@ -150,6 +157,24 @@ public class CheckRecordListActivity extends BaseActivity {
mDlContent.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
mBtnOpenSearch.setOnClickListener(v -> mDlContent.openDrawer(Gravity.RIGHT));
mBtnCancel.setOnClickListener(v -> mDlContent.closeDrawer(Gravity.RIGHT));
mSwChange.setOnCheckedChangeListener((compoundButton, b) -> {
if (b) {
mTvAll.setText("当天");
Date nowDate = TimeUtils.getNowDate();
mStartTime = mDateFormat.format(nowDate);
mEndTime = mStartTime;
requestDatas(-1, mStartTime, mEndTime, "", "1");
} else {
mTvAll.setText("全部");
requestDatas(-1, "", "", "", "1");
}
});
LogUtils.e("测试");
Date nowDate = TimeUtils.getNowDate();
mStartTime = mDateFormat.format(nowDate);
mEndTime = mStartTime;
requestDatas(-1, mStartTime, mEndTime, "", "1");
}
private void resetCondition() {
@ -162,6 +187,7 @@ public class CheckRecordListActivity extends BaseActivity {
mEtSearch.setText("");
mCurrentPageNo = 1;
mDatas.clear();
mSwChange.setChecked(false);
hideSoftKeyboard();
requestDatas(-1, "", "", "", "1");
}
@ -235,8 +261,8 @@ public class CheckRecordListActivity extends BaseActivity {
@Override
protected void onResume() {
super.onResume();
mCurrentPageNo = 1;
requestDatas(-1, "", "", "", "1");
// mCurrentPageNo = 1;
// requestDatas(-1, "", "", "", "1");
}
/**

33
modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRegisterActivity.java
View File

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

149
modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRegisterCarActivity.java
View File

@ -8,6 +8,7 @@ import android.net.Uri;
import android.os.Build;
import android.provider.MediaStore;
import android.support.v4.content.FileProvider;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
@ -61,6 +62,8 @@ import com.sucstepsoft.modulecheck.widget.adapter.enterexamine.PersonShowAdapter
import com.sucstepsoft.modulecheck.widget.adapter.other.MultiCCarAdapter;
import com.sucstepsoft.modulecheck.widget.adapter.other.MultiCLeaderAdapter;
import com.sucstepsoft.modulecheck.widget.adapter.other.MultiCPersonAdapter;
import com.sucstepsoft.modulesupertools.adapter.AddPhotoAdapter;
import com.sucstepsoft.modulesupertools.data.beans.AddPhotoBean;
import java.io.File;
import java.lang.reflect.Type;
@ -117,14 +120,14 @@ public class CheckRegisterCarActivity extends BaseActivity {
Button mBtnCarSubmit;
@BindView(R2.id.tv_car_cop)
TextView mTvCarCop;
@BindView(R2.id.iv_car_person_photo)
ImageView mIvCarPersonPhoto;
@BindView(R2.id.et_car_carry)
EditText mEtCarCarry;
@BindView(R2.id.ic_car_cred)
ImageView mIvCarCard;
@BindView(R2.id.et_car_remark)
EditText mEtInformation;
@BindView(R2.id.rlv_driver)
RecyclerView mRlvDriver;
private Unbinder mBind;
private String startTime = "";
private String endTime = "";
@ -162,7 +165,12 @@ public class CheckRegisterCarActivity extends BaseActivity {
private String mCarCardPhotoId;
private int mTakePhotoType = 0;
private String mBeanId;
private String isNeedInto = "0";
private String isNeedInto = "1";
private List<AddPhotoBean> mPhotos = new ArrayList<>();
private AddPhotoAdapter mPhotoAdapter;
private AddPhotoBean mCurrentBean;
private String mPhotoIds = "";
@Override
protected int setLayoutId() {
@ -211,6 +219,40 @@ public class CheckRegisterCarActivity extends BaseActivity {
//默认带领人选择当前登录人
mTvCarLeadCop.setText(UserInfoSPUtils.getName());
mLeadId = UserInfoSPUtils.getUserId();
mPhotos.add(new AddPhotoBean());
mPhotoAdapter = new AddPhotoAdapter(mActivity, mPhotos);
GridLayoutManager gridLayoutManager = new GridLayoutManager(mActivity, 4) {
@Override
public boolean canScrollHorizontally() {
return false;
}
@Override
public boolean canScrollVertically() {
return false;
}
};
mRlvDriver.setLayoutManager(gridLayoutManager);
mRlvDriver.setAdapter(mPhotoAdapter);
mPhotoAdapter.addOnDeleteListener(((bean, i) -> {
//TODO 删除照片
mPhotoAdapter.removeItem(bean);
mPhotoIds = mPhotoIds.replace(bean.getId() + ",", "");
}));
mPhotoAdapter.addOnItemClickListener(bean -> {
if (TextUtils.isEmpty(bean.getPath())) {
//空数据
takeDriverPhoto(bean);
} else {
//预览
ArrayList<String> list = new ArrayList<>();
list.add(bean.getPath());
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_CMUTILS_PHOTO_SHOW)
.withStringArrayList("imgUrls", list)
.navigation();
}
});
} else {
refreshView(STATE_LOAD_LOADING);
requestDetailDataById(mBeanId);
@ -229,7 +271,6 @@ public class CheckRegisterCarActivity extends BaseActivity {
mTvCarCop.setOnClickListener(v -> showCarCopPicker());
mBtnCarSubmit.setEnabled(false);
mBtnCarSubmit.setOnClickListener(v -> checkComplete());
mIvCarPersonPhoto.setOnClickListener(v -> takePhoto(1));
mIvCarCard.setOnClickListener(v -> takePhoto(2));
initTextChange();
//是否显示疫情防疫
@ -280,12 +321,12 @@ public class CheckRegisterCarActivity extends BaseActivity {
.into(mIvCarCard);
}
mPhotoCarId = detailBean.getPhotoRecordId();
Glide.with(mActivity)
.load(BaseUrlApi.BASE_URL + detailBean.getPhotoRecordPath())
.apply(new RequestOptions()
.error(R.drawable.ic_car_person_default)
.placeholder(R.drawable.ic_car_person_default))
.into(mIvCarPersonPhoto);
// Glide.with(mActivity)
// .load(BaseUrlApi.BASE_URL + detailBean.getPhotoRecordPath())
// .apply(new RequestOptions()
// .error(R.drawable.ic_car_person_default)
// .placeholder(R.drawable.ic_car_person_default))
// .into(mIvCarPersonPhoto);
}
/**
@ -384,6 +425,26 @@ public class CheckRegisterCarActivity extends BaseActivity {
startActivityForResult(intent, CAMERA_REQUEST);
}
/**
* 拍摄驾驶员相片
*/
private void takeDriverPhoto(AddPhotoBean bean) {
mTakePhotoType = 1;
mCurrentBean = bean;
mPicPath = PathConfig.CATCH_PATH + System.currentTimeMillis() + ".jpg";
File file = new File(mPicPath);
Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
// 下面这句指定调用相机拍照后的照片存储的路径
Uri uri;
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
uri = Uri.fromFile(file);
} else {
uri = FileProvider.getUriForFile(mActivity, ProiderUtil.getFileProviderName(mActivity), file);
}
intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
startActivityForResult(intent, CAMERA_REQUEST);
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode == RESULT_OK) {
@ -446,13 +507,17 @@ public class CheckRegisterCarActivity extends BaseActivity {
if (uploadBean != null) {
ToastUtils.showShort("图片上传成功");
if (mTakePhotoType == 1) {
mPhotoCarId = uploadBean.getId();
Glide.with(mActivity)
.load(BaseUrlApi.BASE_URL + uploadBean.getPath())
.apply(new RequestOptions()
.error(R.drawable.ic_car_person_default)
.placeholder(R.drawable.ic_car_person_default))
.into(mIvCarPersonPhoto);
//TODO 上传驾驶员相片
mPhotoIds += (uploadBean.getId() + ",");
mPhotoCarId = mPhotoIds;
mCurrentBean.setId(uploadBean.getId());
mCurrentBean.setPath(BaseUrlApi.BASE_URL + uploadBean.getPath());
if (mPhotos.size() < 4) {
mPhotos.add(new AddPhotoBean());
}
mPhotoAdapter.notifyDataSetChanged();
mCurrentBean = null;
ToastUtils.showShort("上传成功.");
} else {
mCarCardPhotoId = uploadBean.getId();
Glide.with(mActivity)
@ -467,35 +532,12 @@ public class CheckRegisterCarActivity extends BaseActivity {
}
}
});
// Luban.with(mActivity)
//// .load(picPath)
//// .ignoreBy(100)
//// .setTargetDir(PathConfig.CATCH_PATH)
//// .filter(path -> !(TextUtils.isEmpty(path) || path.toLowerCase().endsWith(".gif")))
//// .setCompressListener(new OnCompressListener() {
//// @Override
//// public void onStart() {
////
//// }
////
//// @Override
//// public void onSuccess(File file) {
//// ToastUtils.showLong(TimeUtils.getNowString());
////
//// }
////
//// @Override
//// public void onError(Throwable e) {
//// dialog.disDialog();
//// ToastUtils.showShort("图片上传失败,请稍后重试");
//// }
//// })
//// .launch();
}
/**
* 显示随车特警
* 显示随车民警
*/
private void showCarCopPicker() {
mCarCopView = new CustomPickerBuilder(mActivity, (p1, p2, p3, v) -> {
@ -542,7 +584,7 @@ public class CheckRegisterCarActivity extends BaseActivity {
mCopId = mLeadBean.getUserId();
mCarCopView.dismiss();
} else {
ToastUtils.showShort("请选择随车特警.");
ToastUtils.showShort("请选择随车民警.");
}
});
mTvCancel.setText("取消");
@ -1076,8 +1118,8 @@ public class CheckRegisterCarActivity extends BaseActivity {
*/
private void checkComplete() {
if (checkInfo()) {
showIsNeed();
// toSaveInfo();
// showIsNeed();
toSaveInfo();
}
}
@ -1122,12 +1164,12 @@ public class CheckRegisterCarActivity extends BaseActivity {
ToastUtils.showShort("请选择进出车辆");
return false;
}
if (TextUtils.isEmpty(mLeadId)) {
ToastUtils.showShort("请选择带领民警");
return false;
}
// if (TextUtils.isEmpty(mLeadId)) {
// ToastUtils.showShort("请选择带领民警");
// return false;
// }
// if (TextUtils.isEmpty(mCopId)) {
// ToastUtils.showShort("请选择随车特警");
// ToastUtils.showShort("请选择随车民警");
// return false;
// }
if (TextUtils.isEmpty(mFields)) {
@ -1135,7 +1177,7 @@ public class CheckRegisterCarActivity extends BaseActivity {
return false;
}
if (TextUtils.isEmpty(mPhotoCarId)) {
ToastUtils.showShort("请上传司机、特警、带领民警及车辆照片");
ToastUtils.showShort("请上传车辆以及车辆货物照片");
return false;
}
String trim = mEtCarCarry.getText().toString().trim();
@ -1234,9 +1276,9 @@ public class CheckRegisterCarActivity extends BaseActivity {
params.put("type", "1");//进出类型 1车辆 2人员
params.put("startTime", startTime);
params.put("endTime", endTime);
params.put("fieldIds", mFields);
params.put("fieldIds", mFields);//带领民警
params.put("carryTools", carry);
params.put("guideUserId", mLeadId);
params.put("guideUserId", UserInfoSPUtils.getUserId());//带领民警
params.put("production", isNeedInto);//是否需要进入生产区域
if (!TextUtils.isEmpty(mCarCardPhotoId)) {
params.put("certificatesPhotoId", mCarCardPhotoId);
@ -1252,6 +1294,7 @@ public class CheckRegisterCarActivity extends BaseActivity {
String strangCarId = sb.toString();
strangCarId = strangCarId.substring(0, strangCarId.length() - 1);
params.put("strangerOrCarId", strangCarId);
mPhotoCarId = mPhotoCarId.substring(0, mPhotoIds.length() - 1);
params.put("photoRecord", mPhotoCarId);
return params;
}

359
modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/FlowTransactActivity.java
View File

@ -1,7 +1,9 @@
package com.sucstepsoft.modulecheck.activitys.enteroutexamine;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.graphics.Color;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@ -19,6 +21,8 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.cjt2325.cameralibrary.videorecord.AudioRecordButton;
import com.jakewharton.rxbinding2.widget.RxTextView;
import com.jcodecraeer.xrecyclerview.XRecyclerView;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
@ -28,6 +32,10 @@ import com.sucstepsoft.cm_utils.core.retrofit_net.conver.BaseObserver;
import com.sucstepsoft.cm_utils.core.retrofit_net.conver.RxTransformer;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.core.widget.base.BaseShowPhotoAdapter;
import com.sucstepsoft.cm_utils.core.widget.views.BaseListDialog;
import com.sucstepsoft.cm_utils.core.widget.views.CustomPickerBuilder;
import com.sucstepsoft.cm_utils.core.widget.views.CustomPickerView;
import com.sucstepsoft.cm_utils.core.widget.views.ItemSplitDivider;
import com.sucstepsoft.cm_utils.core.widget.views.LoadingDialog;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
@ -35,20 +43,29 @@ import com.sucstepsoft.cm_utils.utils.UIUtil;
import com.sucstepsoft.cm_utils.utils.UserInfoSPUtils;
import com.sucstepsoft.modulecheck.R;
import com.sucstepsoft.modulecheck.R2;
import com.sucstepsoft.modulecheck.data.beans.CarFollowBean;
import com.sucstepsoft.modulecheck.data.beans.CheckCarBean;
import com.sucstepsoft.modulecheck.data.beans.CheckRecordDetailBean;
import com.sucstepsoft.modulecheck.data.beans.CheckRecordDetailListBean;
import com.sucstepsoft.modulecheck.data.beans.LeadBean;
import com.sucstepsoft.modulecheck.data.beans.ProcessBean;
import com.sucstepsoft.modulecheck.data.net.CheckApiService;
import com.sucstepsoft.modulecheck.widget.adapter.enterexamine.CarFollowAdapter;
import com.sucstepsoft.modulecheck.widget.adapter.enterexamine.FlowProcessAdapter;
import com.sucstepsoft.modulecheck.widget.adapter.enterexamine.RecordDetailAdapter;
import com.sucstepsoft.modulecheck.widget.adapter.other.MultiCLeaderAdapter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
/**
@ -93,8 +110,8 @@ public class FlowTransactActivity extends BaseActivity {
TextView mTvFieldName;
@BindView(R2.id.tv_cop)
TextView mTvCop;
@BindView(R2.id.iv_photo)
ImageView mIvPhoto;
// @BindView(R2.id.iv_photo)
// ImageView mIvPhoto;
@BindView(R2.id.iv_car_card)
ImageView mIvCarCard;
@BindView(R2.id.iv_col_car_hint)
@ -107,14 +124,40 @@ public class FlowTransactActivity extends BaseActivity {
TextView mTvInfo;
@BindView(R2.id.tv_pro)
TextView mTvPro;
@BindView(R2.id.rlv_photo)
RecyclerView mRlvPhoto;
@BindView(R2.id.ll_examine)
LinearLayout mLlExamine;//审核人
@BindView(R2.id.tv_examine)
TextView mTvExamine;
@BindView(R2.id.rlv_list)
RecyclerView mRlvList;
private Unbinder mBind;
private List<ProcessBean> mProcessBeans = new ArrayList<>();
private FlowProcessAdapter mAdapter;
private List<CheckRecordDetailListBean> mData = new ArrayList<>();
private RecordDetailAdapter mCarPersonAdapter;
private String mProcessId;
private String mId;
private Disposable mD;
private Disposable mDisposable;
private int mExamineCurrentPageNo = 1;
private CustomPickerView mExaminePicker;
private XRecyclerView mExamineRlv;
private MultiCLeaderAdapter mExamineAdapter;
private ArrayList<LeadBean> mExamines = new ArrayList<>();
private String mExamineId = "";
private boolean mIsShowExamine = false;
@Override
protected int setLayoutId() {
return R.layout.activity_flow_transact;
}
@Override
public void initData() {
super.initData();
@ -124,6 +167,16 @@ public class FlowTransactActivity extends BaseActivity {
mProcessId = getIntent().getStringExtra("processId");
mId = getIntent().getStringExtra("id");
int type = getIntent().getIntExtra("type", -1);
mCarPersonAdapter = new RecordDetailAdapter(mActivity, mData);
mRlvList.setLayoutManager(new LinearLayoutManager(mActivity) {
@Override
public boolean canScrollVertically() {
return false;
}
});
mRlvList.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL));
mRlvList.setAdapter(mCarPersonAdapter);
doRequestProcessById(mProcessId);
doDetailInfoByProcessId(mProcessId);
mAdapter = new FlowProcessAdapter(mActivity, mProcessBeans);
@ -141,6 +194,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 +203,142 @@ public class FlowTransactActivity extends BaseActivity {
});
}
/**
* 选择审核人
*/
@SuppressLint("CheckResult")
private void showExaminePerson() {
mExaminePicker = new CustomPickerBuilder(mActivity, (p1, p2, p3, v) -> {
})
.setLayoutRes(R.layout.picker_custom_car_type, v -> {
TextView mTvFinish = v.findViewById(R.id.tv_finish);
TextView mTvCancel = v.findViewById(R.id.tv_cancel);
EditText mEtSearch = v.findViewById(R.id.et_search);
mExamineRlv = v.findViewById(R.id.rlv_choose);
if (!TextUtils.isEmpty(mExamineId)) {
for (int i = 0; i < mExamines.size(); i++) {
if (mExamines.get(i).getUsername().equals(mExamineId)) {
mExamines.get(i).setCheck(true);
} else {
mExamines.get(i).setCheck(false);
}
}
}
mExamineAdapter = new MultiCLeaderAdapter(mActivity, mExamines, true);
mExamineRlv.setLayoutManager(new LinearLayoutManager(mActivity));
mExamineRlv.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 3,
Color.parseColor("#F5F5F5")));
mExamineRlv.setAdapter(mExamineAdapter);
mExamineRlv.setPullRefreshEnabled(false);
mExamineRlv.setFootViewText(getResources().getString(R.string.loading),
getResources().getString(R.string.nomore_data));
mExamineRlv.setLoadingListener(new XRecyclerView.LoadingListener() {
@Override
public void onRefresh() {
}
@Override
public void onLoadMore() {
LogUtils.e(mExamineCurrentPageNo + "");
String content = mEtSearch.getText().toString().trim();
requestLeadDatas(content, mExamineCurrentPageNo);
}
});
mTvFinish.setOnClickListener(v1 -> {
List<LeadBean> chooseData = mExamineAdapter.getChooseData();
if (chooseData != null && chooseData.size() > 0) {
LeadBean mLeadBean = chooseData.get(0);
mTvExamine.setText(mLeadBean.getName());
mExamineId = mLeadBean.getUsername();
mExaminePicker.dismiss();
} else {
ToastUtils.showShort("请选择审核人.");
}
});
mTvCancel.setText("取消");
mTvCancel.setOnClickListener(v1 -> mExaminePicker.dismiss());
RxTextView.textChanges(mEtSearch)
.debounce(1, TimeUnit.SECONDS)
.skip(1)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(charSequence -> {
if (!TextUtils.isEmpty(charSequence)) {
requestLeadDatas(charSequence.toString(), 1);
} else {
requestLeadDatas("", 1);
}
});
})
.isDialog(true)
.build();
mExaminePicker.show();
if (mExamines.size() <= 0) {
requestLeadDatas("", 1);
}
}
/**
* 获取带领人数据
*/
private void requestLeadDatas(String keyWord, int s) {
mExamineCurrentPageNo = s;
Map<String, String> params = new HashMap<>();
params.put("pageNo", s + "");
params.put("type", "2");
if (!TextUtils.isEmpty(keyWord)) {
params.put("query", keyWord);
}
RetrofitManager.getInstance()
.create(CheckApiService.class)
.getLeadList(params)
.compose(RxTransformer.getListTransformer())
.subscribe(new BaseObserver<List<LeadBean>>() {
@Override
public void error(ApiException e) {
if ("202".equals(e.getCode())) {
reStartApp();
}
LogUtils.e(e.getErrorMsg());
}
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(List<LeadBean> leadBeans) {
LogUtils.e(leadBeans.size());
if (leadBeans != null && leadBeans.size() > 0) {
if (mExamineCurrentPageNo == 1) {
mExamines = new ArrayList<>(leadBeans);
} else {
mExamines.addAll(leadBeans);
}
mExamineAdapter.setData(mExamines);
mExamineRlv.setNoMore(false);
} else {
mExamineRlv.setNoMore(true);
if (mExamineCurrentPageNo == 1) {
ToastUtils.showShort("未查询到相关信息.");
}
}
if (!TextUtils.isEmpty(mExamineId)) {
for (int i = 0; i < mExamines.size(); i++) {
if (mExamines.get(i).getUserId().equals(mExamineId)) {
mExamines.get(i).setCheck(true);
} else {
mExamines.get(i).setCheck(false);
}
}
}
mExamineCurrentPageNo++;
}
});
}
/**
* 完成审批
*
@ -169,7 +359,12 @@ public class FlowTransactActivity extends BaseActivity {
break;
}
}
if ("同意".equals(opinion) && mIsShowExamine) {
if (TextUtils.isEmpty(mExamineId)) {
ToastUtils.showShort("请选择审核人");
return;
}
}
LoadingDialog dialog = new LoadingDialog(mActivity);
dialog.showDialog();
Map<String, String> params = new HashMap<>();
@ -177,6 +372,7 @@ public class FlowTransactActivity extends BaseActivity {
params.put("id", mId);
params.put("opinion", opinion);
params.put("state", i + "");
params.put("assignee", mExamineId);
RetrofitManager.getInstance()
.create(CheckApiService.class)
.doSaveHandle(params)
@ -217,11 +413,12 @@ public class FlowTransactActivity extends BaseActivity {
RetrofitManager.getInstance()
.create(CheckApiService.class)
.getDataByProcessId(processId)
.compose(RxTransformer.getDataTransformer())
.subscribe(new BaseObserver<CheckRecordDetailBean>() {
.compose(RxTransformer.getBaseBeanTransformer())
.subscribe(new BaseObserver<BaseResponseBean<CheckRecordDetailBean, CheckRecordDetailListBean>>() {
@Override
public void error(ApiException e) {
dialog.dismiss();
refreshView(STATE_LOAD_ERROR);
if ("202".equals(e.getCode())) {
reStartApp();
}
@ -234,60 +431,131 @@ public class FlowTransactActivity extends BaseActivity {
}
@Override
public void onNext(CheckRecordDetailBean checkRecordDetailBean) {
public void onNext(BaseResponseBean<CheckRecordDetailBean, CheckRecordDetailListBean> baseBean) {
dialog.dismiss();
setDataToView(checkRecordDetailBean);
setDataToView(baseBean);
if (baseBean.getList() != null && baseBean.getList().size() > 0) {
mData = baseBean.getList();
mCarPersonAdapter.setData(mData);
if ("1".equals(baseBean.getData().getType())) {
//车辆
mCarPersonAdapter.addOnItemClickListener(bean -> {
if (TextUtils.isEmpty(bean.getBatchNumber())) {
ToastUtils.showShort("数据有误");
} else {
showCarDetail(bean.getId(), bean.getBatchNumber());
}
});
} else {
//人员
mCarPersonAdapter.addOnItemClickListener(bean -> {
ArrayList<String> list = new ArrayList<>();
list.add(bean.getFrontPhotoPath());
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_CMUTILS_PHOTO_SHOW)
.withStringArrayList("imgUrls", list)
.navigation();
});
}
}
}
});
}
/**
* 根据批次号获取车辆详情
*
* @param batchNumber
*/
private void showCarDetail(String id, String batchNumber) {
LoadingDialog dialog = new LoadingDialog(mActivity);
dialog.showDialog();
Map<String, String> params = new HashMap<>();
params.put("id", id);
params.put("batchNumber", batchNumber);
RetrofitManager.getInstance()
.create(CheckApiService.class)
.getCarDetailById(params)
.compose(RxTransformer.getBaseBeanTransformer())
.subscribe(new BaseObserver<BaseResponseBean<CheckCarBean, CarFollowBean>>() {
@Override
public void error(ApiException e) {
dialog.disDialog();
mTvPublish.setVisibility(View.GONE);
if ("202".equals(e.getCode())) {
reStartApp();
}
}
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(BaseResponseBean<CheckCarBean, CarFollowBean> beans) {
dialog.disDialog();
if (beans.getList() != null && beans.getList().size() > 0) {
showFollowPerson(beans.getList());
} else {
ToastUtils.showShort("未查询到该车辆信息");
}
}
});
}
private void showFollowPerson(List<CarFollowBean> list) {
CarFollowAdapter adapter = new CarFollowAdapter(mActivity, list);
BaseListDialog detailDialog = new BaseListDialog(mActivity, adapter);
detailDialog.show();
}
/**
* 显示数据
*
* @param baseBean
* @param data
*/
private void setDataToView(CheckRecordDetailBean baseBean) {
if (baseBean != null) {
private void setDataToView(BaseResponseBean<CheckRecordDetailBean, CheckRecordDetailListBean> data) {
if (data != null) {
CheckRecordDetailBean baseBean = data.getData();
mTvCause.setText("进出事由 : " + baseBean.getCause());
mTvEndTime.setText("授权结束时间 : " + baseBean.getEndTime());
mTvStartTime.setText("授权开始时间 : " + baseBean.getStartTime());
mTvManagerUser.setText("带领人员 : " + baseBean.getGuideUserName());
mTvFieldName.setText("进入监区 : " + baseBean.getFieldnNames());
mTvManagerUser.setText("审核民警 : " + baseBean.getGuideUserName());
if ("1".equals(baseBean.getProduction())) {
mTvPro.setText("是否需要进入生产区域:需要进入");
} else {
mTvPro.setText("是否需要进入生产区域:无需进入");
}
// if (TextUtils.isEmpty(baseBean.getInform())) {
// mTvPer.setText("注意事项 : 未告知");
// } else {
// if ("1".equals(baseBean.getInform())) {
// mTvPer.setText("注意事项 : 已告知");
// } else {
// mTvPer.setText("注意事项 : 未告知");
// }
// }
Glide.with(mActivity)
.load(BaseUrlApi.BASE_URL + baseBean.getPhotoRecordPath())
.apply(new RequestOptions()
.error(R.drawable.ic_car_person_default)
.placeholder(R.drawable.ic_car_person_default))
.into(mIvPhoto);
mIvPhoto.setOnClickListener(v -> {
ArrayList<String> list = new ArrayList<>();
list.add(baseBean.getPhotoRecordPath());
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_CMUTILS_PHOTO_SHOW)
.withStringArrayList("imgUrls", list)
.navigation();
});
if (baseBean.getPhotoRecordIdList() != null && baseBean.getPhotoRecordIdList().size() > 0) {
mRlvPhoto.setVisibility(View.VISIBLE);
List<String> photos = new ArrayList();
for (int i = 0; i < baseBean.getPhotoRecordIdList().size(); i++) {
photos.add(baseBean.getPhotoRecordIdList().get(i).getPath());
}
BaseShowPhotoAdapter photoAdapter = new BaseShowPhotoAdapter(mActivity, photos);
GridLayoutManager manager = new GridLayoutManager(mActivity, 4, GridLayoutManager.VERTICAL,
false);
mRlvPhoto.setLayoutManager(manager);
mRlvPhoto.setAdapter(photoAdapter);
photoAdapter.addOnItemClickListener(photoBean -> ARouter.getInstance().build(PathConfig.PATH_MODULE_CMUTILS_PHOTO_SHOW)
.withSerializable("imgUrls", new ArrayList<>(photoAdapter.getData()))
.navigation());
} else {
mRlvPhoto.setVisibility(View.GONE);
}
if (TextUtils.isEmpty(baseBean.getType())) {
mTvType.setText("进出类型 : 未知");
} else {
if ("1".equals(baseBean.getType())) {
mTvFieldName.setVisibility(View.VISIBLE);
mTvFieldName.setText("进入监区 : " + baseBean.getFieldnNames());
mRlvTools.setVisibility(View.GONE);
mTvColHint.setText("司机、随车特警、带领民警、车合照");
mTvColHint.setText("车辆以及车辆货物照片");
mTvType.setText("进出类型 : 车辆进出");
mTvTools.setText("装载货物 : " + baseBean.getCarryTools());
mTvCop.setVisibility(View.VISIBLE);
@ -314,9 +582,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()) {
@ -326,9 +594,10 @@ public class FlowTransactActivity extends BaseActivity {
mTvInfo.setVisibility(View.GONE);
}
} else {
mTvFieldName.setVisibility(View.GONE);
mIvCarCard.setVisibility(View.GONE);
mTvColCarHint.setVisibility(View.GONE);
mTvColHint.setText("司机、带领民警照");
mTvColHint.setText("人员照片");
mTvCop.setVisibility(View.GONE);
mTvTools.setText("携带工具 : " + baseBean.getCarryTools());
if (baseBean.getCarryToolsPhoto() != null && baseBean.getCarryToolsPhoto().size() > 0) {
@ -400,6 +669,14 @@ public class FlowTransactActivity extends BaseActivity {
@Override
public void onNext(List<ProcessBean> processBeans) {
if (processBeans != null && processBeans.size() > 0) {
mIsShowExamine = false;
for (int i = 0; i < processBeans.size(); i++) {
ProcessBean processBean = processBeans.get(i);
if (processBean.getOrder() == 1 && "狱政科审批".equals(processBean.getActName())) {
mIsShowExamine = true;
}
}
mLlExamine.setVisibility(mIsShowExamine ? View.VISIBLE : View.GONE);
refreshView(STATE_LOAD_SUCCESS);
Collections.sort(processBeans, new ProcessBean());
mAdapter.setData(processBeans);
@ -426,10 +703,6 @@ public class FlowTransactActivity extends BaseActivity {
alertDialog.show();
}
@Override
protected int setLayoutId() {
return R.layout.activity_flow_transact;
}
@Override
protected void onDestroy() {

18
modulecheck/src/main/java/com/sucstepsoft/modulecheck/data/beans/AlreadyFlowBean.java
View File

@ -12,6 +12,24 @@ public class AlreadyFlowBean {
private String dgrmResourceName;
private String id;
private String processId;
private String initatorName;
private String assigneeNames;
public String getInitatorName() {
return initatorName;
}
public void setInitatorName(String initatorName) {
this.initatorName = initatorName;
}
public String getAssigneeNames() {
return assigneeNames;
}
public void setAssigneeNames(String assigneeNames) {
this.assigneeNames = assigneeNames;
}
public int getOrder() {
return order;

38
modulecheck/src/main/java/com/sucstepsoft/modulecheck/data/beans/CarPhotosListBean.java Normal file
View File

@ -0,0 +1,38 @@
package com.sucstepsoft.modulecheck.data.beans;
public class CarPhotosListBean {
/**
* path : uploadFiles/20240706/ed1fda12d8324904ac02f17bc0487ed1.jpeg
* id : 1084a5c660f04c629c06d00057fa698d
* type : 1
*/
private String path;
private String id;
private String type;
public String getPath() {
return path;
}
public void setPath(String path) {
this.path = path;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
}

9
modulecheck/src/main/java/com/sucstepsoft/modulecheck/data/beans/CheckRecordDetailBean.java
View File

@ -55,6 +55,15 @@ public class CheckRecordDetailBean implements Serializable {
private String certificatesPhotoId;
private String certificatesPhotoPath;
private String production;
private List<CarPhotosListBean> photoRecordIdList;
public List<CarPhotosListBean> getPhotoRecordIdList() {
return photoRecordIdList;
}
public void setPhotoRecordIdList(List<CarPhotosListBean> photoRecordIdList) {
this.photoRecordIdList = photoRecordIdList;
}
public String getProduction() {
return production;

19
modulecheck/src/main/java/com/sucstepsoft/modulecheck/data/beans/FinishFlowBean.java
View File

@ -29,6 +29,25 @@ public class FinishFlowBean {
private String startTime;
private String endTime;
private int order;
private String initatorName;
private String assigneeNames;
public String getInitatorName() {
return initatorName;
}
public void setInitatorName(String initatorName) {
this.initatorName = initatorName;
}
public String getAssigneeNames() {
return assigneeNames;
}
public void setAssigneeNames(String assigneeNames) {
this.assigneeNames = assigneeNames;
}
public String getInitator() {
return initator;

9
modulecheck/src/main/java/com/sucstepsoft/modulecheck/data/beans/WaitFlowBean.java
View File

@ -13,6 +13,15 @@ public class WaitFlowBean {
private String dgrmResourceName;
private String id;
private String processId;
private String initatorName;
public String getInitatorName() {
return initatorName;
}
public void setInitatorName(String initatorName) {
this.initatorName = initatorName;
}
public int getOrder() {
return order;

2
modulecheck/src/main/java/com/sucstepsoft/modulecheck/data/net/CheckApiService.java
View File

@ -89,7 +89,7 @@ public interface CheckApiService {
@Headers({"base_url_name:check"})
@FormUrlEncoded
@POST("appRegisterRecord/getDataByProcessId")
Observable<BaseResponseBean<CheckRecordDetailBean, Object>> getDataByProcessId(@Field("processId") String id);
Observable<BaseResponseBean<CheckRecordDetailBean, CheckRecordDetailListBean>> getDataByProcessId(@Field("processId") String id);
@Headers({"base_url_name:check"})
@FormUrlEncoded

4
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/adapter/enterexamine/AlreadyFlowAdapter.java
View File

@ -34,8 +34,8 @@ public class AlreadyFlowAdapter extends BaseRecyclerAdapter<AlreadyFlowBean, Alr
holder.mTvName.setText("流程名称:" + mData.get(i).getPname());
holder.mTvStartTime.setText("开始时间:" + mData.get(i).getStartTime());
holder.mTvEndTime.setText("结束时间:" + mData.get(i).getEndTime());
holder.mTvAssignee.setText("办 理 人:" + mData.get(i).getAssignee());
holder.mTvCreateUser.setText("申 请 人:" + mData.get(i).getInitator());
holder.mTvAssignee.setText("办 理 人:" + mData.get(i).getAssigneeNames());
holder.mTvCreateUser.setText("申 请 人:" + mData.get(i).getInitatorName());
holder.mTvCurrentTask.setText("当前任务:" + mData.get(i).getName());
}

10
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/adapter/enterexamine/CarLIbAdapter.java
View File

@ -6,6 +6,9 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.sucstepsoft.modulecheck.R;
import com.sucstepsoft.modulecheck.data.beans.CheckCarBean;
@ -38,6 +41,13 @@ public class CarLIbAdapter extends BaseRecyclerAdapter<CheckCarBean, CarHolder>
}
holer.mTvName.setText(String.format(mContext.getResources().getString(R.string.car_name), mData.get(i).getCompany()));
holer.mTvCarNumber.setText(String.format(mContext.getResources().getString(R.string.car_number), mData.get(i).getPlateNumber()));
RequestOptions options = new RequestOptions()
.error(com.sucstepsoft.cm_utils.R.drawable.ic_img_default)
.placeholder(com.sucstepsoft.cm_utils.R.drawable.ic_loading);
Glide.with(mContext)
.load(BaseUrlApi.BASE_URL + mData.get(i).getCarFrontPhotoPath())
.apply(options)
.into(holer.mIvImg);
if (mOnItemEditOrDelete != null) {
holer.mBtnDel.setOnClickListener(v -> mOnItemEditOrDelete.onDelete(mData.get(i), i));
holer.mBtnDel.setVisibility(View.GONE);

10
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/adapter/enterexamine/CarShowAdapter.java
View File

@ -6,6 +6,9 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.sucstepsoft.modulecheck.R;
import com.sucstepsoft.modulecheck.data.beans.CheckCarBean;
@ -48,6 +51,13 @@ public class CarShowAdapter extends BaseRecyclerAdapter<CheckCarBean, CarHolder>
// } else {
// holer.mTvCreateTime.setText(String.format(mContext.getResources().getString(R.string.remark_1), mData.get(i).getRemark()));
// }
RequestOptions options = new RequestOptions()
.error(com.sucstepsoft.cm_utils.R.drawable.ic_img_default)
.placeholder(com.sucstepsoft.cm_utils.R.drawable.ic_loading);
Glide.with(mContext)
.load(BaseUrlApi.BASE_URL + mData.get(i).getCarFrontPhotoPath())
.apply(options)
.into(holer.mIvImg);
holer.mTvName.setText(String.format(mContext.getResources().getString(R.string.car_name), mData.get(i).getCompany()));
holer.mTvCarNumber.setText(String.format(mContext.getResources().getString(R.string.car_number), mData.get(i).getPlateNumber()));
if (mType == 1) {

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

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

2
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/adapter/enterexamine/FinishFlowAdapter.java
View File

@ -34,7 +34,7 @@ public class FinishFlowAdapter extends BaseRecyclerAdapter<FinishFlowBean, Finis
@Override
public void bindHolder(FinishFlowHolder holder, int i) {
holder.mTvName.setText("流程名称:" + mData.get(i).getPName());
holder.mTvCreateUser.setText("申 请 人:" + mData.get(i).getInitator());
holder.mTvCreateUser.setText("申 请 人:" + mData.get(i).getInitatorName());
holder.mTvStartTime.setText("开始时间:" + mData.get(i).getStartTime());
holder.mTvEndTime.setText("结束时间:" + mData.get(i).getEndTime());
holder.mTvFinishTime.setText("用 时:" + mData.get(i).getZTime());

10
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/adapter/enterexamine/PersonLIbAdapter.java
View File

@ -6,6 +6,9 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.sucstepsoft.modulecheck.R;
import com.sucstepsoft.modulecheck.data.beans.CheckPersonBean;
@ -63,6 +66,13 @@ public class PersonLIbAdapter extends BaseRecyclerAdapter<CheckPersonBean, Perso
holder.mBtnDelete.setOnClickListener(v -> mOnDeleteListener.onDelete(mData.get(i), i));
}
}
RequestOptions options = new RequestOptions()
.error(com.sucstepsoft.cm_utils.R.drawable.ic_img_default)
.placeholder(com.sucstepsoft.cm_utils.R.drawable.ic_loading);
Glide.with(mContext)
.load(BaseUrlApi.BASE_URL + mData.get(i).getFrontPhotoPath())
.apply(options)
.into(holder.mIvImg);
holder.mTvCadNumber.setText(String.format(mContext.getResources().getString(R.string.card_number), mData.get(i).getIdentity()));
}

11
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/adapter/enterexamine/PersonShowAdapter.java
View File

@ -6,6 +6,9 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.sucstepsoft.modulecheck.R;
import com.sucstepsoft.modulecheck.data.beans.CheckPersonBean;
@ -55,7 +58,13 @@ public class PersonShowAdapter extends BaseRecyclerAdapter<CheckPersonBean, Pers
holder.mLlEdit.setVisibility(View.GONE);
holder.mTvRemark.setVisibility(View.GONE);
}
RequestOptions options = new RequestOptions()
.error(com.sucstepsoft.cm_utils.R.drawable.ic_img_default)
.placeholder(com.sucstepsoft.cm_utils.R.drawable.ic_loading);
Glide.with(mContext)
.load(BaseUrlApi.BASE_URL + mData.get(i).getFrontPhotoPath())
.apply(options)
.into(holder.mIvImg);
holder.mTvCadNumber.setText(String.format(mContext.getResources().getString(R.string.card_number), mData.get(i).getIdentity()));
}

2
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/adapter/enterexamine/WaitFlowAdapter.java
View File

@ -33,7 +33,7 @@ public class WaitFlowAdapter extends BaseRecyclerAdapter<WaitFlowBean, WaitFlowH
holder.mTvCurrentTask.setText("当前任务:" + mData.get(i).getName());
holder.mTvName.setText("流程名称:" + mData.get(i).getPname());
holder.mTvCreateTime.setText("创建时间:" + mData.get(i).getCreateTime());
holder.mTvCreateUser.setText("申请人:" + mData.get(i).getInitator());
holder.mTvCreateUser.setText("申请人:" + mData.get(i).getInitatorName());
}
private OnDeleteListener mOnDeleteListener;

10
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/adapter/other/MultiCCarAdapter.java
View File

@ -5,6 +5,9 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.sucstepsoft.modulecheck.R;
import com.sucstepsoft.modulecheck.data.beans.CheckCarBean;
@ -30,6 +33,13 @@ public class MultiCCarAdapter extends BaseRecyclerAdapter<CheckCarBean, MultiCho
holder.mTvName.setText("所属单位/车主 : " + mData.get(i).getCompany());
holder.mTvContent.setText("车牌号 : " + mData.get(i).getPlateNumber());
holder.mCbChoose.setOnCheckedChangeListener((buttonView, isChecked) -> mData.get(i).setCheck(isChecked));
RequestOptions options = new RequestOptions()
.error(com.sucstepsoft.cm_utils.R.drawable.ic_img_default)
.placeholder(com.sucstepsoft.cm_utils.R.drawable.ic_loading);
Glide.with(mContext)
.load(BaseUrlApi.BASE_URL + mData.get(i).getCarFrontPhotoPath())
.apply(options)
.into(holder.mIvImg);
if (mData.get(i).isCheck()) {
holder.mCbChoose.setChecked(true);
}

1
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/adapter/other/MultiCLeaderAdapter.java
View File

@ -38,6 +38,7 @@ public class MultiCLeaderAdapter extends BaseRecyclerAdapter<LeadBean, MultiChoo
}
mData.get(i).setCheck(isChecked);
});
holder.mIvImg.setVisibility(View.GONE);
holder.mCbChoose.setChecked(mData.get(i).isCheck());
}

11
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/adapter/other/MultiCPersonAdapter.java
View File

@ -6,6 +6,9 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.sucstepsoft.modulecheck.R;
import com.sucstepsoft.modulecheck.data.beans.CheckPersonBean;
@ -38,6 +41,14 @@ public class MultiCPersonAdapter extends BaseRecyclerAdapter<CheckPersonBean, Mu
}
mData.get(i).setCheck(isChecked);
});
RequestOptions options = new RequestOptions()
.error(com.sucstepsoft.cm_utils.R.drawable.ic_img_default)
.placeholder(com.sucstepsoft.cm_utils.R.drawable.ic_loading);
Glide.with(mContext)
.load(BaseUrlApi.BASE_URL + mData.get(i).getFrontPhotoPath())
.apply(options)
.into(holder.mIvImg);
holder.mCbChoose.setChecked(mData.get(i).isCheck());
}

3
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/holer/enterexamine/CarHolder.java
View File

@ -4,6 +4,7 @@ import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@ -17,6 +18,7 @@ public class CarHolder extends RecyclerView.ViewHolder {
public LinearLayout mLlEdit;
public Button mBtnEdit;
public Button mBtnDel;
public ImageView mIvImg;
public CarHolder(@NonNull View itemView) {
super(itemView);
@ -27,5 +29,6 @@ public class CarHolder extends RecyclerView.ViewHolder {
mLlEdit = itemView.findViewById(R.id.ll_edit);
mBtnDel = itemView.findViewById(R.id.btn_del);
mBtnEdit = itemView.findViewById(R.id.btn_edit);
mIvImg = itemView.findViewById(R.id.iv_img);
}
}

3
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/holer/enterexamine/MultiChooseHolder.java
View File

@ -4,6 +4,7 @@ import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.TextView;
import com.sucstepsoft.modulecheck.R;
@ -13,11 +14,13 @@ public class MultiChooseHolder extends RecyclerView.ViewHolder {
public TextView mTvContent;
public CheckBox mCbChoose;
public TextView mTvName;
public ImageView mIvImg;
public MultiChooseHolder(@NonNull View itemView) {
super(itemView);
mTvContent = itemView.findViewById(R.id.tv_content);
mCbChoose = itemView.findViewById(R.id.cb_choose);
mTvName = itemView.findViewById(R.id.tv_name);
mIvImg = itemView.findViewById(R.id.iv_img);
}
}

3
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/holer/enterexamine/PersonHolder.java
View File

@ -4,6 +4,7 @@ import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@ -18,6 +19,7 @@ public class PersonHolder extends RecyclerView.ViewHolder {
public Button mBtnEdit;
public Button mBtnDel;
public Button mBtnDelete;
public ImageView mIvImg;
public PersonHolder(@NonNull View itemView) {
super(itemView);
@ -29,5 +31,6 @@ public class PersonHolder extends RecyclerView.ViewHolder {
mBtnEdit = itemView.findViewById(R.id.btn_edit);
mBtnDel = itemView.findViewById(R.id.btn_del);
mBtnDelete = itemView.findViewById(R.id.btn_delete);
mIvImg = itemView.findViewById(R.id.iv_img);
}
}

3
modulecheck/src/main/java/com/sucstepsoft/modulecheck/widget/holer/enterexamine/PersonShowHolder.java
View File

@ -4,6 +4,7 @@ import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@ -17,6 +18,7 @@ public class PersonShowHolder extends RecyclerView.ViewHolder {
public LinearLayout mLlEdit;
public Button mBtnEdit;
public Button mBtnDel;
public ImageView mIvImg;
public PersonShowHolder(@NonNull View itemView) {
super(itemView);
@ -27,5 +29,6 @@ public class PersonShowHolder extends RecyclerView.ViewHolder {
mLlEdit = itemView.findViewById(R.id.ll_edit);
mBtnEdit = itemView.findViewById(R.id.btn_edit);
mBtnDel = itemView.findViewById(R.id.btn_del);
mIvImg = itemView.findViewById(R.id.iv_img);
}
}

85
modulecheck/src/main/res/layout/activity_check_record_detail.xml
View File

@ -37,8 +37,8 @@
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:textColor="@color/text_gray_66"
android:text="进出类型" />
android:text="进出类型"
android:textColor="@color/text_gray_66" />
<TextView
@ -50,6 +50,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:orientation="vertical">
<TextView
@ -76,8 +77,8 @@
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:textColor="@color/text_gray_66"
android:text="授权开始时间" />
android:text="授权开始时间"
android:textColor="@color/text_gray_66" />
<TextView
@ -91,8 +92,8 @@
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:textColor="@color/text_gray_66"
android:text="授权结束时间" />
android:text="授权结束时间"
android:textColor="@color/text_gray_66" />
<TextView
@ -106,29 +107,31 @@
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:textColor="@color/text_gray_66"
android:text="带领民警" />
android:text="审核民警"
android:textColor="@color/text_gray_66" />
<TextView
android:id="@+id/tv_manager_user"
style="@style/sel_text_show"
android:hint="带领民警" />
android:hint="审核民警" />
</LinearLayout>
<LinearLayout style="@style/item_white_bottom_border">
<LinearLayout
android:id="@+id/ll_cop"
style="@style/item_white_bottom_border">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:textColor="@color/text_gray_66"
android:text="随车特警" />
android:text="随车民警"
android:textColor="@color/text_gray_66" />
<TextView
android:id="@+id/tv_cop"
style="@style/sel_text_show"
android:hint="随车特警" />
android:hint="随车民警" />
</LinearLayout>
<LinearLayout style="@style/item_white_bottom_border_ver">
@ -136,8 +139,8 @@
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:textColor="@color/text_gray_66"
android:text="携带工具/装载货物" />
android:text="携带工具/装载货物"
android:textColor="@color/text_gray_66" />
<TextView
@ -163,8 +166,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
android:textColor="@color/text_gray_66"
android:text="卫生防疫措施"
android:textColor="@color/text_gray_66"
android:textSize="@dimen/text_18" />
<TextView
@ -178,13 +181,15 @@
</LinearLayout>
<LinearLayout style="@style/item_white_bottom_border">
<LinearLayout
style="@style/item_white_bottom_border"
android:visibility="gone">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:textColor="@color/text_gray_66"
android:text="是否进入生产区域" />
android:text="是否进入生产区域"
android:textColor="@color/text_gray_66" />
<TextView
@ -195,13 +200,15 @@
</LinearLayout>
<LinearLayout style="@style/item_white_bottom_border_ver">
<LinearLayout
android:id="@+id/ll_in_prison_area"
style="@style/item_white_bottom_border_ver">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:textColor="@color/text_gray_66"
android:text="进入监区" />
android:text="进入监区"
android:textColor="@color/text_gray_66" />
<TextView
@ -217,8 +224,8 @@
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:textColor="@color/text_gray_66"
android:text="审批状态" />
android:text="审批状态"
android:textColor="@color/text_gray_66" />
<TextView
@ -246,21 +253,14 @@
android:paddingTop="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/iv_photo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:scaleType="centerInside"
android:src="@drawable/ic_car_person_default" />
<TextView
android:id="@+id/iv_col_hint"
android:id="@+id/iv_col_car_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="5dp"
tools:text="请上传司机、随车特警、带领民警、车合照" />
android:textSize="18sp"
android:textColor="@color/black"
android:text="车辆证件照" />
<ImageView
android:id="@+id/ic_car_cred"
@ -271,13 +271,20 @@
android:src="@drawable/ic_car_crad_default" />
<TextView
android:id="@+id/iv_col_car_hint"
android:id="@+id/iv_col_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:gravity="center"
android:padding="5dp"
android:text="车辆证件照" />
android:layout_marginTop="10dp"
android:textSize="18sp"
android:textColor="@color/black"
tools:text="车辆以及车辆货物照片" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rlv_photo"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_into_hint"

60
modulecheck/src/main/res/layout/activity_check_record_list.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -25,25 +24,60 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
android:id="@+id/btn_open_search"
<LinearLayout
android:id="@+id/ll_btns"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@drawable/sel_btn_submit"
android:minWidth="0dp"
android:minHeight="0dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="查 询"
android:textColor="@color/white"
android:textSize="@dimen/text_18" />
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_weight=".4"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingTop="5dp"
android:paddingBottom="5dp">
<TextView
android:id="@+id/tv_all"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="当天"
android:textColor="@color/black"
android:textSize="18sp" />
<Switch
android:id="@+id/sw_change"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true" />
</LinearLayout>
<Button
android:id="@+id/btn_open_search"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_weight="1"
android:background="@drawable/sel_btn_submit"
android:minWidth="0dp"
android:minHeight="0dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="查 询"
android:textColor="@color/white"
android:textSize="@dimen/text_18" />
</LinearLayout>
<com.jcodecraeer.xrecyclerview.XRecyclerView
android:id="@+id/rlv_record"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/btn_open_search"
android:layout_below="@id/ll_btns"
android:padding="5dp" />
<LinearLayout

6
modulecheck/src/main/res/layout/activity_check_register.xml
View File

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

79
modulecheck/src/main/res/layout/activity_check_register_car.xml
View File

@ -94,7 +94,9 @@
</LinearLayout>
<LinearLayout style="@style/item_white_bottom_border">
<LinearLayout
style="@style/item_white_bottom_border"
android:visibility="gone">
<TextView
style="@style/item_title_wrap"
@ -118,7 +120,7 @@
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="随车特警" />
android:text="随车民警" />
<ImageView
style="@style/style_hint_star"
@ -127,7 +129,7 @@
<TextView
android:id="@+id/tv_car_cop"
style="@style/sel_text_arrow"
android:hint="请选择随车特警" />
android:hint="请选择随车民警" />
</LinearLayout>
@ -169,21 +171,24 @@
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/iv_car_person_photo"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:minHeight="150dp"
android:src="@drawable/ic_car_person_default" />
android:layout_marginTop="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:hint="请上传司机、随车特警、带领民警、车合照"
android:padding="5dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
android:text="车辆证件照"
android:textColor="@color/black"
android:textSize="@dimen/text_18" />
<ImageView
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
</LinearLayout>
<ImageView
@ -194,26 +199,6 @@
android:minHeight="150dp"
android:src="@drawable/ic_car_crad_default" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:hint="车辆证件照"
android:padding="5dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
android:text="(请将货物来源证明也拍入其中)"
android:textColor="@color/colorRedBg"
android:textSize="12sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
@ -249,6 +234,30 @@
android:minHeight="100dp"
android:textSize="@dimen/text_18" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
android:text="车辆以及车辆货物照片"
android:textColor="@color/black"
android:textSize="@dimen/text_18" />
<ImageView
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rlv_driver"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<EditText
android:id="@+id/et_car_remark"

102
modulecheck/src/main/res/layout/activity_flow_transact.xml
View File

@ -99,7 +99,7 @@
android:background="@drawable/shape_input_white_bg"
android:drawablePadding="10dp"
android:gravity="left"
android:hint="带领民警:"
android:hint="审核民警:"
android:padding="8dp"
android:textSize="@dimen/text_18" />
@ -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" />
@ -157,7 +157,8 @@
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"
@ -192,29 +193,30 @@
android:padding="8dp"
android:textSize="@dimen/text_18" />
<TextView
android:id="@+id/iv_col_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:padding="5dp"
tools:text="请上传司机、随车特警、带领民警、车合照" />
<!-- <TextView-->
<!-- android:id="@+id/iv_col_hint"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginLeft="15dp"-->
<!-- android:padding="5dp"-->
<!-- tools:text="请上传司机、随车民警、带领民警、车合照" />-->
<ImageView
android:id="@+id/iv_photo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:minHeight="100dp"
tools:background="@drawable/ic_car_person_default" />
<!-- <ImageView-->
<!-- android:id="@+id/iv_photo"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_margin="10dp"-->
<!-- android:minHeight="100dp"-->
<!-- tools:background="@drawable/ic_car_person_default" />-->
<TextView
android:id="@+id/iv_col_car_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:padding="5dp"
android:text="车辆证件照" />
android:text="车辆证件照"
android:textColor="@color/black"
android:textSize="@dimen/text_18" />
<ImageView
android:id="@+id/iv_car_card"
@ -223,8 +225,44 @@
android:layout_margin="10dp"
android:minHeight="100dp"
tools:background="@drawable/ic_car_person_default" />
<TextView
android:id="@+id/iv_col_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="5dp"
android:textColor="@color/black"
android:textSize="18sp"
tools:text="车辆以及车辆货物照片" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rlv_photo"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:id="@+id/tv_into_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:drawablePadding="10dp"
android:gravity="left"
android:padding="8dp"
android:text="进入人员/进入车辆"
android:textColor="@color/black"
android:textSize="@dimen/text_18" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rlv_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:minHeight="150dp"
android:padding="5dp"
android:scrollbars="none" />
<LinearLayout
android:layout_width="match_parent"
@ -305,6 +343,32 @@
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:gravity="center_vertical"
android:orientation="horizontal"
android:padding="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核人:"
android:textSize="18sp" />
<TextView
android:id="@+id/tv_examine"
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"

8
modulecheck/src/main/res/layout/item_car.xml
View File

@ -4,10 +4,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:id="@+id/iv_img"
android:layout_width="80dp"
android:layout_height="70dp"
android:scaleType="fitXY"
tools:src="@drawable/app_bg" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"

8
modulecheck/src/main/res/layout/item_choose_examine_multi.xml
View File

@ -3,10 +3,16 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="8dp">
<ImageView
android:id="@+id/iv_img"
android:layout_width="100dp"
android:layout_height="80dp"
android:scaleType="fitXY"
tools:src="@drawable/app_bg" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"

9
modulecheck/src/main/res/layout/item_person.xml
View File

@ -4,10 +4,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:id="@+id/iv_img"
android:layout_width="100dp"
android:layout_height="80dp"
android:layout_marginTop="2dp"
android:scaleType="fitXY"
tools:src="@drawable/app_bg" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"

9
modulecheck/src/main/res/layout/item_person_show.xml
View File

@ -4,10 +4,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:id="@+id/iv_img"
android:layout_width="80dp"
android:layout_height="60dp"
android:layout_marginTop="5dp"
android:scaleType="fitXY"
tools:src="@drawable/app_bg" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"

87
modulecheck/src/main/res/layout/picker_custom_examine_person.xml Executable file
View File

@ -0,0 +1,87 @@
<?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"
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:paddingLeft="10dp"
android:text="指定审核人"
android:textColor="@color/text_blue"
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>

29
modulemain/src/main/java/com/sucstepsoft/modulemain/adapter/MainFuncationAdapter.java
View File

@ -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)
.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);
if ("mine".equals(mData.get(i).getId())) {
Glide.with(mContext)
.load(R.drawable.ic_mine_main_icon)
.apply(new RequestOptions()
.error(R.drawable.ic_party)
.placeholder(R.drawable.ic_party)
.override(130)
.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);
}

12
modulemain/src/main/java/com/sucstepsoft/modulemain/base/MainActivity.java
View File

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

34
modulemain/src/main/res/drawable-v24/ic_launcher_foreground.xml
View File

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

BIN
modulemain/src/main/res/drawable-xhdpi/ic_mine_main_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

2
modulemain/src/main/res/layout/item_funcation.xml
View File

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

32
modulesupertools/src/main/AndroidManifest.xml
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/DutyAssActivity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/LocalRecordPlayActivity.java
View File

@ -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");

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/RecordPlayActivity.java
View File

@ -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");

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/criminal/VideoListActivity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/CallRecordActivity.java
View File

@ -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();

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/CountDetailActivity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/DutyRecordActivity.java
View File

@ -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();

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/RollCallDetailActivity.java
View File

@ -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("数据有误.");

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaActivity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaCountActivity.java
View File

@ -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");

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaDetaileActivity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchAreaListActivity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/SearchCountActivity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/infosearch/WorkHandoverActivity.java
View File

@ -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>>() {

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/learn/ShouCeMainActivity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/rollcall_manager/YingJiDianMingActivity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/BuJuGuanLiActivity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/Floor2Activity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/PlantActivity.java
View File

@ -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("数据有误,请稍后重试.");

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/PostBuJuActivity.java
View File

@ -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();

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/RoomScrollActivity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/room_manager/WebFloorActivity.java
View File

@ -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");

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuHuiShou2Activity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuHuiShouActivity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GongJuMessageActivity.java
View File

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

2
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/activity/tool_manager/GrantToolsActivity.java
View File

@ -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();
}

1
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/common/Constants.java
View File

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

3
modulesupertools/src/main/java/com/sucstepsoft/modulesupertools/views/activitys/PersonalActivity.java
View File

@ -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();
}

BIN
modulesupertools/src/main/res/drawable-xxhdpi/ic_scan_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 482 B

BIN
modulesupertools/src/main/res/drawable-xxhdpi/login_back.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 47 KiB

BIN
modulesupertools/src/main/res/drawable-xxhdpi/saomiaojieguo_bg.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

2
modulesupertools/src/main/res/layout/activity_personal.xml
View File

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

2
modulesupertools/src/main/res/values/strings.xml
View File

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

1
modulesupertools/src/main/res/values/styles.xml
View File

@ -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>
<!--创建沉浸式状态栏-->