From a5c2e37286dd29b02fff10247e6f3201ad5f58cd Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期一, 26 十月 2020 18:04:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lowprecision'
---
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting1.java | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 177 insertions(+), 3 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 637d131..62e9171 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
@@ -7,12 +7,23 @@
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
+import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+
+import com.anyun.exam.lib.AYSdk;
+import com.google.gson.Gson;
import me.yokeyword.fragmentation.SupportFragment;
+import safeluck.drive.evaluation.Constant;
import safeluck.drive.evaluation.R;
+import safeluck.drive.evaluation.bean.AreaSetting;
+import safeluck.drive.evaluation.fragment.rulefragments.cview.TextEditText;
+import safeluck.drive.evaluation.util.Utils;
+import safeluck.drive.evaluation.viewmodels.AreaSettingViewModel;
/**
* DriveJudge
@@ -20,10 +31,31 @@
* 閭锛�632393724@qq.com
* All Rights Saved! Chongqing AnYun Tech co. LTD
*/
-public class FragmentSetting1 extends SupportFragment {
+public class FragmentSetting1 extends SupportFragment implements View.OnClickListener {
private static final String ARG_NUMBER = "arg_number";
private static final String TAG = FragmentSetting1.class.getSimpleName();
+ private Gson gson = new Gson();
+ AreaSetting areaSetting;
+ AreaSettingViewModel areaSettingViewModel;
+ private TextEditText release_start_key,curve_pause_time,daoku_pause_time,daoku_finish_time;
+ private TextEditText park_pasue_time;//渚ф柟鍋滆溅涓�斿仠杞︽椂闂�
+ private TextEditText park_finish_time;//渚ф柟鍋滆溅瀹屾垚鏃堕棿
+ private TextEditText angle_90_pause_time,ramp_finish_time;
+ //鍧¤捣瓒呭嚭妗╂潌璺濈
+ private TextEditText ramp_beyond_stick_dis;
+
+ //鍧¤捣杈圭嚎榛勭墝璺濈
+ private TextEditText ramp_beyond_edge_dis_yellow;
+
+ //鍧¤捣杈圭嚎绾㈢墝璺濈
+ private TextEditText ramp_beyond_edge_dis_red;
+
+ //鍧¤捣杞﹁締鍚庢簻榛勭墝璺濈
+ private TextEditText back_of_vehicle_yellow;
+ private TextEditText back_of_vehicle_red;
+
+ private Button btn_save;
private int mNumber;
@@ -48,14 +80,156 @@
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.layout_fragment_parkover, container, false);
+ View view = inflater.inflate(R.layout.layout_fragment_changkao, container, false);
initView(view);
+ areaSettingViewModel = ViewModelProviders.of(this).get(AreaSettingViewModel.class);
+
+ areaSettingViewModel.getAreaSetting().observe(this, new Observer<AreaSetting>() {
+ @Override
+ public void onChanged(AreaSetting mareaSetting) {
+ if (mareaSetting != null){
+ areaSetting =mareaSetting;
+ setDatas();
+ }else{
+ Log.i(TAG,"observe AreaSetting==null");
+ }
+ }
+ });
+
return view;
}
- private void initView(View view) {
+ private void setDatas() {
+ if (areaSetting != null){
+ Log.i(TAG,"璁剧疆鏁版嵁");
+ 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()));
+ }
+ }
+ private void initView(View view) {
+ btn_save = view.findViewById(R.id.btn_setting_save);
+ btn_save.setOnClickListener(this);
+
+ curve_pause_time = view.findViewById(R.id.area_curve_pause_time);
+ release_start_key = view.findViewById(R.id.area_release_start_key);
+ daoku_pause_time = view.findViewById(R.id.area_park_pause_time);
+ daoku_finish_time = view.findViewById(R.id.area_park_finish_time);
+ park_finish_time = view.findViewById(R.id.area_park2_finish_time);
+ park_pasue_time = view.findViewById(R.id.area_park2_pause_time);
+ angle_90_pause_time = view.findViewById(R.id.area_turn_a90_pause_time);
+ ramp_finish_time = view.findViewById(R.id.area_ramp_finish_time);
+ ramp_beyond_edge_dis_red = view.findViewById(R.id.area_ramp_edge_red_dist);
+ ramp_beyond_edge_dis_yellow = view.findViewById(R.id.area_ramp_edge_yellow_dist);
+ ramp_beyond_stick_dis = view.findViewById(R.id.area_ramp_flag_red_dist);
+ back_of_vehicle_red = view.findViewById(R.id.area_ramp_slide_red_dist);
+ back_of_vehicle_yellow = view.findViewById(R.id.area_ramp_slide_yellow_dist);
}
+ private boolean canWirteJsonToFile = true;
+
+ @Override
+ public void onClick(View v) {
+ AreaSetting areaSetting = new AreaSetting();
+ String curve_pause_str = curve_pause_time.getInput();
+ String release_start_key_str = release_start_key.getInput();
+ String daoku_pause_time_str = daoku_pause_time.getInput();
+ String daoku_finish_time_str = daoku_pause_time.getInput();
+ String park_finish_time_str = park_finish_time.getInput();
+ String park_pasue_time_str = park_pasue_time.getInput();
+ String angle_90_pause_time_str = angle_90_pause_time.getInput();
+ String ramp_finish_time_str = ramp_finish_time.getInput();
+ String ramp_beyond_edge_dis_red_str = ramp_beyond_edge_dis_red.getInput();
+ String ramp_beyond_edge_dis_yellow_str = ramp_beyond_edge_dis_yellow.getInput();
+ String ramp_beyond_stick_dis_str = ramp_beyond_stick_dis.getInput();
+ 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.setCurve_pause_criteria(Integer.parseInt(curve_pause_str));
+ }else{
+ Toast.makeText(_mActivity, "鏇茬嚎涓�斿仠杞﹀垽瀹氳緭鍏ヤ笉姝ｇ‘锛岃妫�鏌�", Toast.LENGTH_SHORT).show();
+ }
+ if (Utils.isDigital(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.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.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.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.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.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.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.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.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.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.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.setRamp_slide_yellow_distance(Double.parseDouble(back_of_vehicle_yellow_str));
+ }else{
+ Toast.makeText(_mActivity, "渚ф柟鍋滆溅涓�斿仠杞﹀垽瀹氳緭鍏ヤ笉姝ｇ‘锛岃妫�鏌�", Toast.LENGTH_SHORT).show();
+ }
+
+ if (canWirteJsonToFile){
+ areaSettingViewModel.saveAreaSetting(areaSetting);
+ AYSdk.getInstance().sendCmd(Constant.ID_judge_args,gson.toJson(areaSetting));
+ }
+
+ }
}
--
Gitblit v1.8.0