From: snicker <snickersun@163.com>
Date: Mon, 16 Mar 2020 16:10:53 +0000 (+0800)
Subject: release V378 版本
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=5d9e3b8e6ce459b47eabdc35b58163fcdee243c4;p=icsupport.git

release V378 版本
添加和优化gps数据显示窗口
---

diff --git a/app/release/ICSer_V377_2003160004_release.apk b/app/release/ICSer_V377_2003160004_release.apk
deleted file mode 100644
index 3965f6b6..00000000
Binary files a/app/release/ICSer_V377_2003160004_release.apk and /dev/null differ
diff --git a/app/release/ICSer_V378_2003170008_release.apk b/app/release/ICSer_V378_2003170008_release.apk
new file mode 100644
index 00000000..42d9225b
Binary files /dev/null and b/app/release/ICSer_V378_2003170008_release.apk differ
diff --git a/app/src/main/java/com/enqualcomm/support/GPSActivity.java b/app/src/main/java/com/enqualcomm/support/GPSActivity.java
index aa974bea..57ae3dca 100644
--- a/app/src/main/java/com/enqualcomm/support/GPSActivity.java
+++ b/app/src/main/java/com/enqualcomm/support/GPSActivity.java
@@ -16,6 +16,7 @@ import com.enqualcomm.support.NMEAListener.location_callback;
 import com.enqualcomm.support.bean.ICLocation;
 import com.enqualcomm.support.utils.LocationSnrAdapter;
 import com.enqualcomm.support.utils.SnrEntriy;
+import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.WakeLockUtil;
 
 import java.util.ArrayList;
@@ -82,9 +83,10 @@ public class GPSActivity extends AppCompatActivity implements location_callback
         mRv.addItemDecoration(new SpacesItemDecoration(10));
         mRv.setAdapter(adapter);
 
-        mFix.setText("80");
-        mStar.setText("280");
-        mHoop.setText("180");
+        mFix.setText("notFixed");
+        mStar.setText("0 in 0/ inMap 0");
+        mHoop.setText("0.0ç±³");
+        mSearchCount.setText("0秒");
     }
 
     @Override
@@ -92,14 +94,15 @@ public class GPSActivity extends AppCompatActivity implements location_callback
 
         List<ICLocation.GpsSatellitePriv> gpslist =gps_status.numSatelliteList;
         adapter.updateLocationValue(testSnrEntriyDate(gpslist));
-        String fixed=gps_status.locating_status>0?
-                "Fixed":"notFixed";
-        String satlites=new StringBuilder().append(gps_status.used_gps_numbs).append("/")
-                .append(gps_status.satlite_numbss).toString();
+        String fixed=new StringBuilder().append(gps_status.locating_status>0?
+                "Fixed ":"notFixed ").append(TimeUtil.getLocalTime2()).toString();
+        String satlites=new StringBuilder("used ").append(gps_status.used_gps_numbs).append(" in ")
+                .append(gps_status.numSatelliteList.size()).append("/ inMap ").append(gps_status.satlite_numbss).toString();
         String locationTime=new StringBuilder().append(gps_status.search_time_cost).append("秒").toString();
+        String hdop=new StringBuilder().append(String.valueOf(gps_status.hdop)).append("ç±³").toString();
         mFix.setText(fixed);
         mStar.setText(satlites);
-        mHoop.setText(String.valueOf(gps_status.hdop));
+        mHoop.setText(hdop);
         mSearchCount.setText(locationTime);
     }
 
@@ -120,7 +123,7 @@ public class GPSActivity extends AppCompatActivity implements location_callback
         ArrayList<SnrEntriy> entity = new ArrayList<>();
 
         if (gpslist!=null) {
-            for (int i = 1; i < gpslist.size(); i++) {
+            for (int i = 0; i < gpslist.size(); i++) {
 
                 float snr=gpslist.get(i).getSnr();
                 int prn=gpslist.get(i).getPrn();
diff --git a/app/src/main/res/layout/activity_gps.xml b/app/src/main/res/layout/activity_gps.xml
index 80caf4b8..18aed437 100644
--- a/app/src/main/res/layout/activity_gps.xml
+++ b/app/src/main/res/layout/activity_gps.xml
@@ -11,21 +11,21 @@
         android:id="@+id/ic_lc_fix_name"
         style="@style/IcTextStyle"
         android:text="GPS状态:"
-        android:textSize="24sp" />
+        android:textSize="20sp" />
 
     <TextView
         android:id="@+id/ic_lc_fix_value"
         style="@style/IcTextStyle"
         android:layout_marginStart="10dp"
         android:layout_toEndOf="@id/ic_lc_fix_name"
-        android:textSize="24sp" />
+        android:textSize="20sp" />
 
     <TextView
         android:id="@+id/ic_lc_star_name"
         style="@style/IcTextStyle"
         android:layout_below="@id/ic_lc_fix_name"
         android:text="星数:"
-        android:textSize="24sp" />
+        android:textSize="20sp" />
 
     <TextView
         android:id="@+id/ic_lc_star_value"
@@ -33,14 +33,14 @@
         android:layout_below="@id/ic_lc_fix_name"
         android:layout_marginStart="10dp"
         android:layout_toEndOf="@id/ic_lc_star_name"
-        android:textSize="24sp" />
+        android:textSize="20sp" />
 
     <TextView
         android:id="@+id/ic_lc_hoop_name"
         style="@style/IcTextStyle"
         android:layout_below="@id/ic_lc_star_name"
-        android:text="HDOP:"
-        android:textSize="24sp" />
+        android:text="精度:"
+        android:textSize="20sp" />
 
     <TextView
         android:id="@+id/ic_lc_hoop_value"
@@ -48,7 +48,7 @@
         android:layout_below="@id/ic_lc_star_name"
         android:layout_marginStart="10dp"
         android:layout_toEndOf="@id/ic_lc_hoop_name"
-        android:textSize="24sp" />
+        android:textSize="20sp" />
 
 
 
@@ -59,7 +59,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/ic_lc_hoop_name"
         android:text="扫描时间:"
-        android:textSize="24sp" />
+        android:textSize="20sp" />
 
     <TextView
         android:id="@+id/ic_lc_searchCount_value"
@@ -69,7 +69,7 @@
         android:layout_below="@id/ic_lc_hoop_name"
         android:layout_marginStart="10dp"
         android:layout_toEndOf="@id/ic_lc_searchCount"
-        android:textSize="24sp" />
+        android:textSize="20sp" />
     <android.support.v7.widget.RecyclerView
         android:id="@+id/app_list"
         android:layout_below="@id/ic_lc_searchCount"
diff --git a/app/src/main/res/layout/item_snr_layout.xml b/app/src/main/res/layout/item_snr_layout.xml
index ba3b6a61..990587de 100644
--- a/app/src/main/res/layout/item_snr_layout.xml
+++ b/app/src/main/res/layout/item_snr_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.enqualcomm.support.SnrHistogramView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/item_snr_view"
-    android:layout_width="45dp"
+    android:layout_width="24sp"
     android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/app/version_code.properties b/app/version_code.properties
index 70a983de..26e75ef0 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Mar 16 00:04:13 CST 2020
-VERSION_CODE=377
+#Tue Mar 17 00:08:36 CST 2020
+VERSION_CODE=378