From 3df944d30530be8dc0ea1cbe1ed4afc22eb160a5 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期四, 06 二月 2025 11:09:48 +0800 Subject: [PATCH] 1.添加数据更新功能,确保本地没有数据时再获取基础数据 2.地图界面上添加滚动功能的控件(部分功能) --- app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 397 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 348 insertions(+), 49 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 addff5b..ddfb4c4 100644 --- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java +++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java @@ -31,6 +31,7 @@ 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.db.PipeNetworkBean; import com.dayu.pipirrapp.bean.net.CenterPointResult; import com.dayu.pipirrapp.bean.net.DivideListResult; import com.dayu.pipirrapp.bean.net.DivideResult; @@ -38,6 +39,8 @@ 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.bean.net.PipeNetworkListResult; +import com.dayu.pipirrapp.bean.net.PipeNetworkResult; import com.dayu.pipirrapp.dao.DaoSingleton; import com.dayu.pipirrapp.databinding.FragmentMapBinding; import com.dayu.pipirrapp.net.ApiManager; @@ -75,6 +78,7 @@ import java.util.stream.Collectors; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.CompositeDisposable; import io.reactivex.rxjava3.schedulers.Schedulers; /** @@ -111,6 +115,11 @@ public double centerLng; public double centerLat; + MarkerBean mMarkerBean; + + // 娣诲姞CompositeDisposable鏉ョ鐞嗘墍鏈夎闃� + private CompositeDisposable compositeDisposable = new CompositeDisposable(); + @Override public void onAttach(@NonNull Context context) { super.onAttach(context); @@ -122,8 +131,16 @@ @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setRetainInstance(true); Log.i(TAG, "onCreate"); mInspectionState = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.inspectionState, 0); + + // 娣诲姞鍒锋柊鏁版嵁鐨勭洃鍚� + LiveEventBus.get(CommonKeyName.refreshData).observe(this, o -> { + getCenterPoint(); + getMarkerData(); + getDivideList(); + }); } @Override @@ -136,7 +153,6 @@ @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"); @@ -145,13 +161,87 @@ MyWebViewInterface myWebViewInterface = new MyWebViewInterface(MapFragment.this); mWebView.addJavascriptInterface(myWebViewInterface, "Android"); mWebView.loadUrl("file:///android_asset/index.html"); - getCenterPoint(); + + // 寮傛鍔犺浇鏈湴鏁版嵁 + loadLocalData(); + initView(); initWeb(); - getMarkerData(); chageInspecState(mInspectionState); return binding.getRoot(); + } + + /** + * 寮傛鍔犺浇鏈湴鏁版嵁 + */ + private void loadLocalData() { + // 寮傛鍔犺浇涓績鐐规暟鎹� + compositeDisposable.add( + DaoSingleton.getAsynchInstance(this.getContext()).centerPointDao().findFirst() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(result -> { + centerPointBean = result; + if (centerPointBean == null) { + getCenterPoint(); + } else { + jumpCenterPoint(); + } + }, throwable -> { + Log.e(TAG, "Load centerPoint error: " + throwable); + getCenterPoint(); + }, () -> { + // 褰揗aybe涓虹┖鏃惰皟鐢� + getCenterPoint(); + }) + ); + + // 寮傛鍔犺浇鍙栨按鍙f暟鎹� + compositeDisposable.add( + DaoSingleton.getAsynchInstance(this.getContext()).markerDao().getAll() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(markers -> { + if (markers == null || markers.isEmpty()) { + getMarkerData(); + } else { + for (MarkerBean marker : markers) { + markerBeanSet.put(marker.getId(), marker); + setMapMarker(marker); + } + } + }, throwable -> { + Log.e(TAG, "Load markers error: " + throwable.getMessage()); + getMarkerData(); + }, () -> { + // 褰揗aybe涓虹┖鏃惰皟鐢� + getMarkerData(); + }) + ); + + // 寮傛鍔犺浇鍒嗘按鎴挎暟鎹� + compositeDisposable.add( + DaoSingleton.getAsynchInstance(this.getContext()).divideDao().getAll() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(divides -> { + if (divides == null || divides.isEmpty()) { + getDivideList(); + } else { + for (DivideBean divide : divides) { + divideBeanMap.put(divide.getId(), divide); + setMapDivide(divide); + } + } + }, throwable -> { + Log.e(TAG, "Load divides error: " + throwable.getMessage()); + getDivideList(); + }, () -> { + // 褰揗aybe涓虹┖鏃惰皟鐢� + getDivideList(); + }) + ); } private void initWeb() { @@ -213,7 +303,7 @@ super.onPageFinished(view, url); //椤甸潰鍔犺浇瀹屾垚 webViewIsFinished = true; - initLocalData(); + webFinishInitLocalData(); aginShowLocation(null); } @@ -221,16 +311,22 @@ } /** - * 鍒濆鍖栨湰鍦版暟鎹� + * web鍔犺浇瀹屽垵濮嬪寲鏈湴鏁版嵁 */ - public void initLocalData() { - //璺宠浆涓績鐐� - centerPointBean = DaoSingleton.getInstance(MapFragment.this.getContext()).centerPointDao().findFirst(); - jumpCenterPoint(); + public void webFinishInitLocalData() { + // 鍙湪鏈湴娌℃湁鏁版嵁鏃惰幏鍙栦腑蹇冪偣 + if (centerPointBean != null) { + jumpCenterPoint(); + } //娣诲姞鍥爓ebview娌℃湁鍔犺浇瀹屾垚瀵艰嚧娌℃湁娣诲姞鐨勫湴鍥炬爣娉� if (!webNoFinishMarkerData.isEmpty()) { for (MarkerBean bean : webNoFinishMarkerData) { setMapMarker(bean); + } + } + if (!webNoFinishDivideData.isEmpty()) { + for (DivideBean bean : webNoFinishDivideData) { + setMapDivide(bean); } } //鏄剧ず鎵�鏈夊彇姘村彛 @@ -243,7 +339,6 @@ } } - /** * 鑾峰彇鍙栨按鍙e垪琛� */ @@ -252,9 +347,7 @@ @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(); @@ -275,18 +368,22 @@ }) .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()); - }); + // 浣跨敤 CompositeDisposable 绠$悊鏁版嵁搴撴彃鍏ユ搷浣� + compositeDisposable.add( + DaoSingleton.getAsynchInstance(MapFragment.this.getContext()).markerDao().insertAll(markerBeans) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + () -> { + // 鎻掑叆鎴愬姛 + Log.i("mWebView", "鏁版嵁鎻掑叆鎴愬姛"); + }, + throwable -> { + // 鎻掑叆澶辫触 + Log.e("mWebView", "鏁版嵁鎻掑叆澶辫触: " + throwable.getMessage()); + } + ) + ); } } else { @@ -303,7 +400,11 @@ //宸℃鎸夐挳 binding.inspectButton.setOnClickListener(v -> { if (XXPermissions.isGranted(MapFragment.this.getContext(), Permission.ACCESS_BACKGROUND_LOCATION)) { - chageInspecState(InspectionUtils.STAT_INSPECTION_ONCLICK); + new ConfirmDialog(MapFragment.this.getActivity(), (confirmDialog, v1) -> { + chageInspecState(InspectionUtils.STAT_INSPECTION_ONCLICK); + confirmDialog.dismiss(); + }).show(); + } else { TipUtil.show(MapFragment.this.getActivity(), "宸℃瀹氫綅闇�瑕佹偍閫夋嫨\"濮嬬粓鍏佽\"瀹氫綅淇℃伅锛屽惁鍒欐棤娉曞贰妫�銆�", new TipUtil.TipListener() { @Override @@ -349,6 +450,20 @@ } + /** + * 鏄剧ず鍒嗘按鎴胯鎯� + * + * @param data + */ + public void showDivideDetail(String data) { + MyLog.i(data); + DivideBean markerBean = divideBeanMap.get(data); + if (markerBean != null) { + binding.bottomLL.setVisibility(View.GONE); + getDivideDetail(markerBean); + } + + } /** * 鑾峰彇鍦板浘涓績鐐� @@ -581,18 +696,18 @@ /** * 娣诲姞鍙栨按鍙f爣娉� */ - public void setDivide(DivideBean divide) { + public void setMapDivide(DivideBean divide) { if (divide != null) { if (webViewIsFinished) { if (!TextUtils.isEmpty(divide.getLng()) && !TextUtils.isEmpty(divide.getLat())) { - mWebView.evaluateJavascript("javascript:addMarker(\"" + divide.getId() + "\",\"" + divide.getLng() + "\",\"" + divide.getLat() + "\",\"" + divide.getDivideName() + "\")", new ValueCallback<String>() { + mWebView.evaluateJavascript("javascript:addDivide(\"" + divide.getId() + "\",\"" + divide.getLng() + "\",\"" + divide.getLat() + "\",\"" + divide.getDivideName() + "\")", new ValueCallback<String>() { @Override public void onReceiveValue(String value) { } }); divideBeanMap.put(divide.getId(), divide); } else { - MyLog.d("setMapMarker>" + divide.getDivideName() + "缁忕含搴︿负绌�"); + MyLog.d("setMapDivide>" + divide.getDivideName() + "缁忕含搴︿负绌�"); } } else { webNoFinishDivideData.add(divide); @@ -600,6 +715,28 @@ } } + /** + * 娣诲姞绠$綉鏍囨敞 + */ + public void setMapDivide(PipeNetworkBean pipeNetworkBean) { +// if (divide != null) { +// if (webViewIsFinished) { +// for () +// if (!TextUtils.isEmpty(divide.getLng()) && !TextUtils.isEmpty(divide.getLat())) { +// mWebView.evaluateJavascript("javascript:addDivide(\"" + divide.getId() + "\",\"" + divide.getLng() + "\",\"" + divide.getLat() + "\",\"" + divide.getDivideName() + "\")", new ValueCallback<String>() { +// @Override +// public void onReceiveValue(String value) { +// } +// }); +// divideBeanMap.put(divide.getId(), divide); +// } else { +// MyLog.d("setMapDivide>" + divide.getDivideName() + "缁忕含搴︿负绌�"); +// } +// } else { +// webNoFinishDivideData.add(divide); +// } +// } + } /** * 寮�濮嬪贰妫�鐨勭浉鍏抽�昏緫 @@ -695,6 +832,8 @@ }); binding.pointCenterImg.setVisibility(View.GONE); binding.pointRL.setVisibility(View.GONE); + mMarkerBean.setLat(lat); + mMarkerBean.setLng(lng); binding.lng.setText(lng); binding.lat.setText(lat); mWebView.evaluateJavascript("javascript:cancelPin()", value -> { @@ -726,20 +865,20 @@ 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); + mMarkerBean = new MarkerBean(); + mMarkerBean.setId(result.getId()); + mMarkerBean.setLng(result.getLng()); + mMarkerBean.setLat(result.getLat()); + mMarkerBean.setBlockId(result.getBlockId()); + mMarkerBean.setName(result.getName()); + mMarkerBean.setRemarks(result.getRemarks()); + mMarkerBean.setTownId(result.getTownId()); + mMarkerBean.setVillageId(result.getVillageId()); + mMarkerBean.setCountyId(result.getCountyId()); + mMarkerBean.setAddress(result.getAddress()); + mMarkerBean.setBlockName(result.getBlockName()); + mMarkerBean.setDivideId(result.getDivideId()); + showMarker(mMarkerBean); } else { ToastUtil.showToast(MapFragment.this.getContext(), t.getMsg()); } @@ -748,8 +887,32 @@ }); } + /** + * 鏄剧ず鍙栨按鍙h鎯� + */ + private void getDivideDetail(DivideBean divideBean) { + ApiManager.getInstance().requestGet(this.getContext(), Constants.BASE_URL + "/project/divide/getone/" + divideBean.getDivideId(), DivideResult.class, null, new SubscriberListener<BaseResponse<DivideResult>>() { + @Override + public void onNext(BaseResponse<DivideResult> t) { + if (t.isSuccess()) { + DivideBean divideBean = getDivideBean(t.getContent()); + showDivideMarker(divideBean); + } else { + ToastUtil.showToast(MapFragment.this.getContext(), t.getMsg()); + } + } + + }); + } + + /** + * 鏄剧ず鍙栨按鍙h鎯� + */ private void showMarker(MarkerBean markerBean) { binding.bottomLL.setVisibility(View.VISIBLE); + binding.phoneLL.setVisibility(View.GONE); + binding.headerLL.setVisibility(View.GONE); + binding.editePoint.setVisibility(View.VISIBLE); binding.markerAddress.setText(markerBean.getAddress()); binding.markerName.setText(markerBean.getName()); binding.markerBlockName.setText(markerBean.getBlockName()); @@ -785,23 +948,114 @@ } /** + * 鏄剧ず鍒嗘按鎴胯鎯� + * + * @param divideBean + */ + private void showDivideMarker(DivideBean divideBean) { + binding.bottomLL.setVisibility(View.VISIBLE); + binding.phoneLL.setVisibility(View.VISIBLE); + binding.headerLL.setVisibility(View.VISIBLE); + binding.editePoint.setVisibility(View.GONE); + binding.markerAddress.setText(divideBean.getAddress()); + binding.markerName.setText(divideBean.getDivideName()); + binding.markerBlockName.setText(divideBean.getBlockName()); + binding.phone.setText(divideBean.getPhone()); + binding.header.setText(divideBean.getHeader()); + binding.lat.setText(divideBean.getLat()); + binding.lng.setText(divideBean.getLng()); + //淇敼缁忕含搴� + binding.editePoint.setOnClickListener(v -> { + + mWebView.evaluateJavascript("javascript:showPin(\"" + divideBean.getLng() + "\",\"" + divideBean.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(); + }); + } + + + /** * 鑾峰彇鍒嗘按鎴� */ private void getDivideList() { - ApiManager.getInstance().requestPost(MapFragment.this.getContext(), BASE_URL + "/project/divide/getDivides", DivideListResult.class, null, new SubscriberListener<BaseResponse<DivideListResult>>() { + ApiManager.getInstance().requestGetHideLoading(MapFragment.this.getContext(), BASE_URL + "/project/divide/getDivides", DivideListResult.class, null, new SubscriberListener<BaseResponse<DivideListResult>>() { @Override public void onNext(BaseResponse<DivideListResult> t) { try { if (t.isSuccess()) { - if (t.getContent().getObj() != null && t.getContent().getObj().isEmpty()) { - + if (t.getContent().getObj() != null && !t.getContent().getObj().isEmpty()) { List<DivideBean> divideBeans = new ArrayList<>(); for (DivideResult divideResult : t.getContent().getObj()) { DivideBean divideBean = getDivideBean(divideResult); + setMapDivide(divideBean); divideBeans.add(divideBean); } + + // 浣跨敤 CompositeDisposable 绠$悊鏁版嵁搴撴彃鍏ユ搷浣� + compositeDisposable.add( + DaoSingleton.getAsynchInstance(MapFragment.this.getContext()).divideDao().insertAll(divideBeans) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + () -> { + // 鎻掑叆鎴愬姛 + Log.i("mWebView", "鏁版嵁鎻掑叆鎴愬姛"); + }, + throwable -> { + // 鎻掑叆澶辫触 + Log.e("mWebView", "鏁版嵁鎻掑叆澶辫触: " + throwable.getMessage()); + } + ) + ); + } + } else { + ToastUtil.showToastLong(MapFragment.this.getContext(), t.getMsg()); + } + } catch (Exception e) { + e.printStackTrace(); + CrashReport.postCatchedException(e); + } + } + }); + } + /** + * 鑾峰彇绠$綉 + */ + private void getPipeNetworkList() { + ApiManager.getInstance().requestGetHideLoading(MapFragment.this.getContext(), BASE_URL + "/project/network/all", PipeNetworkListResult.class, null, new SubscriberListener<BaseResponse<PipeNetworkListResult>>() { + @Override + public void onNext(BaseResponse<PipeNetworkListResult> t) { + try { + if (t.isSuccess()) { + if (t.getContent().getObj() != null && !t.getContent().getObj().isEmpty()) { + List<DivideBean> divideBeans = new ArrayList<>(); + for (PipeNetworkResult divideResult : t.getContent().getObj()) { + PipeNetworkBean divideBean = getPipeNetworkBean(divideResult); + setMapDivide(divideBean); +// divideBeans.add(divideBean); + } // 浣跨敤 RxJava 寮傛鎻掑叆鏁版嵁 DaoSingleton.getAsynchInstance(MapFragment.this.getContext()).divideDao().insertAll(divideBeans) .subscribeOn(Schedulers.io()) // 鍦� IO 绾跨▼涓婃墽琛� @@ -838,11 +1092,16 @@ divideBean.setBlockId(divideResult.getBlockId()); divideBean.setBlockName(divideResult.getBlockName()); divideBean.setDivideId(divideResult.getDivideId()); - divideBean.setDivideName(divideResult.getDivideName()); + if (!TextUtils.isEmpty(divideResult.getDivideName())) { + divideBean.setDivideName(divideResult.getDivideName()); + } else { + divideBean.setDivideName(divideResult.getName()); + } + divideBean.setHeader(divideResult.getHeader()); - divideBean.setId(String.valueOf(divideResult.getId())); - divideBean.setLat(String.valueOf(divideResult.getLat())); - divideBean.setLng(String.valueOf(divideResult.getLng())); + divideBean.setId(divideResult.getId()); + divideBean.setLat(divideResult.getLat()); + divideBean.setLng(divideResult.getLng()); divideBean.setOperateDt(divideResult.getOperateDt()); divideBean.setOperator(divideResult.getOperator()); divideBean.setPhone(divideResult.getPhone()); @@ -852,10 +1111,50 @@ return divideBean; } + private static @NonNull PipeNetworkBean getPipeNetworkBean(PipeNetworkResult divideResult) { + PipeNetworkBean pipeNetworkBean = new PipeNetworkBean(); + + return pipeNetworkBean; + } @Override public void onDestroy() { super.onDestroy(); + // 娓呯悊鎵�鏈夎闃� + if (compositeDisposable != null && !compositeDisposable.isDisposed()) { + compositeDisposable.dispose(); + } LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver); + if (mWebView != null) { + mWebView.destroy(); + } + } + + @Override + public void onResume() { + super.onResume(); + mWebView.onResume(); + mWebView.resumeTimers(); + } + + @Override + public void onPause() { + super.onPause(); + mWebView.onPause(); + mWebView.pauseTimers(); + } + + @Override + public void onSaveInstanceState(@NonNull Bundle outState) { + super.onSaveInstanceState(outState); + mWebView.saveState(outState); + } + + @Override + public void onViewStateRestored(@Nullable Bundle savedInstanceState) { + super.onViewStateRestored(savedInstanceState); + if (savedInstanceState != null) { + mWebView.restoreState(savedInstanceState); + } } } -- Gitblit v1.8.0