From be9bea2335d4e4617844a1603aa624098c84b2a2 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 15 十月 2024 13:55:00 +0800
Subject: [PATCH] 1、退出登录 2.显示当前版本号 3.删除缓存 4.地图相关
---
app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 138 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 112 insertions(+), 26 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 7c122e4..39d32d5 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
@@ -1,7 +1,9 @@
package com.dayu.pipirrapp.fragment;
import android.content.Context;
+import android.content.Intent;
import android.location.LocationManager;
+import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
@@ -18,6 +20,7 @@
import androidx.annotation.Nullable;
import com.dayu.pipirrapp.bean.db.CenterPointBean;
+import com.dayu.pipirrapp.bean.db.MarkerBean;
import com.dayu.pipirrapp.bean.net.CenterPointResult;
import com.dayu.pipirrapp.bean.net.MarkerResult;
import com.dayu.pipirrapp.dao.DaoSingleton;
@@ -28,6 +31,7 @@
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.utils.CommonData;
import com.dayu.pipirrapp.utils.MapJpgUtils;
import com.dayu.pipirrapp.utils.MyLog;
@@ -37,7 +41,12 @@
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
@@ -54,7 +63,8 @@
WebView mWebView;
CenterPointBean centerPointBean;
- String jsonData;
+ String strMarkerJson;
+ boolean isStartInspec = false;
@Override
public void onAttach(@NonNull Context context) {
@@ -65,6 +75,17 @@
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ //鏄剧ず宸℃鐘舵��
+ if (isStartInspec) {
+ binding.stateText.setVisibility(View.VISIBLE);
+ } else {
+ binding.stateText.setVisibility(View.GONE);
+ }
}
@Nullable
@@ -80,25 +101,36 @@
mWebView.loadUrl("file:///android_asset/index.html");
getCenterPoint();
initView();
- initData();
+ initLocalData();
getMarkerData();
//寮�鍚畾浣�
-// Intent location = new Intent(this.getActivity(), MyLocationService.class);
-// location.putExtra("isSingle", false);
-// this.getActivity().startService(location);
+ 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);
+ }
return binding.getRoot();
}
- private void initData() {
+
+ /**
+ * 鍒濆鍖栨湰鍦版暟鎹�
+ */
+ public void initLocalData() {
+ centerPointBean = DaoSingleton.getInstance(MapFragment.this.getContext()).centerPointDao().findFirst();
+ List<MarkerBean> markerBeans = DaoSingleton.getInstance(MapFragment.this.getContext()).markerDao().findAll();
+ strMarkerJson = beanToJson(markerBeans);
jumpCenterPoint();
+ setMapMarker();
}
+
/**
* 璺宠浆鍦板浘涓績鐐�
*/
public void jumpCenterPoint() {
-
- centerPointBean = DaoSingleton.getInstance(MapFragment.this.getContext()).centerPointDao().findFirst();
if (centerPointBean != null) {
Log.d(TAG, "jumpCenterPoint>>>>>>>>>>>>>>>>>>>" + centerPointBean.getLng() + "\",\"" + centerPointBean.getLat());
mWebView.evaluateJavascript("javascript:setCenterAndZoom(\"" + centerPointBean.getLng() + "\",\"" + centerPointBean.getLat() + "\")", value -> {
@@ -106,9 +138,12 @@
}
}
- public void setMapMarker(){
- Log.i("mWebView", "addMarker????????????" + jsonData);
- mWebView.evaluateJavascript("javascript:addMarker(\"" + jsonData + "\")", new ValueCallback<String>() {
+ /**
+ * 娣诲姞鏍囨敞鐐�
+ */
+ 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);
@@ -117,29 +152,45 @@
}
-
+ /**
+ * 鑾峰彇鍙栨按鍙ｅ垪琛�
+ */
private void getMarkerData() {
- ApiManager.getInstance().requestGet(this.getContext(), Constants.BASE_URL + ":8085/project/intake/all", MarkerResult.class, null, new SubscriberListener<BaseResponse<MarkerResult>>() {
+ ApiManager.getInstance().requestGetHideLoading(this.getContext(), Constants.BASE_URL + ":8085/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()) {
- StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.append("[");
+ List<MarkerBean> markerBeans = new ArrayList<>();
for (int i = 0; i < t.getContent().getObj().size(); i++) {
- stringBuilder.append("[");
- stringBuilder.append(t.getContent().getObj().get(i).getLng());
- stringBuilder.append(",");
- stringBuilder.append(t.getContent().getObj().get(i).getLat());
- stringBuilder.append(",\"" + t.getContent().getObj().get(i).getName() + "\"]");
- if (i != t.getContent().getObj().size() - 1) {
- stringBuilder.append(",");
- }
+ 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);
}
- stringBuilder.append("]");
- jsonData = stringBuilder.toString().replace("\\", "\\\\").replace("\"", "\\\"");
-
+ strMarkerJson = 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 {
@@ -148,6 +199,29 @@
}
});
+ }
+
+ /**
+ * 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("\"", "\\\"");
}
@@ -205,6 +279,7 @@
@Override
public void onDestroy() {
super.onDestroy();
+ Log.d(TAG, "onDestroy>>>>>>>>>>>>>>>>>>>>>>>>>>>");
((ViewGroup) mWebView.getParent()).removeView(mWebView);
mWebView.destroy(); // 褰� Activity 瑕� destroy 鏃讹紝搴斿厛灏� WebView 绉婚櫎锛屽啀 destroy 鎺�
}
@@ -268,6 +343,17 @@
// 鏍规嵁HTTP鐘舵�佺爜澶勭悊閿欒
}
});
+ binding.inspectButton.setOnClickListener(v -> {
+ if (!isStartInspec) {
+ isStartInspec = true;
+ binding.inspectButton.setText("缁�");
+ } else {
+
+ isStartInspec = false;
+ }
+
+ binding.stateText.setVisibility(View.VISIBLE);
+ });
}
--
Gitblit v1.8.0