From 9119ae3e2d99b5afbc8611a99fc134f35260955b Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期一, 26 十月 2020 17:42:22 +0800
Subject: [PATCH] 完成规则设置
---
app/src/main/java/safeluck/drive/evaluation/Constant.java | 1
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting2.java | 7 +
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting5.java | 29 +++++
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting9.java | 43 ++++++++
app/src/main/res/values/strings.xml | 6
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting4.java | 30 +++++
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting7.java | 22 ++++
app/src/main/res/layout/layout_fragment_stationsettin.xml | 21 ++++
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting1.java | 7 +
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting3.java | 32 ++++++
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting6.java | 23 ++++
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting0.java | 7 +
app/src/main/res/layout/layout_fragment_parkover_1.xml | 18 +++
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting8.java | 27 +++++
14 files changed, 259 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/Constant.java b/app/src/main/java/safeluck/drive/evaluation/Constant.java
index 01fb449..92b0e54 100644
--- a/app/src/main/java/safeluck/drive/evaluation/Constant.java
+++ b/app/src/main/java/safeluck/drive/evaluation/Constant.java
@@ -110,4 +110,5 @@
public static final String MCU_UPGRADE_FAIL_RESASON = "mcu_upgrade_fail_reason";
@NotNull
public static final String TTS="tts_judge";
+ public static int ID_judge_args = 0x8019;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting0.java b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting0.java
index e23326b..923b879 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting0.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting0.java
@@ -14,10 +14,14 @@
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProviders;
+import com.anyun.exam.lib.AYSdk;
+import com.google.gson.Gson;
+
import java.util.Arrays;
import java.util.List;
import me.yokeyword.fragmentation.SupportFragment;
+import safeluck.drive.evaluation.Constant;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.fragment.rulefragments.cview.TextEditText;
import safeluck.drive.evaluation.util.FileUtil;
@@ -31,6 +35,8 @@
public class FragmentSetting0 extends SupportFragment {
private static final String ARG_NUMBER = "arg_number";
private static final String TAG = FragmentSetting0.class.getSimpleName();
+
+ private Gson gson = new Gson();
private TextEditText textEditText_gear_n_allow_time;
private TextEditText textEditText_same_gear_min_time;
private TextEditText textEditText_gear_speed_error_cumulative_time;
@@ -227,6 +233,7 @@
}
gearRelateSetViewModel.saveGearRelatedSetting(mgearRelateSet);
+ AYSdk.getInstance().sendCmd(Constant.ID_judge_args,gson.toJson(mgearRelateSet));
Toast.makeText(_mActivity, "淇濆瓨鎴愬姛", Toast.LENGTH_SHORT).show();
}
});
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 1c6fab7..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
@@ -14,7 +14,11 @@
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;
@@ -30,7 +34,7 @@
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;
@@ -224,6 +228,7 @@
if (canWirteJsonToFile){
areaSettingViewModel.saveAreaSetting(areaSetting);
+ AYSdk.getInstance().sendCmd(Constant.ID_judge_args,gson.toJson(areaSetting));
}
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting2.java b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting2.java
index e8d69a6..7d741bd 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting2.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting2.java
@@ -11,7 +11,11 @@
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.fragment.rulefragments.cview.TextEditText;
@@ -27,7 +31,7 @@
public class FragmentSetting2 extends SupportFragment {
private static final String ARG_NUMBER = "arg_number";
private static final String TAG = FragmentSetting2.class.getSimpleName();
-
+ private Gson gson = new Gson();
private CommonSetting mCommonSetting;
private CommonSettingViewModel commonSettingViewModel;
@@ -133,6 +137,7 @@
commonSettingViewModel.saveCommonSetting(mCommonSetting);
+ AYSdk.getInstance().sendCmd(Constant.ID_judge_args,gson.toJson(mCommonSetting));
Toast.makeText(_mActivity, "閫氱敤璁剧疆鎴愬姛", Toast.LENGTH_SHORT).show();
}
}
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 16f00aa..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,16 +5,22 @@
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;
@@ -28,7 +34,7 @@
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;
@@ -85,6 +91,30 @@
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();
+ }
+ }
+ });
}
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 3362c6e..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,16 +5,22 @@
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;
@@ -29,7 +35,7 @@
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;
@@ -79,6 +85,28 @@
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() {
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting5.java b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting5.java
index 138cf52..6ca2c3e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting5.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting5.java
@@ -5,16 +5,22 @@
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.StationSetting;
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.StationSettingViewModel;
@@ -29,7 +35,7 @@
public class FragmentSetting5 extends SupportFragment {
private static final String ARG_NUMBER = "arg_number";
private static final String TAG = FragmentSetting5.class.getSimpleName();
-
+ private Gson gson = new Gson();
private StationSetting mStationSetting;
private StationSettingViewModel mStationSettingViewModel;
@@ -80,6 +86,27 @@
te_crossing_break_valid_distance = view.findViewById(R.id.crossing_break_valid_distance);
te_crossing_stop_valid_distance = view.findViewById(R.id.crossing_stop_valid_distance);
+ view.findViewById(R.id.btn_setting_save).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String teCrossSchoolMaxSpeedInput = te_cross_school_max_speed.getInput();
+ String teCrossingBreakValidDistanceInput = te_crossing_break_valid_distance.getInput();
+ String teCrossingStopValidDistanceInput = te_crossing_stop_valid_distance.getInput();
+ if (mStationSetting != null){
+ if (Utils.isDigital(teCrossingBreakValidDistanceInput)){
+ mStationSetting.setCrossing_break_valid_distance(Integer.parseInt(teCrossingBreakValidDistanceInput));
+ } if (Utils.isDigital(teCrossSchoolMaxSpeedInput)){
+ mStationSetting.setCross_school_max_speed(Integer.parseInt(teCrossSchoolMaxSpeedInput));
+ } if (Utils.isNumber(teCrossingStopValidDistanceInput)){
+ mStationSetting.setCrossing_stop_valid_distance(Double.parseDouble(teCrossingStopValidDistanceInput));
+ }
+ mStationSettingViewModel.saveCommonSetting(mStationSetting);
+ Toast.makeText(_mActivity, "閫氳繃绔欑偣璁剧疆鎴愬姛", Toast.LENGTH_SHORT).show();
+ AYSdk.getInstance().sendCmd(Constant.ID_judge_args,gson.toJson(mStationSetting));
+ }
+ }
+ });
+
}
private void setDatas() {
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting6.java b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting6.java
index 2b539df..af45273 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting6.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting6.java
@@ -5,16 +5,22 @@
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.CorneringLampSetting;
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.CorneringLampSettingViewModel;
@@ -28,7 +34,7 @@
private static final String ARG_NUMBER = "arg_number";
private static final String TAG = FragmentSetting6.class.getSimpleName();
-
+ private Gson gson = new Gson();
private int mNumber;
private TextEditText te_turn_signal_min_advance;
@@ -73,6 +79,21 @@
private void initView(View view) {
te_turn_signal_min_advance = view.findViewById(R.id.turn_signal_min_advance);
+ view.findViewById(R.id.btn_setting_save).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String teTurnSignalMinAdvanceInput = te_turn_signal_min_advance.getInput();
+ if (mCornerLampSetting != null){
+ if (Utils.isDigital(teTurnSignalMinAdvanceInput)){
+
+ mCornerLampSetting.setTurn_signal_min_advance(Integer.parseInt(teTurnSignalMinAdvanceInput));
+ Toast.makeText(_mActivity, "杞悜鐏缃垚鍔�", Toast.LENGTH_SHORT).show();
+ corneringLampSettingViewModel.saveCommonSetting(mCornerLampSetting);
+ AYSdk.getInstance().sendCmd(Constant.ID_judge_args,gson.toJson(mCornerLampSetting));
+ }
+ }
+ }
+ });
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting7.java b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting7.java
index e93b134..be6c8fe 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting7.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting7.java
@@ -5,16 +5,22 @@
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.OverTakeMeetingSetting;
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.OverTakeAndMeetingSettingViewModel;
@@ -27,7 +33,7 @@
public class FragmentSetting7 extends SupportFragment {
private static final String ARG_NUMBER = "arg_number";
private static final String TAG = FragmentSetting7.class.getSimpleName();
-
+ private Gson gson = new Gson();
private OverTakeAndMeetingSettingViewModel overTakeAndMeetingSettingViewModel;
private OverTakeMeetingSetting overTakeMeetingSetting;
@@ -73,7 +79,21 @@
private void initView(View view) {
te_overtake_limit_distance = view.findViewById(R.id.overtake_limit_distance);
+ view.findViewById(R.id.btn_setting_save).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String teOvertakeLimitDistanceInput = te_overtake_limit_distance.getInput();
+ if (overTakeMeetingSetting != null){
+ if (Utils.isDigital(teOvertakeLimitDistanceInput)){
+ Toast.makeText(_mActivity, "瓒呰溅璁剧疆鎴愬姛", Toast.LENGTH_SHORT).show();
+ overTakeMeetingSetting.setOvertake_limit_distance(Integer.parseInt(teOvertakeLimitDistanceInput));
+ AYSdk.getInstance().sendCmd(Constant.ID_judge_args,gson.toJson(overTakeMeetingSetting));
+ }
+ overTakeAndMeetingSettingViewModel.saveCommonSetting(overTakeMeetingSetting);
+ }
+ }
+ });
}
private void setDatas() {
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 07bf8ca..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,16 +5,22 @@
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;
@@ -28,7 +34,7 @@
private static final String ARG_NUMBER = "arg_number";
private static final String TAG = FragmentSetting8.class.getSimpleName();
-
+ private Gson gson = new Gson();
private int mNumber;
@@ -78,6 +84,25 @@
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() {
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting9.java b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting9.java
index e62cfa4..f8e8cbe 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting9.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting9.java
@@ -5,16 +5,22 @@
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.SideStopSetting;
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.SideStopSettingViewModel;
@@ -25,6 +31,7 @@
* All Rights Saved! Chongqing AnYun Tech co. LTD
*/
public class FragmentSetting9 extends SupportFragment {
+ private Gson gson = new Gson();
private static final String ARG_NUMBER = "arg_number";
private static final String TAG = FragmentSetting9.class.getSimpleName();
@@ -82,7 +89,43 @@
te_stop_car_limit_distance = view.findViewById(R.id.stop_car_limit_distance);
te_stop_car_edge_red_distance = view.findViewById(R.id.stop_car_edge_red_distance);
te_stop_car_edge_yellow_distance = view.findViewById(R.id.stop_car_edge_yellow_distance);
+ view.findViewById(R.id.btn_setting_save).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String teRoadMaxSpeedInput = te_road_max_speed.getInput();
+ String teRoadTotalDistanceInput = te_road_total_distance.getInput();
+ String teStopCarOpenDoorAllowTimeInput = te_stop_car_open_door_allow_time.getInput();
+ String teStopCarLimitDistanceInput = te_stop_car_limit_distance.getInput();
+ String teStopCarEdgeRedDistanceInput = te_stop_car_edge_red_distance.getInput();
+ String teStopCarEdgeYellowDistanceInput = te_stop_car_edge_yellow_distance.getInput();
+ if (mSideStopSetting!=null){
+ if (Utils.isDigital(teRoadTotalDistanceInput)){
+ mSideStopSetting.setRoad_total_distance(Integer.parseInt(teRoadTotalDistanceInput));
+ }
+ if (Utils.isDigital(teRoadMaxSpeedInput)){
+ mSideStopSetting.setRoad_max_speed(Integer.parseInt(teRoadMaxSpeedInput));
+ }
+ if (Utils.isDigital(teStopCarOpenDoorAllowTimeInput)){
+ mSideStopSetting.setStop_car_open_door_allow_time(Integer.parseInt(teStopCarOpenDoorAllowTimeInput));
+ }
+ if (Utils.isDigital(teStopCarLimitDistanceInput)){
+ mSideStopSetting.setStop_car_limit_distance(Integer.parseInt(teStopCarLimitDistanceInput));
+ }
+ if (Utils.isNumber(teStopCarEdgeRedDistanceInput)){
+ mSideStopSetting.setStop_car_edge_red_distance(Double.parseDouble(teStopCarEdgeRedDistanceInput));
+ }
+ if (Utils.isNumber(teStopCarEdgeYellowDistanceInput)){
+ mSideStopSetting.setStop_car_edge_yellow_distance(Double.parseDouble(teStopCarEdgeYellowDistanceInput));
+ }
+
+
+ mSideStopSettingViewModel.saveSideStopSetting(mSideStopSetting);
+ Toast.makeText(_mActivity, "闈犺竟鍋滆溅璁剧疆", Toast.LENGTH_SHORT).show();
+ AYSdk.getInstance().sendCmd(Constant.ID_judge_args,gson.toJson(mSideStopSetting));
+ }
+ }
+ });
}
private void setDatas() {
diff --git a/app/src/main/res/layout/layout_fragment_parkover_1.xml b/app/src/main/res/layout/layout_fragment_parkover_1.xml
index 2431b6c..9a2c697 100644
--- a/app/src/main/res/layout/layout_fragment_parkover_1.xml
+++ b/app/src/main/res/layout/layout_fragment_parkover_1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:app="http://schemas.android.com/apk/res-auto"
+<FrameLayout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
@@ -50,4 +50,18 @@
/>
</LinearLayout>
-</ScrollView>
\ No newline at end of file
+ <Button
+ android:id="@+id/btn_setting_save"
+ android:layout_width="100dp"
+ android:layout_height="@dimen/ui_margin_60dp"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="16dp"
+ android:layout_marginTop="32dp"
+ android:layout_gravity="bottom|center"
+
+ android:background="@drawable/btn_start_bg"
+ android:textAllCaps="false"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize32px"
+ android:text="淇濆瓨"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_fragment_stationsettin.xml b/app/src/main/res/layout/layout_fragment_stationsettin.xml
index 3da1f76..2b5bdc4 100644
--- a/app/src/main/res/layout/layout_fragment_stationsettin.xml
+++ b/app/src/main/res/layout/layout_fragment_stationsettin.xml
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<FrameLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+<LinearLayout
+
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -34,3 +38,18 @@
</LinearLayout>
+ <Button
+ android:id="@+id/btn_setting_save"
+ android:layout_width="100dp"
+ android:layout_height="@dimen/ui_margin_60dp"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="16dp"
+ android:layout_marginTop="32dp"
+ android:layout_gravity="bottom|center"
+
+ android:background="@drawable/btn_start_bg"
+ android:textAllCaps="false"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize32px"
+ android:text="淇濆瓨"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e39c86f..ae0f17d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -74,13 +74,13 @@
</string-array>
<string-array name="array_large_item_menu">
- <item>鐏厜璁剧疆</item>
+<!-- <item>鐏厜璁剧疆</item>-->
<item>瑙勫垯璁剧疆</item>
- <item>鎵ｅ垎璁剧疆</item>
+<!-- <item>鎵ｅ垎璁剧疆</item>
<item>鎸囦护璁剧疆</item>
<item>绯荤粺璁剧疆</item>
<item>鏁欏绯荤粺璁剧疆</item>
- <item>妗ｄ綅瀛︿範</item>
+ <item>妗ｄ綅瀛︿範</item>-->
</string-array>
--
Gitblit v1.8.0