From 3ac1a2854f23f61c61e537ea6a7add0c9a70438e Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 02 十二月 2024 15:28:15 +0800
Subject: [PATCH] 1.上传巡检定位点相关功能 2.上传文件相关
---
app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 264 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 187 insertions(+), 77 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..1ce4b82 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
@@ -1,10 +1,15 @@
package com.dayu.pipirrapp.fragment;
+import static com.dayu.pipirrapp.net.Constants.BASE_URL;
+import static com.dayu.pipirrapp.tool.InspectionUtils.addInspectionLocationData;
+import static com.dayu.pipirrapp.tool.InspectionUtils.updateInspectionLocationData;
+
import android.content.Context;
import android.content.Intent;
import android.location.LocationManager;
import android.os.Build;
import android.os.Bundle;
+import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -18,10 +23,17 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.lifecycle.Observer;
+import com.dayu.pipirrapp.MyApplication;
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.InspectionRequest;
+import com.dayu.pipirrapp.bean.net.LoginResult;
import com.dayu.pipirrapp.bean.net.MarkerResult;
import com.dayu.pipirrapp.dao.DaoSingleton;
import com.dayu.pipirrapp.databinding.FragmentMapBinding;
@@ -32,17 +44,26 @@
import com.dayu.pipirrapp.net.subscribers.SubscriberListener;
import com.dayu.pipirrapp.observer.MapFragmenObserver;
import com.dayu.pipirrapp.service.MyLocationService;
+import com.dayu.pipirrapp.tool.InspectionUtils;
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.SharedPreferencesHelper;
import com.dayu.pipirrapp.utils.ToastUtil;
import com.dayu.pipirrapp.utils.WebViewUtils;
+import com.dayu.pipirrapp.view.ConfirmDialog;
+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.Random;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
@@ -64,35 +85,42 @@
WebView mWebView;
CenterPointBean centerPointBean;
String strMarkerJson;
+ //鏄惁鏄剧ず
boolean isStartInspec = false;
+ MapFragmenObserver mapFragmenObserver;
+ //褰撳墠宸℃璁板綍鐨勭浉鍏充俊鎭�
+ InspectionBean mInspectionBean;
+ LatLonBean lastLatLonBean;
+ InspectionRequest inspectionRequest;
@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();
- //鏄剧ず宸℃鐘舵��
- if (isStartInspec) {
- binding.stateText.setVisibility(View.VISIBLE);
- } else {
- binding.stateText.setVisibility(View.GONE);
- }
+ 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;
mWebView = WebViewUtils.initWebView(mWebView);
@@ -103,17 +131,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 +151,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 +163,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 -> {
});
}
}
@@ -156,7 +186,7 @@
* 鑾峰彇鍙栨按鍙ｅ垪琛�
*/
private void getMarkerData() {
- ApiManager.getInstance().requestGetHideLoading(this.getContext(), Constants.BASE_URL + ":8085/project/intake/all", MarkerResult.class, null, new SubscriberListener<BaseResponse<MarkerResult>>() {
+ ApiManager.getInstance().requestGetHideLoading(this.getContext(), Constants.BASE_URL + "/project/intake/all", MarkerResult.class, null, new SubscriberListener<BaseResponse<MarkerResult>>() {
@Override
public void onNext(BaseResponse<MarkerResult> t) {
if (t.isSuccess()) {
@@ -177,7 +207,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 +229,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("\"", "\\\"");
}
@@ -261,40 +268,14 @@
});
}
- @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 鎺�
- }
-
void initView() {
- //璺宠浆鍒版寚瀹氫綅缃�
- binding.flyBtn.setOnClickListener(v -> {
- mWebView.evaluateJavascript("javascript:locationOverLay(116.399565,39.89432)", value -> {
- });
- });
+
mWebView.setWebViewClient(new WebViewClient() {
@Override
public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
String url = request.getUrl().toString();
+ Log.i(TAG, "鍔犺浇鍦板潃>>>" + url);
//鍒ゆ柇褰撳墠鏄惁涓哄姞杞界摝鐗�
if (MapJpgUtils.getInsatance().isTianDiTuTileRequest(url)) {
String androidUrl = url.replace(CommonData.webKey, CommonData.androidKey);
@@ -318,6 +299,8 @@
}
Log.i(TAG, "鍦ㄧ嚎鍔犺浇>>>" + url);
}
+
+
return super.shouldInterceptRequest(view, request);
}
@@ -343,16 +326,21 @@
// 鏍规嵁HTTP鐘舵�佺爜澶勭悊閿欒
}
});
+ //宸℃鎸夐挳
binding.inspectButton.setOnClickListener(v -> {
- if (!isStartInspec) {
- isStartInspec = true;
- binding.inspectButton.setText("缁�");
+ if (isStartInspec) {
+ ConfirmDialog confirmDialog = new ConfirmDialog(MapFragment.this.getActivity(), "鎻愮ず", "纭鍏抽棴宸℃鍚楋紵", new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ isStartInspec = !isStartInspec;
+ chageInspecState();
+ }
+ });
} else {
-
- isStartInspec = false;
+ isStartInspec = !isStartInspec;
+ chageInspecState();
}
- binding.stateText.setVisibility(View.VISIBLE);
});
}
@@ -368,7 +356,7 @@
*/
private void getCenterPoint() {
- ApiManager.getInstance().requestGet(this.getContext(), Constants.BASE_URL + ":8080/base/dict_item/map_center", CenterPointResult.class, null, new SubscriberListener<BaseResponse<CenterPointResult>>() {
+ ApiManager.getInstance().requestGet(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()) {
@@ -377,6 +365,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 +380,125 @@
binding.bottomLL.setVisibility(View.GONE);
}
+ /**
+ * 涓婃姤宸℃璁板綍
+ */
+ private void pushLocationData(InspectionLocationBean inspectionLocationBean) {
+ inspectionRequest.setInspectId(inspectionLocationBean.getInspectId());
+ inspectionRequest.setInspectorId(inspectionLocationBean.getInspectorId());
+ if (mInspectionBean != null) {
+ inspectionRequest.setStartTime(mInspectionBean.getStartTime());
+ inspectionRequest.setStopTime(mInspectionBean.getStopTime());
+ }
+ InspectionRequest.Track track = new InspectionRequest.Track();
+ track.setLat(inspectionLocationBean.getLat());
+ track.setLng(inspectionLocationBean.getLng());
+ track.setLocateTime(inspectionLocationBean.getLocateTime());
+ inspectionRequest.getTracks().clear();
+ inspectionRequest.addTracks(track);
+ ApiManager.getInstance().requestPostHideLoading(MapFragment.this.getContext(), BASE_URL + "/app/inspect/save", LoginResult.class, inspectionRequest.toMap(inspectionRequest), new SubscriberListener<BaseResponse<LoginResult>>() {
+ @Override
+ public void onNext(BaseResponse<LoginResult> t) {
+ try {
+ if (t.isSuccess()) {
+ inspectionLocationBean.setPost(true);
+ updateInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
+ } else {
+
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ CrashReport.postCatchedException(e);
+ }
+
+ }
+ });
+ }
+
+ /**
+ * 寮�濮嬪贰妫�
+ */
+ private void startInspection() {
+ DaoSingleton.getAsynchInstance(this.getContext()).inspectionDao().getMostRecentInspectionWithNoStopTime()
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread()).subscribe(inspectionBean -> {
+ // 鏇存柊 UI
+ mInspectionBean = inspectionBean;
+ });
+ }
+
+
+ /**
+ * 瀹氫綅鐩戝惉
+ */
+ 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 = createInspectionLocation(latLonBean);
+ addInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
+ //鏇存柊鍒板湴鍥�
+ mWebView.evaluateJavascript("javascript:updateLocation(\"" + latLonBean.getLongitude() + "\",\"" + latLonBean.getLatitude() + "\")", value -> {
+ });
+ //涓婁紶鍧愭爣
+ pushLocationData(inspectionLocationBean);
+ } else {
+ Log.d(TAG, "isThanMinMeters>>>false");
+ }
+
+
+ }
+ }
+ };
+
+
+ /**
+ * 鍒涘缓InspectionLocationBean
+ */
+ private InspectionLocationBean createInspectionLocation(LatLonBean latLonBean) {
+ InspectionLocationBean inspectionLocationBean = new InspectionLocationBean();
+ inspectionLocationBean.setInspectId(mInspectionBean.getInspectId());
+ inspectionLocationBean.setLocateTime(DateUtils.getNowDateStr());
+ inspectionLocationBean.setPost(false);
+ inspectionLocationBean.setInspectorId(MyApplication.myApplication.userId);
+ inspectionLocationBean.setLng(String.valueOf(latLonBean.getLongitude()));
+ inspectionLocationBean.setLat(String.valueOf(latLonBean.getLatitude()));
+ return inspectionLocationBean;
+ }
+
+
+ /**
+ * 淇敼宸℃鐘舵��
+ */
+ private void chageInspecState() {
+ Intent location = new Intent(this.getActivity(), MyLocationService.class);
+ location.putExtra("isSingle", false);
+ if (isStartInspec) {
+ //娣诲姞鏂扮殑宸℃璁板綍
+ startInspection();
+ //鑾峰彇瀹氫綅鏈嶅姟浼犺繃鏉ョ殑鍧愭爣鐐�
+ LiveEventBus.get(CommonKeyName.locationData).observeForever(locationObserver);
+ 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);
+ }
+ mInspectionBean = InspectionUtils.startInspection(this.getContext());
+ inspectionRequest = new InspectionRequest();
+ } else {
+ binding.stateText.setVisibility(View.GONE);
+ binding.inspectButton.setText("宸�");
+ LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver);
+ //鍏抽棴瀹氫綅
+ this.getActivity().stopService(location);
+ }
+ }
}
--
Gitblit v1.8.0