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 (file)
index 3965f6b..0000000
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 (file)
index 0000000..42d9225
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 aa974be..57ae3dc 100644 (file)
--- 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;\r
 import com.enqualcomm.support.utils.LocationSnrAdapter;\r
 import com.enqualcomm.support.utils.SnrEntriy;\r
+import com.enqualcomm.support.utils.TimeUtil;\r
 import com.enqualcomm.support.utils.WakeLockUtil;\r
 \r
 import java.util.ArrayList;\r
@@ -82,9 +83,10 @@ public class GPSActivity extends AppCompatActivity implements location_callback
         mRv.addItemDecoration(new SpacesItemDecoration(10));\r
         mRv.setAdapter(adapter);\r
 \r
-        mFix.setText("80");\r
-        mStar.setText("280");\r
-        mHoop.setText("180");\r
+        mFix.setText("notFixed");\r
+        mStar.setText("0 in 0/ inMap 0");\r
+        mHoop.setText("0.0米");\r
+        mSearchCount.setText("0秒");\r
     }\r
 \r
     @Override\r
@@ -92,14 +94,15 @@ public class GPSActivity extends AppCompatActivity implements location_callback
 \r
         List<ICLocation.GpsSatellitePriv> gpslist =gps_status.numSatelliteList;\r
         adapter.updateLocationValue(testSnrEntriyDate(gpslist));\r
-        String fixed=gps_status.locating_status>0?\r
-                "Fixed":"notFixed";\r
-        String satlites=new StringBuilder().append(gps_status.used_gps_numbs).append("/")\r
-                .append(gps_status.satlite_numbss).toString();\r
+        String fixed=new StringBuilder().append(gps_status.locating_status>0?\r
+                "Fixed ":"notFixed ").append(TimeUtil.getLocalTime2()).toString();\r
+        String satlites=new StringBuilder("used ").append(gps_status.used_gps_numbs).append(" in ")\r
+                .append(gps_status.numSatelliteList.size()).append("/ inMap ").append(gps_status.satlite_numbss).toString();\r
         String locationTime=new StringBuilder().append(gps_status.search_time_cost).append("秒").toString();\r
+        String hdop=new StringBuilder().append(String.valueOf(gps_status.hdop)).append("米").toString();\r
         mFix.setText(fixed);\r
         mStar.setText(satlites);\r
-        mHoop.setText(String.valueOf(gps_status.hdop));\r
+        mHoop.setText(hdop);\r
         mSearchCount.setText(locationTime);\r
     }\r
 \r
@@ -120,7 +123,7 @@ public class GPSActivity extends AppCompatActivity implements location_callback
         ArrayList<SnrEntriy> entity = new ArrayList<>();\r
 \r
         if (gpslist!=null) {\r
-            for (int i = 1; i < gpslist.size(); i++) {\r
+            for (int i = 0; i < gpslist.size(); i++) {\r
 \r
                 float snr=gpslist.get(i).getSnr();\r
                 int prn=gpslist.get(i).getPrn();\r

diff --git a/app/src/main/res/layout/activity_gps.xml b/app/src/main/res/layout/activity_gps.xml
index 80caf4b..18aed43 100644 (file)
--- 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"\r
         style="@style/IcTextStyle"\r
         android:text="GPS状态:"\r
-        android:textSize="24sp" />\r
+        android:textSize="20sp" />\r
 \r
     <TextView\r
         android:id="@+id/ic_lc_fix_value"\r
         style="@style/IcTextStyle"\r
         android:layout_marginStart="10dp"\r
         android:layout_toEndOf="@id/ic_lc_fix_name"\r
-        android:textSize="24sp" />\r
+        android:textSize="20sp" />\r
 \r
     <TextView\r
         android:id="@+id/ic_lc_star_name"\r
         style="@style/IcTextStyle"\r
         android:layout_below="@id/ic_lc_fix_name"\r
         android:text="星数:"\r
-        android:textSize="24sp" />\r
+        android:textSize="20sp" />\r
 \r
     <TextView\r
         android:id="@+id/ic_lc_star_value"\r
@@ -33,14 +33,14 @@
         android:layout_below="@id/ic_lc_fix_name"\r
         android:layout_marginStart="10dp"\r
         android:layout_toEndOf="@id/ic_lc_star_name"\r
-        android:textSize="24sp" />\r
+        android:textSize="20sp" />\r
 \r
     <TextView\r
         android:id="@+id/ic_lc_hoop_name"\r
         style="@style/IcTextStyle"\r
         android:layout_below="@id/ic_lc_star_name"\r
-        android:text="HDOP:"\r
-        android:textSize="24sp" />\r
+        android:text="精度:"\r
+        android:textSize="20sp" />\r
 \r
     <TextView\r
         android:id="@+id/ic_lc_hoop_value"\r
@@ -48,7 +48,7 @@
         android:layout_below="@id/ic_lc_star_name"\r
         android:layout_marginStart="10dp"\r
         android:layout_toEndOf="@id/ic_lc_hoop_name"\r
-        android:textSize="24sp" />\r
+        android:textSize="20sp" />\r
 \r
 \r
 \r
@@ -59,7 +59,7 @@
         android:layout_height="wrap_content"\r
         android:layout_below="@id/ic_lc_hoop_name"\r
         android:text="扫描时间:"\r
-        android:textSize="24sp" />\r
+        android:textSize="20sp" />\r
 \r
     <TextView\r
         android:id="@+id/ic_lc_searchCount_value"\r
@@ -69,7 +69,7 @@
         android:layout_below="@id/ic_lc_hoop_name"\r
         android:layout_marginStart="10dp"\r
         android:layout_toEndOf="@id/ic_lc_searchCount"\r
-        android:textSize="24sp" />\r
+        android:textSize="20sp" />\r
     <android.support.v7.widget.RecyclerView\r
         android:id="@+id/app_list"\r
         android:layout_below="@id/ic_lc_searchCount"\r

diff --git a/app/src/main/res/layout/item_snr_layout.xml b/app/src/main/res/layout/item_snr_layout.xml
index ba3b6a6..990587d 100644 (file)
--- 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"?>\r
 <com.enqualcomm.support.SnrHistogramView xmlns:android="http://schemas.android.com/apk/res/android"\r
     android:id="@+id/item_snr_view"\r
-    android:layout_width="45dp"\r
+    android:layout_width="24sp"\r
     android:layout_height="match_parent"/>
\ No newline at end of file

diff --git a/app/version_code.properties b/app/version_code.properties
index 70a983d..26e75ef 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Mar 16 00:04:13 CST 2020\r
-VERSION_CODE=377\r
+#Tue Mar 17 00:08:36 CST 2020\r
+VERSION_CODE=378\r