From fbb64f0b4151a4fefb90191991aa0fba7b26c52a Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 09 十二月 2024 18:08:59 +0800
Subject: [PATCH] 1.优化MQ相关设置 2.上报问题界面相关
---
app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 300 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 221 insertions(+), 79 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 1ce4b82..7c63b91 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
@@ -1,11 +1,10 @@
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.content.res.Resources;
import android.location.LocationManager;
import android.os.Build;
import android.os.Bundle;
@@ -25,15 +24,15 @@
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
-import com.dayu.pipirrapp.MyApplication;
+import com.dayu.pipirrapp.R;
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.LoginResult;
import com.dayu.pipirrapp.bean.net.MarkerResult;
import com.dayu.pipirrapp.dao.DaoSingleton;
import com.dayu.pipirrapp.databinding.FragmentMapBinding;
@@ -54,6 +53,10 @@
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;
@@ -61,9 +64,7 @@
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;
@@ -85,13 +86,16 @@
WebView mWebView;
CenterPointBean centerPointBean;
String strMarkerJson;
- //鏄惁鏄剧ず
- boolean isStartInspec = false;
+ //褰撳墠宸℃鐘舵��
+ int mInspectionState;
MapFragmenObserver mapFragmenObserver;
//褰撳墠宸℃璁板綍鐨勭浉鍏充俊鎭�
- InspectionBean mInspectionBean;
+ public InspectionBean mInspectionBean;
LatLonBean lastLatLonBean;
InspectionRequest inspectionRequest;
+ volatile boolean isHaseAginData = false;
+ volatile boolean webViewIsFinished = false;
+ List<InspectionLocationBean> aginShowlocationBeans;
@Override
public void onAttach(@NonNull Context context) {
@@ -105,7 +109,7 @@
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Log.i(TAG, "onCreate");
- isStartInspec = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.isStartInspec, false);
+ mInspectionState = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.inspectionState, 0);
}
@Override
@@ -131,8 +135,13 @@
initView();
initLocalData();
getMarkerData();
- //鏄剧ず宸℃鐘舵��
- chageInspecState();
+ //鏄剧ず宸℃鐘舵�佸苟涓旀樉绀哄洜鎰忓鍏抽棴鐨勫巻鍙叉暟鎹�
+ switch (mInspectionState) {
+ case InspectionUtils.STAT_INSPECTION:
+ case InspectionUtils.PAUSE_INSPECTION:
+ InspectionUtils.aginShowLocation(MapFragment.this);
+ }
+ chageInspecState(mInspectionState);
return binding.getRoot();
}
@@ -275,14 +284,14 @@
@Override
public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
String url = request.getUrl().toString();
- Log.i(TAG, "鍔犺浇鍦板潃>>>" + url);
+// Log.d(TAG, "鍔犺浇鍦板潃>>>" + url);
//鍒ゆ柇褰撳墠鏄惁涓哄姞杞界摝鐗�
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);
+// Log.d(TAG, "鏈湴缂撳瓨>>>" + androidUrl);
// if (MapJpgUtils.getInsatance().validateImageFile(androidUrl,request.))
// 鍒ゆ柇缂撳瓨鏄惁杩囨湡
// if (!MapJpgUtils.getInsatance(MapFragment.this.getContext()).isCacheExpired(cachedTile)) {
@@ -295,9 +304,9 @@
// }
} else {
//涓嬭浇鐡︾墖
- ApiManager.getInstance().donwLoadTile(androidUrl);
+ ApiManager.getInstance().donwLoadTile(MapFragment.this.getContext(), androidUrl);
}
- Log.i(TAG, "鍦ㄧ嚎鍔犺浇>>>" + url);
+// Log.d(TAG, "鍦ㄧ嚎鍔犺浇>>>" + url);
}
@@ -325,21 +334,45 @@
Log.e("setWebViewClient", "statusCode:" + statusCode + ">>>>description:" + description);
// 鏍规嵁HTTP鐘舵�佺爜澶勭悊閿欒
}
+
+ @Override
+ public void onPageFinished(WebView view, String url) {
+ super.onPageFinished(view, url);
+ webViewIsFinished = true;
+ //椤甸潰鍔犺浇瀹屾垚
+ if (isHaseAginData) {
+ aginShowLocation(null);
+ }
+ }
});
//宸℃鎸夐挳
binding.inspectButton.setOnClickListener(v -> {
- if (isStartInspec) {
- ConfirmDialog confirmDialog = new ConfirmDialog(MapFragment.this.getActivity(), "鎻愮ず", "纭鍏抽棴宸℃鍚楋紵", new View.OnClickListener() {
+ 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 onClick(View v) {
- isStartInspec = !isStartInspec;
- chageInspecState();
+ public void onCancle() {
+ getPermissions();
}
});
- } else {
- isStartInspec = !isStartInspec;
- chageInspecState();
}
+
+ });
+ //鏆傚仠宸℃
+ 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->{
});
}
@@ -385,10 +418,12 @@
*/
private void pushLocationData(InspectionLocationBean inspectionLocationBean) {
inspectionRequest.setInspectId(inspectionLocationBean.getInspectId());
- inspectionRequest.setInspectorId(inspectionLocationBean.getInspectorId());
+ inspectionRequest.setInspectorId(mInspectionBean.getInspectorId());
if (mInspectionBean != null) {
inspectionRequest.setStartTime(mInspectionBean.getStartTime());
- inspectionRequest.setStopTime(mInspectionBean.getStopTime());
+ if (!TextUtils.isEmpty(mInspectionBean.getStopTime())) {
+ inspectionRequest.setStopTime(mInspectionBean.getStopTime());
+ }
}
InspectionRequest.Track track = new InspectionRequest.Track();
track.setLat(inspectionLocationBean.getLat());
@@ -396,13 +431,17 @@
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>>() {
+ 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<LoginResult> t) {
+ public void onNext(BaseResponse<List<InsectionResult>> t) {
try {
if (t.isSuccess()) {
+ if (t.getContent() != null) {
+ mInspectionBean.setInspectId(String.valueOf(t.getContent().get(0).getInspectId()));
+ InspectionUtils.upataInspectionData(MapFragment.this.getContext(), mInspectionBean);
+ }
inspectionLocationBean.setPost(true);
- updateInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
+ InspectionUtils.updateInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
} else {
}
@@ -415,17 +454,6 @@
});
}
- /**
- * 寮�濮嬪贰妫�
- */
- private void startInspection() {
- DaoSingleton.getAsynchInstance(this.getContext()).inspectionDao().getMostRecentInspectionWithNoStopTime()
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread()).subscribe(inspectionBean -> {
- // 鏇存柊 UI
- mInspectionBean = inspectionBean;
- });
- }
/**
@@ -440,9 +468,11 @@
//澶т簬鏈�灏忚窛绂�
lastLatLonBean = latLonBean;
Log.i("chageInspecState", "lat:" + latLonBean.getLatitude() + ",log:" + latLonBean.getLongitude());
- InspectionLocationBean inspectionLocationBean = createInspectionLocation(latLonBean);
- addInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
+ 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 -> {
});
//涓婁紶鍧愭爣
@@ -450,55 +480,167 @@
} else {
Log.d(TAG, "isThanMinMeters>>>false");
}
-
-
}
}
};
/**
- * 鍒涘缓InspectionLocationBean
+ * 淇敼宸℃鐘舵��
+ *
+ * @param inspectionState
*/
- 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(int inspectionState) {
+ Intent location = new Intent(this.getActivity(), MyLocationService.class);
+ location.putExtra("isSingle", false);
+ //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);
+ //鍏抽棴瀹氫綅
+ this.getActivity().stopService(location);
+ break;
+ case InspectionUtils.STAT_INSPECTION_ONCLICK:
+ //娣诲姞鏂扮殑宸℃璁板綍
+ mInspectionBean = InspectionUtils.startInspection(this.getContext());
+ startLocation(location);
+ break;
+ case InspectionUtils.STAT_INSPECTION://1寮�濮�
+
+ startLocation(location);
+ break;
+ case InspectionUtils.PAUSE_INSPECTION://鏆傚仠
+ try {
+ //鍏抽棴瀹氫綅
+ this.getActivity().stopService(location);
+ 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) {
+ isHaseAginData = true;
+ 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();
+
+ }
+
+ }
+ }
+
+ /**
+ * 寮�濮嬪贰妫�鐨勭浉鍏抽�昏緫
+ *
+ * @param location
+ */
+ private void startLocation(Intent location) {
+ //鑾峰彇瀹氫綅鏈嶅姟浼犺繃鏉ョ殑鍧愭爣鐐�
+ LiveEventBus.get(CommonKeyName.locationData).observeForever(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));
+ //寮�鍚畾浣�
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ this.getActivity().startForegroundService(location);
+ } else {
+ this.getActivity().startService(location);
+ }
+ inspectionRequest = new InspectionRequest();
+ SharedPreferencesHelper.getInstance(this.getContext()).put(CommonKeyName.inspectionState, InspectionUtils.STAT_INSPECTION);
}
/**
- * 淇敼宸℃鐘舵��
+ * 鐢宠鍚庡彴瀹氫綅鏉冮檺
*/
- 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);
+ 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();
}
}
}
--
Gitblit v1.8.0