endian11
2020-10-26 f4639550901c5e4b382e98d4c3fb5b62ecb1007c
场考设置完成后台逻辑+UI
3个文件已修改
408 ■■■■■ 已修改文件
app/src/main/assets/area_setting.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/AreaSetting.java 354 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting1.java 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/assets/area_setting.json
@@ -1 +1 @@
{"area_release_start_key":2000,"area_curve_pause_time":200,"area_park_pause_time":2000,"area_park_finish_time":210,"area_park2_pause_time":2000,"area_park2_finish_time":90,"area_turn_a90_pause_time":2000,"area_ramp_finish_time":30,"area_ramp_flag_red_dist":0.5,"area_ramp_edge_yellow_dist":0.3,"area_ramp_edge_red_dist":0.5,"area_ramp_slide_yellow_dist":0.1,"area_ramp_slide_red_dist":0.3}
{"hold_start_key_limit_time":2000,"curve_pause_criteria":200,"park_bottom_pause_criteria":2000,"park_bottom_limit_time":210,"park_edge_pause_criteria":2000,"park_edge_limit_time":90,"turn_a90_pause_criteria":2000,"ramp_start_car_limit_time":30,"ramp_stoppoint_red_distance":0.5,"ramp_edge_yellow_distance":0.3,"ramp_edge_red_distance":0.5,"ramp_slide_yellow_distance":0.1,"ramp_slide_red_distance":0.3}
app/src/main/java/safeluck/drive/evaluation/bean/AreaSetting.java
@@ -7,6 +7,140 @@
 * All Rights Saved! Chongqing AnYun Tech co. LTD
 */
public class AreaSetting {
    /**
     * hold_start_key_limit_time : 2000
     * curve_pause_criteria : 200
     * park_bottom_pause_criteria : 2000
     * park_bottom_limit_time : 210
     * park_edge_pause_criteria : 2000
     * park_edge_limit_time : 90
     * turn_a90_pause_criteria : 2000
     * ramp_start_car_limit_time : 30
     * ramp_stoppoint_red_distance : 0.5
     * ramp_edge_yellow_distance : 0.3
     * ramp_edge_red_distance : 0.5
     * ramp_slide_yellow_distance : 0.1
     * ramp_slide_red_distance : 0.3
     */
    private int hold_start_key_limit_time;
    private int curve_pause_criteria;
    private int park_bottom_pause_criteria;
    private int park_bottom_limit_time;
    private int park_edge_pause_criteria;
    private int park_edge_limit_time;
    private int turn_a90_pause_criteria;
    private int ramp_start_car_limit_time;
    private double ramp_stoppoint_red_distance;
    private double ramp_edge_yellow_distance;
    private double ramp_edge_red_distance;
    private double ramp_slide_yellow_distance;
    private double ramp_slide_red_distance;
    public int getHold_start_key_limit_time() {
        return hold_start_key_limit_time;
    }
    public void setHold_start_key_limit_time(int hold_start_key_limit_time) {
        this.hold_start_key_limit_time = hold_start_key_limit_time;
    }
    public int getCurve_pause_criteria() {
        return curve_pause_criteria;
    }
    public void setCurve_pause_criteria(int curve_pause_criteria) {
        this.curve_pause_criteria = curve_pause_criteria;
    }
    public int getPark_bottom_pause_criteria() {
        return park_bottom_pause_criteria;
    }
    public void setPark_bottom_pause_criteria(int park_bottom_pause_criteria) {
        this.park_bottom_pause_criteria = park_bottom_pause_criteria;
    }
    public int getPark_bottom_limit_time() {
        return park_bottom_limit_time;
    }
    public void setPark_bottom_limit_time(int park_bottom_limit_time) {
        this.park_bottom_limit_time = park_bottom_limit_time;
    }
    public int getPark_edge_pause_criteria() {
        return park_edge_pause_criteria;
    }
    public void setPark_edge_pause_criteria(int park_edge_pause_criteria) {
        this.park_edge_pause_criteria = park_edge_pause_criteria;
    }
    public int getPark_edge_limit_time() {
        return park_edge_limit_time;
    }
    public void setPark_edge_limit_time(int park_edge_limit_time) {
        this.park_edge_limit_time = park_edge_limit_time;
    }
    public int getTurn_a90_pause_criteria() {
        return turn_a90_pause_criteria;
    }
    public void setTurn_a90_pause_criteria(int turn_a90_pause_criteria) {
        this.turn_a90_pause_criteria = turn_a90_pause_criteria;
    }
    public int getRamp_start_car_limit_time() {
        return ramp_start_car_limit_time;
    }
    public void setRamp_start_car_limit_time(int ramp_start_car_limit_time) {
        this.ramp_start_car_limit_time = ramp_start_car_limit_time;
    }
    public double getRamp_stoppoint_red_distance() {
        return ramp_stoppoint_red_distance;
    }
    public void setRamp_stoppoint_red_distance(double ramp_stoppoint_red_distance) {
        this.ramp_stoppoint_red_distance = ramp_stoppoint_red_distance;
    }
    public double getRamp_edge_yellow_distance() {
        return ramp_edge_yellow_distance;
    }
    public void setRamp_edge_yellow_distance(double ramp_edge_yellow_distance) {
        this.ramp_edge_yellow_distance = ramp_edge_yellow_distance;
    }
    public double getRamp_edge_red_distance() {
        return ramp_edge_red_distance;
    }
    public void setRamp_edge_red_distance(double ramp_edge_red_distance) {
        this.ramp_edge_red_distance = ramp_edge_red_distance;
    }
    public double getRamp_slide_yellow_distance() {
        return ramp_slide_yellow_distance;
    }
    public void setRamp_slide_yellow_distance(double ramp_slide_yellow_distance) {
        this.ramp_slide_yellow_distance = ramp_slide_yellow_distance;
    }
    public double getRamp_slide_red_distance() {
        return ramp_slide_red_distance;
    }
    public void setRamp_slide_red_distance(double ramp_slide_red_distance) {
        this.ramp_slide_red_distance = ramp_slide_red_distance;
    }
    /**
     *
@@ -40,121 +174,135 @@
     * area_ramp_slide_red_dist : 0.3
     */
    private int area_release_start_key;
    private int area_curve_pause_time;
    private int area_park_pause_time;
    private int area_park_finish_time;
    private int area_park2_pause_time;
    private int area_park2_finish_time;
    private int area_turn_a90_pause_time;
    private int area_ramp_finish_time;
    private double area_ramp_flag_red_dist;
    private double area_ramp_edge_yellow_dist;
    private double area_ramp_edge_red_dist;
    private double area_ramp_slide_yellow_dist;
    private double area_ramp_slide_red_dist;
//    private int area_release_start_key;
//    private int area_curve_pause_time;
//    private int area_park_pause_time;
//    private int area_park_finish_time;
//    private int area_park2_pause_time;
//    private int area_park2_finish_time;
//    private int area_turn_a90_pause_time;
//    private int area_ramp_finish_time;
//    private double area_ramp_flag_red_dist;
//    private double area_ramp_edge_yellow_dist;
//    private double area_ramp_edge_red_dist;
//    private double area_ramp_slide_yellow_dist;
//    private double area_ramp_slide_red_dist;
//
//    public int getArea_release_start_key() {
//        return area_release_start_key;
//    }
//
//    public void setArea_release_start_key(int area_release_start_key) {
//        this.area_release_start_key = area_release_start_key;
//    }
//
//    public int getArea_curve_pause_time() {
//        return area_curve_pause_time;
//    }
//
//    public void setArea_curve_pause_time(int area_curve_pause_time) {
//        this.area_curve_pause_time = area_curve_pause_time;
//    }
//
//    public int getArea_park_pause_time() {
//        return area_park_pause_time;
//    }
//
//    public void setArea_park_pause_time(int area_park_pause_time) {
//        this.area_park_pause_time = area_park_pause_time;
//    }
//
//    public int getArea_park_finish_time() {
//        return area_park_finish_time;
//    }
//
//    public void setArea_park_finish_time(int area_park_finish_time) {
//        this.area_park_finish_time = area_park_finish_time;
//    }
//
//    public int getArea_park2_pause_time() {
//        return area_park2_pause_time;
//    }
//
//    public void setArea_park2_pause_time(int area_park2_pause_time) {
//        this.area_park2_pause_time = area_park2_pause_time;
//    }
//
//    public int getArea_park2_finish_time() {
//        return area_park2_finish_time;
//    }
//
//    public void setArea_park2_finish_time(int area_park2_finish_time) {
//        this.area_park2_finish_time = area_park2_finish_time;
//    }
//
//    public int getArea_turn_a90_pause_time() {
//        return area_turn_a90_pause_time;
//    }
//
//    public void setArea_turn_a90_pause_time(int area_turn_a90_pause_time) {
//        this.area_turn_a90_pause_time = area_turn_a90_pause_time;
//    }
//
//    public int getArea_ramp_finish_time() {
//        return area_ramp_finish_time;
//    }
//
//    public void setArea_ramp_finish_time(int area_ramp_finish_time) {
//        this.area_ramp_finish_time = area_ramp_finish_time;
//    }
//
//    public double getArea_ramp_flag_red_dist() {
//        return area_ramp_flag_red_dist;
//    }
//
//    public void setArea_ramp_flag_red_dist(double area_ramp_flag_red_dist) {
//        this.area_ramp_flag_red_dist = area_ramp_flag_red_dist;
//    }
//
//    public double getArea_ramp_edge_yellow_dist() {
//        return area_ramp_edge_yellow_dist;
//    }
//
//    public void setArea_ramp_edge_yellow_dist(double area_ramp_edge_yellow_dist) {
//        this.area_ramp_edge_yellow_dist = area_ramp_edge_yellow_dist;
//    }
//
//    public double getArea_ramp_edge_red_dist() {
//        return area_ramp_edge_red_dist;
//    }
//
//    public void setArea_ramp_edge_red_dist(double area_ramp_edge_red_dist) {
//        this.area_ramp_edge_red_dist = area_ramp_edge_red_dist;
//    }
//
//    public double getArea_ramp_slide_yellow_dist() {
//        return area_ramp_slide_yellow_dist;
//    }
//
//    public void setArea_ramp_slide_yellow_dist(double area_ramp_slide_yellow_dist) {
//        this.area_ramp_slide_yellow_dist = area_ramp_slide_yellow_dist;
//    }
//
//    public double getArea_ramp_slide_red_dist() {
//        return area_ramp_slide_red_dist;
//    }
//
//    public void setArea_ramp_slide_red_dist(double area_ramp_slide_red_dist) {
//        this.area_ramp_slide_red_dist = area_ramp_slide_red_dist;
//    }
    public int getArea_release_start_key() {
        return area_release_start_key;
    }
    public void setArea_release_start_key(int area_release_start_key) {
        this.area_release_start_key = area_release_start_key;
    }
    public int getArea_curve_pause_time() {
        return area_curve_pause_time;
    }
    public void setArea_curve_pause_time(int area_curve_pause_time) {
        this.area_curve_pause_time = area_curve_pause_time;
    }
    public int getArea_park_pause_time() {
        return area_park_pause_time;
    }
    public void setArea_park_pause_time(int area_park_pause_time) {
        this.area_park_pause_time = area_park_pause_time;
    }
    public int getArea_park_finish_time() {
        return area_park_finish_time;
    }
    public void setArea_park_finish_time(int area_park_finish_time) {
        this.area_park_finish_time = area_park_finish_time;
    }
    public int getArea_park2_pause_time() {
        return area_park2_pause_time;
    }
    public void setArea_park2_pause_time(int area_park2_pause_time) {
        this.area_park2_pause_time = area_park2_pause_time;
    }
    public int getArea_park2_finish_time() {
        return area_park2_finish_time;
    }
    public void setArea_park2_finish_time(int area_park2_finish_time) {
        this.area_park2_finish_time = area_park2_finish_time;
    }
    public int getArea_turn_a90_pause_time() {
        return area_turn_a90_pause_time;
    }
    public void setArea_turn_a90_pause_time(int area_turn_a90_pause_time) {
        this.area_turn_a90_pause_time = area_turn_a90_pause_time;
    }
    public int getArea_ramp_finish_time() {
        return area_ramp_finish_time;
    }
    public void setArea_ramp_finish_time(int area_ramp_finish_time) {
        this.area_ramp_finish_time = area_ramp_finish_time;
    }
    public double getArea_ramp_flag_red_dist() {
        return area_ramp_flag_red_dist;
    }
    public void setArea_ramp_flag_red_dist(double area_ramp_flag_red_dist) {
        this.area_ramp_flag_red_dist = area_ramp_flag_red_dist;
    }
    public double getArea_ramp_edge_yellow_dist() {
        return area_ramp_edge_yellow_dist;
    }
    public void setArea_ramp_edge_yellow_dist(double area_ramp_edge_yellow_dist) {
        this.area_ramp_edge_yellow_dist = area_ramp_edge_yellow_dist;
    }
    public double getArea_ramp_edge_red_dist() {
        return area_ramp_edge_red_dist;
    }
    public void setArea_ramp_edge_red_dist(double area_ramp_edge_red_dist) {
        this.area_ramp_edge_red_dist = area_ramp_edge_red_dist;
    }
    public double getArea_ramp_slide_yellow_dist() {
        return area_ramp_slide_yellow_dist;
    }
    public void setArea_ramp_slide_yellow_dist(double area_ramp_slide_yellow_dist) {
        this.area_ramp_slide_yellow_dist = area_ramp_slide_yellow_dist;
    }
    public double getArea_ramp_slide_red_dist() {
        return area_ramp_slide_red_dist;
    }
    public void setArea_ramp_slide_red_dist(double area_ramp_slide_red_dist) {
        this.area_ramp_slide_red_dist = area_ramp_slide_red_dist;
    }
}
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting1.java
@@ -98,19 +98,19 @@
    private void setDatas() {
        if (areaSetting != null){
            Log.i(TAG,"设置数据");
            curve_pause_time.setInput(String.valueOf(areaSetting.getArea_curve_pause_time()));
            release_start_key.setInput(String.valueOf(areaSetting.getArea_release_start_key()));
            daoku_pause_time.setInput(String.valueOf(areaSetting.getArea_park_pause_time()));
            daoku_finish_time.setInput(String.valueOf(areaSetting.getArea_park_finish_time()));
            park_finish_time.setInput(String.valueOf(areaSetting.getArea_park2_finish_time()));
            park_pasue_time.setInput(String.valueOf(areaSetting.getArea_park2_pause_time()));
            angle_90_pause_time.setInput(String.valueOf(areaSetting.getArea_turn_a90_pause_time()));
            ramp_finish_time.setInput(String.valueOf(areaSetting.getArea_ramp_finish_time()));
            ramp_beyond_edge_dis_red.setInput(String.valueOf(areaSetting.getArea_ramp_edge_red_dist()));
            ramp_beyond_edge_dis_yellow.setInput(String.valueOf(areaSetting.getArea_ramp_edge_yellow_dist()));
            ramp_beyond_stick_dis.setInput(String.valueOf(areaSetting.getArea_ramp_flag_red_dist()));
            back_of_vehicle_red.setInput(String.valueOf(areaSetting.getArea_ramp_slide_red_dist()));
            back_of_vehicle_yellow.setInput(String.valueOf(areaSetting.getArea_ramp_slide_yellow_dist()));
            curve_pause_time.setInput(String.valueOf(areaSetting.getCurve_pause_criteria()));
            release_start_key.setInput(String.valueOf(areaSetting.getHold_start_key_limit_time()));
            daoku_pause_time.setInput(String.valueOf(areaSetting.getPark_bottom_pause_criteria()));
            daoku_finish_time.setInput(String.valueOf(areaSetting.getPark_edge_limit_time()));
            park_finish_time.setInput(String.valueOf(areaSetting.getPark_edge_limit_time()));
            park_pasue_time.setInput(String.valueOf(areaSetting.getPark_edge_pause_criteria()));
            angle_90_pause_time.setInput(String.valueOf(areaSetting.getTurn_a90_pause_criteria()));
            ramp_finish_time.setInput(String.valueOf(areaSetting.getRamp_start_car_limit_time()));
            ramp_beyond_edge_dis_red.setInput(String.valueOf(areaSetting.getRamp_edge_red_distance()));
            ramp_beyond_edge_dis_yellow.setInput(String.valueOf(areaSetting.getRamp_edge_yellow_distance()));
            ramp_beyond_stick_dis.setInput(String.valueOf(areaSetting.getRamp_stoppoint_red_distance()));
            back_of_vehicle_red.setInput(String.valueOf(areaSetting.getRamp_slide_red_distance()));
            back_of_vehicle_yellow.setInput(String.valueOf(areaSetting.getRamp_slide_yellow_distance()));
        }
    }
@@ -153,71 +153,71 @@
        String back_of_vehicle_red_str = back_of_vehicle_red.getInput();
        String back_of_vehicle_yellow_str = back_of_vehicle_yellow.getInput();
        if (Utils.isDigital(curve_pause_str)){
            areaSetting.setArea_curve_pause_time(Integer.parseInt(curve_pause_str));
            areaSetting.setCurve_pause_criteria(Integer.parseInt(curve_pause_str));
        }else{
            Toast.makeText(_mActivity, "曲线中途停车判定输入不正确,请检查", Toast.LENGTH_SHORT).show();
        }
        if (Utils.isDigital(release_start_key_str)){
            areaSetting.setArea_release_start_key(Integer.parseInt(release_start_key_str));
            areaSetting.setHold_start_key_limit_time(Integer.parseInt(release_start_key_str));
        }else{
            Toast.makeText(_mActivity, "松开点火开关判定输入不正确,请检查", Toast.LENGTH_SHORT).show();
        }
        if (Utils.isDigital(daoku_pause_time_str)){
            areaSetting.setArea_park_pause_time(Integer.parseInt(daoku_pause_time_str));
            areaSetting.setPark_bottom_pause_criteria(Integer.parseInt(daoku_pause_time_str));
        }else{
            Toast.makeText(_mActivity, "倒库中途停车判定输入不正确,请检查", Toast.LENGTH_SHORT).show();
        }
        if (Utils.isDigital(daoku_finish_time_str)){
            areaSetting.setArea_park_finish_time(Integer.parseInt(daoku_finish_time_str));
            areaSetting.setPark_bottom_limit_time(Integer.parseInt(daoku_finish_time_str));
        }else{
            Toast.makeText(_mActivity, "倒库完成时间输入不正确,请检查", Toast.LENGTH_SHORT).show();
        }
        if (Utils.isDigital(park_finish_time_str)){
            areaSetting.setArea_park2_finish_time(Integer.parseInt(park_finish_time_str));
            areaSetting.setPark_edge_limit_time(Integer.parseInt(park_finish_time_str));
        }else{
            Toast.makeText(_mActivity, "侧方停车完成时间输入不正确,请检查", Toast.LENGTH_SHORT).show();
        }
        if (Utils.isDigital(park_pasue_time_str)){
            areaSetting.setArea_park2_pause_time(Integer.parseInt(park_pasue_time_str));
            areaSetting.setPark_edge_pause_criteria(Integer.parseInt(park_pasue_time_str));
        }else{
            Toast.makeText(_mActivity, "侧方停车中途停车判定输入不正确,请检查", Toast.LENGTH_SHORT).show();
        }
        if (Utils.isDigital(angle_90_pause_time_str)){
            areaSetting.setArea_turn_a90_pause_time(Integer.parseInt(angle_90_pause_time_str));
            areaSetting.setTurn_a90_pause_criteria(Integer.parseInt(angle_90_pause_time_str));
        }else{
            Toast.makeText(_mActivity, "直角中途停车判定输入不正确,请检查", Toast.LENGTH_SHORT).show();
        }
        if (Utils.isDigital(ramp_finish_time_str)){
            areaSetting.setArea_ramp_finish_time(Integer.parseInt(ramp_finish_time_str));
            areaSetting.setRamp_start_car_limit_time(Integer.parseInt(ramp_finish_time_str));
        }else{
            Toast.makeText(_mActivity, "坡起完成时间输入不正确,请检查", Toast.LENGTH_SHORT).show();
        }
        if (Utils.isNumber(ramp_beyond_edge_dis_red_str)){
            areaSetting.setArea_ramp_edge_red_dist(Double.parseDouble(ramp_beyond_edge_dis_red_str));
            areaSetting.setRamp_edge_red_distance(Double.parseDouble(ramp_beyond_edge_dis_red_str));
        }else{
            Toast.makeText(_mActivity, "倒库中途停车判定输入不正确,请检查", Toast.LENGTH_SHORT).show();
        }
        if (Utils.isNumber(ramp_beyond_edge_dis_yellow_str)){
            areaSetting.setArea_ramp_edge_yellow_dist(Double.parseDouble(ramp_beyond_edge_dis_yellow_str));
            areaSetting.setRamp_edge_yellow_distance(Double.parseDouble(ramp_beyond_edge_dis_yellow_str));
        }else{
            Toast.makeText(_mActivity, "倒库完成时间输入不正确,请检查", Toast.LENGTH_SHORT).show();
        }
        if (Utils.isNumber(ramp_beyond_stick_dis_str)){
            areaSetting.setArea_ramp_flag_red_dist(Double.parseDouble(ramp_beyond_stick_dis_str));
            areaSetting.setRamp_stoppoint_red_distance(Double.parseDouble(ramp_beyond_stick_dis_str));
        }else{
            Toast.makeText(_mActivity, "侧方停车完成时间输入不正确,请检查", Toast.LENGTH_SHORT).show();
        }
        if (Utils.isNumber(back_of_vehicle_red_str)){
            areaSetting.setArea_ramp_slide_red_dist(Double.parseDouble(back_of_vehicle_red_str));
            areaSetting.setRamp_slide_red_distance(Double.parseDouble(back_of_vehicle_red_str));
        }else{
            Toast.makeText(_mActivity, "侧方停车中途停车判定输入不正确,请检查", Toast.LENGTH_SHORT).show();
        }
        if (Utils.isNumber(back_of_vehicle_yellow_str)){
            areaSetting.setArea_ramp_slide_yellow_dist(Double.parseDouble(back_of_vehicle_yellow_str));
            areaSetting.setRamp_slide_yellow_distance(Double.parseDouble(back_of_vehicle_yellow_str));
        }else{
            Toast.makeText(_mActivity, "侧方停车中途停车判定输入不正确,请检查", Toast.LENGTH_SHORT).show();
        }