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

事件检查图片必填项

Browse Source
This commit is contained in:
itgaojian 2023-03-24 18:03:20 +08:00
parent 23849d2903
commit f5de56e50c
15 changed files with 542 additions and 455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -32,19 +32,12 @@
2.特殊人口添加方式
```
## 2022-9-23
## 2022-9-23 2023-3-12
```
> 1.4.5
1.境外人员 字段变更
```
## 2023-3-12
```
> 1.4.6
1.去除案件检查时相片必填选项
2.去除案件检查时相片必填选项
```

18
app/release/output-metadata.json Normal file
View File

@ -0,0 +1,18 @@
{
"version": 2,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.sucstepsoft.realtimelocation",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"versionCode": 45,
"versionName": "1.4.5",
"outputFile": "app-release.apk"
}
]
}

1
app/release/output.json
View File

@ -1 +0,0 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":45,"versionName":"1.4.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]

BIN
app/release/pz-1.3.1.apk
View File

Binary file not shown.

BIN
app/release/pz-1.3.2.apk
View File

Binary file not shown.

7
app/src/main/AndroidManifest.xml
View File

@ -50,6 +50,13 @@
android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning"
tools:replace="android:appComponentFactory">
<activity
android:name=".WorkSignActivity"
android:exported="false">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".activitys.addresslist.SearchGridActivity"
android:screenOrientation="portrait"

6
app/src/main/java/com/sucstepsoft/realtimelocation/activitys/base/MainActivity.java
View File

@ -1662,9 +1662,9 @@ public class MainActivity extends BaseActivity {
if (mMessageReceiver != null) {
unregisterReceiver(mMessageReceiver);
}
if (mBind != null) {
mBind.unbind();
}
// if (mBind != null) {
// mBind.unbind();
// }
stopLocation();
super.onDestroy();
}

23
app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/WorkSignActivity.java Normal file
View File

@ -0,0 +1,23 @@
package com.sucstepsoft.realtimelocation.activitys.common;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.realtimelocation.R;
import butterknife.ButterKnife;
/**
* 签到
*/
public class WorkSignActivity extends BaseActivity {
@Override
protected int setLayoutId() {
return R.layout.activity_work_sign;
}
@Override
public void initData() {
super.initData();
ButterKnife.bind(this);
}
}

1
app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueDetailActivity.java
View File

@ -307,6 +307,7 @@ public class IssueDetailActivity extends BaseActivity {
});
mBtnIssueDis.setOnClickListener(v -> doDisportIssue());
mBtnReturn.setOnClickListener(v -> doTrans());
}
/**

74
app/src/main/java/com/sucstepsoft/realtimelocation/services/LocationService.java
View File

@ -101,6 +101,22 @@ public class LocationService extends NotificationService {
private String mSignOutEnd;
private String mPositionRecordSrt;
private String mPositionRecordEnd;
private static final int NOTIFY_TYPE_P_AM_SIGN_1 = 1221;//片长上午签到提前一分钟
private static final int NOTIFY_TYPE_P_AM_SIGN_5 = 1222;//片长上午签到开始后五分钟
private static final int NOTIFY_TYPE_P_AM_SIGN_OUT_1 = 1223;//片长上午签退提前一分钟
private static final int NOTIFY_TYPE_P_AM_SIGN_OUT_5 = 1224;//片长上午签退开始后五分钟
private static final int NOTIFY_TYPE_P_PM_SIGN_1 = 1225;//片长下午签到提前一分钟
private static final int NOTIFY_TYPE_P_PM_SIGN_5 = 1226;//片长下午签到开始后五分钟
private static final int NOTIFY_TYPE_P_PM_SIGN_OUT_1 = 1227;//片长下午签退提前一分钟
private static final int NOTIFY_TYPE_P_PM_SIGN_OUT_5 = 1228;//片长下午签退开始后五分钟
private static final int NOTIFY_TYPE_N_SIGN_1 = 2321;//签到提前一分钟
private static final int NOTIFY_TYPE_N_SIGN_5 = 2322;//签到开始后五分钟
private static final int NOTIFY_TYPE_N_SIGN_OUT_1 = 2324;//签退开始前一分钟
private static final int NOTIFY_TYPE_N_SIGN_OUT_5 = 2325;//签退开始后五分钟
private Disposable mUploadDisposable;
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
@ -228,22 +244,6 @@ public class LocationService extends NotificationService {
});
}
private static final int NOTIFY_TYPE_P_AM_SIGN_1 = 1221;//片长上午签到提前一分钟
private static final int NOTIFY_TYPE_P_AM_SIGN_5 = 1222;//片长上午签到开始后五分钟
private static final int NOTIFY_TYPE_P_AM_SIGN_OUT_1 = 1223;//片长上午签退提前一分钟
private static final int NOTIFY_TYPE_P_AM_SIGN_OUT_5 = 1224;//片长上午签退开始后五分钟
private static final int NOTIFY_TYPE_P_PM_SIGN_1 = 1225;//片长下午签到提前一分钟
private static final int NOTIFY_TYPE_P_PM_SIGN_5 = 1226;//片长下午签到开始后五分钟
private static final int NOTIFY_TYPE_P_PM_SIGN_OUT_1 = 1227;//片长下午签退提前一分钟
private static final int NOTIFY_TYPE_P_PM_SIGN_OUT_5 = 1228;//片长下午签退开始后五分钟
private static final int NOTIFY_TYPE_N_SIGN_1 = 2321;//签到提前一分钟
private static final int NOTIFY_TYPE_N_SIGN_5 = 2322;//签到开始后五分钟
private static final int NOTIFY_TYPE_N_SIGN_OUT_1 = 2324;//签退开始前一分钟
private static final int NOTIFY_TYPE_N_SIGN_OUT_5 = 2325;//签退开始后五分钟
private int getNotifyType() {
//判断当前时间是开始打开前一分钟还是后五分钟
@ -911,6 +911,9 @@ public class LocationService extends NotificationService {
stopLocation();
stopPlaySong();
unregisterReceiver(mReceiver);
if (mUploadDisposable != null && !mUploadDisposable.isDisposed()) {
mUploadDisposable.dispose();
}
if (mMTimeDis != null && !mMTimeDis.isDisposed()) {
mMTimeDis.dispose();
}
@ -939,10 +942,12 @@ public class LocationService extends NotificationService {
if (bdLocation.getLongitude() != Double.MIN_VALUE && bdLocation.getLongitude() != Double.MIN_VALUE) {
checkPointIs(bdLocation);
sendLocationBroadcast(bdLocation);
mWifiAutoCloseDelegate.onLocateSuccess(getApplicationContext(), PowerManagerUtil.getInstance().isScreenOn(getApplicationContext()), NetUtil.getInstance().isMobileAva(getApplicationContext()));
mWifiAutoCloseDelegate.onLocateSuccess(getApplicationContext(), PowerManagerUtil.getInstance().isScreenOn(getApplicationContext()),
NetUtil.getInstance().isMobileAva(getApplicationContext()));
}
} else {
mWifiAutoCloseDelegate.onLocateFail(getApplicationContext(), 10, PowerManagerUtil.getInstance().isScreenOn(getApplicationContext()), NetUtil.getInstance().isWifiCon(getApplicationContext()));
mWifiAutoCloseDelegate.onLocateFail(getApplicationContext(), 10, PowerManagerUtil.getInstance().isScreenOn(getApplicationContext()),
NetUtil.getInstance().isWifiCon(getApplicationContext()));
}
}
@ -960,6 +965,36 @@ public class LocationService extends NotificationService {
}
}
/**
* 定时上传定位
*/
private void startUploadLocation() {
Observable.interval(20, 20, TimeUnit.SECONDS)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<Long>() {
@Override
public void onSubscribe(Disposable d) {
mUploadDisposable = d;
}
@Override
public void onNext(Long aLong) {
checkPoints();
}
@Override
public void onError(Throwable e) {
}
@Override
public void onComplete() {
}
});
}
private void checkPointIs(BDLocation bdLocation) {
if (PathConfig.IS_LIMIT) {
if (PathConfig.mDefaultCityCode.equals(bdLocation.getCityCode()) && bdLocation.getRadius() <= 300) {
@ -1073,7 +1108,8 @@ public class LocationService extends NotificationService {
} else {
//TODO 无网络状态下是否保存
if (isSaveLocal) {
String textPoint = "{\"userLongitude\":" + mTempList.get(0).getLongitude() + ",\"userLatitude\":" + mTempList.get(0).getLatitude() + ",\"userLocation\":\"" + mTempList.get(0).getAddrStr() + "\",\"createTime\":\"" + Utils.formatUTC(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss") + "\"}";
String textPoint =
"{\"userLongitude\":" + mTempList.get(0).getLongitude() + ",\"userLatitude\":" + mTempList.get(0).getLatitude() + ",\"userLocation\":\"" + mTempList.get(0).getAddrStr() + "\",\"createTime\":\"" + Utils.formatUTC(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss") + "\"}";
Utils.saveFile(textPoint, "testLocation.txt", true);
}
}

9
app/src/main/res/layout/activity_work_sign.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout 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"
tools:context=".activitys.common.WorkSignActivity">
</android.support.constraint.ConstraintLayout>

2
build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.4'
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-rc2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
// NOTE: Do not place your application dependencies here; they belong

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

@ -10,7 +10,7 @@ import com.sucstepsoft.cm_utils.constant.PathConfig;
public class BaseUrlApi {
public static final String IP = "http://219.147.99.164:8082/usercenter/"; /*正式统一用户*/
// public static final String IP = "http://192.168.31.14:7001/usercenter/"; /*测试统一用户*/
// public static final String IP = "http://192.168.0.15:7021/usercenter/"; /*测试统一用户*/
// public static final String IP = "http://175.24.42.217:7000/usercenter/"; /*测试统一用户*/
public static final String BASE_URL = IP;
public static final String APP_VERSION = BASE_URL + "appCmVersionManagement/getAppVersion";
@ -20,7 +20,7 @@ public class BaseUrlApi {
public static final int CAMERA_REQUEST = 123;
public static final String BASE_IP_P = "http://219.147.99.164:8082/"; /*正式IP*/
// public static final String BASE_IP_P = "http://175.24.42.217"; /*演示IP*/
// public static final String BASE_IP_P = "http://192.168.31.14:8083/"; /*测试IP*/
// public static final String BASE_IP_P = "http://192.168.0.15:7022/"; /*测试IP*/
public static final String BASE_IP = BASE_IP_P + "servicecity/";/*网格系统*/
// public static final String BASE_IP = "http://192.168.0.109:8083/servicecity/";/*测试网格系统*/
public static final String BASE_POPULATION_IP = BASE_IP_P + "population/";/*人口系统*/

67
cm_utils/src/main/res/layout/dialog_choose_func.xml
View File

@ -99,6 +99,40 @@
</LinearLayout>
<LinearLayout
android:id="@+id/ll_house"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:gravity="center"
android:orientation="vertical"
android:padding="10dp">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/ic_house_person" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:text="以房找人"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="visible">
<LinearLayout
android:id="@+id/ll_build"
@ -126,39 +160,6 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone">
<LinearLayout
android:id="@+id/ll_house"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:gravity="center"
android:orientation="vertical"
android:padding="10dp">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/ic_house_person" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:text="以房找人"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_hire"

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Fri Sep 23 10:53:53 CST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME