From bb00b0257227d4d6397caa78143292822df13db8 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 16 三月 2020 10:32:24 +0800
Subject: [PATCH] 状态栏添加卫星颗数和解状态;App_status表添加qf和sat_num字段

---
 app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index e1aba26..5ec7624 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -97,7 +97,8 @@
     private int item_id;//鎵e垎鍒嗘暟鎬诲拰
     private ExamStatusViewModel examStatusViewModel;
     private static final int ADD_DATA = 1;
-    private TextView tv_speed,tv_total_score,tv_sat_num,tv_name,tv_id,tv_work_platform,tv_network_time;
+    private TextView tv_speed,tv_total_score,tv_sat_num,tv_name,tv_id,tv_work_platform,tv_network_time,
+            tv_qf;
     private double speed=0.0;
     private ImageView iv_rtk_status,iv_head;
 
@@ -106,7 +107,6 @@
     private static final int SPEED_DATA = 2;
     private FailedProjViewModel failedProjViewModel;
     String icson;//杩斿洖鐨刬c鍗′俊鎭� json
-    private Random random = new Random();
     private List<SimulateNightBean.QuestionBean> tempQs=  new ArrayList<>();
 
     public static SupportFragment newInstance() {
@@ -127,7 +127,7 @@
                 av_zhijiao.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_ANGLE));
             }
             if (msg.what == SPEED_DATA){
-                tv_speed.setText(getActivity().getApplicationContext().getResources().getString(R.string.speed,speed));
+                tv_speed.setText(_mActivity.getApplicationContext().getResources().getString(R.string.speed,speed));
             }
             if (msg.what == Constant.IC_ID){
                 try {
@@ -367,7 +367,8 @@
                     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(appStatus.getWork_platform())));
-                    tv_sat_num.setText(String.valueOf(appStatus.getDefault_observe1()).length()==1?"0"+appStatus.getDefault_observe1():String.valueOf(appStatus.getDefault_observe1()));
+                    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()]);
                 }
             }
         });
@@ -444,7 +445,8 @@
 
         iv_rtk_status = view.findViewById(R.id.iv_rtk_connect);
         iv_head = view.findViewById(R.id.iv_head);
-        tv_sat_num = view.findViewById(R.id.tv_sat_num);
+        tv_sat_num = view.findViewById(R.id.tv_sat_num_instatus);
+        tv_qf = view.findViewById(R.id.tv_qf);
         tv_speed = view.findViewById(R.id.tv_speed);
         tv_total_score = view.findViewById(R.id.tv_total_score);
         tv_network_time = view.findViewById(R.id.network_time);

--
Gitblit v1.8.0