优化自定义二次确认Dialog回调

zuoxiao

2024-12-03 9c2908d8a110eaa28ec63a877291aeea61ee4e60

优化自定义二次确认Dialog回调

 app/src/main/assets/js/map.js

@@ -271,7 +271,7 @@
    }
    //保存定位坐标生成轨迹
    var path=[];
    var lineLayer = new T.Polyline([], { color: 'red', weight: 3, opacity: 0.8 });
    var lineLayer = new T.Polyline([], { color: '#ff4500', weight: 3, opacity: 0.8 });
 
    function updateLocation(log,lat){
        var lastLat=lat;

 app/src/main/java/com/dayu/pipirrapp/MyApplication.java

@@ -34,14 +34,15 @@
//        JPushInterface.init(this);
        CrashReport.initCrashReport(getApplicationContext(), "3d4bcf7046", false);

        // 设置全局的UncaughtExceptionHandler
        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
            @Override
            public void uncaughtException(Thread thread, Throwable ex) {
                // 这里处理未捕获的异常
                CrashReport.postCatchedException(ex);
            }
        });
//        // 设置全局的UncaughtExceptionHandler
//        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
//            @Override
//            public void uncaughtException(Thread thread, Throwable ex) {
//                Log.e("MyApplication", ex.toString());
//                // 这里处理未捕获的异常
//                CrashReport.postCatchedException(ex);
//            }
//        });
        //设置
        LiveEventBus.config()
//                .lifecycleObserverAlwaysActive(false) // 控制生命周期监听的默认行为

 app/src/main/java/com/dayu/pipirrapp/bean/db/InspectionBean.java

@@ -15,9 +15,17 @@
    @PrimaryKey(autoGenerate = true)
    public long id;
    String inspectId;//巡检ID
    String mInspectId;//本地数据库巡检ID
    String startTime;//开始巡检时间
    String stopTime;//停止巡检时间

    public String getmInspectId() {
        return mInspectId;
    }

    public void setmInspectId(String mInspectId) {
        this.mInspectId = mInspectId;
    }

    public String getInspectId() {
        return inspectId;

 app/src/main/java/com/dayu/pipirrapp/bean/db/InspectionLocationBean.java

@@ -16,11 +16,21 @@
    public long id;
    String inspectorId;//巡检员ID
    String inspectId;//巡检ID
    String mInspectId;//本地数据库巡检ID
    String lng;//经度
    String lat;//纬度
    String locateTime;//打点时间
    boolean isPost;//是否已经上传


    public String getmInspectId() {
        return mInspectId;
    }

    public void setmInspectId(String mInspectId) {
        this.mInspectId = mInspectId;
    }

    public String getInspectorId() {
        return inspectorId;
    }

 app/src/main/java/com/dayu/pipirrapp/bean/net/InspectionRequest.java

@@ -15,7 +15,7 @@
    private String inspectId;
    private String startTime;
    private String stopTime;
    private List<Track> tracks;
    private List<Track> tracks=new ArrayList<>();


    public String getInspectorId() {

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

@@ -9,7 +9,6 @@
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 +25,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 +61,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 +83,8 @@
    WebView mWebView;
    CenterPointBean centerPointBean;
    String strMarkerJson;
    //是否显示
    boolean isStartInspec = false;
    //当前巡检状态
    int mInspectionState;
    MapFragmenObserver mapFragmenObserver;
    //当前巡检记录的相关信息
    InspectionBean mInspectionBean;
@@ -105,7 +103,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 +130,7 @@
        initLocalData();
        getMarkerData();
        //显示巡检状态
        chageInspecState();
        chageInspecState(mInspectionState);
        return binding.getRoot();
    }

@@ -328,19 +326,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 {
                chageInspecState(InspectionUtils.STAT_INSPECTION);
                    }
                });
            } else {
                isStartInspec = !isStartInspec;
                chageInspecState();
            }

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

@@ -475,16 +473,29 @@
    /**
     * 修改巡检状态
     */
    private void chageInspecState() {
    private void chageInspecState(int inspectionState) {
        Intent location = new Intent(this.getActivity(), MyLocationService.class);
        location.putExtra("isSingle", false);
        if (isStartInspec) {
        //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 1:
            //添加新的巡检记录
            startInspection();
            //获取定位服务传过来的坐标点
            LiveEventBus.get(CommonKeyName.locationData).observeForever(locationObserver);
            binding.stateText.setVisibility(View.VISIBLE);
            binding.inspectButton.setText("终");
                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);
@@ -493,12 +504,29 @@
            }
            mInspectionBean = InspectionUtils.startInspection(this.getContext());
            inspectionRequest = new InspectionRequest();
        } else {
            binding.stateText.setVisibility(View.GONE);
            binding.inspectButton.setText("巡");
                break;
            case 2://暂停

            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));
                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);
        }
                });
                confirmDialog.show();
                break;
            default:
        }
        mInspectionState = inspectionState;

    }
}

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

@@ -28,6 +28,7 @@
 */
public class MyFragment extends BaseFragment {
    FragmentMyBinding binding;
    ConfirmDialog confirmDialog;

    @Nullable
    @Override
@@ -46,8 +47,9 @@
        //退出登录
        binding.loginOutRL.setOnClickListener((v) -> {

            ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "确定退出吗？", v1 -> {
            ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "确定退出吗？", (confirmDialog1, v12) -> {
                try {
                    confirmDialog1.dismiss();
                    CleanDataUtils.cleanUserData(MyFragment.this.getContext());
                    Intent intent = new Intent(MyFragment.this.getContext(), LoginActivity.class);
                    MyFragment.this.getActivity().startActivity(intent);
@@ -66,8 +68,9 @@
        }
//        清除缓存
        binding.cleanDataRL.setOnClickListener(v -> {
            ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "确定清除缓存吗？", v1 -> {
            ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "确定清除缓存吗？", (dialog, v1) -> {
                try {
                    dialog.dismiss();
                    CleanDataUtils.cleanMapData(MyFragment.this.getContext());
                    ToastUtil.showToast(MyFragment.this.getActivity(), "清除成功");
                } catch (Exception e) {

 app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java

@@ -1,5 +1,7 @@
package com.dayu.pipirrapp.net;

import android.text.TextUtils;

import com.dayu.pipirrapp.MyApplication;
import com.dayu.pipirrapp.utils.ToastUtil;
import com.tencent.bugly.crashreport.CrashReport;
@@ -65,8 +67,11 @@
                    }
                }
                builder.addHeader("os", "app");
                if (!TextUtils.isEmpty(MyApplication.myApplication.token)) {
                builder.addHeader("token", MyApplication.myApplication.token);
            }

            }
            builder.addHeader("tag", MyApplication.myApplication.myTag);
            return builder.build();
        } catch (Exception e) {

 app/src/main/java/com/dayu/pipirrapp/tool/InspectionUtils.java

@@ -26,6 +26,12 @@
    private static final String TAG = "InspectionUtils";
    //打点的最小两点最小距离
    private static final int MinMeters = 10;
    //0没有开始，1开始，2暂停,3关闭
    public static final int NO_INSPECTION = 0;
    public static final int STAT_INSPECTION = 1;
    public static final int PAUSE_INSPECTION = 2;
    public static final int STOP_INSPECTION = 3;


    /**
     * 获取当前巡检记录ID
@@ -49,7 +55,7 @@
    public static InspectionBean startInspection(Context context) {
        // 创建巡检记录
        InspectionBean inspectionBean = new InspectionBean();
        inspectionBean.setInspectId(UUID.randomUUID().toString());
        inspectionBean.setmInspectId(UUID.randomUUID().toString());
        inspectionBean.setStartTime(DateUtils.getNowDateStr());
        // 异步插入到数据库
        DaoSingleton.getAsynchInstance(context)

 app/src/main/java/com/dayu/pipirrapp/utils/CommonKeyName.java

@@ -13,8 +13,8 @@
    //是否显示验证码
    public final static String isShowCode = "isShowCode";

    //是否开始巡检
    public final static String isStartInspec = "isStartInspec";
    //当前巡检状态 0没有开始，1开始，2暂停
    public final static String inspectionState = "inspectionState";

    //定位后
    public final static String locationData = "locationData";

 app/src/main/java/com/dayu/pipirrapp/view/ConfirmDialog.java

@@ -24,7 +24,7 @@


    Activity mContext;
    View.OnClickListener mListner;
    ConfirmOnClickListener mListner;
    String mData;
    String mTitle;

@@ -34,7 +34,7 @@
        initView();
    }

    public ConfirmDialog(@NonNull Activity context, View.OnClickListener listner) {
    public ConfirmDialog(@NonNull Activity context, ConfirmOnClickListener listner) {
        super(context,R.style.showSelfDialog);
        mContext = context;
        mListner = listner;
@@ -42,7 +42,7 @@
    }


    public ConfirmDialog(@NonNull Activity context, String data, View.OnClickListener listner) {
    public ConfirmDialog(@NonNull Activity context, String data, ConfirmOnClickListener listner) {
        super(context, R.style.showSelfDialog);
        mContext = context;
        mListner = listner;
@@ -50,7 +50,7 @@
        initView();
    }

    public ConfirmDialog(@NonNull Activity context, String title, String data, View.OnClickListener listner) {
    public ConfirmDialog(@NonNull Activity context, String title, String data, ConfirmOnClickListener listner) {
        super(context,R.style.showSelfDialog);
        mContext = context;
        mListner = listner;
@@ -83,7 +83,12 @@
                mContext.finish();
            });
        } else {
            ok.setOnClickListener(mListner);
            ok.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {
                    mListner.onClick(ConfirmDialog.this, v);
                }
            });
        }
    }

@@ -101,4 +106,9 @@
        getWindow().getDecorView().setPadding(0, 0, 0, 0);
        getWindow().setAttributes(layoutParams);
    }


    public interface ConfirmOnClickListener  {
        void onClick(ConfirmDialog confirmDialog, View v);
    }
}

 app/src/main/java/com/dayu/pipirrapp/view/TagDialog.java

@@ -2,15 +2,12 @@

import static android.view.Gravity.CENTER;


import android.app.Activity;
import android.app.Dialog;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.RadioGroup;
import android.widget.TextView;


import com.dayu.pipirrapp.MyApplication;
import com.dayu.pipirrapp.R;
@@ -35,7 +32,6 @@
    libraryBack mLibraryBack;
    String data;
    int type;
    ConfirmDialog confirmDialog;

    public TagDialog(Activity context, libraryBack libraryBack) {
        super(context, R.style.showSelfDialog);
@@ -74,16 +70,12 @@
            okBtn.setOnClickListener(v -> {
                if (ischose) {
                    //二次确认
                    confirmDialog = new ConfirmDialog(mContext, data, new View.OnClickListener() {
                        @Override
                        public void onClick(View v) {
                    ConfirmDialog confirmDialog = new ConfirmDialog(mContext, data, (dialog, v1) -> {
                            MyApplication.myApplication.myTag = tagBean.getTag();

                            tagDao.insert(tagBean);
                            mLibraryBack.listener(type);
                            TagDialog.this.dismiss();
                            confirmDialog.dismiss();
                        }
                        dialog.dismiss();
                    });
                    confirmDialog.show();


 app/src/main/res/layout/fragment_map.xml

@@ -13,17 +13,52 @@
        android:layout_height="match_parent" />


    <RelativeLayout
        android:id="@+id/inspectRL"
        android:layout_width="match_parent"
        android:layout_height="35dp"
        android:background="@color/base_blue">

        <TextView
            android:id="@+id/inspectPause"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:layout_marginLeft="10dp"
            android:background="@drawable/ic_blue_background"
            android:paddingLeft="15dp"
            android:paddingRight="15dp"
            android:text="暂停"
            android:textColor="@color/inspect_text_color_pause" />


    <TextView
        android:id="@+id/stateText"
        android:layout_width="match_parent"
        android:layout_height="35dp"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
        android:layout_alignParentTop="true"
        android:background="@color/base_blue"
            android:layout_centerHorizontal="true"
            android:layout_centerVertical="true"

        android:gravity="center"
        android:text="已开启巡检"
        android:textColor="@color/white"
        android:textSize="18sp" />

        <TextView
            android:id="@+id/inspectClose"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentRight="true"
            android:layout_centerVertical="true"
            android:layout_marginRight="10dp"
            android:background="@drawable/ic_blue_background"
            android:paddingLeft="15dp"
            android:paddingRight="15dp"
            android:text="结束"
            android:textColor="@color/inspect_text_color_close" />
    </RelativeLayout>


    <TextView
        android:id="@+id/inspectButton"
@@ -32,6 +67,7 @@
        android:layout_alignParentRight="true"
        android:layout_marginTop="60dp"
        android:layout_marginRight="15dp"

        android:background="@drawable/ic_blue_background"
        android:padding="10dp"
        android:text="巡"

 app/src/main/res/values/colors.xml

@@ -21,4 +21,7 @@
    <color name="manage_item_time">#AAAAAA</color>
    <color name="app_color_f6">#f6f6f6</color>
    <color name="app_color_white">#FFFFFF</color>
    <color name="inspect_text_color_close">#ff0000</color>
    <color name="inspect_text_color_pause">#7fff00</color>
    <color name="inspect_rl_bg_color">#ff6347</color>
</resources>