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/FragmentSetting3.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting3.java b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting3.java
index aa7ac7e..43d3ada 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting3.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting3.java
@@ -5,11 +5,24 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.Toast;
import androidx.annotation.Nullable;
+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.CommonSetting;
+import safeluck.drive.evaluation.bean.StartCarSetting;
+import safeluck.drive.evaluation.fragment.rulefragments.cview.TextEditText;
+import safeluck.drive.evaluation.util.Utils;
+import safeluck.drive.evaluation.viewmodels.CommonSettingViewModel;
+import safeluck.drive.evaluation.viewmodels.StartCarSettingViewModel;
/**
* DriveJudge
@@ -21,8 +34,15 @@
private static final String ARG_NUMBER = "arg_number";
private static final String TAG = FragmentSetting3.class.getSimpleName();
-
+ private Gson gson = new Gson();
private int mNumber;
+
+ private StartCarSetting mStartCarSetting;
+ private StartCarSettingViewModel startCarSettingViewModel;
+
+ private TextEditText te_start_car_max_rpm;
+ private TextEditText te_start_car_limit_distance;
+ private TextEditText te_open_door_drive_allow_distance;
public static FragmentSetting3 newInstance(String number) {
FragmentSetting3 fragment = new FragmentSetting3();
@@ -45,14 +65,57 @@
@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_start, container, false);
initView(view);
+ startCarSettingViewModel = ViewModelProviders.of(this).get(StartCarSettingViewModel.class);
+ startCarSettingViewModel.getStartCarSetting().observe(this, new Observer<StartCarSetting>() {
+ @Override
+ public void onChanged(StartCarSetting commonSetting) {
+ if (commonSetting != null){
+ mStartCarSetting = commonSetting;
+ setDatas();
+ }
+ }
+ });
return view;
+ }
+
+ private void setDatas() {
+ te_open_door_drive_allow_distance.setInput(String.valueOf(mStartCarSetting.getOpen_door_drive_allow_distance()));
+ te_start_car_limit_distance.setInput(String.valueOf(mStartCarSetting.getStart_car_limit_distance()));
+ te_start_car_max_rpm.setInput(String.valueOf(mStartCarSetting.getStart_car_max_rpm()));
}
private void initView(View view) {
+ te_open_door_drive_allow_distance = view.findViewById(R.id.road_start_open_door_dist);
+ te_start_car_limit_distance = view.findViewById(R.id.road_start_dist);
+ te_start_car_max_rpm = view.findViewById(R.id.road_start_max_rpm);
+ view.findViewById(R.id.btn_setting_save).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String teOpenDoorDriveAllowDistanceInput = te_open_door_drive_allow_distance.getInput();
+ String teStartCarLimitDistanceInput = te_start_car_limit_distance.getInput();
+ String teStartCarMaxRpmInput = te_start_car_max_rpm.getInput();
+ if (mStartCarSetting != null){
+ if (Utils.isNumber(teOpenDoorDriveAllowDistanceInput)){
+ mStartCarSetting.setOpen_door_drive_allow_distance(Double.parseDouble(teOpenDoorDriveAllowDistanceInput));
+ }
+ if (Utils.isDigital(teStartCarLimitDistanceInput)){
+ mStartCarSetting.setStart_car_limit_distance(Integer.parseInt(teStartCarLimitDistanceInput));
+ }
+ if (Utils.isDigital(teStartCarMaxRpmInput)){
+ mStartCarSetting.setStart_car_max_rpm(Integer.parseInt(teStartCarMaxRpmInput));
+ }
+
+ startCarSettingViewModel.saveCommonSetting(mStartCarSetting);
+ AYSdk.getInstance().sendCmd(Constant.ID_judge_args,gson.toJson(mStartCarSetting));
+ Toast.makeText(_mActivity, "涓婅溅璧锋璁剧疆鎴愬姛", Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
}
+
}
--
Gitblit v1.8.0