From 456c5f1a2e83ceb8ded28760abc6105a5279e328 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 11 十一月 2024 11:38:42 +0800
Subject: [PATCH] 地图添加地图标注
---
app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 128 ++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 68 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 39d32d5..5936ae0 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
@@ -18,8 +18,10 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.lifecycle.Observer;
import com.dayu.pipirrapp.bean.db.CenterPointBean;
+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.MarkerResult;
@@ -33,10 +35,13 @@
import com.dayu.pipirrapp.observer.MapFragmenObserver;
import com.dayu.pipirrapp.service.MyLocationService;
import com.dayu.pipirrapp.utils.CommonData;
+import com.dayu.pipirrapp.utils.CommonKeyName;
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.jeremyliao.liveeventbus.LiveEventBus;
import java.io.File;
import java.io.FileInputStream;
@@ -65,34 +70,69 @@
CenterPointBean centerPointBean;
String strMarkerJson;
boolean isStartInspec = false;
+ MapFragmenObserver mapFragmenObserver;
@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");
+ isStartInspec = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.isStartInspec, false);
+
}
@Override
public void onStart() {
super.onStart();
- //鏄剧ず宸℃鐘舵��
+ Log.i(TAG, "onStart");
+ }
+
+ /**
+ * 淇敼宸℃鐘舵��
+ */
+ private void chageInspecState() {
+ Intent location = new Intent(this.getActivity(), MyLocationService.class);
+ location.putExtra("isSingle", false);
if (isStartInspec) {
+ LiveEventBus.get(CommonKeyName.locationData).observeForever(new Observer<Object>() {
+ @Override
+ public void onChanged(Object o) {
+ LatLonBean latLonBean = (LatLonBean) o;
+ mWebView.evaluateJavascript("javascript:locationOverLay(\"" + latLonBean.getLongitude() + "\",\"" + latLonBean.getLatitude() + "\")", value -> {
+ });
+ }
+ });
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);
+ }
} else {
binding.stateText.setVisibility(View.GONE);
+ binding.inspectButton.setText("宸�");
+ //鍏抽棴瀹氫綅
+ this.getActivity().stopService(location);
+
}
}
+
@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);
@@ -103,17 +143,19 @@
initView();
initLocalData();
getMarkerData();
- //寮�鍚畾浣�
- Intent location = new Intent(this.getActivity(), MyLocationService.class);
- location.putExtra("isSingle", false);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- this.getActivity().startForegroundService(location);
- } else {
- this.getActivity().startService(location);
- }
+ //鏄剧ず宸℃鐘舵��
+ chageInspecState();
return binding.getRoot();
}
+
+ /**
+ * 鍒濆鍖栧悇涓姸鎬�
+ */
+ private void initState() {
+ //寮�鍚畾浣�
+
+ }
/**
* 鍒濆鍖栨湰鍦版暟鎹�
@@ -121,7 +163,7 @@
public void initLocalData() {
centerPointBean = DaoSingleton.getInstance(MapFragment.this.getContext()).centerPointDao().findFirst();
List<MarkerBean> markerBeans = DaoSingleton.getInstance(MapFragment.this.getContext()).markerDao().findAll();
- strMarkerJson = beanToJson(markerBeans);
+ strMarkerJson = WebViewUtils.beanToJson(markerBeans);
jumpCenterPoint();
setMapMarker();
}
@@ -133,7 +175,7 @@
public void jumpCenterPoint() {
if (centerPointBean != null) {
Log.d(TAG, "jumpCenterPoint>>>>>>>>>>>>>>>>>>>" + centerPointBean.getLng() + "\",\"" + centerPointBean.getLat());
- mWebView.evaluateJavascript("javascript:setCenterAndZoom(\"" + centerPointBean.getLng() + "\",\"" + centerPointBean.getLat() + "\")", value -> {
+ mWebView.evaluateJavascript("javascript:setCenterAndZoom(\"" + centerPointBean.getLng() + "\",\"" + centerPointBean.getLat() + "\",\"" + centerPointBean.getZoomMp() + "\")", value -> {
});
}
}
@@ -177,7 +219,7 @@
markerBean.setCountyId(result.getCountyId());
markerBeans.add(markerBean);
}
- strMarkerJson = beanToJson(markerBeans);
+ strMarkerJson = WebViewUtils.beanToJson(markerBeans);
setMapMarker();
DaoSingleton.getInstance(MapFragment.this.getContext()).markerDao().deleteAll();
// 浣跨敤 RxJava 寮傛鎻掑叆鏁版嵁
@@ -199,29 +241,6 @@
}
});
- }
-
- /**
- * bean杞琷son
- *
- * @param markerBeans
- */
- private String beanToJson(List<MarkerBean> markerBeans) {
- StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.append("[");
- for (int i = 0; i < markerBeans.size(); i++) {
- MarkerBean markerBean = markerBeans.get(i);
- stringBuilder.append("[");
- stringBuilder.append(markerBean.getLng());
- stringBuilder.append(",");
- stringBuilder.append(markerBean.getLat());
- stringBuilder.append(",\"" + markerBean.getName() + "\"]");
- if (i != markerBeans.size() - 1) {
- stringBuilder.append(",");
- }
- }
- stringBuilder.append("]");
- return stringBuilder.toString().replace("\\", "\\\\").replace("\"", "\\\"");
}
@@ -259,29 +278,6 @@
Log.i("mWebView", "addMarker锛侊紒锛侊紒锛侊紒锛侊紒锛�" + value);
}
});
- }
-
- @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();
- Log.d(TAG, "onDestroy>>>>>>>>>>>>>>>>>>>>>>>>>>>");
- ((ViewGroup) mWebView.getParent()).removeView(mWebView);
- mWebView.destroy(); // 褰� Activity 瑕� destroy 鏃讹紝搴斿厛灏� WebView 绉婚櫎锛屽啀 destroy 鎺�
}
@@ -343,16 +339,10 @@
// 鏍规嵁HTTP鐘舵�佺爜澶勭悊閿欒
}
});
+ //宸℃鎸夐挳
binding.inspectButton.setOnClickListener(v -> {
- if (!isStartInspec) {
- isStartInspec = true;
- binding.inspectButton.setText("缁�");
- } else {
-
- isStartInspec = false;
- }
-
- binding.stateText.setVisibility(View.VISIBLE);
+ isStartInspec = !isStartInspec;
+ chageInspecState();
});
}
@@ -377,6 +367,7 @@
}
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 {
@@ -391,4 +382,5 @@
binding.bottomLL.setVisibility(View.GONE);
}
+
}
--
Gitblit v1.8.0