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 | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 204 insertions(+), 11 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 d2bff28..39d32d5 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
@@ -3,6 +3,7 @@
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,18 +19,34 @@
import androidx.annotation.NonNull;
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;
import com.dayu.pipirrapp.databinding.FragmentMapBinding;
import com.dayu.pipirrapp.js.MyWebViewInterface;
+import com.dayu.pipirrapp.net.ApiManager;
+import com.dayu.pipirrapp.net.BaseResponse;
+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;
+import com.dayu.pipirrapp.utils.ToastUtil;
import com.dayu.pipirrapp.utils.WebViewUtils;
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
@@ -38,11 +55,16 @@
* 澶囨敞锛氬湴鍥鹃〉
*/
public class MapFragment extends BaseFragment {
+ static String TAG = "MapFragment";
FragmentMapBinding binding;
+ //瀹氫綅鐩稿叧
LocationManager locationManager;
WebView mWebView;
+ CenterPointBean centerPointBean;
+ String strMarkerJson;
+ boolean isStartInspec = false;
@Override
public void onAttach(@NonNull Context context) {
@@ -53,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
@@ -66,14 +99,131 @@
MyWebViewInterface myWebViewInterface = new MyWebViewInterface(MapFragment.this);
mWebView.addJavascriptInterface(myWebViewInterface, "Android");
mWebView.loadUrl("file:///android_asset/index.html");
-
+ getCenterPoint();
initView();
+ initLocalData();
+ getMarkerData();
//寮�鍚畾浣�
Intent location = new Intent(this.getActivity(), MyLocationService.class);
location.putExtra("isSingle", false);
- this.getActivity().startService(location);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ this.getActivity().startForegroundService(location);
+ } else {
+ this.getActivity().startService(location);
+ }
return binding.getRoot();
}
+
+
+ /**
+ * 鍒濆鍖栨湰鍦版暟鎹�
+ */
+ 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() {
+ if (centerPointBean != null) {
+ Log.d(TAG, "jumpCenterPoint>>>>>>>>>>>>>>>>>>>" + centerPointBean.getLng() + "\",\"" + centerPointBean.getLat());
+ mWebView.evaluateJavascript("javascript:setCenterAndZoom(\"" + centerPointBean.getLng() + "\",\"" + centerPointBean.getLat() + "\")", value -> {
+ });
+ }
+ }
+
+ /**
+ * 娣诲姞鏍囨敞鐐�
+ */
+ 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);
+ }
+ });
+ }
+
+
+ /**
+ * 鑾峰彇鍙栨按鍙ｅ垪琛�
+ */
+ private void getMarkerData() {
+ 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()) {
+ List<MarkerBean> markerBeans = new ArrayList<>();
+ for (int i = 0; i < t.getContent().getObj().size(); i++) {
+ 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);
+ }
+ 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 {
+ ToastUtil.showToast(MapFragment.this.getContext(), t.getMsg());
+ }
+ }
+
+ });
+ }
+
+ /**
+ * 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("\"", "\\\"");
+ }
+
/**
* 娣诲姞鏍囨敞鐐�
@@ -102,7 +252,6 @@
}
stringBuilder.append("[116.417854,39.921988,\"235鍙栨按鍙"]]");
String jsonData = stringBuilder.toString().replace("\\", "\\\\").replace("\"", "\\\"");
-// String jsonData = "[[116.417854,39.921988,\"235鍙栨按鍙"],[116.406605,39.921585,\"237鍙栨按鍙"],[116.412222,39.912345,\"236鍙栨按鍙"]]";
Log.i("mWebView", "addMarker????????????" + jsonData);
mWebView.evaluateJavascript("javascript:addMarker(\"" + jsonData + "\")", new ValueCallback<String>() {
@Override
@@ -111,7 +260,6 @@
}
});
}
-
@Override
public void onResume() {
@@ -131,6 +279,7 @@
@Override
public void onDestroy() {
super.onDestroy();
+ Log.d(TAG, "onDestroy>>>>>>>>>>>>>>>>>>>>>>>>>>>");
((ViewGroup) mWebView.getParent()).removeView(mWebView);
mWebView.destroy(); // 褰� Activity 瑕� destroy 鏃讹紝搴斿厛灏� WebView 绉婚櫎锛屽啀 destroy 鎺�
}
@@ -144,22 +293,31 @@
});
mWebView.setWebViewClient(new WebViewClient() {
@Override
- public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
+ public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
String url = request.getUrl().toString();
- // 妫�鏌ユ湰鍦扮紦瀛�
- File cachedTile = MapJpgUtils.getInsatance(MapFragment.this.getContext()).getCachedTile(url);
- if (cachedTile != null && cachedTile.exists()) {
- // 鍒ゆ柇缂撳瓨鏄惁杩囨湡
- if (!MapJpgUtils.getInsatance(MapFragment.this.getContext()).isCacheExpired(cachedTile)) {
+ //鍒ゆ柇褰撳墠鏄惁涓哄姞杞界摝鐗�
+ if (MapJpgUtils.getInsatance().isTianDiTuTileRequest(url)) {
+ String androidUrl = url.replace(CommonData.webKey, CommonData.androidKey);
+ // 妫�鏌ユ湰鍦扮紦瀛�
+ File cachedTile = MapJpgUtils.getInsatance().getCachedTile(androidUrl);
+ if (cachedTile != null && cachedTile.exists()) {
+ Log.i(TAG, "鏈湴缂撳瓨>>>" + androidUrl);
+// if (MapJpgUtils.getInsatance().validateImageFile(androidUrl,request.))
+ // 鍒ゆ柇缂撳瓨鏄惁杩囨湡
+// if (!MapJpgUtils.getInsatance(MapFragment.this.getContext()).isCacheExpired(cachedTile)) {
try {
// 浠庣紦瀛樺姞杞界摝鐗�
return new WebResourceResponse("image/jpg", "utf-8", new FileInputStream(cachedTile));
} catch (FileNotFoundException e) {
e.printStackTrace();
}
+// }
+ } else {
+ //涓嬭浇鐡︾墖
+ ApiManager.getInstance().donwLoadTile(androidUrl);
}
+ Log.i(TAG, "鍦ㄧ嚎鍔犺浇>>>" + url);
}
-
return super.shouldInterceptRequest(view, request);
}
@@ -185,6 +343,17 @@
// 鏍规嵁HTTP鐘舵�佺爜澶勭悊閿欒
}
});
+ binding.inspectButton.setOnClickListener(v -> {
+ if (!isStartInspec) {
+ isStartInspec = true;
+ binding.inspectButton.setText("缁�");
+ } else {
+
+ isStartInspec = false;
+ }
+
+ binding.stateText.setVisibility(View.VISIBLE);
+ });
}
@@ -194,6 +363,30 @@
}
+ /**
+ * 鑾峰彇鍦板浘涓績鐐�
+ */
+ private void getCenterPoint() {
+
+ ApiManager.getInstance().requestGet(this.getContext(), Constants.BASE_URL + ":8080/base/dict_item/map_center", CenterPointResult.class, null, new SubscriberListener<BaseResponse<CenterPointResult>>() {
+ @Override
+ public void onNext(BaseResponse<CenterPointResult> t) {
+ if (t.isSuccess()) {
+ if (centerPointBean == null) {
+ centerPointBean = new CenterPointBean();
+ }
+ centerPointBean.setLat(t.getContent().getLat());
+ centerPointBean.setLng(t.getContent().getLng());
+ DaoSingleton.getInstance(MapFragment.this.getContext()).centerPointDao().insert(centerPointBean);
+ jumpCenterPoint();
+ } else {
+ ToastUtil.showToast(MapFragment.this.getContext(), t.getMsg());
+ }
+ }
+
+ });
+ }
+
public void closeWaterIntakeDetail() {
binding.bottomLL.setVisibility(View.GONE);
}
--
Gitblit v1.8.0