From fff165b3215de255000cb133d51ceb03b5202bd6 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期五, 10 一月 2020 16:07:39 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/fragment/RTKConfigFragment.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/RTKConfigFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/RTKConfigFragment.java
index e6506df..4d424ba 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/RTKConfigFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/RTKConfigFragment.java
@@ -1,5 +1,6 @@
package safeluck.drive.evaluation.fragment;
+import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -11,13 +12,20 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
+import android.widget.TextView;
+import com.anyun.exam.lib.MyLog;
import com.google.gson.Gson;
import me.yokeyword.fragmentation.SupportFragment;
+import safeluck.drive.evaluation.Constant;
import safeluck.drive.evaluation.DB.rtktb.RTKConfigViewModel;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.DB.rtktb.RTKConfig;
+import safeluck.drive.evaluation.cEventCenter.CEventCenter;
+import safeluck.drive.evaluation.cEventCenter.ICEventListener;
+import safeluck.drive.evaluation.viewmodels.RTKConnAndLogin;
+import safeluck.drive.evaluation.viewmodels.RTKConnAndLoginViewModel;
/**FTP閰嶇疆UI
* MyApplication2
@@ -30,6 +38,8 @@
private static final String TAG = "RTKConfigFragment";
private EditText et_ip,et_port,et_city_id,et_city_province,et_phone;
+ // RTK娉ㄥ唽鐘舵�併�丷TK杩炴帴鐘舵�併��
+ private TextView tv_reg,tv_connect,tv_model,tv_sn,tv_imei,tv_login;
private RTKConfigViewModel rtkConfigViewModel;
private RTKConfig mRtkConfig;
@@ -55,8 +65,25 @@
et_city_province.setText(String.valueOf(rtkConfig.getProvince()));
et_port.setText(String.valueOf(rtkConfig.getPort()));
et_phone.setText(rtkConfig.getPhone());
+ tv_sn.setText(getResources().getString(R.string.rtk_config_sn,rtkConfig.getSn()));
+ tv_model.setText(getResources().getString(R.string.rtk_config_model,rtkConfig.getModel()));
+ tv_imei.setText(getResources().getString(R.string.rtk_config_imei,rtkConfig.getImei()));
+ tv_reg.setText(getResources().getString(R.string.rtk_register_status,rtkConfig.getRegistered()));
+
}
});
+
+
+ RTKConnAndLoginViewModel rtkConnAndLoginViewModel = ViewModelProviders.of(this).get(RTKConnAndLoginViewModel.class);
+ rtkConnAndLoginViewModel.getRtkConnAndLogin().observe(this, new Observer<RTKConnAndLogin>() {
+ @Override
+ public void onChanged(RTKConnAndLogin rtkConnAndLogin) {
+ MyLog.i(TAG,"骞冲彴鐧诲綍缁撴灉鍙婅繛鎺ョ姸鎬�"+rtkConnAndLogin.toString());
+ tv_connect.setText(getResources().getString(R.string.rtk_connect_status,rtkConnAndLogin.getConnect_status()));
+ tv_connect.setText(getResources().getString(R.string.rtk_config_login,rtkConnAndLogin.getLogin_code()));
+ }
+ });
+
return view;
}
@@ -67,6 +94,13 @@
et_city_province = view.findViewById(R.id.et_provice_id);
et_phone = view.findViewById(R.id.et_phone);
et_port = view.findViewById(R.id.rtk_addr_port);
+
+ tv_connect = view.findViewById(R.id.tv_rtk_connect);//RTK骞冲彴杩炴帴鐘舵��
+ tv_imei = view.findViewById(R.id.tv_rtk_imei);
+ tv_login = view.findViewById(R.id.tv_rtk_login);//RTK骞冲彴鐧诲綍缁撴灉
+ tv_model = view.findViewById(R.id.tv_rtk_model);
+ tv_reg = view.findViewById(R.id.tv_rtk_reg);//RTK骞冲彴娉ㄥ唽鐘舵��
+ tv_sn = view.findViewById(R.id.tv_rtk_sn);
}
@Override
@@ -84,4 +118,17 @@
break;
}
}
+
+
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+
+ }
+
+ @Override
+ public void onDetach() {
+ super.onDetach();
+ }
}
--
Gitblit v1.8.0