android/pipIrrApp.git

			@@ -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;
			@@ -31,11 +30,11 @@
			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.ServiceUtils;
			import com.dayu.pipirrapp.utils.ToastUtil;
			import com.dayu.pipirrapp.view.TitleBar;
			import com.jeremyliao.liveeventbus.LiveEventBus;
			@@ -84,7 +83,7 @@
			/**
			* 定位监听
			*/
			private Observer<Object> locationObserver = new Observer<Object>() {
			private final Observer<Object> locationObserver = new Observer<Object>() {
			@Override
			public void onChanged(Object o) {
			latLonBean = (LatLonBean) o;
			@@ -228,6 +227,7 @@
			existingPaths.add(uplodData.getFilePath());
			}
			//获取在PictureSelector的相册时取消选中的图片
			Set<String> resultPaths = new HashSet<>();

			for (LocalMedia media : result) {
			if (media.getWidth() == 0 \|\| media.getHeight() == 0) {
			@@ -266,8 +266,21 @@
			// 执行上传图片的操作
			uplodeImg(uplodFileState);
			}


			resultPaths.add(media.getCompressPath());
			}
			//处理从相册返回时取消的图片处理
			existingPaths.removeAll(resultPaths);
			if (!existingPaths.isEmpty()) {
			List<UplodFileState> toRemove = new ArrayList<>();
			for (String path : existingPaths) {
			for (UplodFileState uplodFileState : uplodFileStates) {
			if (path.equals(uplodFileState.getFilePath())) {
			uplodFileState.getThisCall().cancel();
			toRemove.add(uplodFileState);
			}
			}
			}
			uplodFileStates.removeAll(toRemove);
			}
			runOnUiThread(new Runnable() {
			@Override
			@@ -340,14 +353,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);
			}