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/FragmentSetting8.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting8.java b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting8.java
index c7ef98f..5c5d031 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting8.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting8.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.SubDecGearSetting;
+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.SubDecGearSettingViewModel;
/**
* DriveJudge
@@ -21,8 +34,15 @@
private static final String ARG_NUMBER = "arg_number";
private static final String TAG = FragmentSetting8.class.getSimpleName();
-
+ private Gson gson = new Gson();
private int mNumber;
+
+
+ private TextEditText te_shift_limit_distance;
+ private TextEditText te_road_shift_hold_time;
+
+ private SubDecGearSetting mSubGearSetting;
+ private SubDecGearSettingViewModel subDecGearSettingViewModel;
public static FragmentSetting8 newInstance(String number) {
FragmentSetting8 fragment = new FragmentSetting8();
@@ -45,14 +65,50 @@
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.fragment_add_sub_gear_setting, container, false);
+ View view = inflater.inflate(R.layout.fragment_add_sub_gear_setting_1, container, false);
initView(view);
+ subDecGearSettingViewModel = ViewModelProviders.of(this).get(SubDecGearSettingViewModel.class);
+ subDecGearSettingViewModel.getSubDecGearSetting().observe(this, new Observer<SubDecGearSetting>() {
+ @Override
+ public void onChanged(SubDecGearSetting commonSetting) {
+ if (commonSetting != null){
+ mSubGearSetting = commonSetting;
+ setDatas();
+ }
+ }
+ });
return view;
}
private void initView(View view) {
+ te_shift_limit_distance = view.findViewById(R.id.shift_limit_distance);
+ te_road_shift_hold_time =view.findViewById(R.id.road_shift_hold_time);
+ view.findViewById(R.id.btn_setting_save).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String teRoadShiftHoldTimeInput = te_road_shift_hold_time.getInput();
+ String teShiftLimitDistanceInput = te_shift_limit_distance.getInput();
+ if (mSubGearSetting != null){
+ if (Utils.isDigital(teRoadShiftHoldTimeInput)){
+ mSubGearSetting.setShift_hold_time(Integer.parseInt(teRoadShiftHoldTimeInput));
+ }if (Utils.isDigital(teShiftLimitDistanceInput)){
+ mSubGearSetting.setShift_limit_distance(Integer.parseInt(teShiftLimitDistanceInput));
+ }
+
+ subDecGearSettingViewModel.saveSubDecGearSetting(mSubGearSetting);
+ AYSdk.getInstance().sendCmd(Constant.ID_judge_args,gson.toJson(mSubGearSetting));
+ Toast.makeText(_mActivity, "鍔犲噺妗ｈ缃垚鍔�", Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
}
+ private void setDatas() {
+ if (mSubGearSetting != null){
+ te_shift_limit_distance.setInput(String.valueOf(mSubGearSetting.getShift_limit_distance()));
+ te_road_shift_hold_time.setInput(String.valueOf(mSubGearSetting.getShift_hold_time()));
+ }
+ }
}
--
Gitblit v1.8.0