1.修复上传文件取消上传还会上传bug 2.添加上传视频功能 3.添加关闭activity时关闭上传功能。

zuoxiao

2025-01-08 596d0bcbacd8dde70f0bbcfdf07db5cf694220ef

 app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java

@@ -22,6 +22,7 @@
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;

import com.dayu.pipirrapp.MyApplication;
import com.dayu.pipirrapp.R;
import com.dayu.pipirrapp.activity.AddIssueActivity;
import com.dayu.pipirrapp.bean.db.CenterPointBean;
@@ -32,10 +33,10 @@
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.MarkerListResult;
import com.dayu.pipirrapp.bean.net.MarkerResult;
import com.dayu.pipirrapp.dao.DaoSingleton;
import com.dayu.pipirrapp.databinding.FragmentMapBinding;
import com.dayu.pipirrapp.tool.MyWebViewInterface;
import com.dayu.pipirrapp.net.ApiManager;
import com.dayu.pipirrapp.net.BaseResponse;
import com.dayu.pipirrapp.net.Constants;
@@ -43,6 +44,7 @@
import com.dayu.pipirrapp.observer.MapFragmenObserver;
import com.dayu.pipirrapp.tool.InspectionUtils;
import com.dayu.pipirrapp.tool.MarkerUtils;
import com.dayu.pipirrapp.tool.MyWebViewInterface;
import com.dayu.pipirrapp.utils.CommonData;
import com.dayu.pipirrapp.utils.CommonKeyName;
import com.dayu.pipirrapp.utils.DateUtils;
@@ -67,6 +69,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -89,15 +92,18 @@
    MapFragmenObserver mapFragmenObserver;
    //当前巡检记录的相关信息
    public InspectionBean mInspectionBean;
    //最后一次定位的坐标
    LatLonBean lastLatLonBean;
    InspectionRequest inspectionRequest;
    //    volatile boolean isHaseAginData = false;
    //web是否加载完成
    volatile boolean webViewIsFinished = false;
    List<InspectionLocationBean> aginShowlocationBeans;
    //web加载时网页还没加载完时的数据
    List<MarkerBean> webNoFinishMarkerData = new ArrayList<>();
    //所有的Marker数据键为marker的Id
    Map<String, MarkerBean> markerBeanSet = new HashMap<>();
    //中心点坐标
    public double centerLng;
    public double centerLat;

    @Override
    public void onAttach(@NonNull Context context) {
@@ -135,20 +141,77 @@
        mWebView.loadUrl("file:///android_asset/index.html");
        getCenterPoint();
        initView();

        initWeb();
        getMarkerData();

        chageInspecState(mInspectionState);
        return binding.getRoot();
    }

    private void initWeb() {
        mWebView.setWebViewClient(new WebViewClient() {
            @Override
            public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
                String url = request.getUrl().toString();
                //判断当前是否为加载瓦片
                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.d(TAG, "本地缓存>>>" + androidUrl);
//                        if (MapJpgUtils.getInsatance().validateImageFile(androidUrl,request.))
                        // 判断缓存是否过期
//                    if (!MapJpgUtils.getInsatance(MapFragment.this.getContext()).isCacheExpired(cachedTile)) {
                        try {
                            // 从缓存加载瓦片
                            return new WebResourceResponse("image/jpg", "utf-8", new FileInputStream(cachedTile));
                        } catch (FileNotFoundException e) {
                            e.printStackTrace();
                        }
//                    }
                    } else {
                        //下载瓦片
                        ApiManager.getInstance().donwLoadTile(MapFragment.this.getContext(), androidUrl);
                    }

    /**
     * 初始化各个状态
     */
    private void initState() {
        //开启定位
                }


                return super.shouldInterceptRequest(view, request);
            }

            @Override
            public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
                super.onReceivedError(view, request, error);
                // 捕获加载过程中发生的错误
                int errorCode = error.getErrorCode();
                String description = error.getDescription().toString();
                String failingUrl = request.getUrl().toString();
                Log.e("setWebViewClient", "errorCode:" + errorCode + ">>>>description:" + description + ">>>>failingUrl:" + failingUrl);
                // 处理错误，例如显示错误页面或提示用户
            }

            @Override
            public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
                super.onReceivedHttpError(view, request, errorResponse);
                // 捕获HTTP错误（如404, 500等）
                int statusCode = errorResponse.getStatusCode();
                String description = errorResponse.getReasonPhrase();
                Log.e("setWebViewClient", "statusCode:" + statusCode + ">>>>description:" + description);
                // 根据HTTP状态码处理错误
            }

            @Override
            public void onPageFinished(WebView view, String url) {
                super.onPageFinished(view, url);
                //页面加载完成
                webViewIsFinished = true;
                initLocalData();
                aginShowLocation(null);

            }
        });
    }

    /**
@@ -179,45 +242,47 @@
     * 获取取水口列表
     */
    private void getMarkerData() {
        ApiManager.getInstance().requestGetHideLoading(this.getContext(), Constants.BASE_URL + "/project/intake/all", MarkerResult.class, null, new SubscriberListener<BaseResponse<MarkerResult>>() {
        ApiManager.getInstance().requestGetHideLoading(this.getContext(), Constants.BASE_URL + "/project/intake/all", MarkerListResult.class, null, new SubscriberListener<BaseResponse<MarkerListResult>>() {
            @Override
            public void onNext(BaseResponse<MarkerResult> t) {
            public void onNext(BaseResponse<MarkerListResult> t) {
                if (t.isSuccess()) {
                    if (t.isSuccess()) {
                        if (t.getContent().getObj() != null && !t.getContent().getObj().isEmpty()) {
                            List<MarkerBean> markerBeans = new ArrayList<>();
                            for (int i = 0; i < t.getContent().getObj().size(); i++) {
                                MarkerResult.Obj result = t.getContent().getObj().get(i);
                                //保存数据
                                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());
                                markerBeans.add(markerBean);
                                setMapMarker(markerBean);
                            }
                            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());
                                    });
                        }

                    if (t.getContent().getObj() != null && !t.getContent().getObj().isEmpty()) {

                        List<MarkerBean> markerBeans = t.getContent().getObj().stream()
                                .map(result -> {
                                    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());
                                    setMapMarker(markerBean);
                                    return markerBean;
                                })
                                .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());
                                });
                    }

                } else {
                    ToastUtil.showToast(MapFragment.this.getContext(), t.getMsg());
                }
@@ -229,71 +294,6 @@

    void initView() {

        mWebView.setWebViewClient(new WebViewClient() {
            @Override
            public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
                String url = request.getUrl().toString();
//                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.d(TAG, "本地缓存>>>" + androidUrl);
//                        if (MapJpgUtils.getInsatance().validateImageFile(androidUrl,request.))
                        // 判断缓存是否过期
//                    if (!MapJpgUtils.getInsatance(MapFragment.this.getContext()).isCacheExpired(cachedTile)) {
                        try {
                            // 从缓存加载瓦片
                            return new WebResourceResponse("image/jpg", "utf-8", new FileInputStream(cachedTile));
                        } catch (FileNotFoundException e) {
                            e.printStackTrace();
                        }
//                    }
                    } else {
                        //下载瓦片
                        ApiManager.getInstance().donwLoadTile(MapFragment.this.getContext(), androidUrl);
                    }
//                    Log.d(TAG, "在线加载>>>" + url);
                }


                return super.shouldInterceptRequest(view, request);
            }

            @Override
            public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
                super.onReceivedError(view, request, error);
                // 捕获加载过程中发生的错误
                int errorCode = error.getErrorCode();
                String description = error.getDescription().toString();
                String failingUrl = request.getUrl().toString();
                Log.e("setWebViewClient", "errorCode:" + errorCode + ">>>>description:" + description + ">>>>failingUrl:" + failingUrl);
                // 处理错误，例如显示错误页面或提示用户
                // view.loadUrl("file:///android_asset/error.html");
            }

            @Override
            public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
                super.onReceivedHttpError(view, request, errorResponse);
                // 捕获HTTP错误（如404, 500等）
                int statusCode = errorResponse.getStatusCode();
                String description = errorResponse.getReasonPhrase();
                Log.e("setWebViewClient", "statusCode:" + statusCode + ">>>>description:" + description);
                // 根据HTTP状态码处理错误
            }

            @Override
            public void onPageFinished(WebView view, String url) {
                super.onPageFinished(view, url);
                //页面加载完成
                webViewIsFinished = true;
                initLocalData();
                aginShowLocation(null);

            }
        });
        //巡检按钮
        binding.inspectButton.setOnClickListener(v -> {
            if (XXPermissions.isGranted(MapFragment.this.getContext(), Permission.ACCESS_BACKGROUND_LOCATION)) {
@@ -325,17 +325,20 @@
            Intent issue = new Intent(MapFragment.this.getActivity(), AddIssueActivity.class);
            MapFragment.this.getActivity().startActivity(issue);
        });


    }


    /**
     * 显示取水口详情
     *
     * @param data
     */
    public void showWaterIntakeDetail(String data) {
        MyLog.i(data);
        MarkerBean markerBean=  markerBeanSet.get(data);
        if (markerBean!=null){
            binding.bottomLL.setVisibility(View.VISIBLE);
            binding.markerAddress.setText(markerBean.getAddress());
            binding.markerName.setText(markerBean.getName());
            binding.markerBlockName.setText(markerBean.getBlockName());
        MarkerBean markerBean = markerBeanSet.get(data);
        if (markerBean != null) {
            getInstakeDetail(markerBean);
        }

    }
@@ -345,8 +348,7 @@
     * 获取地图中心点
     */
    private void getCenterPoint() {

        ApiManager.getInstance().requestGet(this.getContext(), Constants.BASE_URL + "/base/dict_item/map_center", CenterPointResult.class, null, new SubscriberListener<BaseResponse<CenterPointResult>>() {
        ApiManager.getInstance().requestGetHideLoading(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()) {
@@ -374,6 +376,7 @@
     * 上报巡检记录
     */
    private void pushLocationData(InspectionLocationBean inspectionLocationBean) {
        InspectionRequest inspectionRequest = InspectionRequest.getInstance();
        inspectionRequest.setInspectId(inspectionLocationBean.getInspectId());
        inspectionRequest.setInspectorId(mInspectionBean.getInspectorId());
        if (mInspectionBean != null) {
@@ -386,7 +389,6 @@
        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", InsectionResult.class, inspectionRequest.toMap(inspectionRequest), new SubscriberListener<BaseResponse<List<InsectionResult>>>() {
            @Override
@@ -394,6 +396,7 @@
                try {
                    if (t.isSuccess()) {
                        if (t.getContent() != null) {
                            MyLog.d("InspectId:" + String.valueOf(t.getContent().get(0).getInspectId()));
                            mInspectionBean.setInspectId(String.valueOf(t.getContent().get(0).getInspectId()));
                            InspectionUtils.upataInspectionData(MapFragment.this.getContext(), mInspectionBean);
                        }
@@ -425,6 +428,7 @@
                    lastLatLonBean = latLonBean;
                    Log.i("chageInspecState", "lat:" + latLonBean.getLatitude() + ",log:" + latLonBean.getLongitude());
                    InspectionLocationBean inspectionLocationBean = InspectionUtils.createInspectionLocation(latLonBean, mInspectionBean);
                    //添加巡检记录坐标
                    InspectionUtils.addInspectionLocationData(MapFragment.this.getContext(), inspectionLocationBean);
                    //更新到地图
                    mWebView.evaluateJavascript("javascript:updateInspectionLocation(\"" + latLonBean.getLongitude() + "\",\"" + latLonBean.getLatitude() + "\")", value -> {
@@ -552,14 +556,16 @@
    public void setMapMarker(MarkerBean markerBean) {
        if (markerBean != null) {
            if (webViewIsFinished) {
                Log.i("mWebView", "addMarker????????????");
                mWebView.evaluateJavascript("javascript:addMarker(\"" + markerBean.getId() + "\",\"" + markerBean.getLng() + "\",\"" + markerBean.getLat() + "\",\"" + markerBean.getName() + "\")", new ValueCallback<String>() {
                    @Override
                    public void onReceiveValue(String value) {
                    }
                });
                markerBeanSet.put(markerBean.getId(), markerBean);

                if (!TextUtils.isEmpty(markerBean.getLng()) && !TextUtils.isEmpty(markerBean.getLat())) {
                    mWebView.evaluateJavascript("javascript:addMarker(\"" + markerBean.getId() + "\",\"" + markerBean.getLng() + "\",\"" + markerBean.getLat() + "\",\"" + markerBean.getName() + "\")", new ValueCallback<String>() {
                        @Override
                        public void onReceiveValue(String value) {
                        }
                    });
                    markerBeanSet.put(markerBean.getId(), markerBean);
                } else {
                    MyLog.d("setMapMarker>" + markerBean.getName() + "经纬度为空");
                }
            } else {
                webNoFinishMarkerData.add(markerBean);
            }
@@ -574,13 +580,12 @@
     */
    private void startLocation() {
        //获取定位服务传过来的坐标点
        LiveEventBus.get(CommonKeyName.locationData).observeForever(locationObserver);
        LiveEventBus.get(CommonKeyName.locationData).observe(this, 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));
        inspectionRequest = new InspectionRequest();
        SharedPreferencesHelper.getInstance(this.getContext()).put(CommonKeyName.inspectionState, InspectionUtils.STAT_INSPECTION);
        ServiceUtils.startLocationService(MapFragment.this.getContext(), false);
    }
@@ -623,4 +628,138 @@
            e.printStackTrace();
        }
    }

    /**
     * 接收js传来的中心点坐标
     *
     * @param lng
     * @param lat
     */
    public void refreshCenterPoint(double lng, double lat) {
        centerLng = lng;
        centerLat = lat;
        binding.pointText.setText(centerLng + "，" + centerLat);
    }

    /**
     * 修改经纬度
     *
     * @param markerBean
     */
    private void updataInstake(MarkerBean markerBean) {
        String lng = String.valueOf(centerLng);
        String lat = String.valueOf(centerLat);
        Map<String, Object> params = new HashMap<>();
        params.put("id", markerBean.getId());
        params.put("lng", lng);
        params.put("lat", lat);
        params.put("operator", MyApplication.myApplication.userId);

        ApiManager.getInstance().requestPost(MapFragment.this.getContext(), BASE_URL + "/project/intake/updateIntakeLngLat", Boolean.class, params, new SubscriberListener<BaseResponse<Boolean>>() {
            @Override
            public void onNext(BaseResponse<Boolean> t) {
                try {
                    if (t.isSuccess()) {
                        mWebView.evaluateJavascript("javascript:refreshMarker(\"" + markerBean.getId() + "\",\"" + centerLng + "\",\"" + centerLat + "\",\"" + markerBean.getName() + "\")", new ValueCallback<String>() {
                            @Override
                            public void onReceiveValue(String value) {
                            }
                        });
                        binding.pointCenterImg.setVisibility(View.GONE);
                        binding.pointRL.setVisibility(View.GONE);
                        binding.lng.setText(lng);
                        binding.lat.setText(lat);
                        mWebView.evaluateJavascript("javascript:cancelPin()", value -> {
                        });
                        ToastUtil.showToastLong(MapFragment.this.getContext(), "修改成功！");

                    } else {
                        ToastUtil.showToastLong(MapFragment.this.getContext(), t.getMsg());
                    }
                } catch (Exception e) {
                    e.printStackTrace();
                    CrashReport.postCatchedException(e);
                }

            }
        });
    }

    /**
     * 获取取水口详情
     *
     * @param markerBean
     */
    private void getInstakeDetail(MarkerBean markerBean) {
        Map<String, Object> params = new HashMap<>();
        params.put("id", markerBean.getId());
        ApiManager.getInstance().requestGet(this.getContext(), Constants.BASE_URL + "/project/intake/one", MarkerResult.class, params, new SubscriberListener<BaseResponse<MarkerResult>>() {
            @Override
            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);
                } else {
                    ToastUtil.showToast(MapFragment.this.getContext(), t.getMsg());
                }
            }

        });
    }

    private void showMarker(MarkerBean markerBean) {
        binding.bottomLL.setVisibility(View.VISIBLE);
        binding.markerAddress.setText(markerBean.getAddress());
        binding.markerName.setText(markerBean.getName());
        binding.markerBlockName.setText(markerBean.getBlockName());
        binding.lat.setText(markerBean.getLat());
        binding.lng.setText(markerBean.getLng());
        //修改经纬度
        binding.editePoint.setOnClickListener(v -> {

            mWebView.evaluateJavascript("javascript:showPin(\"" + markerBean.getLng() + "\",\"" + markerBean.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();
        });
    }


    @Override
    public void onDestroy() {
        super.onDestroy();
        LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver);
    }
}