From 71ac5ea208fb15da401b980fe788d03ed0f086b1 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 04 十二月 2024 09:56:14 +0800
Subject: [PATCH] 1.添加退出登录时判断是否开启巡检，开启巡检不可退出登录。 2.添加异常退出后恢复巡检记录的功能。 3.添加统一的提示Dialog
---
app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 215 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 141 insertions(+), 74 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 1ce4b82..b4d3094 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
@@ -1,15 +1,13 @@
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.content.res.Resources;
import android.location.LocationManager;
import android.os.Build;
import android.os.Bundle;
-import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -25,15 +23,15 @@
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.InsectionResult;
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;
@@ -47,7 +45,6 @@
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;
@@ -61,9 +58,7 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Random;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
@@ -85,13 +80,16 @@
WebView mWebView;
CenterPointBean centerPointBean;
String strMarkerJson;
- //鏄惁鏄剧ず
- boolean isStartInspec = false;
+ //褰撳墠宸℃鐘舵��
+ int mInspectionState;
MapFragmenObserver mapFragmenObserver;
//褰撳墠宸℃璁板綍鐨勭浉鍏充俊鎭�
- InspectionBean mInspectionBean;
+ public InspectionBean mInspectionBean;
LatLonBean lastLatLonBean;
InspectionRequest inspectionRequest;
+ volatile boolean isHaseAginData = false;
+ volatile boolean webViewIsFinished = false;
+ List<InspectionLocationBean> aginShowlocationBeans;
@Override
public void onAttach(@NonNull Context context) {
@@ -105,7 +103,7 @@
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
@@ -131,8 +129,13 @@
initView();
initLocalData();
getMarkerData();
- //鏄剧ず宸℃鐘舵��
- chageInspecState();
+ //鏄剧ず宸℃鐘舵�佸苟涓旀樉绀哄洜鎰忓鍏抽棴鐨勫巻鍙叉暟鎹�
+ switch (mInspectionState) {
+ case InspectionUtils.STAT_INSPECTION:
+ case InspectionUtils.PAUSE_INSPECTION:
+ InspectionUtils.aginShowLocation(MapFragment.this);
+ }
+ chageInspecState(mInspectionState);
return binding.getRoot();
}
@@ -325,22 +328,32 @@
Log.e("setWebViewClient", "statusCode:" + statusCode + ">>>>description:" + description);
// 鏍规嵁HTTP鐘舵�佺爜澶勭悊閿欒
}
+
+ @Override
+ public void onPageFinished(WebView view, String url) {
+ super.onPageFinished(view, url);
+ webViewIsFinished = true;
+ //椤甸潰鍔犺浇瀹屾垚
+ if (isHaseAginData) {
+ aginShowLocation(null);
+ }
+ }
});
//宸℃鎸夐挳
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();
- }
- });
+ chageInspecState(InspectionUtils.STAT_INSPECTION_ONCLICK);
+ });
+ //鏆傚仠宸℃
+ binding.inspectPause.setOnClickListener(v -> {
+ if (mInspectionState == InspectionUtils.STAT_INSPECTION) {
+ chageInspecState(InspectionUtils.PAUSE_INSPECTION);
} else {
- isStartInspec = !isStartInspec;
- chageInspecState();
+ chageInspecState(InspectionUtils.STAT_INSPECTION);
}
-
+ });
+ //鍋滄宸℃
+ binding.inspectClose.setOnClickListener(v -> {
+ chageInspecState(InspectionUtils.STOP_INSPECTION);
});
}
@@ -396,13 +409,16 @@
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>>() {
+ ApiManager.getInstance().requestPostHideLoading(MapFragment.this.getContext(), BASE_URL + "/app/inspect/save", InsectionResult.class, inspectionRequest.toMap(inspectionRequest), new SubscriberListener<BaseResponse<List<InsectionResult>>>() {
@Override
- public void onNext(BaseResponse<LoginResult> t) {
+ public void onNext(BaseResponse<List<InsectionResult>> t) {
try {
if (t.isSuccess()) {
+ if (t.getContent() != null) {
+
+ }
inspectionLocationBean.setPost(true);
- updateInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
+ InspectionUtils.updateInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
} else {
}
@@ -419,12 +435,7 @@
* 寮�濮嬪贰妫�
*/
private void startInspection() {
- DaoSingleton.getAsynchInstance(this.getContext()).inspectionDao().getMostRecentInspectionWithNoStopTime()
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread()).subscribe(inspectionBean -> {
- // 鏇存柊 UI
- mInspectionBean = inspectionBean;
- });
+
}
@@ -440,8 +451,8 @@
//澶т簬鏈�灏忚窛绂�
lastLatLonBean = latLonBean;
Log.i("chageInspecState", "lat:" + latLonBean.getLatitude() + ",log:" + latLonBean.getLongitude());
- InspectionLocationBean inspectionLocationBean = createInspectionLocation(latLonBean);
- addInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
+ InspectionLocationBean inspectionLocationBean = InspectionUtils.createInspectionLocation(latLonBean, mInspectionBean);
+ InspectionUtils.addInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
//鏇存柊鍒板湴鍥�
mWebView.evaluateJavascript("javascript:updateLocation(\"" + latLonBean.getLongitude() + "\",\"" + latLonBean.getLatitude() + "\")", value -> {
});
@@ -450,55 +461,111 @@
} 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;
- }
-
-
- /**
* 淇敼宸℃鐘舵��
+ *
+ * @param inspectionState
*/
- private void chageInspecState() {
+ private void chageInspecState(int inspectionState) {
Intent location = new Intent(this.getActivity(), MyLocationService.class);
location.putExtra("isSingle", false);
- if (isStartInspec) {
- //娣诲姞鏂扮殑宸℃璁板綍
- startInspection();
- //鑾峰彇瀹氫綅鏈嶅姟浼犺繃鏉ョ殑鍧愭爣鐐�
- LiveEventBus.get(CommonKeyName.locationData).observeForever(locationObserver);
- 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);
+ //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 InspectionUtils.STAT_INSPECTION_ONCLICK:
+ //娣诲姞鏂扮殑宸℃璁板綍
+ mInspectionBean = InspectionUtils.startInspection(this.getContext());
+ startLocation(location);
+ break;
+ case InspectionUtils.STAT_INSPECTION://1寮�濮�
+
+ startLocation(location);
+ break;
+ case 2://鏆傚仠
+ try {
+ //鍏抽棴瀹氫綅
+ this.getActivity().stopService(location);
+ binding.stateText.setText("宸叉殏鍋滃贰妫�");
+ binding.inspectPause.setText("缁х画");
+ binding.inspectRL.setBackgroundColor(this.getContext().getResources().getColor(R.color.inspect_rl_bg_color));
+ SharedPreferencesHelper.getInstance(this.getContext()).put(CommonKeyName.inspectionState, InspectionUtils.PAUSE_INSPECTION);
+ } catch (Resources.NotFoundException e) {
+ e.printStackTrace();
+ }
+ 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);
+ SharedPreferencesHelper.getInstance(MapFragment.this.getContext()).put(CommonKeyName.inspectionState, InspectionUtils.NO_INSPECTION);
+ }
+ });
+ confirmDialog.show();
+ break;
+ default:
+ }
+ mInspectionState = inspectionState;
+ }
+
+ /**
+ * 鎰忓閫�鍑哄悗缁х画鏄剧ず涔嬪墠鐨勫潗鏍�
+ */
+ public void aginShowLocation(List<InspectionLocationBean> locationBeans) {
+ isHaseAginData = true;
+ if (locationBeans != null) {
+ aginShowlocationBeans = locationBeans;
+ }
+ if (webViewIsFinished) {
+ if (aginShowlocationBeans != null) {
+ for (InspectionLocationBean inspectionLocationBean : aginShowlocationBeans) {
+ Log.i("mWebView", "aginShowLocation" + inspectionLocationBean.getLng() + "\",\"" + inspectionLocationBean.getLat());
+ mWebView.evaluateJavascript("javascript:aginShowLocation(\"" + inspectionLocationBean.getLng() + "\",\"" + inspectionLocationBean.getLat() + "\")", value -> {
+ });
+ }
+ // 鍚� WebView 娉ㄥ叆鏁版嵁
+
+ aginShowlocationBeans.clear();
+
}
- mInspectionBean = InspectionUtils.startInspection(this.getContext());
- inspectionRequest = new InspectionRequest();
- } else {
- binding.stateText.setVisibility(View.GONE);
- binding.inspectButton.setText("宸�");
- LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver);
- //鍏抽棴瀹氫綅
- this.getActivity().stopService(location);
+
}
}
+
+ /**
+ * 寮�濮嬪贰妫�鐨勭浉鍏抽�昏緫
+ *
+ * @param location
+ */
+ private void startLocation(Intent location) {
+ //鑾峰彇瀹氫綅鏈嶅姟浼犺繃鏉ョ殑鍧愭爣鐐�
+ 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);
+ }
+ inspectionRequest = new InspectionRequest();
+ SharedPreferencesHelper.getInstance(this.getContext()).put(CommonKeyName.inspectionState, InspectionUtils.STAT_INSPECTION);
+ }
+
}
--
Gitblit v1.8.0