From b3e7f379e72111f55a28c302804702ee7c66bfa2 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期六, 18 一月 2025 16:39:16 +0800
Subject: [PATCH] 1.管网的js相关代码
---
app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 195 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 181 insertions(+), 14 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 addff5b..c414864 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
@@ -31,6 +31,7 @@
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.PipeNetworkBean;
import com.dayu.pipirrapp.bean.net.CenterPointResult;
import com.dayu.pipirrapp.bean.net.DivideListResult;
import com.dayu.pipirrapp.bean.net.DivideResult;
@@ -38,6 +39,8 @@
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.PipeNetworkListResult;
+import com.dayu.pipirrapp.bean.net.PipeNetworkResult;
import com.dayu.pipirrapp.dao.DaoSingleton;
import com.dayu.pipirrapp.databinding.FragmentMapBinding;
import com.dayu.pipirrapp.net.ApiManager;
@@ -148,7 +151,9 @@
getCenterPoint();
initView();
initWeb();
+
getMarkerData();
+ getDivideList();
chageInspecState(mInspectionState);
return binding.getRoot();
@@ -213,7 +218,7 @@
super.onPageFinished(view, url);
//椤甸潰鍔犺浇瀹屾垚
webViewIsFinished = true;
- initLocalData();
+ webFinishInitLocalData();
aginShowLocation(null);
}
@@ -221,9 +226,9 @@
}
/**
- * 鍒濆鍖栨湰鍦版暟鎹�
+ * web鍔犺浇瀹屽垵濮嬪寲鏈湴鏁版嵁
*/
- public void initLocalData() {
+ public void webFinishInitLocalData() {
//璺宠浆涓績鐐�
centerPointBean = DaoSingleton.getInstance(MapFragment.this.getContext()).centerPointDao().findFirst();
jumpCenterPoint();
@@ -231,6 +236,11 @@
if (!webNoFinishMarkerData.isEmpty()) {
for (MarkerBean bean : webNoFinishMarkerData) {
setMapMarker(bean);
+ }
+ }
+ if (!webNoFinishDivideData.isEmpty()) {
+ for (DivideBean bean : webNoFinishDivideData) {
+ setMapDivide(bean);
}
}
//鏄剧ず鎵�鏈夊彇姘村彛
@@ -252,9 +262,7 @@
@Override
public void onNext(BaseResponse<MarkerListResult> t) {
if (t.isSuccess()) {
-
if (t.getContent().getObj() != null && !t.getContent().getObj().isEmpty()) {
-
List<MarkerBean> markerBeans = t.getContent().getObj().stream()
.map(result -> {
MarkerBean markerBean = new MarkerBean();
@@ -349,6 +357,20 @@
}
+ /**
+ * 鏄剧ず鍒嗘按鎴胯鎯�
+ *
+ * @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);
+ }
+
+ }
/**
* 鑾峰彇鍦板浘涓績鐐�
@@ -581,18 +603,18 @@
/**
* 娣诲姞鍙栨按鍙ｆ爣娉�
*/
- public void setDivide(DivideBean divide) {
+ public void setMapDivide(DivideBean divide) {
if (divide != null) {
if (webViewIsFinished) {
if (!TextUtils.isEmpty(divide.getLng()) && !TextUtils.isEmpty(divide.getLat())) {
- mWebView.evaluateJavascript("javascript:addMarker(\"" + divide.getId() + "\",\"" + divide.getLng() + "\",\"" + divide.getLat() + "\",\"" + divide.getDivideName() + "\")", new ValueCallback<String>() {
+ mWebView.evaluateJavascript("javascript:addDivide(\"" + divide.getId() + "\",\"" + divide.getLng() + "\",\"" + divide.getLat() + "\",\"" + divide.getDivideName() + "\")", new ValueCallback<String>() {
@Override
public void onReceiveValue(String value) {
}
});
divideBeanMap.put(divide.getId(), divide);
} else {
- MyLog.d("setMapMarker>" + divide.getDivideName() + "缁忕含搴︿负绌�");
+ MyLog.d("setMapDivide>" + divide.getDivideName() + "缁忕含搴︿负绌�");
}
} else {
webNoFinishDivideData.add(divide);
@@ -600,6 +622,28 @@
}
}
+ /**
+ * 娣诲姞鍙栨按鍙ｆ爣娉�
+ */
+ public void setMapDivide(PipeNetworkBean pipeNetworkBean) {
+// if (divide != null) {
+// if (webViewIsFinished) {
+// for ()
+// if (!TextUtils.isEmpty(divide.getLng()) && !TextUtils.isEmpty(divide.getLat())) {
+// mWebView.evaluateJavascript("javascript:addDivide(\"" + divide.getId() + "\",\"" + divide.getLng() + "\",\"" + divide.getLat() + "\",\"" + divide.getDivideName() + "\")", new ValueCallback<String>() {
+// @Override
+// public void onReceiveValue(String value) {
+// }
+// });
+// divideBeanMap.put(divide.getId(), divide);
+// } else {
+// MyLog.d("setMapDivide>" + divide.getDivideName() + "缁忕含搴︿负绌�");
+// }
+// } else {
+// webNoFinishDivideData.add(divide);
+// }
+// }
+ }
/**
* 寮�濮嬪贰妫�鐨勭浉鍏抽�昏緫
@@ -748,8 +792,32 @@
});
}
+ /**
+ * 鏄剧ず鍙栨按鍙ｈ鎯�
+ */
+ 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());
@@ -785,23 +853,112 @@
}
/**
+ * 鏄剧ず鍒嗘按鎴胯鎯�
+ *
+ * @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().requestPost(MapFragment.this.getContext(), BASE_URL + "/project/divide/getDivides", DivideListResult.class, null, new SubscriberListener<BaseResponse<DivideListResult>>() {
+ 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()) {
+ 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);
}
+ // 浣跨敤 RxJava 寮傛鎻掑叆鏁版嵁
+ DaoSingleton.getAsynchInstance(MapFragment.this.getContext()).divideDao().insertAll(divideBeans)
+ .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);
+ }
+ }
+
+ });
+ }
+
+ /**
+ * 鑾峰彇绠＄綉
+ */
+ private void getPipeNetworkList() {
+ ApiManager.getInstance().requestGetHideLoading(MapFragment.this.getContext(), BASE_URL + "/project/network/all", PipeNetworkListResult.class, null, new SubscriberListener<BaseResponse<PipeNetworkListResult>>() {
+ @Override
+ public void onNext(BaseResponse<PipeNetworkListResult> t) {
+ try {
+ if (t.isSuccess()) {
+ if (t.getContent().getObj() != null && !t.getContent().getObj().isEmpty()) {
+
+ List<DivideBean> divideBeans = new ArrayList<>();
+ for (PipeNetworkResult divideResult : t.getContent().getObj()) {
+ PipeNetworkBean divideBean = getPipeNetworkBean(divideResult);
+ setMapDivide(divideBean);
+// divideBeans.add(divideBean);
+ }
// 浣跨敤 RxJava 寮傛鎻掑叆鏁版嵁
DaoSingleton.getAsynchInstance(MapFragment.this.getContext()).divideDao().insertAll(divideBeans)
.subscribeOn(Schedulers.io()) // 鍦� IO 绾跨▼涓婃墽琛�
@@ -838,11 +995,16 @@
divideBean.setBlockId(divideResult.getBlockId());
divideBean.setBlockName(divideResult.getBlockName());
divideBean.setDivideId(divideResult.getDivideId());
- divideBean.setDivideName(divideResult.getDivideName());
+ if (!TextUtils.isEmpty(divideResult.getDivideName())) {
+ divideBean.setDivideName(divideResult.getDivideName());
+ } else {
+ divideBean.setDivideName(divideResult.getName());
+ }
+
divideBean.setHeader(divideResult.getHeader());
- divideBean.setId(String.valueOf(divideResult.getId()));
- divideBean.setLat(String.valueOf(divideResult.getLat()));
- divideBean.setLng(String.valueOf(divideResult.getLng()));
+ divideBean.setId(divideResult.getId());
+ divideBean.setLat(divideResult.getLat());
+ divideBean.setLng(divideResult.getLng());
divideBean.setOperateDt(divideResult.getOperateDt());
divideBean.setOperator(divideResult.getOperator());
divideBean.setPhone(divideResult.getPhone());
@@ -852,6 +1014,11 @@
return divideBean;
}
+ private static @NonNull PipeNetworkBean getPipeNetworkBean(PipeNetworkResult divideResult) {
+ PipeNetworkBean pipeNetworkBean = new PipeNetworkBean();
+
+ return pipeNetworkBean;
+ }
@Override
public void onDestroy() {
--
Gitblit v1.8.0