From 50f9b82ac862652e88444d727a32e0da1d824e9e Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 13 一月 2025 15:57:06 +0800
Subject: [PATCH] 1.分水房相关 2.删除极光推送相关配置 3.优化图片显示相关
---
app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 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 aff517f..2715f12 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.LatLonBean;
import com.dayu.pipirrapp.bean.db.MarkerBean;
import com.dayu.pipirrapp.bean.net.CenterPointResult;
+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;
@@ -556,13 +557,16 @@
public void setMapMarker(MarkerBean markerBean) {
if (markerBean != null) {
if (webViewIsFinished) {
- 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() + "\")", new ValueCallback<String>() {
+ @Override
+ public void onReceiveValue(String value) {
+ }
+ });
+ markerBeanSet.put(markerBean.getId(), markerBean);
+ } else {
+ MyLog.d("setMapMarker>" + markerBean.getName() + "缁忕含搴︿负绌�");
+ }
} else {
webNoFinishMarkerData.add(markerBean);
}
@@ -753,6 +757,40 @@
});
}
+ /**
+ * 鑾峰彇鍒嗘按鎴�
+ */
+ private void getDivideList() {
+ ApiManager.getInstance().requestPost(MapFragment.this.getContext(), BASE_URL + "/project/divide/getDivides", DivideResult.class, null, new SubscriberListener<BaseResponse<DivideResult>>() {
+ @Override
+ public void onNext(BaseResponse<DivideResult> t) {
+ try {
+ if (t.isSuccess()) {
+// if (t.getContent().)
+//
+//
+// // 浣跨敤 RxJava 寮傛鎻掑叆鏁版嵁
+// DaoSingleton.getAsynchInstance(MapFragment.this.getContext()).markerDao().insertAll()
+// .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);
+ }
+ }
+
+ });
+ }
@Override
--
Gitblit v1.8.0