android/pipIrrApp.git

			@@ -8,6 +8,7 @@
			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;
			@@ -45,6 +46,7 @@
			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;
			@@ -278,14 +280,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)) {
			@@ -298,9 +300,9 @@
			// }
			} else {
			//下载瓦片
			ApiManager.getInstance().donwLoadTile(androidUrl);
			ApiManager.getInstance().donwLoadTile(MapFragment.this.getContext(),androidUrl);
			}
			Log.i(TAG, "在线加载>>>" + url);
			// Log.d(TAG, "在线加载>>>" + url);
			}


			@@ -398,10 +400,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());
			@@ -415,7 +419,8 @@
			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);
			InspectionUtils.updateInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
			@@ -454,6 +459,8 @@
			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 -> {
			});
			//上传坐标
			@@ -476,7 +483,7 @@
			location.putExtra("isSingle", false);
			//0没有开始，1开始，2暂停,3关闭
			switch (inspectionState) {
			case 0:
			case InspectionUtils.NO_INSPECTION:
			binding.inspectButton.setVisibility(View.VISIBLE);
			binding.inspectRL.setVisibility(View.GONE);
			binding.inspectButton.setText("巡");
			@@ -493,7 +500,7 @@

			startLocation(location);
			break;
			case 2://暂停
			case InspectionUtils.PAUSE_INSPECTION://暂停
			try {
			//关闭定位
			this.getActivity().stopService(location);
			@@ -501,17 +508,32 @@
			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 3:
			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);
			//更新本地数据库结束时间
			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();