From a6b8cdf744588806241b8e5a2a2ce3fa1d124a07 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 23 四月 2020 17:19:22 +0800
Subject: [PATCH] 完成参数设置界面；自定义dialog 弹出和消失时也不现实底部导航栏
---
app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java | 121 +++++++++++++++++++++++-----------------
1 files changed, 70 insertions(+), 51 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
index 3c9a001..31da35f 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
@@ -56,6 +56,8 @@
import safeluck.drive.evaluation.bean.MCUInfo;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
+import safeluck.drive.evaluation.customview.MyArgEditText;
+import safeluck.drive.evaluation.customview.SelectDialog;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.SPUtils;
@@ -79,7 +81,10 @@
private Button btn_config_signal;
private Button btn_mcu_upgrade,btn_map_select;
private Gson gson = new Gson();
-// private EditText et_ip_rtk,et_port_rtk,et_city_id,et_city_province,et_phone;
+
+
+ private MyArgEditText platform_ip,platform_port,rtkPlatform_ip,rtkPlatform_port,city,province;
+
private RTKConfigViewModel rtkConfigViewModel;
private RTKConfig mRtkConfig;
private boolean needSendRtk = false;
@@ -87,7 +92,7 @@
public static SetArgumentsFragment newInstance() {
return new SetArgumentsFragment();
}
-//
+
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -100,11 +105,11 @@
if (rtkConfig != null){
Log.i(TAG, "RTKConfig Changed: "+rtkConfig.toString());
mRtkConfig = rtkConfig;
-// et_ip_rtk.setText(rtkConfig.getIp());
-// et_city_id.setText(String.valueOf(rtkConfig.getCity()));
-// et_city_province.setText(String.valueOf(rtkConfig.getProvince()));
-// et_port_rtk.setText(String.valueOf(rtkConfig.getPort()));
-// et_phone.setText(rtkConfig.getPhone());
+
+ rtkPlatform_ip.updateStr(rtkConfig.getIp());
+ rtkPlatform_port.updateStr(String.valueOf(rtkConfig.getPort()));
+ city.updateStr(String.valueOf(rtkConfig.getCity()));
+ province.updateStr(String.valueOf(rtkConfig.getProvince()));
ExamPlatformData.getInstance().setRTKPort(rtkConfig.getPort());
ExamPlatformData.getInstance().setRTKIP(rtkConfig.getIp());
@@ -130,7 +135,6 @@
e.printStackTrace();
}
jsonObject.remove("_id");
- rtkjson = null;
rtkjson = jsonObject.toString();
MyLog.i( "need resend RTK閰嶇疆淇℃伅锛�" + rtkjson+"鏍囧織浣嶏細"+needSendRtk);
AYSdk.getInstance().sendCmd(Constant.PUSH_RTK_PLATFORM_INFO, rtkjson);
@@ -149,10 +153,12 @@
((MainActivity)_mActivity).btn_return.setVisibility(View.VISIBLE);
}
view.findViewById(R.id.btn_save_platform).setOnClickListener(this);
-// et_ip = view.findViewById(R.id.et_platform_ip);
-// et_port = view.findViewById(R.id.et_platform_port);
-// et_ip.setText(ExamPlatformData.getInstance().getPlatformIP());
-// et_port.setText(ExamPlatformData.getInstance().getPlatformPort()+"");
+ platform_ip = view.findViewById(R.id.platform_ip);
+ platform_port = view.findViewById(R.id.platform_port);
+
+ platform_ip.updateStr(ExamPlatformData.getInstance().getPlatformIP());
+
+ platform_port.updateStr(ExamPlatformData.getInstance().getPlatformPort()+"");
btn_mcu_upgrade = view.findViewById(R.id.btn_mcu_upgrade);
btn_map_select = view.findViewById(R.id.btn_map_select);
view.findViewById(R.id.btn_car_select).setOnClickListener(this);
@@ -162,12 +168,10 @@
btn_config_signal.setOnClickListener(this);
-// et_ip_rtk = view.findViewById(R.id.rtk_addr_ip);
-// et_city_id = view.findViewById(R.id.et_city_id);
-// et_city_province = view.findViewById(R.id.et_provice_id);
-// et_phone = view.findViewById(R.id.et_phone);
-// et_port_rtk = view.findViewById(R.id.rtk_addr_port);
-
+ rtkPlatform_ip = view.findViewById(R.id.rtk_addr_ip);
+ rtkPlatform_port = view.findViewById(R.id.rtk_addr_port);
+ city = view.findViewById(R.id.city_id);
+ province = view.findViewById(R.id.province_id);
}
@Override
public void onClick(View v) {
@@ -199,36 +203,41 @@
break;
case R.id.btn_save_platform:
Toast.makeText(_mActivity, "淇濆瓨鎴愬姛", Toast.LENGTH_SHORT).show();
-// if(ExamPlatformData.getInstance().compareIPandPort(et_ip.getText().toString().trim(),Integer.parseInt(et_port.getText().toString().trim()))){
-// SPUtils.put(getActivity(), SPUtils.DES_HEX_PWD,"");
-// ((MainActivity)getActivity()).examPlatformModel.getDataChange().postValue(1);
-// ExamPlatformData.getInstance().insertPlatformIp(et_ip.getText().toString().trim());
-// ExamPlatformData.getInstance().insertPlatformPort(Integer.parseInt(et_port.getText().toString().trim()));
-// }
-
-// if (mRtkConfig != null){
-// String rtkip = et_ip_rtk.getText().toString().trim();
-// int rtkport = Integer.parseInt(et_port_rtk.getText().toString().trim());
-//
-// mRtkConfig.setPort(rtkport);
-// mRtkConfig.setCity(Integer.parseInt(et_city_id.getText().toString().trim()));
-// mRtkConfig.setProvince(Integer.parseInt(et_city_province.getText().toString().trim()));
-// mRtkConfig.setIp(rtkip);
-// mRtkConfig.setPhone(et_phone.getText().toString().trim());
-//
-// if (ExamPlatformData.getInstance().compareRTKIPandPort(rtkip,rtkport)){
-// mRtkConfig.setRegistered(0);
-// MyLog.i("rtk ip鍜屽湴鍧�鏈夊彉鍖�");
-// needSendRtk = true;
-// sendRtkConfigInfo(mRtkConfig);
-//
-// }
-// rtkConfigViewModel.insertRTKConfig(mRtkConfig);
-//
-// }
+ String tempPlatformIp = platform_ip.getInputStr().trim();
+ String tempRTKPlatformIp = rtkPlatform_ip.getInputStr().trim();
+ int city_id_ = Integer.parseInt(city.getInputStr().trim());
+ int province_id_ = Integer.parseInt(province.getInputStr().trim());
+
+ int tempPlatformPort = Integer.parseInt(platform_port.getInputStr().trim());
+ int tempRTKPlatformPort = Integer.parseInt(rtkPlatform_port.getInputStr().trim());
+
+ if(ExamPlatformData.getInstance().compareIPandPort(tempPlatformIp,tempPlatformPort)){
+ SPUtils.put(getActivity(), SPUtils.DES_HEX_PWD,"");
+ ((MainActivity)getActivity()).examPlatformModel.getDataChange().postValue(1);
+ ExamPlatformData.getInstance().insertPlatformIp(tempPlatformIp);
+ ExamPlatformData.getInstance().insertPlatformPort(tempPlatformPort);
+ }
+
+ if (mRtkConfig != null){
+
+ mRtkConfig.setPort(tempRTKPlatformPort);
+ mRtkConfig.setCity(city_id_);
+ mRtkConfig.setProvince(province_id_);
+ mRtkConfig.setIp(tempRTKPlatformIp);
+
+ if (ExamPlatformData.getInstance().compareRTKIPandPort(tempRTKPlatformIp,tempRTKPlatformPort)){
+ mRtkConfig.setRegistered(0);
+ MyLog.i("rtk ip鍜屽湴鍧�鏈夊彉鍖�");
+ needSendRtk = true;
+ sendRtkConfigInfo(mRtkConfig);
+
+ }
+ rtkConfigViewModel.insertRTKConfig(mRtkConfig);
+
+ }
_mActivity.onBackPressed();
break;
case R.id.btn_car_select://杞﹁締妯″瀷鍜屽湴鍥惧叕鐢ㄤ竴濂椾唬鐮� 鍖哄埆鍦ㄤ簬REQUEST_CODE
@@ -236,13 +245,23 @@
openFileMgr();
break;
case R.id.btn_map_select:
- request_code = REQUEST_CODE_MAP;
- openFileMgr();
+ SelectDialog selectDialog = SelectDialog.newInstance();
+ selectDialog.show(getFragmentManager(),"selectdialog");
+ selectDialog.setSelectedListener((int res) -> {
+ if (res != SelectDialog.SELECT_NONE){
+ if (res == SelectDialog.FIRST){
+ request_code = REQUEST_CODE_MAP;
+ Toast.makeText(_mActivity, "鍦鸿�冨湴鍥鹃�夋嫨锛�", Toast.LENGTH_SHORT).show();
+ }else{
+ request_code = REQUEST_CODE_ROADMAP;
+ Toast.makeText(_mActivity, "璺�冨湴鍥鹃�夋嫨锛�", Toast.LENGTH_SHORT).show();
+ }
+ openFileMgr();
+ }else{
+ Toast.makeText(_mActivity, "娌℃湁浠讳綍閫夋嫨锛�", Toast.LENGTH_SHORT).show();
+ }
+ });
break;
-// case R.id.btn_roadmap_select:
-// request_code = REQUEST_CODE_ROADMAP;
-// openFileMgr();
-// break;
default:
break;
}
--
Gitblit v1.8.0