事件检查图片必填项

README.md

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

app/release/output-metadata.json

@@ -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"
+    }
+  ]
+}

app/release/output.json

@@ -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":{}}]

app/src/main/AndroidManifest.xml

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

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

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

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/WorkSignActivity.java

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

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

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

app/src/main/res/layout/activity_work_sign.xml

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

build.gradle

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

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

@@ -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/";/*人口系统*/

cm_utils/src/main/res/layout/dialog_choose_func.xml

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

gradle/wrapper/gradle-wrapper.properties

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