From ec6193939600ca7930193b1d5942b1700baf9e06 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 21 二月 2025 09:20:15 +0800
Subject: [PATCH] 1.巡检记录列表页的实现 2.巡检记录地图展示路径的详情页。 3.处理巡检记录详情页因打开同一个网址导致的webView不显示问题。 4.实现地图页搜索后的地图跳转功能。 5.巡检记录详情页数据加载的优化，默认加载本地数据，当本地没有数据时从服务端获取数据。
---
app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 854 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 781 insertions(+), 73 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 61e1fa0..82ab38e 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
@@ -20,23 +20,31 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
import androidx.lifecycle.Observer;
+import com.dayu.pipirrapp.MyApplication;
import com.dayu.pipirrapp.R;
import com.dayu.pipirrapp.activity.AddIssueActivity;
import com.dayu.pipirrapp.bean.db.CenterPointBean;
+import com.dayu.pipirrapp.bean.db.DivideBean;
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.db.PipeNetWorkDataBean;
+import com.dayu.pipirrapp.bean.db.PipeNetworkBean;
+import com.dayu.pipirrapp.bean.db.PipeNetworkDataCoordinateBean;
import com.dayu.pipirrapp.bean.net.CenterPointResult;
+import com.dayu.pipirrapp.bean.net.DivideListResult;
+import com.dayu.pipirrapp.bean.net.DivideResult;
import com.dayu.pipirrapp.bean.net.InsectionResult;
import com.dayu.pipirrapp.bean.net.InspectionRequest;
import com.dayu.pipirrapp.bean.net.MarkerListResult;
import com.dayu.pipirrapp.bean.net.MarkerResult;
+import com.dayu.pipirrapp.bean.net.PipeNetworkResult;
import com.dayu.pipirrapp.dao.DaoSingleton;
import com.dayu.pipirrapp.databinding.FragmentMapBinding;
-import com.dayu.pipirrapp.tool.MyWebViewInterface;
import com.dayu.pipirrapp.net.ApiManager;
import com.dayu.pipirrapp.net.BaseResponse;
import com.dayu.pipirrapp.net.Constants;
@@ -44,6 +52,7 @@
import com.dayu.pipirrapp.observer.MapFragmenObserver;
import com.dayu.pipirrapp.tool.InspectionUtils;
import com.dayu.pipirrapp.tool.MarkerUtils;
+import com.dayu.pipirrapp.tool.MyWebViewInterface;
import com.dayu.pipirrapp.utils.CommonData;
import com.dayu.pipirrapp.utils.CommonKeyName;
import com.dayu.pipirrapp.utils.DateUtils;
@@ -54,7 +63,9 @@
import com.dayu.pipirrapp.utils.ToastUtil;
import com.dayu.pipirrapp.utils.WebViewUtils;
import com.dayu.pipirrapp.view.ConfirmDialog;
+import com.dayu.pipirrapp.view.SearchResultDialog;
import com.dayu.pipirrapp.view.TipUtil;
+import com.example.expand_button.ExpandButton;
import com.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.Permission;
import com.hjq.permissions.XXPermissions;
@@ -68,8 +79,10 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
import io.reactivex.rxjava3.schedulers.Schedulers;
/**
@@ -90,16 +103,30 @@
MapFragmenObserver mapFragmenObserver;
//褰撳墠宸℃璁板綍鐨勭浉鍏充俊鎭�
public InspectionBean mInspectionBean;
+ //鏈�鍚庝竴娆″畾浣嶇殑鍧愭爣
LatLonBean lastLatLonBean;
- InspectionRequest inspectionRequest;
- // volatile boolean isHaseAginData = false;
//web鏄惁鍔犺浇瀹屾垚
volatile boolean webViewIsFinished = false;
List<InspectionLocationBean> aginShowlocationBeans;
//web鍔犺浇鏃剁綉椤佃繕娌″姞杞藉畬鏃剁殑鏁版嵁
List<MarkerBean> webNoFinishMarkerData = new ArrayList<>();
+ List<DivideBean> webNoFinishDivideData = new ArrayList<>();
+ List<PipeNetworkBean> webNoFinishPipeNetworkData = new ArrayList<>();
//鎵�鏈夌殑Marker鏁版嵁閿负marker鐨処d
Map<String, MarkerBean> markerBeanSet = new HashMap<>();
+ //鎵�鏈夊垎姘存埧
+ Map<String, DivideBean> divideBeanMap = new HashMap<>();
+ //涓績鐐瑰潗鏍�
+ public double centerLng;
+ public double centerLat;
+
+ MarkerBean mMarkerBean;
+
+ //鏄惁鏄剧ずMarker
+ boolean isShowMarker, isShowPipeNetwork, isShowDivide;
+
+ // 娣诲姞CompositeDisposable鏉ョ鐞嗘墍鏈夎闃�
+ private CompositeDisposable compositeDisposable = new CompositeDisposable();
@Override
public void onAttach(@NonNull Context context) {
@@ -112,8 +139,17 @@
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ setRetainInstance(true);
Log.i(TAG, "onCreate");
mInspectionState = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.inspectionState, 0);
+
+ // 娣诲姞鍒锋柊鏁版嵁鐨勭洃鍚�
+ LiveEventBus.get(CommonKeyName.refreshData).observe(this, o -> {
+ getCenterPoint();
+ getMarkerData();
+ getDivideList();
+ getPipeNetworkList();
+ });
}
@Override
@@ -126,7 +162,6 @@
@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");
@@ -135,13 +170,112 @@
MyWebViewInterface myWebViewInterface = new MyWebViewInterface(MapFragment.this);
mWebView.addJavascriptInterface(myWebViewInterface, "Android");
mWebView.loadUrl("file:///android_asset/index.html");
- getCenterPoint();
+
+ // 寮傛鍔犺浇鏈湴鏁版嵁
+ loadLocalData();
+
initView();
initWeb();
- getMarkerData();
chageInspecState(mInspectionState);
return binding.getRoot();
+ }
+
+ /**
+ * 寮傛鍔犺浇鏈湴鏁版嵁
+ */
+ private void loadLocalData() {
+
+
+ // 寮傛鍔犺浇涓績鐐规暟鎹�
+ compositeDisposable.add(
+ DaoSingleton.getAsynchInstance(this.getContext()).centerPointDao().findFirst()
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(result -> {
+ centerPointBean = result;
+ if (centerPointBean == null) {
+ getCenterPoint();
+ } else {
+ jumpCenterPoint();
+ }
+ }, throwable -> {
+ Log.e(TAG, "Load centerPoint error: " + throwable);
+ getCenterPoint();
+ }, () -> {
+ // 褰揗aybe涓虹┖鏃惰皟鐢�
+ getCenterPoint();
+ })
+ );
+ isShowMarker = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.markerKeyIsShow, true);
+ // 寮傛鍔犺浇鍙栨按鍙ｆ暟鎹�
+ compositeDisposable.add(
+ DaoSingleton.getAsynchInstance(this.getContext()).markerDao().getAll()
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(markers -> {
+ if (markers == null || markers.isEmpty()) {
+ getMarkerData();
+ } else {
+ for (MarkerBean marker : markers) {
+ markerBeanSet.put(marker.getId(), marker);
+ setMapMarker(marker);
+ }
+ }
+ }, throwable -> {
+ Log.e(TAG, "Load markers error: " + throwable.getMessage());
+ getMarkerData();
+ }, () -> {
+ // 褰揗aybe涓虹┖鏃惰皟鐢�
+ getMarkerData();
+ })
+ );
+ isShowDivide = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.divideIsShow, true);
+ // 寮傛鍔犺浇鍒嗘按鎴挎暟鎹�
+ compositeDisposable.add(
+ DaoSingleton.getAsynchInstance(this.getContext()).divideDao().getAll()
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(divides -> {
+ if (divides == null || divides.isEmpty()) {
+ getDivideList();
+ } else {
+ for (DivideBean divide : divides) {
+ divideBeanMap.put(divide.getId(), divide);
+ setMapDivide(divide);
+ }
+ }
+ }, throwable -> {
+ Log.e(TAG, "Load divides error: " + throwable.getMessage());
+ getDivideList();
+ }, () -> {
+ // 褰揗aybe涓虹┖鏃惰皟鐢�
+ getDivideList();
+ })
+ );
+
+ isShowPipeNetwork = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.pipeNetworkIsShow, true);
+ //寮傛鍔犺浇绠＄綉鏁版嵁
+ compositeDisposable.add(
+ DaoSingleton.getAsynchInstance(this.getContext()).pipeNetDao().getAll()
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(pipeNetworkBeans -> {
+ if (pipeNetworkBeans == null || pipeNetworkBeans.isEmpty()) {
+ getPipeNetworkList();
+ } else {
+ for (PipeNetworkBean pipeNetworkBean : pipeNetworkBeans) {
+ setMapPipe(pipeNetworkBean);
+ }
+ }
+ }, throwable -> {
+ Log.e(TAG, "Load PipeNetworkBean error: " + throwable.getMessage());
+ getPipeNetworkList();
+ }, () -> {
+ // 褰揗aybe涓虹┖鏃惰皟鐢�
+ getPipeNetworkList();
+ })
+ );
}
private void initWeb() {
@@ -203,7 +337,7 @@
super.onPageFinished(view, url);
//椤甸潰鍔犺浇瀹屾垚
webViewIsFinished = true;
- initLocalData();
+ webFinishInitLocalData();
aginShowLocation(null);
}
@@ -211,18 +345,30 @@
}
/**
- * 鍒濆鍖栨湰鍦版暟鎹�
+ * web鍔犺浇瀹屽垵濮嬪寲鏈湴鏁版嵁
*/
- public void initLocalData() {
- //璺宠浆涓績鐐�
- centerPointBean = DaoSingleton.getInstance(MapFragment.this.getContext()).centerPointDao().findFirst();
- jumpCenterPoint();
+ public void webFinishInitLocalData() {
+ // 鍙湪鏈湴娌℃湁鏁版嵁鏃惰幏鍙栦腑蹇冪偣
+ if (centerPointBean != null) {
+ jumpCenterPoint();
+ }
//娣诲姞鍥爓ebview娌℃湁鍔犺浇瀹屾垚瀵艰嚧娌℃湁娣诲姞鐨勫湴鍥炬爣娉�
if (!webNoFinishMarkerData.isEmpty()) {
for (MarkerBean bean : webNoFinishMarkerData) {
setMapMarker(bean);
}
}
+ if (!webNoFinishDivideData.isEmpty()) {
+ for (DivideBean bean : webNoFinishDivideData) {
+ setMapDivide(bean);
+ }
+ }
+ if (!webNoFinishPipeNetworkData.isEmpty()) {
+ for (PipeNetworkBean bean : webNoFinishPipeNetworkData) {
+ setMapPipe(bean);
+ }
+ }
+
//鏄剧ず鎵�鏈夊彇姘村彛
MarkerUtils.showLocoMarks(MapFragment.this);
//鏄剧ず宸℃鐘舵�佸苟涓旀樉绀哄洜鎰忓鍏抽棴鐨勫巻鍙叉暟鎹�
@@ -233,7 +379,6 @@
}
}
-
/**
* 鑾峰彇鍙栨按鍙ｅ垪琛�
*/
@@ -242,41 +387,45 @@
@Override
public void onNext(BaseResponse<MarkerListResult> 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 result = t.getContent().getObj().get(i);
- //淇濆瓨鏁版嵁
- MarkerBean markerBean = new MarkerBean();
- markerBean.setId(result.getId());
- 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());
- markerBean.setAddress(result.getAddress());
- markerBean.setBlockName(result.getBlockName());
- markerBeans.add(markerBean);
- setMapMarker(markerBean);
- }
- 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());
- });
- }
+ if (t.getContent().getObj() != null && !t.getContent().getObj().isEmpty()) {
+ List<MarkerBean> markerBeans = t.getContent().getObj().stream()
+ .map(result -> {
+ MarkerBean markerBean = new MarkerBean();
+ markerBean.setId(result.getId());
+ 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());
+ markerBean.setAddress(result.getAddress());
+ markerBean.setBlockName(result.getBlockName());
+ markerBean.setDivideId(result.getDivideId());
+ setMapMarker(markerBean);
+ return markerBean;
+ })
+ .collect(Collectors.toList());
+ DaoSingleton.getInstance(MapFragment.this.getContext()).markerDao().deleteAll();
+ // 浣跨敤 CompositeDisposable 绠＄悊鏁版嵁搴撴彃鍏ユ搷浣�
+ compositeDisposable.add(
+ DaoSingleton.getAsynchInstance(MapFragment.this.getContext()).markerDao().insertAll(markerBeans)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(
+ () -> {
+ // 鎻掑叆鎴愬姛
+ Log.i("mWebView", "鏁版嵁鎻掑叆鎴愬姛");
+ },
+ throwable -> {
+ // 鎻掑叆澶辫触
+ Log.e("mWebView", "鏁版嵁鎻掑叆澶辫触: " + throwable.getMessage());
+ }
+ )
+ );
}
+
} else {
ToastUtil.showToast(MapFragment.this.getContext(), t.getMsg());
}
@@ -288,11 +437,14 @@
void initView() {
-
//宸℃鎸夐挳
binding.inspectButton.setOnClickListener(v -> {
if (XXPermissions.isGranted(MapFragment.this.getContext(), Permission.ACCESS_BACKGROUND_LOCATION)) {
- chageInspecState(InspectionUtils.STAT_INSPECTION_ONCLICK);
+ new ConfirmDialog(MapFragment.this.getActivity(), "纭寮�濮嬪贰妫�鍚楋紵",(confirmDialog, v1) -> {
+ chageInspecState(InspectionUtils.STAT_INSPECTION_ONCLICK);
+ confirmDialog.dismiss();
+ }).show();
+
} else {
TipUtil.show(MapFragment.this.getActivity(), "宸℃瀹氫綅闇�瑕佹偍閫夋嫨\"濮嬬粓鍏佽\"瀹氫綅淇℃伅锛屽惁鍒欐棤娉曞贰妫�銆�", new TipUtil.TipListener() {
@Override
@@ -320,9 +472,88 @@
Intent issue = new Intent(MapFragment.this.getActivity(), AddIssueActivity.class);
MapFragment.this.getActivity().startActivity(issue);
});
+ binding.expandButton.setLegendsArray(new ExpandButton.Quadruple(
+ ContextCompat.getDrawable(requireContext(), R.drawable.marker_blue),
+ ContextCompat.getDrawable(requireContext(), R.drawable.marker_unselected),
+ "鍙栨按鍙�", isShowMarker
+ ),
+ new ExpandButton.Quadruple(
+ ContextCompat.getDrawable(requireContext(), R.drawable.divide_home_blue),
+ ContextCompat.getDrawable(requireContext(), R.drawable.divide_home_unselected),
+ "鍒嗘按鎴�", isShowDivide
+ ),
+ new ExpandButton.Quadruple(
+ ContextCompat.getDrawable(requireContext(), R.drawable.ic_pipenetwork_line),
+ ContextCompat.getDrawable(requireContext(), R.drawable.ic_pipenetwork_line_unselected),
+ "绠＄綉", isShowPipeNetwork
+ )
+ );
+ binding.expandButton.setOnLegendItemClickListener((position, isSelected) -> {
+ switch (position) {
+ case 0:
+ showMarkers(isSelected);
+ SharedPreferencesHelper.getInstance(this.getContext()).put(CommonKeyName.markerKeyIsShow, isSelected);
+ break;
+ case 1:
+ showDivideMarkers(isSelected);
+ SharedPreferencesHelper.getInstance(this.getContext()).put(CommonKeyName.divideIsShow, isSelected);
+ break;
+ case 2:
+ showPipeLine(isSelected);
+ SharedPreferencesHelper.getInstance(this.getContext()).put(CommonKeyName.pipeNetworkIsShow, isSelected);
+ break;
-
+ }
+ });
+ binding.searchButton.setOnSearchClickListener(s -> {
+ if (s != null && !s.isEmpty()) {
+ SearchResultDialog searchDialog = new SearchResultDialog(requireContext());
+ searchDialog.setOnItemClickListener(item -> {
+ // 鏍规嵁绫诲瀷澶勭悊鐐瑰嚮浜嬩欢
+// if ("marker".equals(item.getType())) {
+// MarkerBean markerBean = new MarkerBean();
+// markerBean.setId(item.getId());
+// getInstakeDetail(markerBean);
+// } else {
+// DivideBean divideBean = new DivideBean();
+// divideBean.setDivideId(item.getId());
+// getDivideDetail(divideBean);
+// }
+ // 璺宠浆鍒伴�夋嫨鐨勪綅缃�
+ mWebView.evaluateJavascript(
+ String.format("javascript:setCenterAndZoom(\"%s\",\"%s\",\"17\")",
+ item.getLng(),
+ item.getLat()),
+ null
+ );
+ });
+
+ // 鎵ц鎼滅储
+ compositeDisposable.add(
+ DaoSingleton.getAsynchInstance(requireContext())
+ .divideDao()
+ .searchAllByKeyword(s)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(
+ results -> {
+ if (results != null && !results.isEmpty()) {
+ searchDialog.setData(results);
+ searchDialog.show();
+ } else {
+ ToastUtil.showToast(requireContext(), "鏈壘鍒扮浉鍏崇粨鏋�");
+ }
+ },
+ throwable -> {
+ ToastUtil.showToast(requireContext(), "鎼滅储澶辫触锛�" + throwable.getMessage());
+ }
+ )
+ );
+ }
+ return null;
+ });
}
+
/**
* 鏄剧ず鍙栨按鍙ｈ鎯�
@@ -333,26 +564,31 @@
MyLog.i(data);
MarkerBean markerBean = markerBeanSet.get(data);
if (markerBean != null) {
- binding.bottomLL.setVisibility(View.VISIBLE);
- binding.markerAddress.setText(markerBean.getAddress());
- binding.markerName.setText(markerBean.getName());
- binding.markerBlockName.setText(markerBean.getBlockName());
- binding.lat.setText(markerBean.getLat());
- binding.lng.setText(markerBean.getLng());
- binding.editePoint.setOnClickListener(v -> {
- mWebView.evaluateJavascript("javascript:showPin()", value -> {
- });
- });
+ getInstakeDetail(markerBean);
}
}
+ /**
+ * 鏄剧ず鍒嗘按鎴胯鎯�
+ *
+ * @param data
+ */
+ public void showDivideDetail(String data) {
+ MyLog.i(data);
+ DivideBean markerBean = divideBeanMap.get(data);
+ if (markerBean != null) {
+ binding.bottomLL.setVisibility(View.GONE);
+ getDivideDetail(markerBean);
+ }
+
+ }
/**
* 鑾峰彇鍦板浘涓績鐐�
*/
private void getCenterPoint() {
- ApiManager.getInstance().requestGet(this.getContext(), Constants.BASE_URL + "/base/dict_item/map_center", CenterPointResult.class, null, new SubscriberListener<BaseResponse<CenterPointResult>>() {
+ ApiManager.getInstance().requestGetHideLoading(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()) {
@@ -362,6 +598,7 @@
centerPointBean.setLat(t.getContent().getLat());
centerPointBean.setLng(t.getContent().getLng());
centerPointBean.setZoomMp(t.getContent().getZoomMp());
+ DaoSingleton.getInstance(MapFragment.this.getContext()).centerPointDao().deleteAll();
DaoSingleton.getInstance(MapFragment.this.getContext()).centerPointDao().insert(centerPointBean);
jumpCenterPoint();
} else {
@@ -380,6 +617,7 @@
* 涓婃姤宸℃璁板綍
*/
private void pushLocationData(InspectionLocationBean inspectionLocationBean) {
+ InspectionRequest inspectionRequest = InspectionRequest.getInstance();
inspectionRequest.setInspectId(inspectionLocationBean.getInspectId());
inspectionRequest.setInspectorId(mInspectionBean.getInspectorId());
if (mInspectionBean != null) {
@@ -392,7 +630,6 @@
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", InsectionResult.class, inspectionRequest.toMap(inspectionRequest), new SubscriberListener<BaseResponse<List<InsectionResult>>>() {
@Override
@@ -400,6 +637,7 @@
try {
if (t.isSuccess()) {
if (t.getContent() != null) {
+ MyLog.d("InspectId:" + String.valueOf(t.getContent().get(0).getInspectId()));
mInspectionBean.setInspectId(String.valueOf(t.getContent().get(0).getInspectId()));
InspectionUtils.upataInspectionData(MapFragment.this.getContext(), mInspectionBean);
}
@@ -431,6 +669,7 @@
lastLatLonBean = latLonBean;
Log.i("chageInspecState", "lat:" + latLonBean.getLatitude() + ",log:" + latLonBean.getLongitude());
InspectionLocationBean inspectionLocationBean = InspectionUtils.createInspectionLocation(latLonBean, mInspectionBean);
+ //娣诲姞宸℃璁板綍鍧愭爣
InspectionUtils.addInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
//鏇存柊鍒板湴鍥�
mWebView.evaluateJavascript("javascript:updateInspectionLocation(\"" + latLonBean.getLongitude() + "\",\"" + latLonBean.getLatitude() + "\")", value -> {
@@ -553,25 +792,71 @@
}
/**
- * 娣诲姞鏍囨敞鐐�
+ * 娣诲姞鍙栨按鍙�
*/
public void setMapMarker(MarkerBean markerBean) {
if (markerBean != null) {
if (webViewIsFinished) {
- Log.i("mWebView", "addMarker????????????");
- mWebView.evaluateJavascript("javascript:addMarker(\"" + markerBean.getId() + "\",\"" + markerBean.getLng() + "\",\"" + markerBean.getLat() + "\",\"" + markerBean.getName() + "\")", new ValueCallback<String>() {
- @Override
- public void onReceiveValue(String value) {
- }
- });
- markerBeanSet.put(markerBean.getId(), markerBean);
-
+ if (!TextUtils.isEmpty(markerBean.getLng()) && !TextUtils.isEmpty(markerBean.getLat())) {
+ mWebView.evaluateJavascript("javascript:addMarker(\"" + markerBean.getId() + "\",\"" + markerBean.getLng() + "\",\"" + markerBean.getLat() + "\",\"" + markerBean.getName() + "\",\"" + isShowMarker + "\")", new ValueCallback<String>() {
+ @Override
+ public void onReceiveValue(String value) {
+ }
+ });
+ markerBeanSet.put(markerBean.getId(), markerBean);
+ } else {
+ MyLog.d("setMapMarker>" + markerBean.getName() + "缁忕含搴︿负绌�");
+ }
} else {
webNoFinishMarkerData.add(markerBean);
}
}
}
+ /**
+ * 娣诲姞鍒嗘按鎴�
+ */
+ public void setMapDivide(DivideBean divide) {
+ if (divide != null) {
+ if (webViewIsFinished) {
+ if (!TextUtils.isEmpty(divide.getLng()) && !TextUtils.isEmpty(divide.getLat())) {
+ mWebView.evaluateJavascript("javascript:addDivide(\"" + divide.getId() + "\",\"" + divide.getLng() + "\",\"" + divide.getLat() + "\",\"" + divide.getDivideName() + "\",\"" + isShowDivide + "\")", new ValueCallback<String>() {
+ @Override
+ public void onReceiveValue(String value) {
+ }
+ });
+ divideBeanMap.put(divide.getId(), divide);
+ } else {
+ MyLog.d("setMapDivide>" + divide.getDivideName() + "缁忕含搴︿负绌�");
+ }
+ } else {
+ webNoFinishDivideData.add(divide);
+ }
+ }
+ }
+
+ /**
+ * 娣诲姞绠＄綉鏍囨敞
+ */
+ public void setMapPipe(PipeNetworkBean pipeNetworkBean) {
+ if (pipeNetworkBean != null) {
+ if (webViewIsFinished) {
+ boolean isfrist = true;
+ for (PipeNetworkDataCoordinateBean data : pipeNetworkBean.getData().getCoordinates()) {
+ if (!TextUtils.isEmpty(data.getLat()) && !TextUtils.isEmpty(data.getLng())) {
+ mWebView.evaluateJavascript("javascript:addPipeNetwork(\"" + data.getLng() + "\",\"" + data.getLat() + "\",\"" + isfrist + "\",\"" + isShowPipeNetwork +"\")", new ValueCallback<String>() {
+ @Override
+ public void onReceiveValue(String value) {
+ }
+ });
+ isfrist = false;
+ }
+ }
+ } else {
+ webNoFinishPipeNetworkData.add(pipeNetworkBean);
+ }
+ }
+ }
/**
* 寮�濮嬪贰妫�鐨勭浉鍏抽�昏緫
@@ -580,13 +865,12 @@
*/
private void startLocation() {
//鑾峰彇瀹氫綅鏈嶅姟浼犺繃鏉ョ殑鍧愭爣鐐�
- LiveEventBus.get(CommonKeyName.locationData).observeForever(locationObserver);
+ LiveEventBus.get(CommonKeyName.locationData).observe(this, 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));
- inspectionRequest = new InspectionRequest();
SharedPreferencesHelper.getInstance(this.getContext()).put(CommonKeyName.inspectionState, InspectionUtils.STAT_INSPECTION);
ServiceUtils.startLocationService(MapFragment.this.getContext(), false);
}
@@ -629,4 +913,428 @@
e.printStackTrace();
}
}
+
+ /**
+ * 鎺ユ敹js浼犳潵鐨勪腑蹇冪偣鍧愭爣
+ *
+ * @param lng
+ * @param lat
+ */
+ public void refreshCenterPoint(double lng, double lat) {
+ centerLng = lng;
+ centerLat = lat;
+ binding.pointText.setText(centerLng + "锛�" + centerLat);
+ }
+
+ /**
+ * 淇敼缁忕含搴�
+ *
+ * @param markerBean
+ */
+ private void updataInstake(MarkerBean markerBean) {
+ String lng = String.valueOf(centerLng);
+ String lat = String.valueOf(centerLat);
+ Map<String, Object> params = new HashMap<>();
+ params.put("id", markerBean.getId());
+ params.put("lng", lng);
+ params.put("lat", lat);
+ params.put("operator", MyApplication.myApplication.userId);
+
+ ApiManager.getInstance().requestPost(MapFragment.this.getContext(), BASE_URL + "/project/intake/updateIntakeLngLat", Boolean.class, params, new SubscriberListener<BaseResponse<Boolean>>() {
+ @Override
+ public void onNext(BaseResponse<Boolean> t) {
+ try {
+ if (t.isSuccess()) {
+ mWebView.evaluateJavascript("javascript:refreshMarker(\"" + markerBean.getId() + "\",\"" + centerLng + "\",\"" + centerLat + "\",\"" + markerBean.getName() + "\")", new ValueCallback<String>() {
+ @Override
+ public void onReceiveValue(String value) {
+ }
+ });
+ binding.pointCenterImg.setVisibility(View.GONE);
+ binding.pointRL.setVisibility(View.GONE);
+ mMarkerBean.setLat(lat);
+ mMarkerBean.setLng(lng);
+ binding.lng.setText(lng);
+ binding.lat.setText(lat);
+ mWebView.evaluateJavascript("javascript:cancelPin()", value -> {
+ });
+ ToastUtil.showToastLong(MapFragment.this.getContext(), "淇敼鎴愬姛锛�");
+
+ } else {
+ ToastUtil.showToastLong(MapFragment.this.getContext(), t.getMsg());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ CrashReport.postCatchedException(e);
+ }
+
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇鍙栨按鍙ｈ鎯�
+ *
+ * @param markerBean
+ */
+ private void getInstakeDetail(MarkerBean markerBean) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("id", markerBean.getId());
+ ApiManager.getInstance().requestGet(this.getContext(), Constants.BASE_URL + "/project/intake/one", MarkerResult.class, params, new SubscriberListener<BaseResponse<MarkerResult>>() {
+ @Override
+ public void onNext(BaseResponse<MarkerResult> t) {
+ if (t.isSuccess()) {
+ MarkerResult result = t.getContent();
+ mMarkerBean = new MarkerBean();
+ mMarkerBean.setId(result.getId());
+ mMarkerBean.setLng(result.getLng());
+ mMarkerBean.setLat(result.getLat());
+ mMarkerBean.setBlockId(result.getBlockId());
+ mMarkerBean.setName(result.getName());
+ mMarkerBean.setRemarks(result.getRemarks());
+ mMarkerBean.setTownId(result.getTownId());
+ mMarkerBean.setVillageId(result.getVillageId());
+ mMarkerBean.setCountyId(result.getCountyId());
+ mMarkerBean.setAddress(result.getAddress());
+ mMarkerBean.setBlockName(result.getBlockName());
+ mMarkerBean.setDivideId(result.getDivideId());
+ showMarker(mMarkerBean);
+ } else {
+ ToastUtil.showToast(MapFragment.this.getContext(), t.getMsg());
+ }
+ }
+
+ });
+ }
+
+ /**
+ * 鏄剧ず鍙栨按鍙ｈ鎯�
+ */
+ private void getDivideDetail(DivideBean divideBean) {
+ ApiManager.getInstance().requestGet(this.getContext(), Constants.BASE_URL + "/project/divide/getone/" + divideBean.getDivideId(), DivideResult.class, null, new SubscriberListener<BaseResponse<DivideResult>>() {
+ @Override
+ public void onNext(BaseResponse<DivideResult> t) {
+ if (t.isSuccess()) {
+ DivideBean divideBean = getDivideBean(t.getContent());
+ showDivideMarker(divideBean);
+ } else {
+ ToastUtil.showToast(MapFragment.this.getContext(), t.getMsg());
+ }
+ }
+
+ });
+ }
+
+ /**
+ * 鏄剧ず鍙栨按鍙ｈ鎯�
+ */
+ private void showMarker(MarkerBean markerBean) {
+ binding.bottomLL.setVisibility(View.VISIBLE);
+ binding.phoneLL.setVisibility(View.GONE);
+ binding.headerLL.setVisibility(View.GONE);
+ binding.editePoint.setVisibility(View.VISIBLE);
+ binding.markerAddress.setText(markerBean.getAddress());
+ binding.markerName.setText(markerBean.getName());
+ binding.markerBlockName.setText(markerBean.getBlockName());
+ binding.lat.setText(markerBean.getLat());
+ binding.lng.setText(markerBean.getLng());
+ //淇敼缁忕含搴�
+ binding.editePoint.setOnClickListener(v -> {
+
+ mWebView.evaluateJavascript("javascript:showPin(\"" + markerBean.getLng() + "\",\"" + markerBean.getLat() + "\")", value -> {
+ binding.pointRL.setVisibility(View.VISIBLE);
+ binding.pointCenterImg.setVisibility(View.VISIBLE);
+ MyLog.d("showPin>>" + value);
+ });
+
+ });
+ //鍙栨秷淇敼缁忕含搴�
+ binding.pointCancel.setOnClickListener(v -> {
+ binding.pointCenterImg.setVisibility(View.GONE);
+ binding.pointRL.setVisibility(View.GONE);
+ mWebView.evaluateJavascript("javascript:cancelPin()", value -> {
+
+ });
+ }
+ );
+ //纭淇敼缁忕含搴�
+ binding.pointEdt.setOnClickListener(v -> {
+ ConfirmDialog confirmDialog = new ConfirmDialog(MapFragment.this.getActivity(), "纭淇敼鍒拌浣嶇疆鍚楋紵", (confirmDialog1, v1) -> {
+ confirmDialog1.dismiss();
+ updataInstake(markerBean);
+ });
+ confirmDialog.show();
+ });
+ }
+
+ /**
+ * 鏄剧ず鍒嗘按鎴胯鎯�
+ *
+ * @param divideBean
+ */
+ private void showDivideMarker(DivideBean divideBean) {
+ binding.bottomLL.setVisibility(View.VISIBLE);
+ binding.phoneLL.setVisibility(View.VISIBLE);
+ binding.headerLL.setVisibility(View.VISIBLE);
+ binding.editePoint.setVisibility(View.GONE);
+ binding.markerAddress.setText(divideBean.getAddress());
+ binding.markerName.setText(divideBean.getDivideName());
+ binding.markerBlockName.setText(divideBean.getBlockName());
+ binding.phone.setText(divideBean.getPhone());
+ binding.header.setText(divideBean.getHeader());
+ binding.lat.setText(divideBean.getLat());
+ binding.lng.setText(divideBean.getLng());
+ //淇敼缁忕含搴�
+ binding.editePoint.setOnClickListener(v -> {
+
+ mWebView.evaluateJavascript("javascript:showPin(\"" + divideBean.getLng() + "\",\"" + divideBean.getLat() + "\")", value -> {
+ binding.pointRL.setVisibility(View.VISIBLE);
+ binding.pointCenterImg.setVisibility(View.VISIBLE);
+ MyLog.d("showPin>>" + value);
+ });
+
+ });
+ //鍙栨秷淇敼缁忕含搴�
+ binding.pointCancel.setOnClickListener(v -> {
+ binding.pointCenterImg.setVisibility(View.GONE);
+ binding.pointRL.setVisibility(View.GONE);
+ mWebView.evaluateJavascript("javascript:cancelPin()", value -> {
+
+ });
+ }
+ );
+ //纭淇敼缁忕含搴�
+ binding.pointEdt.setOnClickListener(v -> {
+ ConfirmDialog confirmDialog = new ConfirmDialog(MapFragment.this.getActivity(), "纭淇敼鍒拌浣嶇疆鍚楋紵", (confirmDialog1, v1) -> {
+ confirmDialog1.dismiss();
+// updataInstake(markerBean);
+ });
+ confirmDialog.show();
+ });
+ }
+
+
+ /**
+ * 鑾峰彇鍒嗘按鎴�
+ */
+ private void getDivideList() {
+ ApiManager.getInstance().requestGetHideLoading(MapFragment.this.getContext(), BASE_URL + "/project/divide/getDivides", DivideListResult.class, null, new SubscriberListener<BaseResponse<DivideListResult>>() {
+ @Override
+ public void onNext(BaseResponse<DivideListResult> t) {
+ try {
+ if (t.isSuccess()) {
+ if (t.getContent().getObj() != null && !t.getContent().getObj().isEmpty()) {
+ List<DivideBean> divideBeans = new ArrayList<>();
+ for (DivideResult divideResult : t.getContent().getObj()) {
+ DivideBean divideBean = getDivideBean(divideResult);
+ setMapDivide(divideBean);
+ divideBeans.add(divideBean);
+ }
+ DaoSingleton.getInstance(MapFragment.this.getContext()).divideDao().deleteAll();
+ // 浣跨敤 CompositeDisposable 绠＄悊鏁版嵁搴撴彃鍏ユ搷浣�
+ compositeDisposable.add(
+ DaoSingleton.getAsynchInstance(MapFragment.this.getContext()).divideDao().insertAll(divideBeans)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(
+ () -> {
+ // 鎻掑叆鎴愬姛
+ Log.i("mWebView", "鏁版嵁鎻掑叆鎴愬姛");
+ },
+ throwable -> {
+ // 鎻掑叆澶辫触
+ Log.e("mWebView", "鏁版嵁鎻掑叆澶辫触: " + throwable.getMessage());
+ }
+ )
+ );
+ }
+ } else {
+ ToastUtil.showToastLong(MapFragment.this.getContext(), t.getMsg());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ CrashReport.postCatchedException(e);
+ }
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇绠＄綉
+ */
+ private void getPipeNetworkList() {
+ ApiManager.getInstance().requestGetHideLoading(MapFragment.this.getContext(), BASE_URL + "/project/network/all", PipeNetworkResult.class, null, new SubscriberListener<BaseResponse<List<PipeNetworkResult>>>() {
+ @Override
+ public void onNext(BaseResponse<List<PipeNetworkResult>> t) {
+ try {
+ if (t.isSuccess()) {
+ if (t.getContent() != null && t.getContent().size() > 0) {
+
+ List<PipeNetworkBean> pipeNetBeans = new ArrayList<>();
+
+ for (PipeNetworkResult pipeNetworkResult : t.getContent()) {
+ PipeNetworkBean pipeNetBean = new PipeNetworkBean();
+ pipeNetBean.setNetworkId(pipeNetworkResult.getNetworkId());
+ pipeNetBean.setType(pipeNetworkResult.getType());
+ PipeNetWorkDataBean data = new PipeNetWorkDataBean();
+ data.setType(pipeNetworkResult.getData().getType());
+ List<PipeNetworkDataCoordinateBean> coordinates = new ArrayList<>();
+ for (PipeNetworkResult.Data.Coordinate dataBean : pipeNetworkResult.getData().getCoordinates()) {
+ PipeNetworkDataCoordinateBean coordinate = new PipeNetworkDataCoordinateBean();
+ coordinate.setLat(dataBean.getLat());
+ coordinate.setLng(dataBean.getLng());
+ coordinates.add(coordinate);
+ }
+ data.setCoordinates(coordinates);
+ pipeNetBean.setData(data);
+ setMapPipe(pipeNetBean);
+ pipeNetBeans.add(pipeNetBean);
+ }
+
+ DaoSingleton.getInstance(MapFragment.this.getContext()).pipeNetDao().deleteAll();
+ // 浣跨敤 RxJava 寮傛鎻掑叆鏁版嵁
+ compositeDisposable.add(
+ DaoSingleton.getAsynchInstance(MapFragment.this.getContext()).pipeNetDao().insertAll(pipeNetBeans)
+ .subscribeOn(Schedulers.io()) // 鍦� IO 绾跨▼涓婃墽琛�
+ .observeOn(AndroidSchedulers.mainThread()) // 鍦ㄤ富绾跨▼涓婅瀵�
+ .subscribe(() -> {
+ // 鎻掑叆鎴愬姛
+ Log.i("mWebView", "鏁版嵁鎻掑叆鎴愬姛");
+ }, throwable -> {
+ // 鎻掑叆澶辫触
+ Log.e("mWebView", "鏁版嵁鎻掑叆澶辫触: " + throwable.getMessage());
+ })
+ );
+ }
+
+
+ } else {
+ ToastUtil.showToastLong(MapFragment.this.getContext(), t.getMsg());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ CrashReport.postCatchedException(e);
+ }
+ }
+
+ });
+ }
+
+ /**
+ * @param divideResult
+ * @return
+ */
+ private static @NonNull DivideBean getDivideBean(DivideResult divideResult) {
+ DivideBean divideBean = new DivideBean();
+ divideBean.setAddress(divideResult.getAddress());
+ divideBean.setBlockId(divideResult.getBlockId());
+ divideBean.setBlockName(divideResult.getBlockName());
+ divideBean.setDivideId(divideResult.getDivideId());
+ if (!TextUtils.isEmpty(divideResult.getDivideName())) {
+ divideBean.setDivideName(divideResult.getDivideName());
+ } else {
+ divideBean.setDivideName(divideResult.getName());
+ }
+
+ divideBean.setHeader(divideResult.getHeader());
+ divideBean.setId(divideResult.getId());
+ divideBean.setLat(divideResult.getLat());
+ divideBean.setLng(divideResult.getLng());
+ divideBean.setOperateDt(divideResult.getOperateDt());
+ divideBean.setOperator(divideResult.getOperator());
+ divideBean.setPhone(divideResult.getPhone());
+ divideBean.setRemarks(divideResult.getRemarks());
+ divideBean.setVillages(divideResult.getVillages());
+ divideBean.setArea(divideResult.getArea());
+ return divideBean;
+ }
+
+ private static @NonNull PipeNetworkBean getPipeNetworkBean(PipeNetworkResult divideResult) {
+ PipeNetworkBean pipeNetworkBean = new PipeNetworkBean();
+
+ return pipeNetworkBean;
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ // 娓呯悊鎵�鏈夎闃�
+ if (compositeDisposable != null && !compositeDisposable.isDisposed()) {
+ compositeDisposable.dispose();
+ }
+ LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver);
+ if (mWebView != null) {
+ mWebView.destroy();
+ }
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ mWebView.onResume();
+ mWebView.resumeTimers();
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ mWebView.onPause();
+ mWebView.pauseTimers();
+ }
+
+ @Override
+ public void onSaveInstanceState(@NonNull Bundle outState) {
+ super.onSaveInstanceState(outState);
+ mWebView.saveState(outState);
+ }
+
+ @Override
+ public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
+ super.onViewStateRestored(savedInstanceState);
+ if (savedInstanceState != null) {
+ mWebView.restoreState(savedInstanceState);
+ }
+ }
+
+ /**
+ * 鏄剧ず鎴栭殣钘忓湴鍥句笂鐨勫彇姘村彛
+ *
+ * @param isShow
+ */
+ private void showMarkers(boolean isShow) {
+ if (isShow) {
+ mWebView.evaluateJavascript("javascript:showAllWaterIntakes()", value -> {
+ });
+ } else {
+ mWebView.evaluateJavascript("javascript:hideAllWaterIntakes()", value -> {
+ });
+ }
+
+ }
+
+ /**
+ * 鏄剧ず鎴栭殣钘忓湴鍥句笂鐨勫垎姘存埧
+ *
+ * @param isShow
+ */
+ private void showDivideMarkers(boolean isShow) {
+ if (isShow) {
+ mWebView.evaluateJavascript("javascript:showAllDivides()", value -> {
+ });
+ } else {
+ mWebView.evaluateJavascript("javascript:hideAllDivides()", value -> {
+ });
+ }
+ }
+
+ private void showPipeLine(boolean isSelected) {
+ if (isSelected) {
+ mWebView.evaluateJavascript("javascript:showAllPipeLines()", value -> {
+ });
+ } else {
+ mWebView.evaluateJavascript("javascript:hideAllPipeLines()", value -> {
+ });
+ }
+ }
+
}
--
Gitblit v1.8.0