From 6a44973461e2a91f62f7eed681b4db3abb026289 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 24 十二月 2024 16:52:23 +0800
Subject: [PATCH] 1.优化地图相关代码，提高运行效率和可读性。 2.添加修改密码功能。 3.优化列表和详情页展示。
---
app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 791 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 703 insertions(+), 88 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 9f8833d..aff517f 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
@@ -1,27 +1,78 @@
package com.dayu.pipirrapp.fragment;
+import static com.dayu.pipirrapp.net.Constants.BASE_URL;
+
import android.content.Context;
-import android.location.LocationManager;
+import android.content.Intent;
+import android.content.res.Resources;
import android.os.Bundle;
+import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.webkit.JsResult;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
+import android.webkit.ValueCallback;
+import android.webkit.WebResourceError;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
import android.webkit.WebView;
+import android.webkit.WebViewClient;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.lifecycle.DefaultLifecycleObserver;
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleEventObserver;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.Observer;
+import com.dayu.pipirrapp.MyApplication;
+import com.dayu.pipirrapp.R;
+import com.dayu.pipirrapp.activity.AddIssueActivity;
+import com.dayu.pipirrapp.bean.db.CenterPointBean;
+import com.dayu.pipirrapp.bean.db.InspectionBean;
+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.net.CenterPointResult;
+import com.dayu.pipirrapp.bean.net.InsectionResult;
+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.dao.DaoSingleton;
import com.dayu.pipirrapp.databinding.FragmentMapBinding;
+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.tool.InspectionUtils;
+import com.dayu.pipirrapp.tool.MarkerUtils;
+import com.dayu.pipirrapp.tool.MyWebViewInterface;
+import com.dayu.pipirrapp.utils.CommonData;
+import com.dayu.pipirrapp.utils.CommonKeyName;
+import com.dayu.pipirrapp.utils.DateUtils;
+import com.dayu.pipirrapp.utils.MapJpgUtils;
+import com.dayu.pipirrapp.utils.MyLog;
+import com.dayu.pipirrapp.utils.ServiceUtils;
+import com.dayu.pipirrapp.utils.SharedPreferencesHelper;
+import com.dayu.pipirrapp.utils.ToastUtil;
+import com.dayu.pipirrapp.utils.WebViewUtils;
+import com.dayu.pipirrapp.view.ConfirmDialog;
+import com.dayu.pipirrapp.view.TipUtil;
+import com.hjq.permissions.OnPermissionCallback;
+import com.hjq.permissions.Permission;
+import com.hjq.permissions.XXPermissions;
+import com.jeremyliao.liveeventbus.LiveEventBus;
+import com.tencent.bugly.crashreport.CrashReport;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
/**
* author: zuo
@@ -29,120 +80,684 @@
* Time: 10:16
* 澶囨敞锛氬湴鍥鹃〉
*/
-public class MapFragment extends BaseFragment implements DefaultLifecycleObserver {
+public class MapFragment extends BaseFragment {
+ static String TAG = "MapFragment";
FragmentMapBinding binding;
- LocationManager locationManager;
WebView mWebView;
+ CenterPointBean centerPointBean;
+ //褰撳墠宸℃鐘舵��
+ int mInspectionState;
+ MapFragmenObserver mapFragmenObserver;
+ //褰撳墠宸℃璁板綍鐨勭浉鍏充俊鎭�
+ public InspectionBean mInspectionBean;
+ //鏈�鍚庝竴娆″畾浣嶇殑鍧愭爣
+ LatLonBean lastLatLonBean;
+ //web鏄惁鍔犺浇瀹屾垚
+ volatile boolean webViewIsFinished = false;
+ List<InspectionLocationBean> aginShowlocationBeans;
+ //web鍔犺浇鏃剁綉椤佃繕娌″姞杞藉畬鏃剁殑鏁版嵁
+ List<MarkerBean> webNoFinishMarkerData = new ArrayList<>();
+ //鎵�鏈夌殑Marker鏁版嵁閿负marker鐨処d
+ Map<String, MarkerBean> markerBeanSet = new HashMap<>();
+ //涓績鐐瑰潗鏍�
+ public double centerLng;
+ public double centerLat;
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
- requireActivity().getLifecycle().addObserver(this);
+ Log.i(TAG, "onAttach");
+ mapFragmenObserver = new MapFragmenObserver();
+ requireActivity().getLifecycle().addObserver(mapFragmenObserver);
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- locationManager = (LocationManager) getActivity().getSystemService(Context.LOCATION_SERVICE);
+ Log.i(TAG, "onCreate");
+ mInspectionState = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.inspectionState, 0);
}
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ Log.i(TAG, "onStart");
+ }
+
@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;
- initWebView();
- mWebView.loadUrl("http://192.168.3.178:3002/");
+ mWebView = WebViewUtils.initWebView(mWebView);
+ MyWebViewInterface myWebViewInterface = new MyWebViewInterface(MapFragment.this);
+ mWebView.addJavascriptInterface(myWebViewInterface, "Android");
+ mWebView.loadUrl("file:///android_asset/index.html");
+ getCenterPoint();
initView();
+ initWeb();
+ getMarkerData();
+
+ chageInspecState(mInspectionState);
return binding.getRoot();
}
+ private void initWeb() {
+ mWebView.setWebViewClient(new WebViewClient() {
+ @Override
+ public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
+ String url = request.getUrl().toString();
+ //鍒ゆ柇褰撳墠鏄惁涓哄姞杞界摝鐗�
+ 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.d(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(MapFragment.this.getContext(), androidUrl);
+ }
- @Override
- public void onCreate(@NonNull LifecycleOwner owner) {
- DefaultLifecycleObserver.super.onCreate(owner);
+ }
- Log.i("MapFragment", "onCreate");
+
+ return super.shouldInterceptRequest(view, request);
+ }
+
+ @Override
+ public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
+ super.onReceivedError(view, request, error);
+ // 鎹曡幏鍔犺浇杩囩▼涓彂鐢熺殑閿欒
+ int errorCode = error.getErrorCode();
+ String description = error.getDescription().toString();
+ String failingUrl = request.getUrl().toString();
+ Log.e("setWebViewClient", "errorCode:" + errorCode + ">>>>description:" + description + ">>>>failingUrl:" + failingUrl);
+ // 澶勭悊閿欒锛屼緥濡傛樉绀洪敊璇〉闈㈡垨鎻愮ず鐢ㄦ埛
+ }
+
+ @Override
+ public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
+ super.onReceivedHttpError(view, request, errorResponse);
+ // 鎹曡幏HTTP閿欒锛堝404, 500绛夛級
+ int statusCode = errorResponse.getStatusCode();
+ String description = errorResponse.getReasonPhrase();
+ Log.e("setWebViewClient", "statusCode:" + statusCode + ">>>>description:" + description);
+ // 鏍规嵁HTTP鐘舵�佺爜澶勭悊閿欒
+ }
+
+ @Override
+ public void onPageFinished(WebView view, String url) {
+ super.onPageFinished(view, url);
+ //椤甸潰鍔犺浇瀹屾垚
+ webViewIsFinished = true;
+ initLocalData();
+ aginShowLocation(null);
+
+ }
+ });
}
- @Override
- public void onResume() {
- super.onResume();
- mWebView.onResume(); // 鎭㈠ WebView锛岃兘姝ｅ父鎵ц缃戦〉鐨勫搷搴�
+ /**
+ * 鍒濆鍖栨湰鍦版暟鎹�
+ */
+ public void initLocalData() {
+ //璺宠浆涓績鐐�
+ centerPointBean = DaoSingleton.getInstance(MapFragment.this.getContext()).centerPointDao().findFirst();
+ jumpCenterPoint();
+ //娣诲姞鍥爓ebview娌℃湁鍔犺浇瀹屾垚瀵艰嚧娌℃湁娣诲姞鐨勫湴鍥炬爣娉�
+ if (!webNoFinishMarkerData.isEmpty()) {
+ for (MarkerBean bean : webNoFinishMarkerData) {
+ setMapMarker(bean);
+ }
+ }
+ //鏄剧ず鎵�鏈夊彇姘村彛
+ MarkerUtils.showLocoMarks(MapFragment.this);
+ //鏄剧ず宸℃鐘舵�佸苟涓旀樉绀哄洜鎰忓鍏抽棴鐨勫巻鍙叉暟鎹�
+ switch (mInspectionState) {
+ case InspectionUtils.STAT_INSPECTION:
+ case InspectionUtils.PAUSE_INSPECTION:
+ InspectionUtils.aginShowLocation(MapFragment.this);
+ }
+ }
+
+
+ /**
+ * 鑾峰彇鍙栨按鍙ｅ垪琛�
+ */
+ private void getMarkerData() {
+ ApiManager.getInstance().requestGetHideLoading(this.getContext(), Constants.BASE_URL + "/project/intake/all", MarkerListResult.class, null, new SubscriberListener<BaseResponse<MarkerListResult>>() {
+ @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();
+ markerBean.setId(result.getId());
+ 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());
+ markerBean.setAddress(result.getAddress());
+ markerBean.setBlockName(result.getBlockName());
+ markerBean.setDivideId(result.getDivideId());
+ setMapMarker(markerBean);
+ return markerBean;
+ })
+ .collect(Collectors.toList());
+
+ 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());
+ }
+ }
+
+ });
+ }
+
+
+ void initView() {
+
+ //宸℃鎸夐挳
+ binding.inspectButton.setOnClickListener(v -> {
+ if (XXPermissions.isGranted(MapFragment.this.getContext(), Permission.ACCESS_BACKGROUND_LOCATION)) {
+ chageInspecState(InspectionUtils.STAT_INSPECTION_ONCLICK);
+ } else {
+ TipUtil.show(MapFragment.this.getActivity(), "宸℃瀹氫綅闇�瑕佹偍閫夋嫨\"濮嬬粓鍏佽\"瀹氫綅淇℃伅锛屽惁鍒欐棤娉曞贰妫�銆�", new TipUtil.TipListener() {
+ @Override
+ public void onCancle() {
+ getPermissions();
+ }
+ });
+ }
+
+ });
+ //鏆傚仠宸℃
+ binding.inspectPause.setOnClickListener(v -> {
+ if (mInspectionState == InspectionUtils.STAT_INSPECTION) {
+ chageInspecState(InspectionUtils.PAUSE_INSPECTION);
+ } else {
+ chageInspecState(InspectionUtils.STAT_INSPECTION);
+ }
+ });
+ //鍋滄宸℃
+ binding.inspectClose.setOnClickListener(v -> {
+ chageInspecState(InspectionUtils.STOP_INSPECTION);
+ });
+ //涓婃姤闂
+ binding.putButton.setOnClickListener(v -> {
+ Intent issue = new Intent(MapFragment.this.getActivity(), AddIssueActivity.class);
+ MapFragment.this.getActivity().startActivity(issue);
+ });
+
}
- @Override
- public void onPause() {
- super.onPause();
- mWebView.onPause(); // 閫氳繃 onPause 鍔ㄤ綔閫氱煡鍐呮牳鏆傚仠鎵�鏈夌殑鍔ㄤ綔锛屽 DOM 鐨勮В鏋愩�乸lugin 鐨勬墽琛屻�丣avaScript 鎵ц绛�
+ /**
+ * 鏄剧ず鍙栨按鍙ｈ鎯�
+ *
+ * @param data
+ */
+ public void showWaterIntakeDetail(String data) {
+ MyLog.i(data);
+ MarkerBean markerBean = markerBeanSet.get(data);
+ if (markerBean != null) {
+ getInstakeDetail(markerBean);
+ }
+
}
+
+
+ /**
+ * 鑾峰彇鍦板浘涓績鐐�
+ */
+ private void getCenterPoint() {
+ ApiManager.getInstance().requestGetHideLoading(this.getContext(), Constants.BASE_URL + "/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());
+ centerPointBean.setZoomMp(t.getContent().getZoomMp());
+ 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);
+ }
+
+ /**
+ * 涓婃姤宸℃璁板綍
+ */
+ private void pushLocationData(InspectionLocationBean inspectionLocationBean) {
+ InspectionRequest inspectionRequest = InspectionRequest.getInstance();
+ inspectionRequest.setInspectId(inspectionLocationBean.getInspectId());
+ inspectionRequest.setInspectorId(mInspectionBean.getInspectorId());
+ if (mInspectionBean != null) {
+ inspectionRequest.setStartTime(mInspectionBean.getStartTime());
+ if (!TextUtils.isEmpty(mInspectionBean.getStopTime())) {
+ inspectionRequest.setStopTime(mInspectionBean.getStopTime());
+ }
+ }
+ InspectionRequest.Track track = new InspectionRequest.Track();
+ track.setLat(inspectionLocationBean.getLat());
+ track.setLng(inspectionLocationBean.getLng());
+ track.setLocateTime(inspectionLocationBean.getLocateTime());
+ inspectionRequest.addTracks(track);
+ ApiManager.getInstance().requestPostHideLoading(MapFragment.this.getContext(), BASE_URL + "/app/inspect/save", InsectionResult.class, inspectionRequest.toMap(inspectionRequest), new SubscriberListener<BaseResponse<List<InsectionResult>>>() {
+ @Override
+ public void onNext(BaseResponse<List<InsectionResult>> t) {
+ try {
+ if (t.isSuccess()) {
+ if (t.getContent() != null) {
+ MyLog.d("InspectId:" + String.valueOf(t.getContent().get(0).getInspectId()));
+ mInspectionBean.setInspectId(String.valueOf(t.getContent().get(0).getInspectId()));
+ InspectionUtils.upataInspectionData(MapFragment.this.getContext(), mInspectionBean);
+ }
+ inspectionLocationBean.setPost(true);
+ InspectionUtils.updateInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
+ } else {
+
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ CrashReport.postCatchedException(e);
+ }
+
+ }
+ });
+ }
+
+
+ /**
+ * 瀹氫綅鐩戝惉
+ */
+ private Observer<Object> locationObserver = new Observer<Object>() {
+ @Override
+ public void onChanged(Object o) {
+ if (mInspectionBean != null) {
+ LatLonBean latLonBean = (LatLonBean) o;
+ if (InspectionUtils.isThanMinMeters(lastLatLonBean, latLonBean)) {
+ //澶т簬鏈�灏忚窛绂�
+ lastLatLonBean = latLonBean;
+ Log.i("chageInspecState", "lat:" + latLonBean.getLatitude() + ",log:" + latLonBean.getLongitude());
+ InspectionLocationBean inspectionLocationBean = InspectionUtils.createInspectionLocation(latLonBean, mInspectionBean);
+ //娣诲姞宸℃璁板綍鍧愭爣
+ InspectionUtils.addInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
+ //鏇存柊鍒板湴鍥�
+ mWebView.evaluateJavascript("javascript:updateInspectionLocation(\"" + latLonBean.getLongitude() + "\",\"" + latLonBean.getLatitude() + "\")", value -> {
+ });
+ mWebView.evaluateJavascript("javascript:updateLocation(\"" + latLonBean.getLongitude() + "\",\"" + latLonBean.getLatitude() + "\")", value -> {
+ });
+ //涓婁紶鍧愭爣
+ pushLocationData(inspectionLocationBean);
+ } else {
+ Log.d(TAG, "isThanMinMeters>>>false");
+ }
+ }
+ }
+ };
+
+
+ /**
+ * 淇敼宸℃鐘舵��
+ *
+ * @param inspectionState
+ */
+ private void chageInspecState(int inspectionState) {
+
+ //0娌℃湁寮�濮嬶紝1寮�濮嬶紝2鏆傚仠,3鍏抽棴
+ switch (inspectionState) {
+ case InspectionUtils.NO_INSPECTION:
+ binding.inspectButton.setVisibility(View.VISIBLE);
+ binding.inspectRL.setVisibility(View.GONE);
+ binding.inspectButton.setText("宸�");
+ LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver);
+ //鍏抽棴瀹氫綅
+ ServiceUtils.stopLocationService(MapFragment.this.getContext());
+ break;
+ case InspectionUtils.STAT_INSPECTION_ONCLICK:
+ //娣诲姞鏂扮殑宸℃璁板綍
+ mInspectionBean = InspectionUtils.startInspection(this.getContext());
+ startLocation();
+ break;
+ case InspectionUtils.STAT_INSPECTION://1寮�濮�
+
+ startLocation();
+ break;
+ case InspectionUtils.PAUSE_INSPECTION://鏆傚仠
+ try {
+ //鍏抽棴瀹氫綅
+ ServiceUtils.stopLocationService(MapFragment.this.getContext());
+ binding.stateText.setText("宸叉殏鍋滃贰妫�");
+ binding.inspectPause.setText("缁х画");
+ binding.inspectRL.setBackgroundColor(this.getContext().getResources().getColor(R.color.inspect_rl_bg_color));
+ SharedPreferencesHelper.getInstance(this.getContext()).put(CommonKeyName.inspectionState, InspectionUtils.PAUSE_INSPECTION);
+ //娓呴櫎鍦板浘宸℃杞ㄨ抗
+ mWebView.evaluateJavascript("javascript:cleanLoclLay()", value -> {
+ });
+ } catch (Resources.NotFoundException e) {
+ e.printStackTrace();
+ }
+ break;
+ case InspectionUtils.STOP_INSPECTION://鍏抽棴
+ ConfirmDialog confirmDialog = new ConfirmDialog(MapFragment.this.getActivity(), "鎻愮ず", "纭鍏抽棴宸℃鍚楋紵", new ConfirmDialog.ConfirmOnClickListener() {
+ @Override
+ public void onClick(ConfirmDialog confirmDialog, View v) {
+ confirmDialog.dismiss();
+ chageInspecState(InspectionUtils.NO_INSPECTION);
+ SharedPreferencesHelper.getInstance(MapFragment.this.getContext()).put(CommonKeyName.inspectionState, InspectionUtils.NO_INSPECTION);
+ //鏈夊彲鑳借繕娌¤幏鍙栧埌瀹氫綅淇℃伅灏辩粨鏉熷贰妫�浜�
+ if (lastLatLonBean != null) {
+ //鏇存柊鏈湴鏁版嵁搴撶粨鏉熸椂闂�
+ mInspectionBean.setStopTime(DateUtils.getNowDateStr());
+ InspectionUtils.upataInspectionData(MapFragment.this.getContext(), mInspectionBean);
+ //涓婃姤缁撴潫鏃堕棿
+ InspectionLocationBean inspectionLocationBean = InspectionUtils.createInspectionLocation(lastLatLonBean, mInspectionBean);
+ InspectionUtils.addInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
+ pushLocationData(inspectionLocationBean);
+ mInspectionBean = new InspectionBean();
+ //娓呴櫎鍦板浘宸℃杞ㄨ抗
+ mWebView.evaluateJavascript("javascript:cleanLocationLay()", value -> {
+ });
+ lastLatLonBean = null;
+ }
+ }
+ });
+ confirmDialog.show();
+ break;
+ default:
+ }
+ mInspectionState = inspectionState;
+ }
+
+ /**
+ * 鎰忓閫�鍑哄悗缁х画鏄剧ず涔嬪墠鐨勫潗鏍�
+ */
+ public void aginShowLocation(List<InspectionLocationBean> locationBeans) {
+ if (locationBeans != null) {
+ aginShowlocationBeans = locationBeans;
+ }
+ if (webViewIsFinished) {
+ if (aginShowlocationBeans != null) {
+ for (InspectionLocationBean inspectionLocationBean : aginShowlocationBeans) {
+ Log.i("mWebView", "aginShowLocation" + inspectionLocationBean.getLng() + "\",\"" + inspectionLocationBean.getLat());
+ mWebView.evaluateJavascript("javascript:aginShowLocation(\"" + inspectionLocationBean.getLng() + "\",\"" + inspectionLocationBean.getLat() + "\")", value -> {
+ });
+ }
+ // 鍚� WebView 娉ㄥ叆鏁版嵁
+ aginShowlocationBeans.clear();
+ }
+ }
+ }
+
+ /**
+ * 璺宠浆鍦板浘涓績鐐�
+ */
+ public void jumpCenterPoint() {
+ if (webViewIsFinished) {
+ if (centerPointBean != null) {
+ Log.d(TAG, "jumpCenterPoint>>>>>>>>>>>>>>>>>>>" + centerPointBean.getLng() + "\",\"" + centerPointBean.getLat());
+ mWebView.evaluateJavascript("javascript:setCenterAndZoom(\"" + centerPointBean.getLng() + "\",\"" + centerPointBean.getLat() + "\",\"" + centerPointBean.getZoomMp() + "\")", value -> {
+ });
+ }
+ }
+ }
+
+ /**
+ * 娣诲姞鏍囨敞鐐�
+ */
+ 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);
+
+ } else {
+ webNoFinishMarkerData.add(markerBean);
+ }
+ }
+ }
+
+
+ /**
+ * 寮�濮嬪贰妫�鐨勭浉鍏抽�昏緫
+ *
+ * @param
+ */
+ private void startLocation() {
+ //鑾峰彇瀹氫綅鏈嶅姟浼犺繃鏉ョ殑鍧愭爣鐐�
+ LiveEventBus.get(CommonKeyName.locationData).observe(this, locationObserver);
+ binding.inspectRL.setVisibility(View.VISIBLE);
+ binding.inspectButton.setVisibility(View.GONE);
+ binding.inspectPause.setText("鏆傚仠");
+ binding.stateText.setText("宸插紑鍚贰妫�");
+ binding.inspectRL.setBackgroundColor(this.getContext().getResources().getColor(R.color.base_blue));
+ SharedPreferencesHelper.getInstance(this.getContext()).put(CommonKeyName.inspectionState, InspectionUtils.STAT_INSPECTION);
+ ServiceUtils.startLocationService(MapFragment.this.getContext(), false);
+ }
+
+
+ /**
+ * 鐢宠鍚庡彴瀹氫綅鏉冮檺
+ */
+ private void getPermissions() {
+ try {
+ XXPermissions.with(MapFragment.this.getContext())
+ // 鐢宠澶氫釜鏉冮檺
+ .permission(Permission.ACCESS_BACKGROUND_LOCATION)
+ .request(new OnPermissionCallback() {
+
+ @Override
+ public void onGranted(@NonNull List<String> permissions, boolean allGranted) {
+ if (allGranted) {
+ chageInspecState(InspectionUtils.STAT_INSPECTION_ONCLICK);
+ }
+ }
+
+ @Override
+ public void onDenied(@NonNull List<String> permissions, boolean doNotAskAgain) {
+ if (doNotAskAgain) {
+ // 濡傛灉鏄姘镐箙鎷掔粷灏辫烦杞埌搴旂敤鏉冮檺绯荤粺璁剧疆椤甸潰
+ TipUtil.show(MapFragment.this.getActivity(), "琚案涔呮嫆缁濇巿鏉冿紝璇锋墜鍔ㄦ巿浜堝畾浣嶅缁堝厑璁告潈闄�!閫夋嫨鈥滄潈闄愨��-->鈥滀綅缃俊鎭��-->鈥滃缁堝厑璁糕��,鐒跺悗杩斿洖搴旂敤銆�", new TipUtil.TipListener() {
+ @Override
+ public void onCancle() {
+ XXPermissions.startPermissionActivity(MapFragment.this.getContext(), permissions);
+ }
+ });
+ } else {
+ ToastUtil.showToastLong(MapFragment.this.getContext(), "鑾峰彇瀹氫綅濮嬬粓鍏佽鏉冮檺澶辫触");
+ }
+ }
+ });
+
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鎺ユ敹js浼犳潵鐨勪腑蹇冪偣鍧愭爣
+ *
+ * @param lng
+ * @param lat
+ */
+ public void refreshCenterPoint(double lng, double lat) {
+ centerLng = lng;
+ centerLat = lat;
+ binding.pointText.setText(centerLng + "锛�" + centerLat);
+ }
+
+ /**
+ * 淇敼缁忕含搴�
+ *
+ * @param markerBean
+ */
+ private void updataInstake(MarkerBean markerBean) {
+ String lng = String.valueOf(centerLng);
+ String lat = String.valueOf(centerLat);
+ Map<String, Object> params = new HashMap<>();
+ params.put("id", markerBean.getId());
+ params.put("lng", lng);
+ params.put("lat", lat);
+ params.put("operator", MyApplication.myApplication.userId);
+
+ ApiManager.getInstance().requestPost(MapFragment.this.getContext(), BASE_URL + "/project/intake/updateIntakeLngLat", Boolean.class, params, new SubscriberListener<BaseResponse<Boolean>>() {
+ @Override
+ public void onNext(BaseResponse<Boolean> t) {
+ try {
+ if (t.isSuccess()) {
+ mWebView.evaluateJavascript("javascript:refreshMarker(\"" + markerBean.getId() + "\",\"" + centerLng + "\",\"" + centerLat + "\",\"" + markerBean.getName() + "\")", new ValueCallback<String>() {
+ @Override
+ public void onReceiveValue(String value) {
+ }
+ });
+ binding.pointCenterImg.setVisibility(View.GONE);
+ binding.pointRL.setVisibility(View.GONE);
+ binding.lng.setText(lng);
+ binding.lat.setText(lat);
+ mWebView.evaluateJavascript("javascript:cancelPin()", value -> {
+ });
+ ToastUtil.showToastLong(MapFragment.this.getContext(), "淇敼鎴愬姛锛�");
+
+ } else {
+ ToastUtil.showToastLong(MapFragment.this.getContext(), t.getMsg());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ CrashReport.postCatchedException(e);
+ }
+
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇鍙栨按鍙ｈ鎯�
+ *
+ * @param markerBean
+ */
+ private void getInstakeDetail(MarkerBean markerBean) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("id", markerBean.getId());
+ ApiManager.getInstance().requestGet(this.getContext(), Constants.BASE_URL + "/project/intake/one", MarkerResult.class, params, new SubscriberListener<BaseResponse<MarkerResult>>() {
+ @Override
+ public void onNext(BaseResponse<MarkerResult> t) {
+ if (t.isSuccess()) {
+ MarkerResult result = t.getContent();
+ MarkerBean markerBean = new MarkerBean();
+ markerBean.setId(result.getId());
+ 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());
+ markerBean.setAddress(result.getAddress());
+ markerBean.setBlockName(result.getBlockName());
+ markerBean.setDivideId(result.getDivideId());
+ showMarker(markerBean);
+ } else {
+ ToastUtil.showToast(MapFragment.this.getContext(), t.getMsg());
+ }
+ }
+
+ });
+ }
+
+ private void showMarker(MarkerBean markerBean) {
+ binding.bottomLL.setVisibility(View.VISIBLE);
+ binding.markerAddress.setText(markerBean.getAddress());
+ binding.markerName.setText(markerBean.getName());
+ binding.markerBlockName.setText(markerBean.getBlockName());
+ binding.lat.setText(markerBean.getLat());
+ binding.lng.setText(markerBean.getLng());
+ //淇敼缁忕含搴�
+ binding.editePoint.setOnClickListener(v -> {
+
+ mWebView.evaluateJavascript("javascript:showPin(\"" + markerBean.getLng() + "\",\"" + markerBean.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();
+ });
+ }
+
+
@Override
public void onDestroy() {
super.onDestroy();
- ((ViewGroup) mWebView.getParent()).removeView(mWebView);
- mWebView.destroy(); // 褰� Activity 瑕� destroy 鏃讹紝搴斿厛灏� WebView 绉婚櫎锛屽啀 destroy 鎺�
+ LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver);
}
-
- void initWebView() {
-// getActivity().getWindow().setFlags(
-// WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
-// WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
- // WebView 閰嶇疆
- WebSettings webSettings = mWebView.getSettings();
- // 鐢熷懡鍛ㄦ湡
-// 鍓嶈繘鍚庨��
- if (mWebView.canGoBack()) {
- mWebView.goBack();
- }
- if (mWebView.canGoForward()) {
- mWebView.goForward();
- }
- // 缂撳瓨鐩稿叧
- mWebView.clearCache(false); // 娓呴櫎缂撳瓨
-// mWebView.clearHistory(); // 娓呴櫎鍘嗗彶
-// mWebView.clearFormData(); // 娓呴櫎琛ㄥ崟鏁版嵁
- webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);// 璁剧疆缂撳瓨妯″紡
- webSettings.setDatabaseEnabled(true);
- webSettings.setDomStorageEnabled(true);//寮�鍚疍OM缂撳瓨锛屽叧闂殑璇滺5鑷韩鐨勪竴浜涙搷浣滄槸鏃犳晥鐨�
-// 缂撳瓨妯″紡
-// LOAD_DEFAULT: 榛樿锛屾牴鎹� cache-control 鍐冲畾鏄惁浠庣綉缁滀笂鍙栨暟鎹�
-// LOAD_NORMAL: API level 17 涓凡缁忓簾寮�, 浠嶢PI level 11寮�濮嬩綔鐢ㄥ悓 LOAD_DEFAULT 妯″紡
-// LOAD_CACHE_ELSE_NETWORK: 鍙鏈湴鏈夛紝鏃犺鏄惁杩囨湡锛屾垨鑰� no-cache锛岄兘浣跨敤缂撳瓨涓殑鏁版嵁
-// LOAD_NO_CACHE: 涓嶄娇鐢ㄧ紦瀛橈紝鍙粠缃戠粶鑾峰彇鏁版嵁
-// LOAD_CACHE_ONLY: 涓嶄娇鐢ㄧ綉缁滐紝鍙鍙栨湰鍦扮紦瀛樻暟鎹�
-// js 鐩稿叧
- webSettings.setJavaScriptEnabled(true); // 鏀寔 js銆傚鏋滅鍒板悗鍙版棤娉曢噴鏀� js 瀵艰嚧鑰楃數锛屽簲鍦� onStop 鍜� onResume 閲屽垎鍒鎴� false 鍜� true
-// mWebView.addJavascriptInterface(new WebAppInterface(this), "android"); // js 鎺ュ彛
-
-// webSettings.setPluginsEnabled(true); // 鏀寔鎻掍欢
-// 璁剧疆鑷�傚簲灞忓箷锛屼袱鑰呭悎鐢�
- webSettings.setUseWideViewPort(true); // 灏嗗浘鐗囪皟鏁村埌閫傚悎 WebView 鐨勫ぇ灏�
- webSettings.setLoadWithOverviewMode(true); // 缂╂斁鑷冲睆骞曠殑澶у皬
-// 缂╂斁鎿嶄綔
- webSettings.setSupportZoom(true); // 鏀寔缂╂斁锛岄粯璁や负 true
- webSettings.setBuiltInZoomControls(true); // 璁剧疆鍐呯疆鐨勭缉鏀炬帶浠讹紝鑻ヤ负 false锛屽垯璇� WebView 涓嶅彲缂╂斁
- webSettings.setDisplayZoomControls(false); // 闅愯棌鍘熺敓鐨勭缉鏀炬帶浠�
- //webView寮笿sAlert
- mWebView.setWebChromeClient(new WebChromeClient(){
- @Override public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
- return super.onJsAlert(view, url, message, result);
- }
- });
-
- }
-
- void initView(){
- binding.flyBtn.setOnClickListener(v->{
- mWebView.evaluateJavascript("javascript:data()",value -> {
-
- });
- });
- }
-
-
}
--
Gitblit v1.8.0