From 21e38bfe17d3077d7ab0e05ee065f59547536692 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 03 十二月 2024 10:33:19 +0800
Subject: [PATCH] 1.添加当前巡检状态的功能。 2.修复工单界面刷新已完成列表导致未完成列表数据被清除的bug
---
app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 421 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 380 insertions(+), 41 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 d2bff28..73b3946 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
@@ -1,8 +1,14 @@
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.util.Log;
import android.view.LayoutInflater;
@@ -17,19 +23,50 @@
import androidx.annotation.NonNull;
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;
import com.dayu.pipirrapp.js.MyWebViewInterface;
+import com.dayu.pipirrapp.net.ApiManager;
+import com.dayu.pipirrapp.net.BaseResponse;
+import com.dayu.pipirrapp.net.Constants;
+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;
+import com.dayu.pipirrapp.utils.ToastUtil;
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;
import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Random;
+
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
/**
* author: zuo
@@ -38,42 +75,161 @@
* 澶囨敞锛氬湴鍥鹃〉
*/
public class MapFragment extends BaseFragment {
+ static String TAG = "MapFragment";
FragmentMapBinding binding;
+ //瀹氫綅鐩稿叧
LocationManager locationManager;
WebView mWebView;
+ CenterPointBean centerPointBean;
+ String strMarkerJson;
+ //褰撳墠宸℃鐘舵��
+ int mInspectionState;
+ MapFragmenObserver mapFragmenObserver;
+ //褰撳墠宸℃璁板綍鐨勭浉鍏充俊鎭�
+ InspectionBean mInspectionBean;
+ LatLonBean lastLatLonBean;
+ InspectionRequest inspectionRequest;
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
- requireActivity().getLifecycle().addObserver(new MapFragmenObserver());
+ Log.i(TAG, "onAttach");
+ mapFragmenObserver = new MapFragmenObserver();
+ requireActivity().getLifecycle().addObserver(mapFragmenObserver);
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ Log.i(TAG, "onCreate");
+ mInspectionState = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.inspectionState, 0);
}
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ Log.i(TAG, "onStart");
+ }
+
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
binding = FragmentMapBinding.inflate(inflater, container, false);
+ mapFragmenObserver.setmWebView(binding.webView);
Log.i("MapFragment", "onCreateView");
mWebView = binding.webView;
mWebView = WebViewUtils.initWebView(mWebView);
MyWebViewInterface myWebViewInterface = new MyWebViewInterface(MapFragment.this);
mWebView.addJavascriptInterface(myWebViewInterface, "Android");
mWebView.loadUrl("file:///android_asset/index.html");
-
+ getCenterPoint();
initView();
- //寮�鍚畾浣�
- Intent location = new Intent(this.getActivity(), MyLocationService.class);
- location.putExtra("isSingle", false);
- this.getActivity().startService(location);
+ initLocalData();
+ getMarkerData();
+ //鏄剧ず宸℃鐘舵��
+ chageInspecState(mInspectionState);
return binding.getRoot();
}
+
+
+ /**
+ * 鍒濆鍖栧悇涓姸鎬�
+ */
+ private void initState() {
+ //寮�鍚畾浣�
+
+ }
+
+ /**
+ * 鍒濆鍖栨湰鍦版暟鎹�
+ */
+ public void initLocalData() {
+ centerPointBean = DaoSingleton.getInstance(MapFragment.this.getContext()).centerPointDao().findFirst();
+ List<MarkerBean> markerBeans = DaoSingleton.getInstance(MapFragment.this.getContext()).markerDao().findAll();
+ strMarkerJson = WebViewUtils.beanToJson(markerBeans);
+ jumpCenterPoint();
+ setMapMarker();
+ }
+
+
+ /**
+ * 璺宠浆鍦板浘涓績鐐�
+ */
+ public void jumpCenterPoint() {
+ if (centerPointBean != null) {
+ Log.d(TAG, "jumpCenterPoint>>>>>>>>>>>>>>>>>>>" + centerPointBean.getLng() + "\",\"" + centerPointBean.getLat());
+ mWebView.evaluateJavascript("javascript:setCenterAndZoom(\"" + centerPointBean.getLng() + "\",\"" + centerPointBean.getLat() + "\",\"" + centerPointBean.getZoomMp() + "\")", value -> {
+ });
+ }
+ }
+
+ /**
+ * 娣诲姞鏍囨敞鐐�
+ */
+ public void setMapMarker() {
+ Log.i("mWebView", "addMarker????????????" + strMarkerJson);
+ mWebView.evaluateJavascript("javascript:addMarker(\"" + strMarkerJson + "\")", new ValueCallback<String>() {
+ @Override
+ public void onReceiveValue(String value) {
+ Log.i("mWebView", "addMarker锛侊紒锛侊紒锛侊紒锛侊紒锛�" + value);
+ }
+ });
+ }
+
+
+ /**
+ * 鑾峰彇鍙栨按鍙ｅ垪琛�
+ */
+ private void getMarkerData() {
+ 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()) {
+ if (t.isSuccess()) {
+ if (t.getContent().getObj() != null && !t.getContent().getObj().isEmpty()) {
+ List<MarkerBean> markerBeans = new ArrayList<>();
+ for (int i = 0; i < t.getContent().getObj().size(); i++) {
+ MarkerResult.Obj result = t.getContent().getObj().get(i);
+ //淇濆瓨鏁版嵁
+ MarkerBean markerBean = new MarkerBean();
+ markerBean.setLng(result.getLng());
+ markerBean.setLat(result.getLat());
+ markerBean.setBlockId(result.getBlockId());
+ markerBean.setName(result.getName());
+ markerBean.setRemarks(result.getRemarks());
+ markerBean.setTownId(result.getTownId());
+ markerBean.setVillageId(result.getVillageId());
+ markerBean.setCountyId(result.getCountyId());
+ markerBeans.add(markerBean);
+ }
+ strMarkerJson = WebViewUtils.beanToJson(markerBeans);
+ setMapMarker();
+ DaoSingleton.getInstance(MapFragment.this.getContext()).markerDao().deleteAll();
+ // 浣跨敤 RxJava 寮傛鎻掑叆鏁版嵁
+ DaoSingleton.getAsynchInstance(MapFragment.this.getContext()).markerDao().insertAll(markerBeans)
+ .subscribeOn(Schedulers.io()) // 鍦� IO 绾跨▼涓婃墽琛�
+ .observeOn(AndroidSchedulers.mainThread()) // 鍦ㄤ富绾跨▼涓婅瀵�
+ .subscribe(() -> {
+ // 鎻掑叆鎴愬姛
+ Log.i("mWebView", "鏁版嵁鎻掑叆鎴愬姛");
+ }, throwable -> {
+ // 鎻掑叆澶辫触
+ Log.e("mWebView", "鏁版嵁鎻掑叆澶辫触: " + throwable.getMessage());
+ });
+ }
+ }
+ } else {
+ ToastUtil.showToast(MapFragment.this.getContext(), t.getMsg());
+ }
+ }
+
+ });
+ }
+
/**
* 娣诲姞鏍囨敞鐐�
@@ -102,7 +258,6 @@
}
stringBuilder.append("[116.417854,39.921988,\"235鍙栨按鍙"]]");
String jsonData = stringBuilder.toString().replace("\\", "\\\\").replace("\"", "\\\"");
-// String jsonData = "[[116.417854,39.921988,\"235鍙栨按鍙"],[116.406605,39.921585,\"237鍙栨按鍙"],[116.412222,39.912345,\"236鍙栨按鍙"]]";
Log.i("mWebView", "addMarker????????????" + jsonData);
mWebView.evaluateJavascript("javascript:addMarker(\"" + jsonData + "\")", new ValueCallback<String>() {
@Override
@@ -113,52 +268,37 @@
}
- @Override
- public void onResume() {
- super.onResume();
- mWebView.onResume(); // 鎭㈠ WebView锛岃兘姝ｅ父鎵ц缃戦〉鐨勫搷搴�
-
- }
-
- @Override
- public void onPause() {
- super.onPause();
- //
- mWebView.onPause(); // 閫氳繃 onPause 鍔ㄤ綔閫氱煡鍐呮牳鏆傚仠鎵�鏈夌殑鍔ㄤ綔锛屽 DOM 鐨勮В鏋愩�乸lugin 鐨勬墽琛屻�丣avaScript 鎵ц绛�
-
- }
-
- @Override
- public void onDestroy() {
- super.onDestroy();
- ((ViewGroup) mWebView.getParent()).removeView(mWebView);
- mWebView.destroy(); // 褰� Activity 瑕� destroy 鏃讹紝搴斿厛灏� WebView 绉婚櫎锛屽啀 destroy 鎺�
- }
-
-
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) {
+ public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
String url = request.getUrl().toString();
- // 妫�鏌ユ湰鍦扮紦瀛�
- File cachedTile = MapJpgUtils.getInsatance(MapFragment.this.getContext()).getCachedTile(url);
- if (cachedTile != null && cachedTile.exists()) {
- // 鍒ゆ柇缂撳瓨鏄惁杩囨湡
- if (!MapJpgUtils.getInsatance(MapFragment.this.getContext()).isCacheExpired(cachedTile)) {
+ Log.i(TAG, "鍔犺浇鍦板潃>>>" + url);
+ //鍒ゆ柇褰撳墠鏄惁涓哄姞杞界摝鐗�
+ if (MapJpgUtils.getInsatance().isTianDiTuTileRequest(url)) {
+ String androidUrl = url.replace(CommonData.webKey, CommonData.androidKey);
+ // 妫�鏌ユ湰鍦扮紦瀛�
+ File cachedTile = MapJpgUtils.getInsatance().getCachedTile(androidUrl);
+ if (cachedTile != null && cachedTile.exists()) {
+ Log.i(TAG, "鏈湴缂撳瓨>>>" + androidUrl);
+// if (MapJpgUtils.getInsatance().validateImageFile(androidUrl,request.))
+ // 鍒ゆ柇缂撳瓨鏄惁杩囨湡
+// if (!MapJpgUtils.getInsatance(MapFragment.this.getContext()).isCacheExpired(cachedTile)) {
try {
// 浠庣紦瀛樺姞杞界摝鐗�
return new WebResourceResponse("image/jpg", "utf-8", new FileInputStream(cachedTile));
} catch (FileNotFoundException e) {
e.printStackTrace();
}
+// }
+ } else {
+ //涓嬭浇鐡︾墖
+ ApiManager.getInstance().donwLoadTile(androidUrl);
}
+ Log.i(TAG, "鍦ㄧ嚎鍔犺浇>>>" + url);
}
+
return super.shouldInterceptRequest(view, request);
}
@@ -185,6 +325,22 @@
// 鏍规嵁HTTP鐘舵�佺爜澶勭悊閿欒
}
});
+ //宸℃鎸夐挳
+ binding.inspectButton.setOnClickListener(v -> {
+ 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);
+ });
}
@@ -194,8 +350,191 @@
}
+ /**
+ * 鑾峰彇鍦板浘涓績鐐�
+ */
+ private void getCenterPoint() {
+
+ 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()) {
+ if (centerPointBean == null) {
+ centerPointBean = new CenterPointBean();
+ }
+ centerPointBean.setLat(t.getContent().getLat());
+ centerPointBean.setLng(t.getContent().getLng());
+ centerPointBean.setZoomMp(t.getContent().getZoomMp());
+ DaoSingleton.getInstance(MapFragment.this.getContext()).centerPointDao().insert(centerPointBean);
+ jumpCenterPoint();
+ } else {
+ ToastUtil.showToast(MapFragment.this.getContext(), t.getMsg());
+ }
+ }
+
+ });
+ }
+
public void closeWaterIntakeDetail() {
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 InspectionUtils.STAT_INSPECTION://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();
+ SharedPreferencesHelper.getInstance(this.getContext()).put(CommonKeyName.inspectionState, InspectionUtils.STAT_INSPECTION);
+ break;
+ case 2://鏆傚仠
+
+ try {
+ 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));
+ 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;
+
+ }
}
--
Gitblit v1.8.0