From c91d4503a63013be3242120ae0ad9cd1b0b8127e Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 12 十二月 2024 17:18:54 +0800
Subject: [PATCH] 优化定位服务相关代码
---
app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java
index a50d481..2d796c5 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java
@@ -4,7 +4,6 @@
import android.content.Context;
import android.content.Intent;
-import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
@@ -30,11 +29,12 @@
import com.dayu.pipirrapp.net.BaseResponse;
import com.dayu.pipirrapp.net.subscribers.SubscriberListener;
import com.dayu.pipirrapp.net.upload.UploadFileListener;
-import com.dayu.pipirrapp.service.MyLocationService;
import com.dayu.pipirrapp.tool.FullyGridLayoutManager;
import com.dayu.pipirrapp.tool.GlideEngine;
import com.dayu.pipirrapp.tool.ImageFileCompressEngine;
import com.dayu.pipirrapp.utils.CommonKeyName;
+import com.dayu.pipirrapp.utils.MyLog;
+import com.dayu.pipirrapp.utils.ServiceUtils;
import com.dayu.pipirrapp.utils.ToastUtil;
import com.dayu.pipirrapp.view.TitleBar;
import com.jeremyliao.liveeventbus.LiveEventBus;
@@ -68,7 +68,7 @@
* @since 2024-11-27
*/
public class OrderDealActivity extends BaseActivity {
- private String TAG = "OrderDealActivity";
+ private final String TAG = "OrderDealActivity";
ActivityOrderDealBinding binding;
RecyclerView mRecyclerView;
AddPictureAdapter mAdapter;
@@ -87,6 +87,7 @@
private Observer<Object> locationObserver = new Observer<Object>() {
@Override
public void onChanged(Object o) {
+ MyLog.d("OrderDealActivity>>>locationObserver>>");
latLonBean = (LatLonBean) o;
}
};
@@ -224,10 +225,13 @@
* @param result
*/
private void analyticalSelectResults(ArrayList<LocalMedia> result) {
+ //鑾峰彇褰撳墠uplodFileStates鎵�鏈夌殑鍥剧墖鍦板潃
Set<String> existingPaths = new HashSet<>();
for (UplodFileState uplodData : uplodFileStates) {
existingPaths.add(uplodData.getFilePath());
}
+ //鑾峰彇鍦≒ictureSelector鐨勭浉鍐屾椂鍙栨秷閫変腑鐨勫浘鐗�
+ Set<String> resultPaths = new HashSet<>();
for (LocalMedia media : result) {
if (media.getWidth() == 0 || media.getHeight() == 0) {
if (PictureMimeType.isHasImage(media.getMimeType())) {
@@ -266,7 +270,19 @@
uplodeImg(uplodFileState);
}
-
+ resultPaths.add(media.getCompressPath());
+ }
+ //澶勭悊浠庣浉鍐岃繑鍥炴椂鍙栨秷鐨勫浘鐗囧鐞�
+ existingPaths.removeAll(resultPaths);
+ if (!existingPaths.isEmpty()) {
+ for (String path : existingPaths) {
+ for (UplodFileState uplodFileState : uplodFileStates) {
+ if (path.equals(uplodFileState.getFilePath())) {
+ uplodFileState.getThisCall().cancel();
+ uplodFileStates.remove(uplodFileState);
+ }
+ }
+ }
}
runOnUiThread(new Runnable() {
@Override
@@ -340,14 +356,7 @@
* 寮�濮嬪畾浣嶇浉鍏抽�昏緫
*/
private void startLocation() {
- Intent location = new Intent(this, MyLocationService.class);
- location.putExtra("isSingle", true);
- //寮�鍚畾浣�
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- startForegroundService(location);
- } else {
- startService(location);
- }
+ ServiceUtils.startLocationService(this,true);
//鑾峰彇瀹氫綅鏈嶅姟浼犺繃鏉ョ殑鍧愭爣鐐�
LiveEventBus.get(CommonKeyName.locationData).observeForever(locationObserver);
}
--
Gitblit v1.8.0