From 9c2908d8a110eaa28ec63a877291aeea61ee4e60 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 03 十二月 2024 09:38:24 +0800
Subject: [PATCH] 优化自定义二次确认Dialog回调
---
app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 242 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 186 insertions(+), 56 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
index ebc3cd1..0cb878e 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
@@ -1,5 +1,9 @@
package com.dayu.pipirrapp.fragment;
+import static com.dayu.pipirrapp.net.Constants.BASE_URL;
+import static com.dayu.pipirrapp.tool.InspectionUtils.addInspectionLocationData;
+import static com.dayu.pipirrapp.tool.InspectionUtils.updateInspectionLocationData;
+
import android.content.Context;
import android.content.Intent;
import android.location.LocationManager;
@@ -20,10 +24,16 @@
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
+import com.dayu.pipirrapp.MyApplication;
+import com.dayu.pipirrapp.R;
import com.dayu.pipirrapp.bean.db.CenterPointBean;
+import com.dayu.pipirrapp.bean.db.InspectionBean;
+import com.dayu.pipirrapp.bean.db.InspectionLocationBean;
import com.dayu.pipirrapp.bean.db.LatLonBean;
import com.dayu.pipirrapp.bean.db.MarkerBean;
import com.dayu.pipirrapp.bean.net.CenterPointResult;
+import com.dayu.pipirrapp.bean.net.InspectionRequest;
+import com.dayu.pipirrapp.bean.net.LoginResult;
import com.dayu.pipirrapp.bean.net.MarkerResult;
import com.dayu.pipirrapp.dao.DaoSingleton;
import com.dayu.pipirrapp.databinding.FragmentMapBinding;
@@ -34,8 +44,10 @@
import com.dayu.pipirrapp.net.subscribers.SubscriberListener;
import com.dayu.pipirrapp.observer.MapFragmenObserver;
import com.dayu.pipirrapp.service.MyLocationService;
+import com.dayu.pipirrapp.tool.InspectionUtils;
import com.dayu.pipirrapp.utils.CommonData;
import com.dayu.pipirrapp.utils.CommonKeyName;
+import com.dayu.pipirrapp.utils.DateUtils;
import com.dayu.pipirrapp.utils.MapJpgUtils;
import com.dayu.pipirrapp.utils.MyLog;
import com.dayu.pipirrapp.utils.SharedPreferencesHelper;
@@ -43,6 +55,7 @@
import com.dayu.pipirrapp.utils.WebViewUtils;
import com.dayu.pipirrapp.view.ConfirmDialog;
import com.jeremyliao.liveeventbus.LiveEventBus;
+import com.tencent.bugly.crashreport.CrashReport;
import java.io.File;
import java.io.FileInputStream;
@@ -70,8 +83,13 @@
WebView mWebView;
CenterPointBean centerPointBean;
String strMarkerJson;
- boolean isStartInspec = false;
+ //褰撳墠宸℃鐘舵��
+ int mInspectionState;
MapFragmenObserver mapFragmenObserver;
+ //褰撳墠宸℃璁板綍鐨勭浉鍏充俊鎭�
+ InspectionBean mInspectionBean;
+ LatLonBean lastLatLonBean;
+ InspectionRequest inspectionRequest;
@Override
public void onAttach(@NonNull Context context) {
@@ -85,47 +103,13 @@
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Log.i(TAG, "onCreate");
- isStartInspec = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.isStartInspec, false);
-
+ mInspectionState = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.inspectionState, 0);
}
@Override
public void onStart() {
super.onStart();
Log.i(TAG, "onStart");
- }
-
- /**
- * 淇敼宸℃鐘舵��
- */
- private void chageInspecState() {
- Intent location = new Intent(this.getActivity(), MyLocationService.class);
- location.putExtra("isSingle", false);
- if (isStartInspec) {
- //鑾峰彇瀹氫綅鏈嶅姟浼犺繃鏉ョ殑鍧愭爣鐐�
- LiveEventBus.get(CommonKeyName.locationData).observeForever(new Observer<Object>() {
- @Override
- public void onChanged(Object o) {
- LatLonBean latLonBean = (LatLonBean) o;
- mWebView.evaluateJavascript("javascript:updateLocation(\"" + latLonBean.getLatitude()+ "\",\"" + latLonBean.getLongitude()+ "\")", value -> {
- });
- }
- });
- binding.stateText.setVisibility(View.VISIBLE);
- binding.inspectButton.setText("缁�");
- //寮�鍚畾浣�
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- this.getActivity().startForegroundService(location);
- } else {
- this.getActivity().startService(location);
- }
- } else {
- binding.stateText.setVisibility(View.GONE);
- binding.inspectButton.setText("宸�");
- //鍏抽棴瀹氫綅
- this.getActivity().stopService(location);
-
- }
}
@@ -146,7 +130,7 @@
initLocalData();
getMarkerData();
//鏄剧ず宸℃鐘舵��
- chageInspecState();
+ chageInspecState(mInspectionState);
return binding.getRoot();
}
@@ -200,7 +184,7 @@
* 鑾峰彇鍙栨按鍙ｅ垪琛�
*/
private void getMarkerData() {
- ApiManager.getInstance().requestGetHideLoading(this.getContext(), Constants.BASE_URL + ":8085/project/intake/all", MarkerResult.class, null, new SubscriberListener<BaseResponse<MarkerResult>>() {
+ ApiManager.getInstance().requestGetHideLoading(this.getContext(), Constants.BASE_URL + "/project/intake/all", MarkerResult.class, null, new SubscriberListener<BaseResponse<MarkerResult>>() {
@Override
public void onNext(BaseResponse<MarkerResult> t) {
if (t.isSuccess()) {
@@ -284,11 +268,7 @@
void initView() {
- //璺宠浆鍒版寚瀹氫綅缃�
- binding.flyBtn.setOnClickListener(v -> {
- mWebView.evaluateJavascript("javascript:locationOverLay(116.399565,39.89432)", value -> {
- });
- });
+
mWebView.setWebViewClient(new WebViewClient() {
@Override
public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
@@ -346,19 +326,19 @@
});
//宸℃鎸夐挳
binding.inspectButton.setOnClickListener(v -> {
- if (isStartInspec){
- ConfirmDialog confirmDialog=new ConfirmDialog(MapFragment.this.getActivity(), "鎻愮ず", "纭鍏抽棴宸℃鍚楋紵", new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- isStartInspec = !isStartInspec;
- chageInspecState();
- }
- });
- }else {
- isStartInspec = !isStartInspec;
- chageInspecState();
+ chageInspecState(InspectionUtils.STAT_INSPECTION);
+ });
+ //鏆傚仠宸℃
+ binding.inspectPause.setOnClickListener(v -> {
+ if (mInspectionState == InspectionUtils.STAT_INSPECTION) {
+ chageInspecState(InspectionUtils.PAUSE_INSPECTION);
+ } else {
+ chageInspecState(InspectionUtils.STAT_INSPECTION);
}
-
+ });
+ //鍋滄宸℃
+ binding.inspectClose.setOnClickListener(v -> {
+ chageInspecState(InspectionUtils.STOP_INSPECTION);
});
}
@@ -374,7 +354,7 @@
*/
private void getCenterPoint() {
- ApiManager.getInstance().requestGet(this.getContext(), Constants.BASE_URL + ":8080/base/dict_item/map_center", CenterPointResult.class, null, new SubscriberListener<BaseResponse<CenterPointResult>>() {
+ ApiManager.getInstance().requestGet(this.getContext(), Constants.BASE_URL + "/base/dict_item/map_center", CenterPointResult.class, null, new SubscriberListener<BaseResponse<CenterPointResult>>() {
@Override
public void onNext(BaseResponse<CenterPointResult> t) {
if (t.isSuccess()) {
@@ -398,5 +378,155 @@
binding.bottomLL.setVisibility(View.GONE);
}
+ /**
+ * 涓婃姤宸℃璁板綍
+ */
+ private void pushLocationData(InspectionLocationBean inspectionLocationBean) {
+ inspectionRequest.setInspectId(inspectionLocationBean.getInspectId());
+ inspectionRequest.setInspectorId(inspectionLocationBean.getInspectorId());
+ if (mInspectionBean != null) {
+ inspectionRequest.setStartTime(mInspectionBean.getStartTime());
+ inspectionRequest.setStopTime(mInspectionBean.getStopTime());
+ }
+ InspectionRequest.Track track = new InspectionRequest.Track();
+ track.setLat(inspectionLocationBean.getLat());
+ track.setLng(inspectionLocationBean.getLng());
+ track.setLocateTime(inspectionLocationBean.getLocateTime());
+ inspectionRequest.getTracks().clear();
+ inspectionRequest.addTracks(track);
+ ApiManager.getInstance().requestPostHideLoading(MapFragment.this.getContext(), BASE_URL + "/app/inspect/save", LoginResult.class, inspectionRequest.toMap(inspectionRequest), new SubscriberListener<BaseResponse<LoginResult>>() {
+ @Override
+ public void onNext(BaseResponse<LoginResult> t) {
+ try {
+ if (t.isSuccess()) {
+ inspectionLocationBean.setPost(true);
+ updateInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
+ } else {
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ CrashReport.postCatchedException(e);
+ }
+
+ }
+ });
+ }
+
+ /**
+ * 寮�濮嬪贰妫�
+ */
+ private void startInspection() {
+ DaoSingleton.getAsynchInstance(this.getContext()).inspectionDao().getMostRecentInspectionWithNoStopTime()
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread()).subscribe(inspectionBean -> {
+ // 鏇存柊 UI
+ mInspectionBean = inspectionBean;
+ });
+ }
+
+
+ /**
+ * 瀹氫綅鐩戝惉
+ */
+ private Observer<Object> locationObserver = new Observer<Object>() {
+ @Override
+ public void onChanged(Object o) {
+ if (mInspectionBean != null) {
+ LatLonBean latLonBean = (LatLonBean) o;
+ if (InspectionUtils.isThanMinMeters(lastLatLonBean, latLonBean)) {
+ //澶т簬鏈�灏忚窛绂�
+ lastLatLonBean = latLonBean;
+ Log.i("chageInspecState", "lat:" + latLonBean.getLatitude() + ",log:" + latLonBean.getLongitude());
+ InspectionLocationBean inspectionLocationBean = createInspectionLocation(latLonBean);
+ addInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
+ //鏇存柊鍒板湴鍥�
+ mWebView.evaluateJavascript("javascript:updateLocation(\"" + latLonBean.getLongitude() + "\",\"" + latLonBean.getLatitude() + "\")", value -> {
+ });
+ //涓婁紶鍧愭爣
+ pushLocationData(inspectionLocationBean);
+ } else {
+ Log.d(TAG, "isThanMinMeters>>>false");
+ }
+
+
+ }
+ }
+ };
+
+
+ /**
+ * 鍒涘缓InspectionLocationBean
+ */
+ private InspectionLocationBean createInspectionLocation(LatLonBean latLonBean) {
+ InspectionLocationBean inspectionLocationBean = new InspectionLocationBean();
+ inspectionLocationBean.setInspectId(mInspectionBean.getInspectId());
+ inspectionLocationBean.setLocateTime(DateUtils.getNowDateStr());
+ inspectionLocationBean.setPost(false);
+ inspectionLocationBean.setInspectorId(MyApplication.myApplication.userId);
+ inspectionLocationBean.setLng(String.valueOf(latLonBean.getLongitude()));
+ inspectionLocationBean.setLat(String.valueOf(latLonBean.getLatitude()));
+ return inspectionLocationBean;
+ }
+
+
+ /**
+ * 淇敼宸℃鐘舵��
+ */
+ private void chageInspecState(int inspectionState) {
+ Intent location = new Intent(this.getActivity(), MyLocationService.class);
+ location.putExtra("isSingle", false);
+ //0娌℃湁寮�濮嬶紝1寮�濮嬶紝2鏆傚仠,3鍏抽棴
+ switch (inspectionState) {
+ case 0:
+ binding.inspectButton.setVisibility(View.VISIBLE);
+ binding.inspectRL.setVisibility(View.GONE);
+ binding.inspectButton.setText("宸�");
+ LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver);
+ //鍏抽棴瀹氫綅
+ this.getActivity().stopService(location);
+ break;
+ case 1:
+ //娣诲姞鏂扮殑宸℃璁板綍
+ startInspection();
+ //鑾峰彇瀹氫綅鏈嶅姟浼犺繃鏉ョ殑鍧愭爣鐐�
+ LiveEventBus.get(CommonKeyName.locationData).observeForever(locationObserver);
+ binding.inspectRL.setVisibility(View.VISIBLE);
+ binding.inspectButton.setVisibility(View.GONE);
+ binding.inspectPause.setText("鏆傚仠");
+ binding.stateText.setText("宸插紑鍚贰妫�");
+ binding.inspectRL.setBackgroundColor(this.getContext().getResources().getColor(R.color.base_blue));
+ //寮�鍚畾浣�
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ this.getActivity().startForegroundService(location);
+ } else {
+ this.getActivity().startService(location);
+ }
+ mInspectionBean = InspectionUtils.startInspection(this.getContext());
+ inspectionRequest = new InspectionRequest();
+ break;
+ case 2://鏆傚仠
+
+ LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver);
+ //鍏抽棴瀹氫綅
+ this.getActivity().stopService(location);
+ binding.stateText.setText("宸叉殏鍋滃贰妫�");
+ binding.inspectPause.setText("缁х画");
+ binding.inspectRL.setBackgroundColor(this.getContext().getResources().getColor(R.color.inspect_rl_bg_color));
+ break;
+ case 3:
+ ConfirmDialog confirmDialog = new ConfirmDialog(MapFragment.this.getActivity(), "鎻愮ず", "纭鍏抽棴宸℃鍚楋紵", new ConfirmDialog.ConfirmOnClickListener() {
+ @Override
+ public void onClick(ConfirmDialog confirmDialog, View v) {
+ confirmDialog.dismiss();
+ chageInspecState(InspectionUtils.NO_INSPECTION);
+ }
+ });
+ confirmDialog.show();
+ break;
+ default:
+ }
+ mInspectionState = inspectionState;
+
+ }
}
--
Gitblit v1.8.0