1.添加当前巡检状态的功能。 2.修复工单界面刷新已完成列表导致未完成列表数据被清除的bug

zuoxiao

2024-12-03 21e38bfe17d3077d7ab0e05ee065f59547536692

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

@@ -6,10 +6,10 @@

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;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -26,6 +26,7 @@
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;
@@ -61,9 +62,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,8 +84,8 @@
    WebView mWebView;
    CenterPointBean centerPointBean;
    String strMarkerJson;
    //是否显示
    boolean isStartInspec = false;
    //当前巡检状态
    int mInspectionState;
    MapFragmenObserver mapFragmenObserver;
    //当前巡检记录的相关信息
    InspectionBean mInspectionBean;
@@ -105,7 +104,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
@@ -132,7 +131,7 @@
        initLocalData();
        getMarkerData();
        //显示巡检状态
        chageInspecState();
        chageInspecState(mInspectionState);
        return binding.getRoot();
    }

@@ -328,19 +327,19 @@
        });
        //巡检按钮
        binding.inspectButton.setOnClickListener(v -> {
            if (isStartInspec) {
                ConfirmDialog confirmDialog = new ConfirmDialog(MapFragment.this.getActivity(), "提示", "确认关闭巡检吗？", new View.OnClickListener() {
                    @Override
                    public void onClick(View v) {
                        isStartInspec = !isStartInspec;
                        chageInspecState();
                    }
                });
            chageInspecState(InspectionUtils.STAT_INSPECTION);
        });
        //暂停巡检
        binding.inspectPause.setOnClickListener(v -> {
            if (mInspectionState == InspectionUtils.STAT_INSPECTION) {
                chageInspecState(InspectionUtils.PAUSE_INSPECTION);
            } else {
                isStartInspec = !isStartInspec;
                chageInspecState();
                chageInspecState(InspectionUtils.STAT_INSPECTION);
            }

        });
        //停止巡检
        binding.inspectClose.setOnClickListener(v -> {
            chageInspecState(InspectionUtils.STOP_INSPECTION);
        });
    }

@@ -475,30 +474,67 @@
    /**
     * 修改巡检状态
     */
    private void chageInspecState() {
    private void chageInspecState(int inspectionState) {
        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);
        //0没有开始，1开始，2暂停,3关闭
        switch (inspectionState) {
            case 0:
                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://1开始
                //添加新的巡检记录
                startInspection();
                //获取定位服务传过来的坐标点
                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);
                }
                mInspectionBean = InspectionUtils.startInspection(this.getContext());
                inspectionRequest = new InspectionRequest();
                SharedPreferencesHelper.getInstance(this.getContext()).put(CommonKeyName.inspectionState, InspectionUtils.STAT_INSPECTION);
                break;
            case 2://暂停

                try {
                    LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver);
                    //关闭定位
                    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);
                } catch (Resources.NotFoundException e) {
                    e.printStackTrace();
                }
                break;
            case 3:
                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);
                    }
                });
                confirmDialog.show();
                break;
            default:
        }
        mInspectionState = inspectionState;

    }
}