From fbfa859ff0fe312cbb49a3345b6e3d67d574a946 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 28 十一月 2024 16:33:37 +0800
Subject: [PATCH] 1.工单列表界面 2.工单详情界面 3.处理工单界面选择图片相关
---
app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 150 ++++++++++++++++++++++++++------------------------
1 files changed, 78 insertions(+), 72 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..e8e1f24 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
@@ -18,8 +18,10 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.lifecycle.Observer;
import com.dayu.pipirrapp.bean.db.CenterPointBean;
+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.MarkerResult;
@@ -33,10 +35,14 @@
import com.dayu.pipirrapp.observer.MapFragmenObserver;
import com.dayu.pipirrapp.service.MyLocationService;
import com.dayu.pipirrapp.utils.CommonData;
+import com.dayu.pipirrapp.utils.CommonKeyName;
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 java.io.File;
import java.io.FileInputStream;
@@ -65,34 +71,72 @@
CenterPointBean centerPointBean;
String strMarkerJson;
boolean isStartInspec = false;
+ MapFragmenObserver mapFragmenObserver;
@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();
- //鏄剧ず宸℃鐘舵��
+ Log.i(TAG, "onStart");
+ }
+
+ /**
+ * 淇敼宸℃鐘舵��
+ */
+ private void chageInspecState() {
+ Intent location = new Intent(this.getActivity(), MyLocationService.class);
+ location.putExtra("isSingle", false);
if (isStartInspec) {
+ //鑾峰彇瀹氫綅鏈嶅姟浼犺繃鏉ョ殑鍧愭爣鐐�
+ LiveEventBus.get(CommonKeyName.locationData).observeForever(new Observer<Object>() {
+ @Override
+ public void onChanged(Object o) {
+
+ LatLonBean latLonBean = (LatLonBean) o;
+ Log.i("chageInspecState", "lat:" + latLonBean.getLatitude() + ",log:" + latLonBean.getLongitude());
+ mWebView.evaluateJavascript("javascript:updateLocation(\"" + latLonBean.getLatitude() + "\",\"" + latLonBean.getLongitude() + "\")", value -> {
+ });
+ }
+ });
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);
+ }
} else {
binding.stateText.setVisibility(View.GONE);
+ binding.inspectButton.setText("宸�");
+ //鍏抽棴瀹氫綅
+ this.getActivity().stopService(location);
+
}
}
+
@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 +147,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 +167,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 +179,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 +202,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 +223,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 +245,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 +284,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 +315,8 @@
}
Log.i(TAG, "鍦ㄧ嚎鍔犺浇>>>" + url);
}
+
+
return super.shouldInterceptRequest(view, request);
}
@@ -343,16 +342,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 +372,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 +381,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 +396,5 @@
binding.bottomLL.setVisibility(View.GONE);
}
+
}
--
Gitblit v1.8.0