From 8735b56eefde751618c819f5b331a56a62274a5c Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 14 五月 2020 18:30:22 +0800
Subject: [PATCH] Merge branch 'newUI'
---
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 91 ++++++++++++++++++++++++++++++++-------------
1 files changed, 65 insertions(+), 26 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 7df7eb4..9cf5b06 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -14,6 +14,9 @@
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
import android.widget.Toast;
@@ -25,6 +28,8 @@
import androidx.work.WorkManager;
import me.yokeyword.fragmentation.SupportActivity;
+import safeluck.drive.evaluation.DB.appstatusdb.AppStatus;
+import safeluck.drive.evaluation.DB.appstatusdb.AppStatusViewModel;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusViewModel;
import safeluck.drive.evaluation.DB.rtktb.RTKConfig;
import safeluck.drive.evaluation.DB.rtktb.RTKConfigViewModel;
@@ -64,17 +69,24 @@
import safeluck.drive.evaluation.viewmodels.ExamPlatformModel;
import safeluck.drive.evaluation.viewmodels.TimeViewModel;
-public class MainActivity extends SupportActivity implements IMSConnectStatusCallback {
+public class MainActivity extends SupportActivity implements IMSConnectStatusCallback, View.OnClickListener {
private static final int PERMISSIONS_REQUEST_CODE = 1001;
private String TAG = MainActivity.class.getCanonicalName();
SignalConfigViewModel signalConfigViewModel;
private PermissionManager mPermissionsManager;
private RTKConfig mRTKConfig;//RTK閰嶇疆淇℃伅
+ private ImageView iv_rtk_status;
private Gson gson = new Gson();
String[] PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA};
RTKConfigViewModel rtkConfigViewModel;
public ExamPlatformModel examPlatformModel;
+
+ private TextView tv_sat_num,tv_work_platform,tv_network_time,
+ tv_qf;
+
+ public Button btn_return;
+ public View viewtitle;
private ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
@@ -113,8 +125,52 @@
hideBottomUIMenu();
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,WindowManager.LayoutParams.FLAG_FULLSCREEN);
setContentView(R.layout.activity_main);
+
+ viewtitle = findViewById(R.id.top_title);
+ btn_return = findViewById(R.id.btn_return);
+
+
+ btn_return.setOnClickListener(this);
+ iv_rtk_status = findViewById(R.id.iv_rtk_connect);
+ tv_work_platform = findViewById(R.id.platform);
+
+ tv_sat_num = findViewById(R.id.tv_sat_num_instatus);
+ tv_qf = findViewById(R.id.tv_qf);
+ iv_rtk_status.getDrawable().setLevel(0);
+ tv_network_time = findViewById(R.id.network_time);
+
+
+ tv_network_time.setText(Utils.getHHmm());
//鍒濆鍖杢ts
ExamPlatformData.getInstance().initTTS(getApplicationContext());
+
+
+
+ AppStatusViewModel appStatusViewModel = ViewModelProviders.of(this).get(AppStatusViewModel.class);
+ appStatusViewModel.getAppStatus().observe(this, new Observer<AppStatus>() {
+ @Override
+ public void onChanged(AppStatus appStatus) {
+ if (appStatus != null){
+ Log.i(TAG, "onChanged: "+appStatus.toString());
+ iv_rtk_status.getDrawable().setLevel(appStatus.getRtk_connect_status());
+ tv_work_platform.setText(getString(R.string.platform_status,ExamPlatformData.getInstance().getExamplatformStatusStr(
+ ExamPlatformData.getInstance().getExamplatformStatus()
+ )));
+ tv_sat_num.setText(String.valueOf(appStatus.getSat_num()).length()==1?"0"+appStatus.getSat_num():String.valueOf(appStatus.getSat_num()));
+ tv_qf.setText(getResources().getStringArray(R.array.qf_status)[appStatus.getQf()]);
+ }
+ }
+ });
+
+ TimeViewModel timeViewModel = ViewModelProviders.of(this).get(TimeViewModel.class);
+ timeViewModel.getLiveDataTime().observe(this, new Observer<String>() {
+ @Override
+ public void onChanged(String s) {
+ tv_network_time.setText(s);
+ }
+ });
+
+
// TODO
// 杩涜tcp杩炴帴
final String userId = "100002";
@@ -215,32 +271,7 @@
CEventCenter.onBindEvent(false, icEventListener, Constant.BIND_CONNECT_RTK_TOPIC);
Log.i(TAG, "onDestroy: ");
}
- private void sendSignalConfigsToRemote() {
- if (signalConfiglist.size()>0){
- new AsyncTask<Void, Void, List<Integer>>(
- ) {
- @Override
- protected List<Integer> doInBackground(Void... voids) {
- return signalConfigViewModel.getAllIndexs();
- }
-
- @Override
- protected void onPostExecute(List<Integer> indexs) {
- if (listContainsSameValue(indexs)){
- Log.i(TAG, "sendSignalConfigsToRemote: 鏈夌浉鍚岀殑index锛屼笉鑳藉彂閫�"+gson.toJson(signalConfiglist));
- Toast.makeText(getApplicationContext(), "涓嶈兘鏈夌浉鍚岀殑鐗╃悊鎵�寮曪紒", Toast.LENGTH_SHORT).show();
- }else{
- AYSdk.getInstance().sendCmd(Constant.SEND_CONFIG_SIGNAL,gson.toJson(signalConfiglist));
- }
- }
- }.execute();
-
- }
-
-
-
- }
@Override
protected void onResume() {
@@ -340,4 +371,12 @@
}
}
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()){
+ case R.id.btn_return:
+ onBackPressed();
+ break;
+ }
+ }
}
--
Gitblit v1.8.0