fix: 合并代码

2023-04-25 15:40:23 +08:00
parent 58c3ad62c3 153156d07c
commit 67ce6f11b9
34 changed files with 560 additions and 188 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
@@ -10,6 +10,7 @@ import androidx.lifecycle.viewModelScope
 import com.blankj.utilcode.util.ResourceUtils
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.bean.LoginUserBean
+import com.navinfo.omqs.db.MyRealmModule
 import com.navinfo.omqs.db.RoomAppDatabase
 import com.navinfo.omqs.http.NetResult
 import com.navinfo.omqs.http.NetworkService
@@ -170,7 +171,7 @@ class LoginViewModel @Inject constructor(
            .directory(userFolder)
            .name("OMQS.realm")
            .encryptionKey(password)
-//            .modules(Realm.getDefaultModule(), MyRealmModule())
+            .modules(Realm.getDefaultModule(), MyRealmModule())
            .schemaVersion(1)
            .build()
        Realm.setDefaultConfiguration(config)
--- 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
@@ -4,10 +4,8 @@ import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.core.view.WindowCompat
 import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProvider
-import com.blankj.utilcode.util.ToastUtils
-import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
+import com.blankj.utilcode.util.ToastUtils
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.collect.library.map.handler.NiLocationListener
 import com.navinfo.omqs.Constant
@@ -34,10 +32,10 @@ class MainActivity : BaseActivity() {
    @Inject
    lateinit var offlineMapDownloadManager: OfflineMapDownloadManager

+
    override fun onCreate(savedInstanceState: Bundle?) {
        WindowCompat.setDecorFitsSystemWindows(window, false)
        super.onCreate(savedInstanceState)
-
        binding = DataBindingUtil.setContentView(this, R.layout.activity_main)
        //初始化地图
        mapController.init(
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
@@ -3,38 +3,24 @@ package com.navinfo.omqs.ui.fragment.personalcenter
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.blankj.utilcode.util.UriUtils
 import com.github.k1rakishou.fsaf.FileChooser
 import com.github.k1rakishou.fsaf.callback.FSAFActivityCallbacks
 import com.github.k1rakishou.fsaf.callback.FileChooserCallback
-import com.navinfo.collect.library.data.RealmUtils
-import com.navinfo.collect.library.data.entity.OMDBEntity
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.FragmentPersonalCenterBinding
 import com.navinfo.omqs.db.ImportOMDBHelper
 import com.navinfo.omqs.hilt.ImportOMDBHiltFactory
 import com.navinfo.omqs.tools.CoroutineUtils
-import com.navinfo.omqs.ui.activity.BaseActivity
 import com.navinfo.omqs.ui.fragment.BaseFragment
 import dagger.hilt.android.AndroidEntryPoint
-import io.realm.Realm
-import io.realm.RealmDictionary
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.FlowCollector
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.oscim.core.GeoPoint
-import java.io.File
-import java.util.UUID
 import javax.inject.Inject

 /**
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListAdapter.kt
@@ -28,6 +28,7 @@ class QsRecordListAdapter(
    private val context: Context
 ) : BaseRecyclerViewAdapter<QsRecordBean>() {

+    private var itemClickListener: IKotlinItemClickListener? = null

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
        val viewBinding =
@@ -46,6 +47,10 @@ class QsRecordListAdapter(
        val qsRecordBean = data[position]
        //tag 方便onclick里拿到数据
        holder.tag = qsRecordBean.id.toString()
+        // 点击事件
+        holder.itemView.setOnClickListener {
+            itemClickListener!!.onItemClickListener(position)
+        }
        changeViews(binding, qsRecordBean)
    }

@@ -59,6 +64,16 @@ class QsRecordListAdapter(
    override fun getItemViewRes(position: Int): Int {
        return R.layout.adapter_qs_record_list
    }
+
+    // 提供set方法
+    fun setOnKotlinItemClickListener(itemClickListener: IKotlinItemClickListener) {
+        this.itemClickListener = itemClickListener
+    }
+
+    //自定义接口
+    interface IKotlinItemClickListener {
+        fun onItemClickListener(position: Int)
+    }
 }


--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt
@@ -5,13 +5,17 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView.VERTICAL
+import com.blankj.utilcode.util.ToastUtils
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.FragmentQsRecordListBinding
+import com.navinfo.omqs.ui.activity.map.MainActivity
 import com.navinfo.omqs.ui.fragment.BaseFragment
 import com.navinfo.omqs.ui.fragment.tasklist.QsRecordListAdapter
+import com.navinfo.omqs.ui.other.BaseToast.makeText
 import com.navinfo.omqs.ui.widget.RecycleViewDivider
 import dagger.hilt.android.AndroidEntryPoint
 import org.apache.poi.xwpf.usermodel.VerticalAlign
@@ -51,6 +55,18 @@ class QsRecordListFragment : BaseFragment(){
        itemDecoration.setDrawable(resources.getDrawable(R.drawable.separator))
        binding.qsRecyclerview.addItemDecoration(itemDecoration)
        viewModel.getList(requireContext())
+        // itemClick
+        adapter!!.setOnKotlinItemClickListener(object : QsRecordListAdapter.IKotlinItemClickListener {
+            override fun onItemClickListener(position: Int) {
+                viewModel.onItemClickListener(activity as MainActivity,position)
+                findNavController().popBackStack()
+            }
+        })
+    }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.getList(requireContext())
    }

    override fun onDestroyView() {
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListViewModel.kt
@@ -1,11 +1,16 @@
 package com.navinfo.omqs.ui.fragment.qsrecordlist

 import android.content.Context
+import android.os.Bundle
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.navigation.findNavController
+import com.blankj.utilcode.util.ToastUtils
 import com.navinfo.collect.library.data.entity.QsRecordBean
+import com.navinfo.omqs.R
+import com.navinfo.omqs.ui.activity.map.MainActivity
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.realm.Realm
 import kotlinx.coroutines.Dispatchers
@@ -27,4 +32,11 @@ class QsRecordListViewModel @Inject constructor(
        }
    }

+    fun onItemClickListener(activity: MainActivity, position :Int){
+        val naviController = activity.findNavController(R.id.main_activity_right_fragment)
+        val bundle = Bundle()
+        bundle.putString("QsId", liveDataQSList.value?.get(position)?.id)
+        naviController.navigate(R.id.EvaluationResultFragment, bundle)
+        ToastUtils.showLong(liveDataQSList.value?.get(position)?.classType)
+    }
 }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt
@@ -13,6 +13,8 @@ import com.navinfo.omqs.http.taskdownload.TaskDownloadManager
 import com.navinfo.omqs.tools.FileManager.Companion.FileDownloadStatus
 import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter
 import com.navinfo.omqs.ui.other.BaseViewHolder
+import java.io.File
+import javax.inject.Inject

 /**
 * 离线地图城市列表 RecyclerView 适配器
@@ -31,7 +33,7 @@ class TaskListAdapter(
        if (it.tag != null) {
            val taskBean = data[it.tag as Int]
            when (taskBean.status) {
-                FileDownloadStatus.NONE, FileDownloadStatus.UPDATE, FileDownloadStatus.PAUSE, FileDownloadStatus.ERROR -> {
+                FileDownloadStatus.NONE, FileDownloadStatus.UPDATE, FileDownloadStatus.PAUSE, FileDownloadStatus.IMPORT, FileDownloadStatus.ERROR -> {
                    Log.e("jingo", "开始下载 ${taskBean.status}")
                    downloadManager.start(taskBean.id)
                }
@@ -125,6 +127,29 @@ class TaskListAdapter(
                    View.INVISIBLE
                binding.taskDownloadBtn.text = "更新"
            }
+            FileDownloadStatus.IMPORTING -> {
+                if (binding.taskProgress.visibility != View.VISIBLE) binding.taskProgress.visibility =
+                    View.VISIBLE
+                binding.taskDownloadBtn.text = "安装中"
+                val split = taskBean.message.split("/")
+                if (split.size == 2) {
+                    try {
+                        val index = split[0].toInt()
+                        val count = split[1].toInt()
+                        binding.taskProgress.progress =
+                            index * 100 / count
+                    } catch (e: Exception) {
+                        Log.e("jingo", "更新进度条 $e")
+                    }
+                } else {
+                    binding.taskProgress.progress = 0
+                }
+            }
+            FileDownloadStatus.IMPORT -> {
+                if (binding.taskProgress.visibility != View.VISIBLE) binding.taskProgress.visibility =
+                    View.INVISIBLE
+                binding.taskDownloadBtn.text = "安装"
+            }
        }
    }

--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt
@@ -30,6 +30,7 @@ class TaskListFragment : BaseFragment(){
        inflater: LayoutInflater, container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View {
+        downloadManager.init(requireContext())
        _binding = FragmentTaskListBinding.inflate(inflater, container, false)
        return binding.root

--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt
@@ -27,12 +27,28 @@ class TaskListViewModel @Inject constructor(
    fun getTaskList(context: Context) {
        viewModelScope.launch(Dispatchers.IO) {
            val realm = Realm.getDefaultInstance()
-            Log.e("jingo","realm hashCOde ${realm.hashCode()}")
+            Log.e("jingo", "realm hashCOde ${realm.hashCode()}")
+            var taskList: List<TaskBean> = mutableListOf()
            when (val result = networkService.getTaskList("02911")) {
                is NetResult.Success -> {
                    if (result.data != null) {
                        realm.executeTransaction {
-                            realm.copyToRealmOrUpdate(result.data.obj)
+                            result.data.obj?.let { list ->
+                                for (task in list) {
+                                    val item = realm.where(TaskBean::class.java).equalTo(
+                                        "id", task.id
+                                    ).findFirst()
+                                    if (item != null) {
+                                        task.fileSize = item.fileSize
+                                        Log.e("jingo", "当前文件大小 ${task.fileSize}")
+                                        task.status = item.status
+                                        task.currentSize = item.currentSize
+                                    }
+                                    realm.copyToRealmOrUpdate(task)
+                                }
+                            }
+                            val objects = realm.where(TaskBean::class.java).findAll()
+                            taskList = realm.copyFromRealm(objects)
                        }
                    }
                }
@@ -51,9 +67,8 @@ class TaskListViewModel @Inject constructor(
                is NetResult.Loading -> {}
                else -> {}
            }
-            val objects = realm.where(TaskBean::class.java).findAll()
-            val taskList = realm.copyFromRealm(objects)
-            for(item in taskList){
+
+            for (item in taskList) {
                FileManager.checkOMDBFileInfo(item)
            }
            liveDataTaskList.postValue(taskList)