From f4639550901c5e4b382e98d4c3fb5b62ecb1007c Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期一, 26 十月 2020 13:42:21 +0800
Subject: [PATCH] 场考设置完成后台逻辑+UI
---
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting1.java | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting1.java b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting1.java
index 88aa566..1c6fab7 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting1.java
+++ b/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();
}
--
Gitblit v1.8.0