Model 界面更新

README.md

@@ -85,3 +85,6 @@ http://202.100.179.139:8088/api
 传入cfgv <= YYYYMMDDHH 下发配置，切换至url http://202.100.179.139:8088/api_b
 传入cfgv <= YYYYMMDDHH 下发配置，切换至url http://202.100.179.139:8088/api_b
 时间间隔为 1-5的随机数
 时间间隔为 1-5的随机数
 
 
+
+
+*#*#737678#*#*
\ No newline at end of file

app/src/main/java/com/agenew/location_server/application/BirdService.java

@@ -326,8 +326,6 @@ public class BirdService extends Service {
 
 
         String temp_model = Build.MODEL;
         String temp_model = Build.MODEL;
         mModel = temp_model.trim().replaceAll(" ", "");
         mModel = temp_model.trim().replaceAll(" ", "");
-//        mModel = "HBA7+";
-
     }
     }
 
 
 }
 }

app/src/main/res/layout/location_msg.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="30dp"
     android:padding="10dp"
     android:padding="10dp"
     android:orientation="vertical">
     android:orientation="vertical">
 
 
@@ -27,7 +26,6 @@
 
 
     <TextView
     <TextView
         android:id="@+id/url"
         android:id="@+id/url"
-        android:layout_marginTop="20dp"
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/url"
         android:text="@string/url"
@@ -40,9 +38,25 @@
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
         />
         />
 
 
+    <!--<TextView-->
+        <!--android:layout_marginTop="20dp"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:text="@string/user_tips_title"/>-->
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/user_tips_content"/>
+
+    <!--<EditText-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:text="@string/other_tips"/>-->
     <LinearLayout
     <LinearLayout
+        android:layout_marginTop="50dp"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
         <LinearLayout
         <LinearLayout
             android:orientation="horizontal"
             android:orientation="horizontal"
             android:layout_width="0dp"
             android:layout_width="0dp"

app/src/main/res/values/strings.xml

@@ -14,4 +14,7 @@
     <string name="save_cacel">取消</string>
     <string name="save_cacel">取消</string>
     <string name="time_inter_tips">请输入时间间隔</string>
     <string name="time_inter_tips">请输入时间间隔</string>
     <string name="server_tips">请输入当前服务器接口地址</string>
     <string name="server_tips">请输入当前服务器接口地址</string>
+    <string name="user_tips_title">使用说明:</string>
+    <string name="user_tips_content">每次重启开机后均会发送定位信息，可保存后重启手机测试。</string>
+    <string name="other_tips">测试接口: http://202.100.179.139:8088/api  正式接口: http://202.100.190.58:8090/api/cstmzPosition</string>
 </resources>
 </resources>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
         jcenter()
     }
     }
     dependencies {
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         
         
 
 
         // NOTE: Do not place your application dependencies here; they belong
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

+#Thu Apr 04 16:04:06 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip