From 2ed968c550d1bafe39f57bbc14a9269e52a69ed7 Mon Sep 17 00:00:00 2001
From: ZCShou <72115@163.com>
Date: Thu, 2 Sep 2021 14:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E4=BA=86=E4=B8=8D=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/ic_faq.xml         |  4 ----
 app/src/main/res/drawable/ic_menu_map.xml    |  6 ------
 app/src/main/res/drawable/ic_route.xml       | 10 ----------
 app/src/main/res/layout/content_map.xml      |  4 ----
 app/src/main/res/layout/history_item.xml     |  1 -
 app/src/main/res/layout/input_latlng.xml     |  1 -
 app/src/main/res/layout/joystick.xml         |  1 -
 app/src/main/res/layout/joystick_history.xml |  1 -
 app/src/main/res/layout/nav_header.xml       |  1 -
 app/src/main/res/layout/register_dialog.xml  |  1 -
 app/src/main/res/layout/user_protocol.xml    |  1 -
 app/src/main/res/layout/welcome.xml          |  1 -
 app/src/main/res/menu/menu_history.xml       |  2 --
 app/src/main/res/values/dimens.xml           |  2 --
 app/src/main/res/values/strings.xml          |  5 -----
 15 files changed, 41 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_faq.xml
 delete mode 100644 app/src/main/res/drawable/ic_menu_map.xml
 delete mode 100644 app/src/main/res/drawable/ic_route.xml

diff --git a/app/src/main/res/drawable/ic_faq.xml b/app/src/main/res/drawable/ic_faq.xml
deleted file mode 100644
index dfe7d14..0000000
--- a/app/src/main/res/drawable/ic_faq.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="1024"
-    android:viewportWidth="1024" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M510.67,62.82c-247.15,0 -447.52,200.36 -447.52,447.51 0,247.15 200.37,447.51 447.52,447.51 247.15,0 447.51,-200.36 447.51,-447.51C958.18,263.18 757.82,62.82 510.67,62.82zM265.57,520.55 L265.57,295.87c0,-16.95 13.69,-30.63 30.63,-30.63l224.68,0c16.95,0 30.63,13.69 30.63,30.63l0,224.68c0,16.95 -13.69,30.63 -30.63,30.63L296.2,551.18C279.26,551.18 265.57,537.5 265.57,520.55zM755.77,724.79c0,16.96 -13.68,30.64 -30.64,30.64L500.46,755.43c-16.95,0 -30.64,-13.68 -30.64,-30.64L469.82,571.61l71.48,0c16.95,0 30.64,-13.68 30.64,-30.63l0,-71.5 153.18,0c16.96,0 30.64,13.69 30.64,30.64L755.76,724.79zM499.19,482.5c-1.74,-1.64 -5.41,-3.68 -10.83,-6.43 -5.41,-2.56 -10.52,-5.42 -15.01,-8.28 12.76,-15.01 19.29,-35.54 19.29,-61.48 0,-17.06 -3.16,-31.87 -9.59,-44.43 -6.33,-12.66 -15.73,-22.36 -28.19,-29.21 -12.46,-6.95 -27.37,-10.42 -44.53,-10.42 -12.76,0 -24.1,1.94 -34.21,5.72 -10.01,3.88 -18.48,9.29 -25.53,16.34 -6.95,7.15 -12.25,15.73 -15.93,25.84 -3.68,10.21 -5.42,21.24 -5.42,33.29 0,11.95 1.74,22.98 5.42,33.19 3.58,10.21 8.98,18.9 16.13,26.24 7.14,7.25 16.13,13.08 26.65,16.85 10.52,3.98 22.36,5.92 35.74,5.92 16.24,0 30.13,-2.04 41.47,-6.33 5.41,3.77 10.52,7.14 15.32,10.21 4.6,2.66 8.58,4.9 12.16,6.54 3.47,1.43 6.33,2.14 8.88,2.14 2.86,0 5.52,-1.13 7.66,-2.96 2.14,-2.25 3.26,-4.29 3.26,-6.23C501.94,486.17 500.93,484.03 499.19,482.5zM458.34,430.31c-2.35,7.66 -6.02,14.19 -11.13,19.61 -17.57,-12.15 -30.02,-18.17 -37.38,-18.17 -2.55,0 -4.8,0.91 -6.73,2.65 -2.05,1.94 -2.97,4.08 -2.97,6.23 0,2.96 0.92,5.01 3.17,6.43 2.05,1.64 6.03,3.68 11.85,6.33 5.72,2.76 10.51,5.52 14.29,8.17 -6.33,2.55 -12.56,3.68 -18.69,3.68 -14.61,0 -26.96,-5.31 -36.46,-15.93 -9.6,-10.72 -14.39,-26.05 -14.39,-45.86 0,-9.5 1.22,-18.28 3.88,-26.14 2.45,-7.87 6.02,-14.2 10.52,-19.31 4.39,-4.9 9.7,-8.77 15.93,-11.33 6.02,-2.55 12.76,-3.98 20.12,-3.98 10.21,0 19.1,2.35 27.06,7.15 7.87,4.8 13.89,11.65 18.28,20.94 4.08,9.29 6.33,20.22 6.33,32.88C462.02,413.87 460.79,422.65 458.34,430.31zM648.7,574.41c-2.04,-5.1 -3.78,-9.09 -5.11,-12.15 -1.22,-2.96 -2.86,-5.82 -4.8,-8.58 -1.94,-2.55 -4.39,-4.8 -7.46,-6.54 -3.17,-1.63 -7.04,-2.55 -11.64,-2.55 -4.7,0 -8.48,0.92 -11.65,2.55 -3.27,1.74 -5.61,3.99 -7.55,6.75 -1.84,2.65 -3.79,6.02 -5.42,10.21 -1.74,4.08 -3.17,7.65 -4.29,10.51L548.52,677.15c-1.73,4.18 -3.06,7.55 -3.68,9.8 -0.82,2.24 -1.13,4.49 -1.13,6.53 0,3.77 1.64,7.35 4.8,10.21s7.05,4.29 11.13,4.29c5,0 8.47,-1.22 10.72,-4.18 2.24,-2.86 4.8,-8.28 7.96,-16.24l7.87,-20.42 67.1,0 7.86,20.12c0.92,2.55 2.24,5.41 3.88,8.58 1.43,3.17 2.87,5.61 4.09,7.25 1.33,1.53 2.75,2.65 4.6,3.68 1.94,0.92 4.18,1.22 6.95,1.22 4.39,0 8.27,-1.43 11.43,-4.49 3.17,-2.97 4.8,-6.33 4.8,-10.21 0,-3.47 -1.74,-9.09 -5.11,-16.85L648.7,574.41zM594.98,646.71l24.41,-71.48 24.81,71.48L594.98,646.71z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_map.xml b/app/src/main/res/drawable/ic_menu_map.xml
deleted file mode 100644
index 97b87a2..0000000
--- a/app/src/main/res/drawable/ic_menu_map.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="1024"
-    android:viewportWidth="1024" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M0,192l320,-128 0,768 -320,128z"/>
-    <path android:fillColor="#FF000000" android:pathData="M384,32l320,192 0,736 -320,-160z"/>
-    <path android:fillColor="#FF000000" android:pathData="M768,224l256,-192 0,768 -256,192z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_route.xml b/app/src/main/res/drawable/ic_route.xml
deleted file mode 100644
index fedacce..0000000
--- a/app/src/main/res/drawable/ic_route.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector android:height="16dp" android:viewportHeight="1024"
-    android:viewportWidth="1024" android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M64.38,168.83a102.2,102.2 0,1 0,208.89 0,102.2 102.2,0 1,0 -208.89,0Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M750.73,168.83a102.2,102.2 0,1 0,208.89 0,102.2 102.2,0 1,0 -208.89,0Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M168.83,855.17m-104.44,0a102.2,102.2 0,1 0,208.89 0,102.2 102.2,0 1,0 -208.89,0Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M750.73,855.17a102.2,102.2 0,1 0,208.89 0,102.2 102.2,0 1,0 -208.89,0Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M358.43,183.75C373.7,183.75 386.08,173.73 386.08,161.37 386.08,149.01 373.7,138.99 358.43,138.99L330.77,138.99C315.49,138.99 303.11,149.01 303.11,161.37 303.11,173.73 315.49,183.75 330.77,183.75L358.43,183.75ZM469.05,183.75C484.33,183.75 496.71,173.73 496.71,161.37 496.71,149.01 484.33,138.99 469.05,138.99L441.4,138.99C426.12,138.99 413.74,149.01 413.74,161.37 413.74,173.73 426.12,183.75 441.4,183.75L469.05,183.75ZM579.68,183.75C594.95,183.75 607.34,173.73 607.34,161.37 607.34,149.01 594.95,138.99 579.68,138.99L552.02,138.99C536.75,138.99 524.37,149.01 524.37,161.37 524.37,173.73 536.75,183.75 552.02,183.75L579.68,183.75ZM690.31,183.75C705.58,183.75 717.96,173.73 717.96,161.37 717.96,149.01 705.58,138.99 690.31,138.99L662.65,138.99C647.38,138.99 634.99,149.01 634.99,161.37 634.99,173.73 647.38,183.75 662.65,183.75L690.31,183.75Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M358.45,885.02C373.72,885.01 386.1,875.03 386.08,862.74 386.07,850.45 373.68,840.49 358.4,840.5L330.75,840.52C315.47,840.53 303.1,850.5 303.11,862.8 303.13,875.09 315.52,885.05 330.79,885.04L358.45,885.02ZM469.08,884.94C484.35,884.93 496.72,874.96 496.71,862.67 496.7,850.37 484.3,840.41 469.03,840.42L441.37,840.44C426.1,840.45 413.73,850.43 413.74,862.72 413.75,875.01 426.15,884.97 441.42,884.96L469.08,884.94ZM579.7,884.87C594.98,884.86 607.35,874.88 607.34,862.59 607.32,850.3 594.93,840.34 579.66,840.35L552,840.37C536.73,840.38 524.35,850.35 524.37,862.65 524.38,874.94 536.77,884.9 552.05,884.89L579.7,884.87ZM690.33,884.79C705.61,884.78 717.98,874.81 717.96,862.52 717.95,850.22 705.56,840.26 690.28,840.27L662.63,840.29C647.35,840.3 634.98,850.28 634.99,862.57 635.01,874.86 647.4,884.82 662.67,884.81L690.33,884.79Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M332.09,733.42C340.75,724.6 340.62,710.43 331.8,701.77 322.98,693.11 308.81,693.24 300.15,702.06L279.25,723.36C270.59,732.18 270.72,746.35 279.54,755.01 288.36,763.67 302.53,763.53 311.19,754.71L332.09,733.42ZM415.71,648.24C424.37,639.42 424.24,625.25 415.42,616.59 406.6,607.93 392.43,608.06 383.77,616.88L362.87,638.18C354.21,647 354.34,661.17 363.16,669.83 371.98,678.49 386.15,678.36 394.81,669.54L415.71,648.24ZM499.33,563.06C507.99,554.24 507.86,540.07 499.04,531.41 490.22,522.75 476.05,522.88 467.39,531.7L446.49,553C437.83,561.82 437.96,575.99 446.78,584.65 455.6,593.31 469.77,593.18 478.43,584.36L499.33,563.06ZM582.96,477.88C591.61,469.06 591.48,454.89 582.66,446.23 573.84,437.57 559.67,437.7 551.01,446.53L530.11,467.82C521.45,476.64 521.58,490.81 530.4,499.47 539.22,508.13 553.39,508 562.05,499.18L582.96,477.88ZM666.58,392.7C675.23,383.88 675.1,369.71 666.28,361.05 657.46,352.39 643.29,352.53 634.63,361.35L613.73,382.64C605.07,391.46 605.2,405.63 614.02,414.29 622.84,422.95 637.01,422.82 645.67,414L666.58,392.7ZM750.2,307.53C758.86,298.7 758.72,284.53 749.9,275.88 741.08,267.22 726.91,267.35 718.25,276.17L697.35,297.46C688.69,306.28 688.82,320.45 697.64,329.11 706.46,337.77 720.63,337.64 729.29,328.82L750.2,307.53Z"/>
-</vector>
diff --git a/app/src/main/res/layout/content_map.xml b/app/src/main/res/layout/content_map.xml
index 6a9feca..92cb3c8 100644
--- a/app/src/main/res/layout/content_map.xml
+++ b/app/src/main/res/layout/content_map.xml
@@ -46,7 +46,6 @@
         </RadioGroup>
 
         <ImageButton
-            android:id="@+id/pos_btn"
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_alignParentEnd="true"
@@ -60,7 +59,6 @@
             app:tint="@color/colorAccent" />
 
         <ImageButton
-            android:id="@+id/zoom_in"
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_alignParentEnd="true"
@@ -74,7 +72,6 @@
             app:tint="@color/colorAccent"/>
 
         <ImageButton
-            android:id="@+id/zoom_out"
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_alignParentEnd="true"
@@ -88,7 +85,6 @@
             app:tint="@color/colorAccent" />
 
         <ImageButton
-            android:id="@+id/input"
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/history_item.xml b/app/src/main/res/layout/history_item.xml
index d8fdf7a..31a4aa2 100644
--- a/app/src/main/res/layout/history_item.xml
+++ b/app/src/main/res/layout/history_item.xml
@@ -6,7 +6,6 @@
     android:orientation="horizontal">
 
     <LinearLayout
-        android:id="@+id/content_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="3"
diff --git a/app/src/main/res/layout/input_latlng.xml b/app/src/main/res/layout/input_latlng.xml
index 384ac61..d96f04d 100644
--- a/app/src/main/res/layout/input_latlng.xml
+++ b/app/src/main/res/layout/input_latlng.xml
@@ -43,7 +43,6 @@
             android:text="@string/input_latlng_baidu" />
 
         <RadioButton
-            android:id="@+id/pos_type_gps"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/app/src/main/res/layout/joystick.xml b/app/src/main/res/layout/joystick.xml
index 903846c..ba20c44 100644
--- a/app/src/main/res/layout/joystick.xml
+++ b/app/src/main/res/layout/joystick.xml
@@ -19,7 +19,6 @@
             android:orientation="horizontal">
 
             <ImageButton
-                android:id="@+id/joystick_move"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:clickable="false"
diff --git a/app/src/main/res/layout/joystick_history.xml b/app/src/main/res/layout/joystick_history.xml
index dcf5c19..8c36eaa 100644
--- a/app/src/main/res/layout/joystick_history.xml
+++ b/app/src/main/res/layout/joystick_history.xml
@@ -40,7 +40,6 @@
         android:theme="@style/RippleWhite" />
 
     <LinearLayout
-        android:id="@+id/joystick_his_content"
         android:layout_width="wrap_content"
         android:layout_height="450dp"
         android:layout_marginTop="30dp"
diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
index a9cf344..df7445c 100644
--- a/app/src/main/res/layout/nav_header.xml
+++ b/app/src/main/res/layout/nav_header.xml
@@ -27,7 +27,6 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
     <TextView
-        android:id="@+id/user_limit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/register_dialog.xml b/app/src/main/res/layout/register_dialog.xml
index 8b80ff4..a788718 100644
--- a/app/src/main/res/layout/register_dialog.xml
+++ b/app/src/main/res/layout/register_dialog.xml
@@ -7,7 +7,6 @@
     android:orientation="vertical">
 
     <TextView
-        android:id="@+id/reg_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/user_protocol.xml b/app/src/main/res/layout/user_protocol.xml
index 4568c56..4929de3 100644
--- a/app/src/main/res/layout/user_protocol.xml
+++ b/app/src/main/res/layout/user_protocol.xml
@@ -6,7 +6,6 @@
     android:orientation="vertical">
 
     <TextView
-        android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/welcome.xml b/app/src/main/res/layout/welcome.xml
index 8cec24b..71f4f4e 100644
--- a/app/src/main/res/layout/welcome.xml
+++ b/app/src/main/res/layout/welcome.xml
@@ -6,7 +6,6 @@
     android:layout_height="match_parent">
 
     <ImageView
-        android:id="@+id/startImageView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:srcCompat="@drawable/welcome"
diff --git a/app/src/main/res/menu/menu_history.xml b/app/src/main/res/menu/menu_history.xml
index b841f56..ac1cabc 100644
--- a/app/src/main/res/menu/menu_history.xml
+++ b/app/src/main/res/menu/menu_history.xml
@@ -3,12 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/action_leading_in"
         android:icon="@drawable/ic_leading_in"
         android:title=""
         app:showAsAction="ifRoom" />
     <item
-        android:id="@+id/action_leading_out"
         android:icon="@drawable/ic_leading_out"
         android:title=""
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f8f45e6..914311f 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,11 +1,9 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin_top">32dp</dimen>
     <dimen name="activity_vertical_margin">24dp</dimen>
     <dimen name="nav_header_vertical_spacing">10dp</dimen>
     <dimen name="nav_header_height">200dp</dimen>
-    <dimen name="fab_margin">30dp</dimen>
     <!-- 摇杆按钮 -->
     <dimen name="joystick_btn_width">30dp</dimen>
     <dimen name="joystick_btn_height">30dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 985130d..ce92a01 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -46,9 +46,6 @@
 
     <!-- 历史记录页面 -->
     <string name="history_idle">暂无历史记录</string>
-    <string name="action_delete">删除</string>
-    <string name="action_all">全选</string>
-    <string name="action_cancel">取消</string>
 
     <!-- 导航页 -->
     <string name="navigation_drawer_open">Open navigation drawer</string>
@@ -57,14 +54,12 @@
     <string name="user_limit_info">未注册版本部分功能受限</string>
     <string name="nav_menu_history">历史记录</string>
     <string name="nav_menu_settings">设置</string>
-    <string name="nav_menu_preference">设置</string>
     <string name="nav_menu_dev">开发人员选项</string>
     <string name="nav_menu_more">更多</string>
     <string name="nav_menu_feedback">问题反馈</string>
     <string name="nav_menu_contact">联系作者</string>
 
     <!-- 设置界面 -->
-    <string name="title_activity_settings">设置</string>
     <string name="setting_group_move">移动</string>
     <string name="setting_joystick">摇杆类型</string>
     <string name="setting_joystick_tips">重启摇杆后生效</string>