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/FragmentSetting4.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting4.java b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting4.java
index 35bb34b..5d482b2 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting4.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting4.java
@@ -5,14 +5,29 @@
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.StraightLineSetting;
+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.StraightLineSettingViewModel;
/**
* DriveJudge
+ *
+ * 鐩寸嚎琛岄┒璁剧疆
* Created by lzw on 2020/9/14. 10:16:39
* 閭锛�632393724@qq.com
* All Rights Saved! Chongqing AnYun Tech co. LTD
@@ -20,9 +35,15 @@
public class FragmentSetting4 extends SupportFragment {
private static final String ARG_NUMBER = "arg_number";
private static final String TAG = FragmentSetting4.class.getSimpleName();
-
+ private Gson gson = new Gson();
private int mNumber;
+
+ private TextEditText te_straight_limit_distance;
+ private TextEditText te_straight_max_offset;
+
+ private StraightLineSetting mStrarightLineSetting;
+ private StraightLineSettingViewModel straightLineSettingViewModel;
public static FragmentSetting4 newInstance(String number) {
FragmentSetting4 fragment = new FragmentSetting4();
@@ -45,14 +66,51 @@
@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_straight_line, container, false);
initView(view);
+ straightLineSettingViewModel = ViewModelProviders.of(this).get(StraightLineSettingViewModel.class);
+ straightLineSettingViewModel.getStraightLineSetting().observe(this, new Observer<StraightLineSetting>() {
+ @Override
+ public void onChanged(StraightLineSetting commonSetting) {
+ if (commonSetting != null){
+ mStrarightLineSetting = commonSetting;
+ setDatas();
+ }
+ }
+ });
return view;
}
private void initView(View view) {
+ te_straight_limit_distance = view.findViewById(R.id.straight_limit_distance);
+ te_straight_max_offset = view.findViewById(R.id.straight_max_offset);
+ view.findViewById(R.id.btn_setting_save).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String teStraightLimitDistanceInput = te_straight_limit_distance.getInput();
+ String teStraightMaxOffsetInput = te_straight_max_offset.getInput();
+ if (mStrarightLineSetting != null){
+ if (Utils.isDigital(teStraightLimitDistanceInput)){
+
+ mStrarightLineSetting.setStraight_limit_distance(Integer.parseInt(teStraightLimitDistanceInput));
+ }
+ if (Utils.isNumber(teStraightMaxOffsetInput)){
+
+ mStrarightLineSetting.setStraight_max_offset(Double.parseDouble(teStraightMaxOffsetInput));
+ }
+
+ straightLineSettingViewModel.saveCommonSetting(mStrarightLineSetting);
+ AYSdk.getInstance().sendCmd(Constant.ID_judge_args,gson.toJson(mStrarightLineSetting));
+ Toast.makeText(_mActivity, "鐩寸嚎琛岄┒璁剧疆鎴愬姛", Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
}
+ private void setDatas() {
+ te_straight_limit_distance.setInput(String.valueOf(mStrarightLineSetting.getStraight_limit_distance()));
+ te_straight_max_offset.setInput(String.valueOf(mStrarightLineSetting.getStraight_max_offset()));
+ }
}
--
Gitblit v1.8.0