升级地图

app/build.gradle

@@ -70,6 +70,9 @@ dependencies {
     implementation project(':cm_utils')
     implementation project(':camera')
     //百度地图
+//    implementation 'com.baidu.lbsyun:BaiduMapSDK_Map:7.6.2'
+//    implementation 'com.baidu.lbsyun:BaiduMapSDK_Location_All:9.6.4'
+//    implementation "com.baidu.lbsyun:BaiduMapSDK_Util:7.6.2"
     implementation files('libs/BaiduLBS_Android.jar')
     implementation files('libs/IndoorscapeAlbumPlugin.jar')
     //极光推送

app/release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 52,
-      "versionName": "1.5.2",
+      "versionCode": 53,
+      "versionName": "1.5.3",
       "outputFile": "app-release.apk"
     }
   ]

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

@@ -55,7 +55,6 @@ import com.sucstepsoft.realtimelocation.ScreenManager;
 import com.sucstepsoft.realtimelocation.activitys.addresslist.AddressListMainActivity;
 import com.sucstepsoft.realtimelocation.activitys.census.house.NewSearchHouseByPersonActivity;
 import com.sucstepsoft.realtimelocation.activitys.census.house.NewSearchPersonByHouseActivity;
-import com.sucstepsoft.realtimelocation.activitys.census.house.SearchPersonByHouseActivity;
 import com.sucstepsoft.realtimelocation.activitys.census.newhouse.activitys.BuildingViewPageActivity;
 import com.sucstepsoft.realtimelocation.activitys.census.newhouse.activitys.NewGroupHouseAddActivity;
 import com.sucstepsoft.realtimelocation.activitys.census.newhouse.activitys.NewRuleHouseAddActivity;
@@ -1620,6 +1619,7 @@ public class MainActivity extends BaseActivity {
 
     private void startSignLocation() {
         stopLocation();
+        try {
             mLocationClient = new LocationClient(getApplicationContext());
             LocationClientOption locationOption = new LocationClientOption();
             SignLocationListener myLocationListener = new SignLocationListener();
@@ -1640,6 +1640,9 @@ public class MainActivity extends BaseActivity {
             mLocationClient.setLocOption(locationOption);
             //开始定位
             mLocationClient.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     private void stopLocation() {

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/AddBuildingActivity.java

@@ -3,31 +3,23 @@ package com.sucstepsoft.realtimelocation.activitys.census.house;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
 import android.text.TextUtils;
-import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
 import com.baidu.location.LocationClient;
 import com.baidu.location.LocationClientOption;
 import com.google.gson.Gson;
-import com.sucstepsoft.cm_utils.constant.RegexConstants;
 import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
 import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
-import com.sucstepsoft.cm_utils.utils.LogUtils;
 import com.sucstepsoft.cm_utils.utils.RegexUtils;
 import com.sucstepsoft.cm_utils.utils.ToastUtils;
 import com.sucstepsoft.cm_utils.utils.UIUtil;
 import com.sucstepsoft.cm_utils.utils.UserLgUtils;
 import com.sucstepsoft.realtimelocation.R;
-import com.sucstepsoft.realtimelocation.activitys.base.MainActivity;
-import com.sucstepsoft.realtimelocation.activitys.issue.IssueReportActivity;
 import com.sucstepsoft.realtimelocation.activitys.issue.TakePointActivity;
 import com.sucstepsoft.realtimelocation.beans.BuildingSaveBean;
 import com.sucstepsoft.realtimelocation.beans.SuccessBean;
@@ -189,6 +181,7 @@ public class AddBuildingActivity extends BaseActivity {
 
     private void startSignLocation() {
         stopLocation();
+        try {
             mLocationClient = new LocationClient(getApplicationContext());
             LocationClientOption locationOption = new LocationClientOption();
             SignLocationListener myLocationListener = new SignLocationListener();
@@ -208,6 +201,9 @@ public class AddBuildingActivity extends BaseActivity {
             mLocationClient.setLocOption(locationOption);
             //开始定位
             mLocationClient.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     private void stopLocation() {

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/AddHouseActivity.java

@@ -4,8 +4,6 @@ import android.app.ProgressDialog;
 import android.content.Intent;
 import android.graphics.Color;
 import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.widget.Button;
 import android.widget.EditText;
@@ -14,7 +12,6 @@ import android.widget.TextView;
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
 import com.baidu.location.LocationClient;
-import com.baidu.location.LocationClientOption;
 import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
 import com.bigkoo.pickerview.view.OptionsPickerView;
 import com.google.gson.Gson;
@@ -26,7 +23,6 @@ import com.sucstepsoft.cm_utils.utils.UIUtil;
 import com.sucstepsoft.cm_utils.utils.UserLgUtils;
 import com.sucstepsoft.realtimelocation.R;
 import com.sucstepsoft.realtimelocation.activitys.issue.TakePointActivity;
-import com.sucstepsoft.realtimelocation.beans.BuildingSaveBean;
 import com.sucstepsoft.realtimelocation.beans.HouseSaveBean;
 import com.sucstepsoft.realtimelocation.beans.SuccessBean;
 import com.sucstepsoft.realtimelocation.beans.TypeUserBean;
@@ -236,25 +232,11 @@ public class AddHouseActivity extends BaseActivity {
 
     private void startSignLocation() {
         stopLocation();
-        mLocationClient = new LocationClient(getApplicationContext());
-        LocationClientOption locationOption = new LocationClientOption();
-        SignLocationListener myLocationListener = new SignLocationListener();
-        mLocationClient.registerLocationListener(myLocationListener);
-        locationOption.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);
-        locationOption.setCoorType("bd09ll");
-        locationOption.setScanSpan(30 * 1000);
-        locationOption.setIsNeedAddress(true);
-        locationOption.setNeedDeviceDirect(false);
-        locationOption.setLocationNotify(false);
-        locationOption.setIgnoreKillProcess(true);
-        locationOption.setIsNeedLocationDescribe(true);
-        locationOption.setIsNeedLocationPoiList(true);
-        locationOption.SetIgnoreCacheException(false);
-        locationOption.setOpenGps(true);
-        locationOption.setIsNeedAltitude(false);
-        mLocationClient.setLocOption(locationOption);
-        //开始定位
-        mLocationClient.start();
+        try {
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     private void stopLocation() {

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/EditBuildingActivity.java

@@ -239,6 +239,7 @@ public class EditBuildingActivity extends BaseActivity {
 
     private void startSignLocation() {
         stopLocation();
+        try {
             mLocationClient = new LocationClient(getApplicationContext());
             LocationClientOption locationOption = new LocationClientOption();
             SignLocationListener myLocationListener = new SignLocationListener();
@@ -258,6 +259,9 @@ public class EditBuildingActivity extends BaseActivity {
             mLocationClient.setLocOption(locationOption);
             //开始定位
             mLocationClient.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     private void stopLocation() {

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/EditHouseActivity.java

@@ -297,6 +297,7 @@ public class EditHouseActivity extends BaseActivity {
 
     private void startSignLocation() {
         stopLocation();
+        try {
             mLocationClient = new LocationClient(getApplicationContext());
             LocationClientOption locationOption = new LocationClientOption();
             SignLocationListener myLocationListener = new SignLocationListener();
@@ -316,6 +317,10 @@ public class EditHouseActivity extends BaseActivity {
             mLocationClient.setLocOption(locationOption);
             //开始定位
             mLocationClient.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
     }
 
     private void stopLocation() {

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

@@ -799,6 +799,8 @@ public class WorkSignActivity extends BaseActivity {
      */
     private void startLocation() {
         stopLocation();
+        try {
+
             mLocationClient = new LocationClient(getApplicationContext());
             LocationClientOption locationOption = new LocationClientOption();
             SignLocationListener myLocationListener = new SignLocationListener();
@@ -818,6 +820,10 @@ public class WorkSignActivity extends BaseActivity {
             mLocationClient.setLocOption(locationOption);
             //开始定位
             mLocationClient.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
     }
 
     private void stopLocation() {

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

@@ -260,6 +260,7 @@ public class TakePointActivity extends BaseActivity {
 
     private void startSignLocation() {
         stopLocation();
+        try {
             mLocationClient = new LocationClient(getApplicationContext());
             LocationClientOption locationOption = new LocationClientOption();
             SignLocationListener myLocationListener = new SignLocationListener();
@@ -279,6 +280,10 @@ public class TakePointActivity extends BaseActivity {
             mLocationClient.setLocOption(locationOption);
             //开始定位
             mLocationClient.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
     }
 
     private void stopLocation() {

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/locus/LocusMapActivity.java

@@ -963,6 +963,7 @@ public class LocusMapActivity extends BaseActivity {
 
     private void startSignLocation() {
         stopLocation();
+        try {
             mLocationClient = new LocationClient(getApplicationContext());
             LocationClientOption locationOption = new LocationClientOption();
             SignLocationListener myLocationListener = new SignLocationListener();
@@ -982,6 +983,10 @@ public class LocusMapActivity extends BaseActivity {
             mLocationClient.setLocOption(locationOption);
             //开始定位
             mLocationClient.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
     }
 
     private void stopLocation() {

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/mine/WorkLogAddActivity.java

@@ -609,6 +609,7 @@ public class WorkLogAddActivity extends BaseActivity {
 
     private void startSignLocation() {
         stopLocation();
+        try {
             mLocationClient = new LocationClient(getApplicationContext());
             LocationClientOption locationOption = new LocationClientOption();
             SignLocationListener myLocationListener = new SignLocationListener();
@@ -627,6 +628,10 @@ public class WorkLogAddActivity extends BaseActivity {
             locationOption.setIsNeedAltitude(false);
             mLocationClient.setLocOption(locationOption);
             mLocationClient.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
     }
 
     private void stopLocation() {

app/src/main/java/com/sucstepsoft/realtimelocation/base/BaseApplication.java

@@ -5,12 +5,11 @@ import android.support.multidex.MultiDex;
 import android.support.multidex.MultiDexApplication;
 import android.view.Gravity;
 
+import com.baidu.location.LocationClient;
 import com.baidu.mapapi.CoordType;
 import com.baidu.mapapi.SDKInitializer;
 import com.hjq.toast.Toaster;
 import com.squareup.leakcanary.LeakCanary;
-import com.sucstepsoft.cm_utils.utils.LogUtils;
-import com.sucstepsoft.realtimelocation.services.LocationChangBroadcastReceiver;
 import com.tencent.bugly.crashreport.CrashReport;
 
 import cn.jpush.android.api.JPushInterface;
@@ -60,10 +59,12 @@ public class BaseApplication extends MultiDexApplication {
      * 百度地图初始化
      */
     private void initBaiduMap() {
+        SDKInitializer.setAgreePrivacy(this, true);
         SDKInitializer.initialize(this);
         //自4.3.0起，百度地图SDK所有接口均支持百度坐标和国测局坐标，用此方法设置您使用的坐标类型.
         //包括BD09LL和GCJ02两种坐标，默认是BD09LL坐标。
         SDKInitializer.setCoordType(CoordType.BD09LL);
+        LocationClient.setAgreePrivacy(true);
     }
 
 //    public static LocationChangBroadcastReceiver getlocationChangeBoardcase() {

app/src/main/java/com/sucstepsoft/realtimelocation/services/LocationService.java

@@ -1269,6 +1269,7 @@ public class LocationService extends NotificationService {
      */
     private void startLocation() {
         stopLocation();
+        try {
             mLocationClient = new LocationClient(getApplicationContext());
             //声明LocationClient类实例并配置定位参数
             LocationClientOption locationOption = new LocationClientOption();
@@ -1309,6 +1310,10 @@ public class LocationService extends NotificationService {
             mLocationClient.setLocOption(locationOption);
             //开始定位
             mLocationClient.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
     }
 
     void stopLocation() {

app/src/main/java/com/sucstepsoft/realtimelocation/services/NotificationService.java

@@ -20,7 +20,7 @@ public class NotificationService extends Service {
      */
 //    private static int NOTI_ID = 123321;
     private static int NOTI_ID = 123322;
-//    private static int NOTI_ID_1 = 123443;
+    //    private static int NOTI_ID_1 = 123443;
     private static int NOTI_ID_1 = 123444;
 
     private Utils.CloseServiceReceiver mCloseReceiver;
@@ -50,12 +50,12 @@ public class NotificationService extends Service {
      * 触发利用notification增加进程优先级
      */
     protected void applyNotiKeepMech() {
-        startForeground(NOTI_ID, Utils.buildNotification(getBaseContext()));
+        startForeground(NOTI_ID, Utils.buildNotification(this.getApplicationContext()));
         startBindHelperService();
     }
 
     protected void sendNoti() {
-        startForeground(NOTI_ID_1, Utils.buildNotification(getBaseContext()));
+        startForeground(NOTI_ID_1, Utils.buildNotification(getApplicationContext()));
     }
 
     public void unApplyNotiKeepMech() {

build.gradle

@@ -3,8 +3,15 @@
 buildscript {
     repositories {
         google()
-        jcenter()
-
+        mavenCentral()
+        // 阿里云云效仓库：https://maven.aliyun.com/mvn/guide
+        maven { url 'https://maven.aliyun.com/repository/jcenter' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        // 华为开源镜像：https://mirrors.huaweicloud.com
+        maven { url 'https://repo.huaweicloud.com/repository/maven' }
+        maven {
+            url "https://jitpack.io"
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.2'
@@ -45,7 +52,12 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        // 阿里云云效仓库：https://maven.aliyun.com/mvn/guide
+        maven { url 'https://maven.aliyun.com/repository/jcenter' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        // 华为开源镜像：https://mirrors.huaweicloud.com
+        maven { url 'https://repo.huaweicloud.com/repository/maven' }
         maven {
             url "https://jitpack.io"
         }
@@ -61,12 +73,12 @@ ext {
     gTargetSdkVersion = 28
 //    gVersionCode = 3
 //    gVersionName = '1.0.3'
-    gVersionCode=52
-    gVersionName='1.5.2'
+    gVersionCode = 53
+    gVersionName = '1.5.3'
     //Router编译版本
     gRouterApiVersion = '1.4.1'
     gRouterCompileVersion = '1.2.2'
-    //appcompat
+    //appcompatb
     gAppcompatVersion_v7_28 = '28.0.0'
     //constraint-layout
     gConstraint_layout = '1.1.3'

camera/src/androidTest/java/com/cjt2325/cameralibrary/ApplicationTest.java

@@ -1,13 +0,0 @@
-package com.cjt2325.cameralibrary;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

cm_utils/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

cm_utils/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>