Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Conflicts: app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
2023-04-25 15:35:09 +08:00
parent 72d51c19c2 9fb85862db
commit 969d687c58
42 changed files with 950 additions and 172 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/CheckPermissionsActivity.java
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/CheckPermissionsActivity.java
@@ -0,0 +1,204 @@
+/**
+ * 
+ */
+package com.navinfo.omqs.ui.activity;
+
+import android.Manifest;
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.view.KeyEvent;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 继承了Activity，实现Android6.0的运行时权限检测
+ * 需要进行运行时权限检测的Activity可以继承这个类
+ */
+public class CheckPermissionsActivity extends BaseActivity {
+	//是否需要检测后台定位权限，设置为true时，如果用户没有给予后台定位权限会弹窗提示
+	private boolean needCheckBackLocation = false;
+	//如果设置了target > 28，需要增加这个权限，否则不会弹出"始终允许"这个选择框
+	private static String BACKGROUND_LOCATION_PERMISSION = "android.permission.ACCESS_BACKGROUND_LOCATION";
+	/**
+	 * 需要进行检测的权限数组
+	 */
+	protected String[] needPermissions = {
+			Manifest.permission.ACCESS_COARSE_LOCATION,
+			Manifest.permission.ACCESS_FINE_LOCATION,
+			Manifest.permission.WRITE_EXTERNAL_STORAGE,
+			Manifest.permission.READ_EXTERNAL_STORAGE,
+	};
+
+	private static final int PERMISSON_REQUESTCODE = 0;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		if(Build.VERSION.SDK_INT > 28
+				&& getApplicationContext().getApplicationInfo().targetSdkVersion > 28) {
+			needPermissions = new String[] {
+					Manifest.permission.ACCESS_COARSE_LOCATION,
+					Manifest.permission.ACCESS_FINE_LOCATION,
+					Manifest.permission.WRITE_EXTERNAL_STORAGE,
+					Manifest.permission.READ_EXTERNAL_STORAGE,
+					BACKGROUND_LOCATION_PERMISSION
+			};
+		}
+	}
+
+	/**
+	 * 判断是否需要检测，防止不停的弹框
+	 */
+	private boolean isNeedCheck = true;
+	
+	@Override
+	protected void onResume() {
+		super.onResume();
+		if (Build.VERSION.SDK_INT >= 23
+				&& getApplicationInfo().targetSdkVersion >= 23) {
+			if (isNeedCheck) {
+				checkPermissions(needPermissions);
+			}
+		}
+	}
+	
+	/**
+	 * 
+	 * @param permissions
+	 *
+	 */
+	private void checkPermissions(String... permissions) {
+		try {
+			if (Build.VERSION.SDK_INT >= 23
+					&& getApplicationInfo().targetSdkVersion >= 23) {
+				List<String> needRequestPermissonList = findDeniedPermissions(permissions);
+				if (null != needRequestPermissonList
+						&& needRequestPermissonList.size() > 0) {
+					String[] array = needRequestPermissonList.toArray(new String[needRequestPermissonList.size()]);
+					Method method = getClass().getMethod("requestPermissions", new Class[]{String[].class,
+							int.class});
+
+					method.invoke(this, array, PERMISSON_REQUESTCODE);
+				}
+			}
+		} catch (Throwable e) {
+		}
+	}
+
+	/**
+	 * 获取权限集中需要申请权限的列表
+	 * 
+	 * @param permissions
+	 *
+	 */
+	private List<String> findDeniedPermissions(String[] permissions) {
+		List<String> needRequestPermissonList = new ArrayList<String>();
+		if (Build.VERSION.SDK_INT >= 23
+				&& getApplicationInfo().targetSdkVersion >= 23){
+			try {
+				for (String perm : permissions) {
+					Method checkSelfMethod = getClass().getMethod("checkSelfPermission", String.class);
+					Method shouldShowRequestPermissionRationaleMethod = getClass().getMethod("shouldShowRequestPermissionRationale",
+							String.class);
+					if ((Integer)checkSelfMethod.invoke(this, perm) != PackageManager.PERMISSION_GRANTED
+							|| (Boolean)shouldShowRequestPermissionRationaleMethod.invoke(this, perm)) {
+						if(!needCheckBackLocation
+						  		&& BACKGROUND_LOCATION_PERMISSION.equals(perm)) {
+							continue;
+						}
+						needRequestPermissonList.add(perm);
+					}
+				}
+			} catch (Throwable e) {
+
+			}
+		}
+		return needRequestPermissonList;
+	}
+
+	/**
+	 * 检测是否所有的权限都已经授权
+	 *
+	 */
+	private boolean verifyPermissions(int[] grantResults) {
+		for (int result : grantResults) {
+			if (result != PackageManager.PERMISSION_GRANTED) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	@TargetApi(23)
+	public void onRequestPermissionsResult(int requestCode,
+			String[] permissions, int[] paramArrayOfInt) {
+		if (requestCode == PERMISSON_REQUESTCODE) {
+			if (!verifyPermissions(paramArrayOfInt)) {
+				showMissingPermissionDialog();
+				isNeedCheck = false;
+			}
+		}
+	}
+
+	/**
+	 * 显示提示信息
+	 *
+	 */
+	private void showMissingPermissionDialog() {
+		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		builder.setTitle("提示");
+		builder.setMessage("当前应用缺少必要权限。\\n\\n请点击\\\"设置\\\"-\\\"权限\\\"-打开所需权限。");
+
+		// 拒绝, 退出应用
+		builder.setNegativeButton("取消",
+				new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						finish();
+					}
+				});
+
+		builder.setPositiveButton("设置",
+				new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						startAppSettings();
+					}
+				});
+
+		builder.setCancelable(false);
+
+		builder.show();
+	}
+
+	/**
+	 *  启动应用的设置
+	 *
+	 */
+	private void startAppSettings() {
+		Intent intent = new Intent(
+				Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+		intent.setData(Uri.parse("package:" + getPackageName()));
+		startActivity(intent);
+	}
+	
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		if(keyCode == KeyEvent.KEYCODE_BACK){
+			this.finish();
+			return true;
+		}
+		return super.onKeyDown(keyCode, event);
+	}
+		
+}
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt
@@ -33,7 +33,7 @@ open abstract class PermissionsActivity : BaseActivity() {
        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
 //            permissionList.add(Permission.ACCESS_BACKGROUND_LOCATION)
        }
-        XXPermissions.with(this)
+/*        XXPermissions.with(this)
            // 申请单个权限
            .permission(permissionList)
            // 设置权限请求拦截器（局部设置）
@@ -73,7 +73,7 @@ open abstract class PermissionsActivity : BaseActivity() {
                        onPermissionsDenied()
                    }
                }
-            })
+            })*/
    }

    /**
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt
@@ -11,6 +11,7 @@ import androidx.lifecycle.Observer
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.ActivityLoginBinding
+import com.navinfo.omqs.ui.activity.CheckPermissionsActivity
 import com.navinfo.omqs.ui.activity.PermissionsActivity
 import com.navinfo.omqs.ui.activity.map.MainActivity
 import dagger.hilt.android.AndroidEntryPoint
@@ -20,7 +21,7 @@ import dagger.hilt.android.AndroidEntryPoint
 */

@AndroidEntryPoint
-class LoginActivity : PermissionsActivity() {
+class LoginActivity : CheckPermissionsActivity() {

    private lateinit var binding: ActivityLoginBinding
    private val viewModel by viewModels<LoginViewModel>()
@@ -97,15 +98,6 @@ class LoginActivity : PermissionsActivity() {
        }
    }

-    //进应用根本不调用，待查
-    override fun onPermissionsGranted() {
-        Log.e("jingo", "调用了吗")
-
-    }
-
-    override fun onPermissionsDenied() {
-    }
-
    override fun onDestroy() {
        super.onDestroy()
    }
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
@@ -19,8 +19,8 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.*
-import okio.IOException
 import java.io.File
+import java.io.IOException
 import javax.inject.Inject

 enum class LoginStatus {
@@ -155,11 +155,12 @@ class LoginViewModel @Inject constructor(
    /**
     * 创建用户目录
     */
-    @Throws(IOException::class)
    private fun createUserFolder(context: Context, userId: String) {
+        Constant.USER_ID = userId
+        Constant.VERSION_ID = userId
+        Constant.USER_DATA_PATH = Constant.DATA_PATH + Constant.USER_ID + "/" + Constant.VERSION_ID
        // 在SD卡创建用户目录，解压资源等
        val userFolder = File("${Constant.DATA_PATH}/${userId}")
-        Constant.CURRENT_USER_ID = userId
        // 初始化Realm
        Realm.init(context.applicationContext)
        val password = "encryp".encodeToByteArray().copyInto(ByteArray(64))
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
@@ -18,8 +18,6 @@ import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager
 import com.navinfo.omqs.http.taskdownload.TaskDownloadManager
 import com.navinfo.omqs.system.SystemConstant
 import com.navinfo.omqs.ui.activity.BaseActivity
-import com.navinfo.omqs.ui.fragment.evaluationresult.EvaluationResultFragment
-import com.navinfo.omqs.ui.fragment.evaluationresult.EvaluationResultViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject

@@ -50,7 +48,7 @@ class MainActivity : BaseActivity() {
            binding.mainActivityMap,
            null,
            Constant.MAP_PATH,
-            Constant.DATA_PATH + SystemConstant.USER_ID + "/trace.sqlite"
+            Constant.USER_DATA_PATH+"/trace.sqlite"
        )
        //关联生命周期
        binding.lifecycleOwner = this
@@ -73,8 +71,9 @@ class MainActivity : BaseActivity() {
        mapController.locationLayerHandler.startLocation()
        //启动轨迹存储
        mapController.locationLayerHandler.setNiLocationListener(NiLocationListener {
-            viewModel.addSaveTrace(it)
-//            binding.viewModel!!.startSaveTraceThread(this)
+            ToastUtils.showLong("定位${it.longitude}")
+            binding!!.viewModel!!.addSaveTrace(it)
+            binding!!.viewModel!!.startSaveTraceThread(this)
        })
        //显示轨迹图层
 //        mapController.layerManagerHandler.showNiLocationLayer(Constant.DATA_PATH+ SystemConstant.USER_ID+"/trace.sqlite")
@@ -108,9 +107,8 @@ class MainActivity : BaseActivity() {
     * 打开相机预览
     */
    fun openCamera() {
-        binding.viewModel!!.onClickCameraButton(this)
        //显示轨迹图层
-        //binding!!.viewModel!!.onClickCameraButton(this)
+        binding!!.viewModel!!.onClickCameraButton(this)
    }

    /**
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
@@ -16,7 +16,6 @@ import com.navinfo.collect.library.utils.GeometryTools
 import com.navinfo.collect.library.utils.GeometryToolsKt
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
-import com.navinfo.omqs.system.SystemConstant
 import com.navinfo.omqs.ui.dialog.CommonDialog
 import com.navinfo.omqs.ui.manager.TakePhotoManager
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -122,7 +121,7 @@ class MainViewModel @Inject constructor(

                        TraceDataBase.getDatabase(
                            context,
-                            Constant.DATA_PATH + SystemConstant.USER_ID + "/trace.sqlite"
+                            Constant.USER_DATA_PATH + "/trace.sqlite"
                        ).niLocationDao.insert(niLocation)
                        niLocationList.removeAt(0)
                        Log.e("qj", "saveTrace")