From 2f3b1cbeae7c2bfbaf65b358ade4fb5f5322bd54 Mon Sep 17 00:00:00 2001
From: md <zmd1026@163.com>
Date: Fri, 13 Aug 2021 15:39:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B913=E6=97=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |  74 +++++------
 .../outdoor/activity/LoginActivity.java       | 124 ++++++++++--------
 .../outdoor/activity/StatementActivity.java   |  16 +++
 .../outdoor/adapter/PoiTaskAdapter.java       |   1 +
 .../fragment/CapacityEvaluationFragment.java  |  10 +-
 .../fragment/EventPrefectureFragment.java     |  14 +-
 .../outdoor/fragment/MessageFragment.java     |   2 +-
 .../outdoor/fragment/PoiTaskFragment.java     |   2 +-
 .../outdoor/fragment/TaskExplainFragment.java |  14 +-
 .../fragment/TaskPrefectureFragment.java      |  10 +-
 .../outdoor/fragment/TreasureFragment.java    |   8 +-
 app/src/main/res/drawable-hdpi/graycharge.png | Bin 1916 -> 1863 bytes
 app/src/main/res/drawable-hdpi/grayfacet.png  | Bin 0 -> 1269 bytes
 app/src/main/res/drawable-hdpi/grayother.png  | Bin 1764 -> 1712 bytes
 app/src/main/res/drawable-hdpi/graypoi.png    | Bin 2026 -> 1965 bytes
 app/src/main/res/drawable-hdpi/grayroad.png   | Bin 1791 -> 1737 bytes
 .../res/drawable-hdpi/marker_charge_bg1.png   | Bin 2132 -> 2068 bytes
 .../res/drawable-hdpi/marker_facet_bg1.png    | Bin 0 -> 1408 bytes
 .../res/drawable-hdpi/marker_other_bg1.png    | Bin 1856 -> 1800 bytes
 .../main/res/drawable-hdpi/marker_poi_bg1.png | Bin 1895 -> 1839 bytes
 .../drawable-hdpi/marker_poi_video_bg1.png    | Bin 1231 -> 1293 bytes
 .../main/res/drawable-hdpi/marker_road_bg.png | Bin 1915 -> 1850 bytes
 .../res/drawable-hdpi/poi_video_have_bg1.png  | Bin 1279 -> 1315 bytes
 .../main/res/drawable/marker_charge_bags.png  | Bin 3419 -> 2586 bytes
 .../main/res/drawable/marker_charge_bg.png    | Bin 928 -> 0 bytes
 .../res/drawable/marker_charge_centre_bg.png  | Bin 937 -> 0 bytes
 .../res/drawable/marker_charge_have_bag.png   | Bin 3228 -> 0 bytes
 .../res/drawable/marker_charge_have_bg.png    | Bin 893 -> 0 bytes
 .../main/res/drawable/marker_facet_bag.png    | Bin 0 -> 1665 bytes
 .../main/res/drawable/marker_other_bag.png    | Bin 2882 -> 2491 bytes
 app/src/main/res/drawable/marker_other_bg.png | Bin 888 -> 0 bytes
 .../res/drawable/marker_other_have_bag.png    | Bin 894 -> 0 bytes
 app/src/main/res/drawable/marker_pile_bag.png | Bin 3303 -> 0 bytes
 app/src/main/res/drawable/marker_pile_bg.png  | Bin 802 -> 0 bytes
 .../res/drawable/marker_pile_centre_bg.png    | Bin 806 -> 0 bytes
 .../main/res/drawable/marker_pile_have_bg.png | Bin 832 -> 0 bytes
 app/src/main/res/drawable/marker_poi_bag.png  | Bin 2854 -> 0 bytes
 app/src/main/res/drawable/marker_poi_bags.png | Bin 2801 -> 2472 bytes
 app/src/main/res/drawable/marker_poi_bg.png   | Bin 844 -> 0 bytes
 .../main/res/drawable/marker_poi_have_bag.png | Bin 2574 -> 0 bytes
 .../main/res/drawable/marker_poi_have_bg.png  | Bin 844 -> 0 bytes
 app/src/main/res/drawable/marker_road_bag.png | Bin 4252 -> 2529 bytes
 .../res/drawable/marker_road_have_bag.png     | Bin 4200 -> 0 bytes
 .../main/res/drawable/marker_road_have_bg.png | Bin 1037 -> 0 bytes
 app/src/main/res/drawable/poi_video_bag.png   | Bin 2854 -> 2854 bytes
 app/src/main/res/layout/activity_login.xml    |   2 +-
 app/src/main/res/layout/activity_picture.xml  |   1 +
 .../main/res/layout/activity_statement.xml    |   9 ++
 app/src/main/res/layout/activity_web.xml      |   2 +-
 app/src/main/res/layout/has_sumit_item.xml    |   1 -
 app/src/main/res/layout/icon.xml              |   2 +-
 app/src/main/res/layout/mine_fragment.xml     |   1 -
 app/src/main/res/values/strings.xml           |   2 +-
 54 files changed, 168 insertions(+), 129 deletions(-)
 create mode 100644 app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java
 create mode 100644 app/src/main/res/drawable-hdpi/grayfacet.png
 create mode 100644 app/src/main/res/drawable-hdpi/marker_facet_bg1.png
 delete mode 100644 app/src/main/res/drawable/marker_charge_bg.png
 delete mode 100644 app/src/main/res/drawable/marker_charge_centre_bg.png
 delete mode 100644 app/src/main/res/drawable/marker_charge_have_bag.png
 delete mode 100644 app/src/main/res/drawable/marker_charge_have_bg.png
 create mode 100644 app/src/main/res/drawable/marker_facet_bag.png
 delete mode 100644 app/src/main/res/drawable/marker_other_bg.png
 delete mode 100644 app/src/main/res/drawable/marker_other_have_bag.png
 delete mode 100644 app/src/main/res/drawable/marker_pile_bag.png
 delete mode 100644 app/src/main/res/drawable/marker_pile_bg.png
 delete mode 100644 app/src/main/res/drawable/marker_pile_centre_bg.png
 delete mode 100644 app/src/main/res/drawable/marker_pile_have_bg.png
 delete mode 100644 app/src/main/res/drawable/marker_poi_bag.png
 delete mode 100644 app/src/main/res/drawable/marker_poi_bg.png
 delete mode 100644 app/src/main/res/drawable/marker_poi_have_bag.png
 delete mode 100644 app/src/main/res/drawable/marker_poi_have_bg.png
 delete mode 100644 app/src/main/res/drawable/marker_road_have_bag.png
 delete mode 100644 app/src/main/res/drawable/marker_road_have_bg.png
 create mode 100644 app/src/main/res/layout/activity_statement.xml

diff --git a/app/build.gradle b/app/build.gradle
index d1bb336..5e04152 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 29
     buildToolsVersion '29.0.2'
-   // ndkVersion '23.0.7123448'
+    ndkVersion '23.0.7123448'
 
     defaultConfig {
         applicationId "com.navinfo.outdoor"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b9581b5..af34ca1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,24 +4,20 @@
     package="com.navinfo.outdoor">
 
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.READ_CALENDAR" />
-<!--    <uses-permission android:name="android.permission.WRITE_CALENDAR" />-->
+    <uses-permission android:name="android.permission.READ_CALENDAR" /> <!-- <uses-permission android:name="android.permission.WRITE_CALENDAR" /> -->
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" /> <!-- <uses-sdk android:minSdkVersion="8"></uses-sdk> -->
-
     <!-- 在SDCard中创建与删除文件权限 -->
     <uses-permission
         android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
-        tools:ignore="ProtectedPermissions" />
-    <!-- 安装APK权限 -->
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <!-- 友盟检测bug -->
-<!--    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />-->
-<!--    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />-->
-<!--    <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
-<!--    <uses-permission android:name="android.permission.INTERNET" /> -->
+        tools:ignore="ProtectedPermissions" /> <!-- 安装APK权限 -->
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <!-- 友盟检测bug -->
+    <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
+    <!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> -->
+    <!-- <uses-permission android:name="android.permission.READ_PHONE_STATE" /> -->
+    <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
     <!-- 腾讯地图 定位权限 -->
     <!-- 通过GPS得到精确位置 -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 通过网络得到粗略位置 -->
@@ -44,25 +40,22 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:requestLegacyExternalStorage="true"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:largeHeap="true"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.WhiteScreen">
-        <activity android:name=".activity.PicturesActivity"
-            >
-
-        </activity>
+        <activity android:name=".activity.StatementActivity"></activity>
+        <activity android:name=".activity.PicturesActivity"></activity>
         <activity
             android:name=".activity.PictureActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|navigation"
-            android:launchMode="singleTop"></activity>
+            android:launchMode="singleTop" />
 
         <meta-data
             android:name="TencentMapSDK"
-            android:value="EWWBZ-2PB62-6JXUL-CEX7G-N7UE6-XRB4V" />
-        <!--今日头屏幕适配-->
+            android:value="EWWBZ-2PB62-6JXUL-CEX7G-N7UE6-XRB4V" /> <!-- 今日头屏幕适配 -->
         <meta-data
             android:name="design_width_in_dp"
             android:value="360" />
@@ -70,7 +63,8 @@
             android:name="design_height_in_dp"
             android:value="640" />
 
-        <activity android:name=".activity.MainActivity"
+        <activity
+            android:name=".activity.MainActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -78,37 +72,37 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.LoginActivity"
+        <activity
+            android:name=".activity.LoginActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="portrait"/>
-        <!--|screenSize-->
-        <activity android:name=".activity.HomeActivity"
+            android:screenOrientation="portrait" /> <!-- |screenSize -->
+        <activity
+            android:name=".activity.HomeActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name=".activity.WebActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.WebActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".activity.FragmentManagement"
-            android:windowSoftInputMode="adjustPan"
-            android:screenOrientation="portrait"/>
-        <activity android:name=".activity.ImageShowActivity"
-            android:screenOrientation="portrait"/>
-        <activity android:name=".activity.UserActivity"
-            android:screenOrientation="portrait"/>
-
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".activity.ImageShowActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.UserActivity"
+            android:screenOrientation="portrait" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.navinfo.outdoor.fileprovider"
-            android:grantUriPermissions="true"
-            android:exported="false">
+            android:exported="false"
+            android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
     </application>
 
-
-
-
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java
index 79e1811..f348bc3 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java
@@ -42,6 +42,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     private Button btnLogin;
     private SharedPreferences navInfo;
     private SharedPreferences.Editor navInfoEditor;
+    private TextView tvStatement;
 
     @Override
     public void onStart() {
@@ -51,6 +52,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         }
 
     }
+
     @Override
     protected int getLayout() {
         return R.layout.activity_login;
@@ -64,12 +66,13 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     @Subscribe
     public void onEvent(Message data) {
         if (data.what == Constant.REGISTER_WORD) {
-            if ((boolean)data.obj){
-             etLoginName.setText(Constant.USER_NAME);
-             etLoginPaw.setText(Constant.PASS_WORD);
+            if ((boolean) data.obj) {
+                etLoginName.setText(Constant.USER_NAME);
+                etLoginPaw.setText(Constant.PASS_WORD);
             }
         }
     }
+
     @Override
     protected void initView() {
         super.initView();
@@ -77,19 +80,21 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         navInfo = getSharedPreferences("navInfo", Context.MODE_PRIVATE);
         tvRegister = findViewById(R.id.tv_register);
         etLoginName = findViewById(R.id.et_login_name);
-        etLoginPaw =  findViewById(R.id.et_login_paw);
+        etLoginPaw = findViewById(R.id.et_login_paw);
         tvForgetPaw = findViewById(R.id.tv_forget_paw);
-        btnLogin =  findViewById(R.id.btn_login);
+        btnLogin = findViewById(R.id.btn_login);
         btnLogin.setOnClickListener(this::onClick);
+        tvStatement = findViewById(R.id.tv_statement);
+        tvStatement.setOnClickListener(this::onClick);
         tvRegister.setOnClickListener(this);
         tvForgetPaw.setOnClickListener(this);
         String user_name = navInfo.getString("user_name", null);
-        if (user_name!=null&&!user_name.equals("")){
+        if (user_name != null && !user_name.equals("")) {
             etLoginName.setText(user_name);
         }
         String pass_word = navInfo.getString("pass_word", null);
-        if (pass_word!=null&&!pass_word.equals("")){
-             etLoginPaw.setText(pass_word);
+        if (pass_word != null && !pass_word.equals("")) {
+            etLoginPaw.setText(pass_word);
         }
     }
 
@@ -108,16 +113,20 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 break;
             case R.id.btn_login:
                 String name = etLoginName.getText().toString().trim();
-                if (name == null||name.equals("")) {
+                if (name == null || name.equals("")) {
                     Toast.makeText(this, "请输入账号", Toast.LENGTH_SHORT).show();
                     return;
                 }
                 String paw = etLoginPaw.getText().toString().trim();
-                if (paw == null||paw.equals("")) {
+                if (paw == null || paw.equals("")) {
                     Toast.makeText(this, "请输入密码", Toast.LENGTH_SHORT).show();
                     return;
                 }
-                initLogIn(name,paw);
+                initLogIn(name, paw);
+                break;
+
+            case R.id.tv_statement:
+
                 break;
         }
     }
@@ -125,11 +134,11 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     private void initLogIn(String name, String paw) {
         try {
             HttpParams httpParams = new HttpParams();
-            httpParams.put("username",name);
-            long time=System.currentTimeMillis();
-            httpParams.put("password",Base64.desEncrypt(time + Md5Util.toMD5(paw)));
-            httpParams.put("grant_type","password");
-            httpParams.put("datetime",time);
+            httpParams.put("username", name);
+            long time = System.currentTimeMillis();
+            httpParams.put("password", Base64.desEncrypt(time + Md5Util.toMD5(paw)));
+            httpParams.put("grant_type", "password");
+            httpParams.put("datetime", time);
             showLoadingDialog();
             OkGoBuilder.getInstance().Builder(this)
                     .url(HttpInterface.USER_LOGIN_OAUTH_TOKEN)
@@ -140,31 +149,33 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                         public void onSuccess(LoginOauthTokenBean response, int id) {
                             dismissLoadingDialog();
 
-                            if (response.getCode()==200){
+                            if (response.getCode() == 200) {
                                 LoginOauthTokenBean.BodyBean body = response.getBody();
-                                navInfoEditor.putString("access_token",body.getAccess_token());
-                                navInfoEditor.putString("refresh_token",body.getRefresh_token());
-                                navInfoEditor.putString("userId",body.getUserId());
+                                navInfoEditor.putString("access_token", body.getAccess_token());
+                                navInfoEditor.putString("refresh_token", body.getRefresh_token());
+                                navInfoEditor.putString("userId", body.getUserId());
                                 navInfoEditor.commit();
-                                if (body.getUserId()!=null&&!body.getUserId().equals("")){
+                                if (body.getUserId() != null && !body.getUserId().equals("")) {
                                     Constant.initRootFolder(body.getUserId());
 
                                 }
 
-                                Constant.ACCESS_TOKEN=body.getAccess_token();
-                                Constant.REFRESH_TOKEN=body.getRefresh_token();
-                                Constant.USERID=body.getUserId();
-                                Constant.PASS_WORD=paw;
+                                Constant.ACCESS_TOKEN = body.getAccess_token();
+                                Constant.REFRESH_TOKEN = body.getRefresh_token();
+                                Constant.USERID = body.getUserId();
+                                Constant.PASS_WORD = paw;
                                 initGetUserInfo();//获取用户信息
-                                Toast.makeText(LoginActivity.this,  "登录成功", Toast.LENGTH_SHORT).show();
-                            }else {
+                                Toast.makeText(LoginActivity.this, "登录成功", Toast.LENGTH_SHORT).show();
+                            } else {
+                                Toast.makeText(LoginActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show();
                                 dismissLoadingDialog();
                             }
                         }
+
                         @Override
                         public void onError(Throwable e, int id) {
                             dismissLoadingDialog();
-                            Toast.makeText(LoginActivity.this, e.getMessage()+"", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(LoginActivity.this, e.getMessage() + "", Toast.LENGTH_SHORT).show();
                         }
                     });
         } catch (Exception e) {
@@ -183,50 +194,50 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                     @Override
                     public void onSuccess(UserDetailBean response, int id) {
                         dismissLoadingDialog();
-                        if (response.getCode()==200){
+                        if (response.getCode() == 200) {
                             UserDetailBean.BodyBean body = response.getBody();
-                            if (body!=null){
-                                navInfoEditor.putString("username",body.getUsername());
-                                Constant.USER_NAME=body.getUsername();
-                                navInfoEditor.putString("mobile",body.getMobile());
-                                Constant.MOBILE=body.getMobile();
-                                navInfoEditor.putInt("sex",body.getSex());//0:女  1：男
-                                Constant.SEX=body.getSex();
-                                navInfoEditor.putString("qq",body.getQq());
-                                Constant.QQ=body.getQq();
-                                navInfoEditor.putString("wechat",body.getWechat());
-                                Constant.WECHAT=body.getWechat();
+                            if (body != null) {
+                                navInfoEditor.putString("username", body.getUsername());
+                                Constant.USER_NAME = body.getUsername();
+                                navInfoEditor.putString("mobile", body.getMobile());
+                                Constant.MOBILE = body.getMobile();
+                                navInfoEditor.putInt("sex", body.getSex());//0:女  1：男
+                                Constant.SEX = body.getSex();
+                                navInfoEditor.putString("qq", body.getQq());
+                                Constant.QQ = body.getQq();
+                                navInfoEditor.putString("wechat", body.getWechat());
+                                Constant.WECHAT = body.getWechat();
                                 UserDetailBean.BodyBean.UserBankcardBean userBankcard = body.getUserBankcard();
-                                if (userBankcard!=null){//存储银行卡信息
-                                    navInfoEditor.putString("bankAccount",userBankcard.getBankAccount());//银行卡编号
-                                    Constant.BANKACCOUNT=userBankcard.getBankAccount();
-                                    navInfoEditor.putString("idNumber",userBankcard.getIdNumber());//银行卡账号
-                                    Constant.ID_NUMBER=userBankcard.getIdNumber();
+                                if (userBankcard != null) {//存储银行卡信息
+                                    navInfoEditor.putString("bankAccount", userBankcard.getBankAccount());//银行卡编号
+                                    Constant.BANKACCOUNT = userBankcard.getBankAccount();
+                                    navInfoEditor.putString("idNumber", userBankcard.getIdNumber());//银行卡账号
+                                    Constant.ID_NUMBER = userBankcard.getIdNumber();
                                 }
                                 UserDetailBean.BodyBean.UserAuthBean userAuth = body.getUserAuth();
-                                if (userAuth!=null){//存储身份证信息
-                                    navInfoEditor.putString("name",userAuth.getName());//身份证姓名
-                                    Constant.NAME=userAuth.getName();
-                                    navInfoEditor.putString("idnum",userAuth.getIdnum());//身份证号码
-                                    Constant.ID_NUM=userAuth.getIdnum();
-                                    navInfoEditor.putInt("auditstatus",userAuth.getAuditstatus());//审核状态
-                                    Constant.AUDITSTATUS=userAuth.getAuditstatus();
-                                    navInfoEditor.putString("auditmsg",userAuth.getAuditmsg());//审核信息
-                                    Constant.AUDITMSG=userAuth.getAuditmsg();
+                                if (userAuth != null) {//存储身份证信息
+                                    navInfoEditor.putString("name", userAuth.getName());//身份证姓名
+                                    Constant.NAME = userAuth.getName();
+                                    navInfoEditor.putString("idnum", userAuth.getIdnum());//身份证号码
+                                    Constant.ID_NUM = userAuth.getIdnum();
+                                    navInfoEditor.putInt("auditstatus", userAuth.getAuditstatus());//审核状态
+                                    Constant.AUDITSTATUS = userAuth.getAuditstatus();
+                                    navInfoEditor.putString("auditmsg", userAuth.getAuditmsg());//审核信息
+                                    Constant.AUDITMSG = userAuth.getAuditmsg();
                                 }
                                 navInfoEditor.commit();
                             }
                             Intent intent = new Intent(LoginActivity.this, HomeActivity.class);
                             startActivity(intent);
                             finish();
-                        }else {
+                        } else {
                             Toast.makeText(LoginActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show();
                         }
                     }
 
                     @Override
                     public void onError(Throwable e, int id) {
-                      dismissLoadingDialog();
+                        dismissLoadingDialog();
                         Toast.makeText(LoginActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
                     }
                 });
@@ -238,6 +249,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
     }
+
     @Override
     public void onDestroy() {
         if (EventBus.getDefault().isRegistered(this))//加上判断
diff --git a/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java
new file mode 100644
index 0000000..39c67de
--- /dev/null
+++ b/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java
@@ -0,0 +1,16 @@
+package com.navinfo.outdoor.activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+import com.navinfo.outdoor.R;
+
+public class StatementActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_statement);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java
index 18a59d4..94ce74d 100644
--- a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java
+++ b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java
@@ -48,6 +48,7 @@ public class PoiTaskAdapter extends RecyclerView.Adapter<PoiTaskAdapter.ViewHold
         }else if (listBean.getAuditStatus() == -1){
             holder.tvAuditStatus.setText("待审核");
         }
+
         holder.tvMany.setText("￥0.0");
     }
 
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java
index 7d94a14..05fc5e8 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java
@@ -37,6 +37,7 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC
     private ImageView ivEvaluationTaskFinish;
     private XRecyclerView capacityEvaluationRecycler;
     private CapacityEvaluationAdapter capacityEvaluationAdapter;
+    private int capacityPage = 1;
 
 
     public static CapacityEvaluationFragment newInstance(Bundle bundle) {
@@ -61,8 +62,8 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC
         capacityEvaluationRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
         capacityEvaluationRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
         //取消上拉加载，刷新功能
-        capacityEvaluationRecycler.setPullRefreshEnabled(false);
-        capacityEvaluationRecycler.setLoadingMoreEnabled(false);
+//        capacityEvaluationRecycler.setPullRefreshEnabled(false);
+//        capacityEvaluationRecycler.setLoadingMoreEnabled(false);
         capacityEvaluationAdapter = new CapacityEvaluationAdapter(getActivity());
         capacityEvaluationRecycler.setAdapter(capacityEvaluationAdapter);
         capacityEvaluationRecycler.getDefaultFootView().setNoMoreHint("加载成功");
@@ -97,8 +98,8 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC
     private void initNewWork() {
         showLoadingDialog();
         HttpParams httpParams = new HttpParams();
-        httpParams.put("fid", "1");
-        httpParams.put("pageNum", "1");
+        httpParams.put("fid", "4");
+        httpParams.put("pageNum", capacityPage);
         httpParams.put("pageSize", "10");
         OkGoBuilder.getInstance()
                 .Builder(getActivity())
@@ -111,6 +112,7 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC
                     public void onSuccess(TaskPrefectureBean response, int id) {
                         dismissLoadingDialog();
                         capacityEvaluationAdapter.setCapacityList(response.getBody().getList());
+                        capacityPage++;
                         Log.d("TAG", "onSuccess: " + response.getMessage() + "sssssssssssss");
                     }
 
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java
index ec2528e..e8c0abc 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java
@@ -38,6 +38,7 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic
     private XRecyclerView eventRecycler;
     private List<TaskPrefectureBean.BodyBean.ListBean> taskExplainBean;
     private EventPrefectureAdapter eventPrefectureAdapter;
+    private int eventPage = 1;
 
 
     public static EventPrefectureFragment newInstance(Bundle bundle) {
@@ -63,12 +64,12 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic
     private void initNetwork() {
         showLoadingDialog();
         HttpParams httpParams = new HttpParams();
-        httpParams.put("fid", "1");
-        httpParams.put("pageNum", "1");
-        httpParams.put("pageSize", "10");
+        httpParams.put("fid", "2");
+        httpParams.put("pageNum", eventPage);
+        httpParams.put("pageSize", "20");
         OkGoBuilder.getInstance()
                 .Builder(getActivity())
-                .url(HttpInterface.MSG_LISt)
+                .url(HttpInterface.LIST_EVENT)
                 .cls(TaskPrefectureBean.class)
                 .params(httpParams)
                 .token(Constant.ACCESS_TOKEN)
@@ -78,6 +79,7 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic
                         dismissLoadingDialog();
                         eventPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList());
                         Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage() + "sssssssssssss");
+                        eventPage++;
                         //initEventPrefecture(eventPrefectureBean,b);
                     }
 
@@ -142,8 +144,8 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic
         eventRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
         eventRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
         //取消上拉加载，刷新功能。
-        eventRecycler.setPullRefreshEnabled(false);
-        eventRecycler.setLoadingMoreEnabled(false);
+//        eventRecycler.setPullRefreshEnabled(false);
+//        eventRecycler.setLoadingMoreEnabled(false);
         eventPrefectureAdapter = new EventPrefectureAdapter(getActivity());
         eventRecycler.setAdapter(eventPrefectureAdapter);
         eventRecycler.getDefaultFootView().setNoMoreHint("已全部加载完毕");
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java
index d5059f1..fbedb2a 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java
@@ -87,7 +87,7 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene
     private void initNetwork() {
         showLoadingDialog();
         HttpParams httpParams = new HttpParams();
-        httpParams.put("fid", "1");
+        httpParams.put("fid", "5");
         httpParams.put("pageNum", "1");
         httpParams.put("pageSize", "10");
         OkGoBuilder.getInstance()
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java
index 41b5c92..dd1dbe4 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java
@@ -77,9 +77,9 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene
         ivPoiTaskFinish.setOnClickListener(this::onClick);
         poiTaskXrv = (XRecyclerView) findViewById(R.id.poiTask_xrv);
         poiTaskXrv.setLayoutManager(new LinearLayoutManager(getActivity()));
-        poiTaskXrv.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
         poiTaskXrv.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
         poiTaskXrv.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
+        poiTaskXrv.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
         poiTaskXrv.setLoadingListener(new XRecyclerView.LoadingListener() {
             @Override
             public void onRefresh() {
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java
index 5c9a6ab..2079f48 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java
@@ -35,6 +35,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
     private XRecyclerView taskExplainRecycle;
 
     private TaskExplainAdapter taskExplainAdapter;
+    private int taskPage = 1;
 
 
     public static TaskExplainFragment newInstance(Bundle bundle) {
@@ -62,8 +63,8 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
         taskExplainRecycle.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
         taskExplainRecycle.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
         //取消上啦加载下拉刷新
-        taskExplainRecycle.setPullRefreshEnabled(false);
-        taskExplainRecycle.setLoadingMoreEnabled(false);
+//        taskExplainRecycle.setPullRefreshEnabled(false);
+//        taskExplainRecycle.setLoadingMoreEnabled(false);
         taskExplainAdapter = new TaskExplainAdapter(getActivity());
         taskExplainRecycle.setAdapter(taskExplainAdapter);
         taskExplainRecycle.getDefaultFootView().setNoMoreHint("加载完毕");
@@ -98,12 +99,12 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
     private void initNetWork() {
         showLoadingDialog();
         HttpParams httpParams = new HttpParams();
-        httpParams.put("fid", "1");
-        httpParams.put("pageNum", "1");
-        httpParams.put("pageSize", "10");
+        httpParams.put("fid", "3");
+        httpParams.put("pageNum", taskPage);
+        httpParams.put("pageSize", "20");
         OkGoBuilder.getInstance()
                 .Builder(getActivity())
-                .url(HttpInterface.MSG_LISt)
+                .url(HttpInterface.LIST_TASK_EXPLAIN)
                 .cls(TaskPrefectureBean.class)
                 .params(httpParams)
                 .token(Constant.ACCESS_TOKEN)
@@ -112,6 +113,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
                     public void onSuccess(TaskPrefectureBean response, int id) {
                         dismissLoadingDialog();
                         taskExplainAdapter.setExplainList(response.getBody().getList());
+                       taskPage++;
                         Log.d("TAG", "onSuccess: " + response.getMessage() + "");
                     }
 
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java
index 7cbe61f..0a4ca94 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java
@@ -39,6 +39,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick
     private XRecyclerView taskRecycler;
     private List<TaskPrefectureBean.BodyBean.ListBean> dataBeanList;
     private TaskPrefectureAdapter taskPrefectureAdapter;
+    private int taskPage = 1;
 
 
     public static TaskPrefectureFragment newInstance(Bundle bundle) {
@@ -63,8 +64,8 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick
         taskRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
         taskRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
         //取消上拉加载，刷新功能。
-        taskRecycler.setPullRefreshEnabled(false);
-        taskRecycler.setLoadingMoreEnabled(false);
+//        taskRecycler.setPullRefreshEnabled(false);
+//        taskRecycler.setLoadingMoreEnabled(false);
         taskPrefectureAdapter = new TaskPrefectureAdapter(getActivity());
         taskRecycler.setAdapter(taskPrefectureAdapter);
         taskRecycler.getDefaultFootView().setNoMoreHint("已全部加载完毕");
@@ -100,11 +101,11 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick
         showLoadingDialog();
         HttpParams httpParams = new HttpParams();
         httpParams.put("fid", "1");
-        httpParams.put("pageNum", "1");
+        httpParams.put("pageNum", taskPage);
         httpParams.put("pageSize", "20");
         OkGoBuilder.getInstance()
                 .Builder(getActivity())
-                .url(HttpInterface.MSG_LISt)
+                .url(HttpInterface.LIST_TASK)
                 .cls(TaskPrefectureBean.class)
                 .params(httpParams)
                 .token(Constant.ACCESS_TOKEN)
@@ -113,6 +114,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick
                     public void onSuccess(TaskPrefectureBean taskPrefectureBean, int id) {
                         dismissLoadingDialog();
                         taskPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList());
+                        taskPage++;
                         Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage() + "");
                         //initTaskSpecification(taskSpecificationBean,start);
                     }
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
index 6b0bd43..ab27cc6 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
@@ -598,7 +598,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                         otherMarker.setClickable(true);
                                         break;
                                     case 6://面状任务
-                                        BitmapDescriptor Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_bg);
+                                        BitmapDescriptor Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_facet_bg1);
                                         Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Descriptor).alpha(0.9f)
                                                 .flat(true)
                                                 .clockwise(false));
@@ -707,7 +707,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
         } else if (poiEntity.getType() == 5) {
             descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bag);
         } else if (poiEntity.getType() == 6) {
-            descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bag);
+            descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_facet_bag);
         }
         if (bigMarker == null) {
             bigMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(descriptor).alpha(0.9f)
@@ -901,9 +901,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                 case 6://面状任务
                                     BitmapDescriptor Descriptor = null;
                                     if (poiEntity.getTaskStatus() == 1) {
-                                        Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_bg);
+                                        Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_facet_bg1);
                                     } else {
-                                        Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_have_bag);
+                                        Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.grayfacet);
                                     }
                                     Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Descriptor).alpha(0.9f)
                                             .clockwise(false)
diff --git a/app/src/main/res/drawable-hdpi/graycharge.png b/app/src/main/res/drawable-hdpi/graycharge.png
index 1da65b3ba10733dffb17a77376599da46abebd10..1df1089c77726bde4117b1ac8f3f2147c6894a27 100644
GIT binary patch
literal 1863
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
Bc~bxY

literal 1916
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
Cd1(az

diff --git a/app/src/main/res/drawable-hdpi/grayfacet.png b/app/src/main/res/drawable-hdpi/grayfacet.png
new file mode 100644
index 0000000000000000000000000000000000000000..655ef3d620404f249ee7a67cfb5878e991a76db9
GIT binary patch
literal 1269
zcmV<R1Pc3!P)<h;3K|Lk000e1NJLTq0012T001Qj1^@s6zPjSi00001b5ch_0Itp)
z=>Px(uSrBfR9FeES6N70R~Y{1j?Q8gw}^>~A}DzbL=0$(Qkvodf?z82A-HQGEiHru
z`qI9%(3ke9d2peS2OBG)h7y$^w5ejB>OxD4)nH)M3?c5$m~nJw`u!Kr<=k=ZovY)4
z!&(02yZ>_jbFPgnw%*>}WJOV~gZ)xC9L_ry^J4U7W@b(|H#Y|@sv=uF#{T~PdVqWk
zzW31IqT6jYn~UWlkw^f;5!NY~Phxz~-QE2Q)6AM7XkTAn4Ftc1vLcMBW=bU59)Mp%
z=3Y-v&l721H$4Fg0UH3n16L=yRWO}WEPT-OxUjJBc71*QK{QbZIy^k=-rCw)1XDpY
z;~CZ*3OC~IjE=V=l#PvzIk&gBpJRPN>?Jt5As>d$e+CB!Gi6;WC|seeuCD$B!ew+d
zNz&5NsGuNWgIRxp&*%FZUUUdx6?9-=;C%ppfS%5ToSYnLY-|)f360RnM%>!j+3669
zY<&K(@StDhO^3rlt*xyzK0Zz>D=WNpE)7}jPfAKEZf|dY!<N2_{*KUGR#ryK%gg5q
z$hu*1<nZwDCeIo44!Q<fR8&NBb8}2P@5aaPGgg{}eg$2PEpH4B4e_8gww(L=`Z^sP
z98g|f9-%^!*XyN}loZO!%A&o!JqiQ@<nefDW@bi{jh?{8#k|L0qK-!MXzRtrMH(3y
zA!MNnI59CnlarH_oSaM>8yhNZX=zF0H=5vMkB~!`6rgKX8Zj>{EKpTd6_u2f5Cd**
zZc;--0|kRY8XX-aR356Rs4x=O_JMU|x7!`;-gR`-1IY^6jYfdg)z!4Nwx%gJngG-l
z3WZ)NF!^^ZB1Vk79}jSTe%?~@A%XwHMR15KQW=KcT{F<Bsi~MQWeWvhd3m{+3Z?~s
zHOLbMrS2K5we!NLakfUsPzJ24tE2REwU`;HAb69L@JD7)`0BwIJisPj$T1ryk(@L#
zU~O$JIh{^oZ<w?&T>Beb>tP->a{>50Hp50jsGC}r3c%UfS*oe2q14n=!VSe0$4H#_
z_kr=1U{FE3y1G`e@zBWH>FH_pSVRNju2cctZZ|Q_poQ>3f8rVQhoJM35$y|1TEs#g
zD=RB0J3Ct~47s_v)YQ~O85tS0ySuBNU#78(V>JK<QRqLBX}XsK9${Z1*!RGo)nb|X
z40C>}j3AaD$+Eg?l%Jpf4P3k<GbA#HE`FBktYm#UP|jqyqYcddM8J+^eHib;O0Iai
zrgN{LpeR2D@C|%G>_7=dgAuZvJbxp3u3~;7t#y_P9k@N(AavsCDCqG<$Oci^Ka2&)
zvN1u`CxxPPK<F%P_CxOT&d$ykMjsc`y@HwDjQI_8OKygR{EIP<IGPsXn3f7qm&?WH
zc3-UHjR53Q+7yq^6ttzKWdn7YA5&I<{orjA_0<g66qE%~B7eouXBJ=3xVHWb-p6KO
zf)*F_nDIX1#gE{S5R^u~LEfO>miA1irimm=qC^&>ME-?6eoD&Ck0W*s8UL@mX*RcN
zDZBY46x~9X<GYVIcAW;0KgKdBGb2f!Aa*|-$Cu;y2p{u^X{TwY0%gSj`4sWvKkog~
f(o)NDlt1c!_?`FmhQ`0*00000NkvXXu0mjfqs~}#

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/grayother.png b/app/src/main/res/drawable-hdpi/grayother.png
index 02409e38b4842d964ce05a6fc1242346bf72c7f8..a299f12d2ab7afda2bdfaeb650eb1a42cac005e1 100644
GIT binary patch
literal 1712
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
GLSTX&93ra#

literal 1764
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
GLSTYaD?``-

diff --git a/app/src/main/res/drawable-hdpi/graypoi.png b/app/src/main/res/drawable-hdpi/graypoi.png
index d1752de2e6b172c983c07452f1cbe786b089b81b..377386c3ca608403042dbfe55c93fa45abd61bf0 100644
GIT binary patch
literal 1965
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

literal 2026
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
IM6N<$g4f%i$p8QV

diff --git a/app/src/main/res/drawable-hdpi/grayroad.png b/app/src/main/res/drawable-hdpi/grayroad.png
index efe3c21912b5839cc78e14d432a4654af4defcab..e4d9985cf61a8fefe38aac7e02822f788a06f2cd 100644
GIT binary patch
literal 1737
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

literal 1791
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

diff --git a/app/src/main/res/drawable-hdpi/marker_charge_bg1.png b/app/src/main/res/drawable-hdpi/marker_charge_bg1.png
index 44560d8ed747991946e21c639d4f3ea855c1c59d..9124f69ceec4fba10412759251a52d9483c68cda 100644
GIT binary patch
literal 2068
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

literal 2132
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
KMNUMnLSTZ+>F&}1

diff --git a/app/src/main/res/drawable-hdpi/marker_facet_bg1.png b/app/src/main/res/drawable-hdpi/marker_facet_bg1.png
new file mode 100644
index 0000000000000000000000000000000000000000..d64c4d0db76810ebd6c6a6e35c455cfcfb3e127d
GIT binary patch
literal 1408
zcmV-`1%LX9P)<h;3K|Lk000e1NJLTq0012T001Qj1^@s6zPjSi00001b5ch_0Itp)
z=>Px)I!Q!9R9FeES6ygaMHD_W_wL=@yPIUQi823K+We<Yj0z$|=z|JAh+^?o!H4=U
zSlXAG1Ox>YT19*@wW1(>?L!ftECodrTcl}2e#|D#=GP?K?Eh}|-nrw<Z6>|@zngSm
zIcH|hIp3Xg&YUxgpv<w{y6g-o#wnT7qmpF!xSCFIz(Ckf+{(nzWMjNcQ-DedP90eq
z_t+Efd7X)RVql691@<%b42mfGfs75blTw2_yRL8h{q3WrY!(E)-5EI7?2L>#<+NSG
zq@bJ?fDno98nU(#t2y7d&~eVXXXSH@QA*K5um47)8X1<$1hX3Cyv{rlOjge)sOO2^
z*+-(;`x&5<?V;L^+Pj+$S(CE`E1eruVxb^tMr(6t#~TY{Gd){Xjn%6G1rtfE9fop1
zU@`B2&3n_nb)VIi2})n3k{btS-Lj@)mK3HyivsBBYO8GJJWDv{HJjZYyLxMI!zB!u
zpi?&kXS|L?qa<nO9QCVU`=L+B9Eu`jphh)1;EX3P3PXtBznc2(s9n<UyVWg$a(x)I
z59WaW5fO5Sri5ZTf3K;3@NV-A4lDF63DN!7N^drU@$1e*1>|4ME(O@7-Eq$2S|xef
zh7Hb}13%*da%oLW9~$M?uR)ET<OXGzZMT84G!xdfmv0N!q|&Ko;6G!ARk;WO^kfwP
zVH!8t^{ZC^cRGQt?E($yKz|PdnJE0hs!g+Tqgau3lgU8JnvkD^puav1bR%s7>Sz6+
zf3gHf#bErK0PVGDFn$SUY2{9N$-L9DGK3MUrKN^(WecQ_e1Ko@0tck?Nw7`y0F4vS
z-<|_JQUlV5ZKccr4<eP3OHLD+IOKHE3M8Fw1Jva#3^?us`gcyX%lQbI9neFJe{eYE
zSVmC%xTOG%A2-TMzNn_`wym@!aZGn!)>wDQ`7Fx<`E)72OW6rc!0*>VdZ)#rk;@va
z351fa>wE`e+4(v1^nUi{inA4+=EhI}URnqF>n=bYj=ZY-iwq&2R6gc&%v;ZTy!tQR
z74`+P7-^Kn%$hV-z^^(1s%6lbHwq0NzMYh7YiPCgPcCCtB0Z(PPYXgaKP;ynWT^oB
zZVluwI{`J>L4S9S2^E3_&<KX@q<c(An4rDO%{Mj^Ra1pdOTGx)zZL@UA_F|n0FO99
zV}QsjgFNOFHZv$cWhCtg4KB7$h>iWL5{fxbHmH%Ae6J?yOuKnycqKx|U0}Q156H(V
z(Mk&B(GEb}Dj??Ke1ot~xs~v|Vcp9}Ab+R-T4PoC#6h1aR>Pb(SZCQzxC3o7JwEH+
zes|%EnpFJ~d*3{${#MBY@Vx8=qps((RWm?&Ca*+mM|tnd7OZqm42dp9ygxm*+RCyl
zb7Z(zY_0Z9Z?Jc617=-ctW`!4jiw#Ry2$}I%2V7kPAUuslQk!}YYsZN?tcl-i}?V#
z&Ag!eNfC&6FYxzkrNI1Oz;f7oWx(Hht&ncf<5cWsmJ8vuJ<)LIn7a@lU(b6|p%9AJ
zjqrpJ^HP*Bx32Gao-HL;6m(#vVSXv*JzEa&UbbEk^|csqQTGZ(f6x5QCN(@PiHEq@
z*rU8{Z6&G}+Go32^)Ee&o>ZtSar;P0SJIH@{_@(IGGr2usZR;{QnV~k-tE_8b<gpb
zWe=9&uo|g<rEj&h^vi5dxhzmFJFwXN+fumhGi!X!IEK9699wL;n*A}w=DD9<Oq%U2
z_RQaURE-?x4V1ORIp1t|ZwZy0?XpiQG<}0dAJ-`|czxDL*N|ARg#HgY>{!~_mw8kG
O0000<MNUMnLSTYVS*Ljb

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/marker_other_bg1.png b/app/src/main/res/drawable-hdpi/marker_other_bg1.png
index 16665b45373f092c00e5ee16b0c7ddd2db4731b5..57188375eb4cba15f4976e8483d0ec7c71cf866d 100644
GIT binary patch
literal 1800
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

literal 1856
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

diff --git a/app/src/main/res/drawable-hdpi/marker_poi_bg1.png b/app/src/main/res/drawable-hdpi/marker_poi_bg1.png
index da8941e0229f83747dc1eed9e4c55bebf47d88cd..7092783f3d13b5d5e5de2f252df26245abf6d8e5 100644
GIT binary patch
literal 1839
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

literal 1895
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

diff --git a/app/src/main/res/drawable-hdpi/marker_poi_video_bg1.png b/app/src/main/res/drawable-hdpi/marker_poi_video_bg1.png
index cf7b8931a175dd3fffbed03db55f052d93e25bad..65f183aba273c2bab41655ed0b38129992409520 100644
GIT binary patch
delta 1260
zcmV<I1QYwu35^PnF@MKNL_t(o38hzCXk1kkUFXi7JSUB5LmFw*M&qMYCA9reN|6Xw
z@lgtuLM=8X`4B(!rzm2v1;G#fu!#6$MGb28r&vp|V8MJSNGmN8s9-}{ZCZ=9O`@4R
zW+ur!u6<_C%*~y9CpTt?WS_fV>+HSHD+)2`r?tBF;y7M#=6}%PIcPU-9!8XlOHK+$
zx^Jkdn4zE+GyJ4ZA5t1GL8F<rTI~5pi6goB=1@5bqm1@p&$N0&Y${PC=*M;XfaBpH
zovQ_;QV^@7kxXJ%Ie3@g2dq5E%YtdGRev4M(S1`~uwYPrYX%-(nZlNxw^TZ)UjTZv
zQ8#5X_?vmTL4U)geoNLeX}1xnV80z3>_oF}Am9iA6IQkyE`S0&|1ZYAs?qKKSO!$@
z)`_txTqIx}l_vWX&DL!9n=XA^XistmIQiLXU2h{8(Ed|+g*|Mg(0n&<0e1XgO_s+C
z!1s9*_{c_5X8+wpnw>XgO|Af*y8)cu3H*85nk}D8seh|IY}}huzqv!>c##D)8A|9)
z+$4V-F99k}rD`P=obqCn8<!?VTjdfsMD1SJ^RVAEv0%IIDPUkv$?>t1K=Wq6%avqN
zqszzgnzQ@MElim;o)L}fXta2~&3|lT$)V~tDp-S~((Rb^$d^1#Sefits6$eu#Dp1y
znY2F4Qh$FPriqqa{~i#(DEd69I|Ve7QtN<;OOfhOMf!K3eod$<zb-WD<>Zmphn_&w
z*Qw0p12|F-X}+Ch$k>|&=B9zEYk8ltzx3&7#V;;zkgE*V&RG8SWb7r&_1rqO>}hH}
z(Do#7^;AAo*m&{^&~!g=<(o1%E68rWre=7!>wmYnf?ub!xNWS3@cK3`iqU)qetFoq
z<ssnqE@1HOFs-=+zU$4XC!D4_yu%dBvb1h@cLS@qWh}WVu1?;pt{j*F;)M>`*I{G;
z=JBTJ9CP(3oTboqE6m5p?%V@B&V9S}ee!RCdwLd{W^Mtpkb-1lE8OgzRcAzJ7EsL`
zUVqLc@N>{O_`RY7xbPl(b|T+v>7Sn_hPc{?{gTp{_uN7IW%~H+tUAXue~pu^bqwQe
zJk5gH7qa}PFQblFpW@<4@Q8}4ub#8!mARZ=VLf#f`uv`pNQwGu^Z<do_*;~(-Uf8O
z#)r=&&~OKN8j#-Aa4{tt7WUBPjd`9$9Df_k$CNBt){(xfYA>Pqf{RdI52I;}6Eb2A
z`dwp<H7mH``K)5MOH?ech-4*m*~=3$s?sITMMfq|g)f4D;#Mr9KgOrE`Y)EHB}(tN
z4I2v}<ug4qNGZiLFF*@2wYutgblLI$;ewKIu_Fvn;)R0BlY%ey!_=3}Qk*K0WPh1Z
zINm*}2BPdj%WI9L%!F+raz#69FMzb2=APtX8BL*?T65RKHU?QzwrU=aTK_0s5p-Wx
z4Rf=<O6Ns^B}=}p58LxK3Q**+%EmIECv4>ZHUh|>%e`53S0ym3tC*=Zx_6Z+bIt^}
z!U7kW#|K7Z6&?(zB0pn+%59%aVr6?&l%#`QyV8nReLRW<DxvnJ)sH;T<xNoRFSots
z%kG2jX~kPMKE>*(KOFlz$bIpEI1+t`+hc=YA7>mpQyZ-3X>2AS+X&sd7M)hU6#gIg
WsAUcdC7|m70000<MNUMnLSTZIVt3vE

delta 1198
zcmV;f1X25q3eO3UF@K3kL_t(o3AI;CXk29!{?5HOnMX<!o1&Duh!#wvC|HY7bz!4c
zMT63a7(;3%8!h5OAsZL18#jUrah=Z8(sohA7f4$bMInn~!TM^0H0eVvQfxA9Gmp&N
z`+Lrv{4;mvKISID6YiYzpV#-F{~f{#=xB%9UhcpU6z+5sHh&Z0ZxCj!B^)2C(sbNZ
z)Xwopr`lRJky8rW*w^9!#k?NJ4aE&&ZgVHjz(yvsM88Dktp~R{eVkUC78H&f3ipbQ
zlZN{0Say&O$<ItT@XT<DX0^@B4R1rsxh}OUZ{xB63RoOKiPgRg-k%5lm`bSEbxtq$
zfgbEqla7rOJbzS-*}gh&GA%F183y6QY)ZYa^_n*g*@3j$M-JXuEtpQ)%E>@3Q=p92
z*DK8>)o3f=?N4jBHF5{9989bII*VJWQi^gZEV44GtK4}Q=-vu^`ha#_8|Q^#cX#5p
z-8bl8x6*7EvJ6%S9M}u=?PkF3YXfSE<~6cV#R<{5m46;cDycFpisY@p$VK4rCSYkn
zG(cw$J6bh4>epEUD%Ybt;8gBG()wtf8nmlOaiuP8ejK>?MFVhMAMpH-yz>jo4iT($
z4JiBtOuqr#2;8AS;w<)Cwu47Gk6^l0pFaY~r)l6d;F}kKE8l5NG~aL^Ak%Yd((lIr
z<T%)7@P7o~&1M(S?*?q(^C&K$#9#Xv=otvgR69J_(r-Cjaj;8G>r|qw!8V!OP*SiA
z!@(?<si)NEd;NSvWu^f6gu-O8Eu52IKM4*W6c?<7gF__~JoUjOD|pMxfb{;37ukoq
zH+L*tmd@D4;9Ty)G4Q23m%L?UKsth5`H<)b@_#d7)@J<^p8;Pz*R0bmskDD1y4=Ho
z5BHN%L%iby9mXq;BN7|=>uu<~k{Pl>-24i25B*6+cgrV%y(QkB-rz9#+3$gymul7?
zJ|;hrtKCCaPk9<GBAIwoRBojsMY_!LOjNZx-r!2U<vEs*uRtID^sY}O`;m`#+#D~^
z=YL{#K}E1^ycD{G#UUmQ@*-;`$;<DY`h{Kx9jnk8?$YU?YMp9pn((&S*=&=1yk@TM
zDbXQqX*$NaG0Y=&K^rwMUIBI<t+f)j1k2iY{&y`kxM^af(F!>JvT2o7eCe_icXG`n
zRZeG$^oTc;FLBU??hROx%olehjow%1DSz*ctIw%c5|Q+7Ot)9dWiFM8eXW3!&sV7i
z$)(f}{EB}#%18UQaslMOxlEb1wA!TYt5iGP)r(y$SKS0!8I$uCQR_`K&7(Io6x2Pg
z2%}!-II?t-PoBx)0`Zy;rqJQl?o&ziH9HM*yREMP@;^4eP85mX58)JAsScSK!he(e
z)L)c@S{KA!Kz^55>#-xq?$xygrDJ4+-%*i>%NY$5Lwo)qd09qMTTqD}uh41UM(;&b
zt9VIf#~0~jB-*l(^TelYQvJr>16*}I&K*{TOA}@4i<>D{r8=3}jR#pS>xx}K-d2eu
z?$<tX_=-SfzN{)9^Cq?|JT;o9c_**#f046Y>Med(sj0Mjdo=+60o<Tn&j{q^-~a#s
M07*qoM6N<$f*?juQvd(}

diff --git a/app/src/main/res/drawable-hdpi/marker_road_bg.png b/app/src/main/res/drawable-hdpi/marker_road_bg.png
index 90adc8d97e73186fb141d74a61747c4a377d3647..73a9b995f93ef9015071e133111f23316d5d4b42 100644
GIT binary patch
literal 1850
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

literal 1915
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
Ba3uf$

diff --git a/app/src/main/res/drawable-hdpi/poi_video_have_bg1.png b/app/src/main/res/drawable-hdpi/poi_video_have_bg1.png
index 6f483c2d3f08856fc9aee310036282d22249d153..db64b098376e7c97360d747762e7e190a04f801a 100644
GIT binary patch
delta 1282
zcmV+d1^xQ}38M;-F@N1jL_t(o39VOKNNiOYUUP9SIwIcCBZE32=v$!llrPalF!msH
z5(*Ap@-k9~f;d4h^-_=Z)ZwTPfe&^}4t0o7Lg)thAUz~eP~>gQ4slY^(Q(GP*!OK*
zyV-lz?7gScg5_F!t?&Q8^<UP%Mwf8dW@l%s3WdUxE|=>XdVkxM*aM6Y>g(&j9~v6E
zaHvYS?0_>fGqKCd%U6MW3jG{}9`pd^aELVKIZUh3zjM3Yw<jkjKj)rRD@!^zH}@>a
z-iP82C<|FB;U2IYk{JI2{?^pg)O{|fS_vtHTyW(F7{_5n2wf#tc8%odrvTjR=;(;Y
zVzG=FY|yy0w0{&lI5_wXpfFBr##ZzV;&b$1V`HP=9B*Co^769(@bK^(Sl0BYgghPe
z1Thp~#Lo*03-!e()<|(8cOsGa1i)@|ElFx?YehI5F2+_o$Klz+CnqQG!HYhrKqEyA
zpT@#7=ylv^Zf+KXgM*y@A1wewZX6vQy)2b6X?Xt<*nen67e1d)jEszkm6a8-x3?#8
zk37PgXV4uP8ykD*g|>e58WOVg_4SFZtu399>wdpq+q3(V$z<f!Q9&=W+3a;}-0{N7
zSD?5?qLAidb#+yK3Z%SfYHDI3(AUaMHa9o5t+lna5(qd#u=aIq+@Yn9V?od2#l=Nk
zfUc&c^MCX6`kLJ&8jWh6q1B2O;Tp+g9WBAMwY6!kF4?eH*x%n5lv6c$D~BAq<}S9<
z3=D-r0_kpEw)`f(rbdsJ0gLOC^LRWyy7zB%<%LY8QX-dQJ%>viR4B%s_|sEXL1hc%
z^Z7r$2=2GA_9Z|JC6OY>$HyWPiHPdzYQbXB-hbXMc6WERIIHF)YiMW?+uPepMsWQa
zkH@oKn7f1%J_lm0FchOv!UPi{ola{OY;0`k+p2j>ON*$hs}qznHxQ=btp%>TQR=?L
zf(PA<)4sdAyR|DLH>;|uL?93lUN0kKY&f`G7(S+in@<nGx6#u^6{TNYU0vF}?eFgw
z1AhYpqNk_F0HQ}!i3fuU=wIWFO;A8PE?oQ}0(_GvwQ6)7-MX{0BRV@f1)ePfoH?K(
z1t<lMcO_UW3KJ6(f8ZqZShTfP3aUm{Gls*|^3eSQe#Yo!O0Pr+^4nK#Fvwuds-7CK
z{4je99=t#v+$;tf{E2Gu4oGf6P`}-+t$(eex3^cISZmjYBV)&8Vp1iONnIb4YkhrP
z&tB-tpno<!J^i8%;=zhP`0D}pa0^ze>sT?^!5oB181NVphy_S*x_i08Oa|d7z-Kz*
zKTdG>Poe7#Ga=O(ES384TlWi`Fp6(y52+OVcVzPX1j1hEDJcL3OQj5+v{9Ut@qds@
z6^)R+Kzv_N5mJ$ols_pTz~3|#yP2VZ>|5jG<G+_XsnWd?OgCd5g%U?@24N2UM`Y_0
zQip0(S}K9TU~m{pQs{EYZe&q^-VS6*Iy^jlfY@9ov7I7d7>ZF@U#;+#q!dJn{0i=!
z!?bLCc_?5$#ansLicId=k`f4oZ+jvm`6D<l1?31rz90|r9hYl%qa#wdEDJaD|I~AZ
zLjKPh1I9K4Qq~bE!Ep07l;42Gx^lXeTX5?yQlXR4F)5Y7n)}Gkk3e>IMR*s4cbyOw
sV=5x0Al}8-K**;hg}2jj9E(Z+0lESl(pHXhIsgCw07*qoM6N<$f+Kro)Bpeg

delta 1246
zcmV<41R?vQ3jYa^F@L#9L_t(o39Xn*NL*JK$B*Oqm^2n2bde%LL<_-9q2NZBDm8&(
ziAXl3wc|68Qc5X>LZMIEZrZGTTcPb{l!VfSNTpdsa8nlvw9qQWLTZD>M|CophvW43
zop^4pbI%=TOb?tn-}`^Q?>pz-t3|4SF)=Ywo5^IJXFiMDxqrjM!}~==MH|6j@NQpU
z-=F!0Dmuw<dV2bqR4Vm0K;6u9fj}UEPYJV(nLw6emO}r-yis0W{zY$Z?|o?B;R`x7
zHC1tNaPVn5oel#e0YYTu8%Pv@%O*0|eM9!|lKr;L!5U?JeEd1UZsA<XJY#drB?C8(
zK2}^@+|}RTe}6mM)&mM)8-PEOT?S*1K081zo}M2P=gQ#V;H=wD*Ubn<M@KIL`2A5i
zp9oN55+?v|gaa5h7+P)^6fZzWuye{;S664$r(Pui61hG$Hg?Gb(V0r`IW$xBuiPlw
z+S*iebF*QeXeI7b1egL?C!|5?qojYHSuD|;nwnI7eSf{0o0}8%{~BjW?js2nlpmO@
z?B;2qL!pprX=zb2Gc&^KQC3!_&>PlwrGF}!Oj`9|NVcy>B9V83larGTl(x|Xt*xz9
z>+9=|b45jk>hA7V*jR(Pg^5H$MWa!*w6vu5_V(N=y=j2e?(XiTAi*vG=tNvyT~#v8
zkWw!!EPtqtjSVBpxz^Ow==LlxFMI63IYTur1R&0{1Lpu`TUJ+B=M5;nTU%SIs;VkG
zjNwbcY6|dE3b1d(q)&woKOZSCqfGAaJ&1>Xf!)2~d8%Z}@S{byv$G?MXOLSO;cr2R
zB`$BdTw>dh)7aS9C>LBcG&E?FwY4>0S~erLwtqpUQSff-vW|?5tim)fZMLeivQkc+
zRhKR7?CezY^Yhta%~SRm$yMs~AjXl#td<B{TU#BKY>aoNo{rE(@Mdvwk4dsT!1o3Z
z|J0)fDJ7sEJ~r{Ey1Kg5{{Fr;kW)H4d+Y_GHa9o@oRcK?nJ9Ipp#RHGzJ-^sf}BG#
zS$|wy)br>x9<yIrSvkfFgPmM~I|Bm)zX<P~9(M6Q%Cs$z80I@VIyyY2#FUr%8%E)P
zlI`CpM^JdKkKesBLENjQr_#$?LqkJ98#~ie&2vCLj>qHu7=?_1tg%>3wYRrxkv#lu
zw6WjbKK@xmB1x{%n?^6I=Z?r*o_qEcz<+1mhNq+-P^Ig`!^7{n{hjg}AzyIQ?CuZv
z!k>R8$k7VmKGoCjP`AnhN`@KA@d^&o{8JA${(%0z#y7Ahjt5jw_-wq(@})SQ1{FU!
zj5oO=3pRf%s2FmEKEPT2Y|yU;o3oz`zi3HG$yGnSFQ`1O0K80@eIJjupi&*$bAKfq
z4nKNqS&V!^#g@BuhajIzAd9a}Bz7~j=O>%e$Z~>;5x}1S`YUA0IQgt;s&bDnjkkRC
zj`&1SN-S6BWq{*M$1$4_J*V}ho}M22=b+2sL{PEia{oopS0SxsCc`MYYn;~K#r~v`
z7pMdQ_$JGDfFC<p@DHiR547RylUKluK5tNQpkLPjS!bG0R(UIJAP<{>`K$$jO24>&
z7bQCh&Kie*5xM8hlncBdPzfaeTi_mc(MNfJT!vrE1z^+t2VVOT43um0Gynhq07*qo
IM6N<$g6ZL7QUCw|

diff --git a/app/src/main/res/drawable/marker_charge_bags.png b/app/src/main/res/drawable/marker_charge_bags.png
index 686bea68a89b1d078283f522bbf75eb31b15e89d..bb409ec38924b2dc9f30fb742ee208f3a223cbb3 100644
GIT binary patch
literal 2586
zcmV+#3gz{QP)<h;3K|Lk000e1NJLTq001BW001cn1^@s6RCOyn00001b5ch_0Itp)
z=>Px;)Ja4^R9FeMS9@$z=M_Kq=|}vC<0Ql+B!mPK0wh3qg)rKo&{7ys-b_VIt)ObP
zNnN)|RsWb&O;x8&o2ISRRM0eO8>|YeRwx;R2?~^o#}=OD5g;Wb#13&1J9ccx_g>$7
zcg~INJaCFPsmD6L*WY&@zjMCxo$oUPS(2{nY*LiLXNt#a>-ZzZz%Yz9c5<?JGBhcn
z)086)g?MBk$s#^Eh{FgdGmtYCSw>cpoJfx82!?=Vq)7oJBPPe>)QW6ZKyh@&2V5VB
zz4d*XS~S2Y`D8Uu=LZT|q4#yUuyuyn9S}eW<8TCd7+FGAC(Fna0FqHtWaQX}oEuC8
zi{4JOuRX)|ulMp?l`}pR73GL#l81Cg(?Bvi7)i9TA+s~blStfOp}Sgsp;xpNm<xJQ
zKY&bNC^Oo`Y>WetbWTy5k(~p|z|^<oTU(Ct;a3!0wwL)X54-*MI93juHC^X4T_agw
z8CGQ(Mpea}c%ZOaedJkSW_U|%jpqEz@7TJJ9D>7(Vj<)>GG!yZBohIUK?`zTXQ;Ds
zGk5vj2Le}L(fPUT>bag{08DA5O`tT<m~jSwgp1}x+NVD&PF3OdL4NVuwR%Y#hBbha
zF$6&MVo*vA&^S4#;wn5nc(rbe&3AB^H`yA#_>ID;QUasYRb91Uou_q1Ol0^@O6V-7
z-=DiP-sdW{oQxH2Y-DS1Ac#KHh^IgpqRG_Ln!8Shugu>qJp8j5>2c0%`$QIWu_I5+
zy=oVndUv#Y{je5uXK<N$XatCUb;)ZQ$C)Dg<g!;b+3GH$Fl9ofrAPsw=yUvXaQZUo
z<R{jFTSdiP7b0%n_3=ER?$ko}V#%3jE7*7M!#BEzyK50}swZT2Ja#k*qI<@wxHYHv
z{sH?7uhs}t?x0ANvcM*z=WxT=zaKlbJ7^M0J-#bSNlwYW7hRj1H<WJ(2K2s~BV9+n
zGav^_|0m}JWTaM@k_V^FUQw+6LHzuW$rsM><eNzvwBA;HGaKQ`xvHBVo93y);hlv$
z_tm&+r2SpL-*G*1bDfls+>#QvWA#&)qne@WCl}cfW<oK$l&g#Oz;E@+)i3jvmr*g6
zvLL=Qbm>Jt5$9~7NBqLv`S)uIYMdwfPds}ybYnwU3YQ@OJI@G^E4n~nM935KvU8l0
z!b}LmK_NHzQ2T>)b2koC!5giVK#2blm90~~R}xg?_lE8-ZSHPfd)j|`M@)%%jLJs?
z<vHcBVd{FQu+4yN)3&49$O4n0tO&)6ysdCg<kq1)0br@WlNEkQ5Iml+kEb=e8*N+K
z9{*~-Y@}S{vEe|mr5L_duo9NImw<^i!HWD9aMphs?ndsRfh>WbZF|_qMR^moaKm?M
z2|(g4Hd8!6gCHlAoMAbZr|OzOw(Xo9HWqJ$#)9P_vLejSoo_t9SN<}dNJcY6+&UyQ
z1z80ZnSN&?R+Cv?Rn+&OvykS~0O-hK6UvA+nj!rpH+fdWOxrB5a8}T;_Y1553OXyz
zDTQKdF-c=x2vF^)f%?39sBl!`K|*ciNkU+FP^(%HWJ7==CO3+x#Nv|KX*S3Dj4X^*
z-8gk4wDkM~Jdq-x!Y|D!gRbE&M9)F3qZYbiUC@x<0M8XZ4=l@qq)BkXcN{JTFFv_E
z*ijY1EbN7nZt_hTFaS8>gWjOKGTo!c0>~9};hg_09P&29t<Y_Zjfc<s&cXH2b+C&L
z5OG($RJIG+qwR3C=TqpD{II=j2TDDeg-~v}YLg=Um`^&Y(*PvTQ0QDBzjD$}AJw8*
z3l3OQv<BQJH%u{2!Syya4LC(7lvqmOsP9u~9cYDPzJD4!#>VH2jl(GSfV)z6N5lWd
z3A!hw0m!T4!XG2HLN0E}ql`R3RO$AlLARI>b-8uG8=Gik{WZK41>^uE^aS+Fek1i%
zD`QFJ1l>Pn4mVFx_u)9*4|F`njk8%>8LGNnFyueuD_NpY<xeEqiaqhiAnOtw?>P=1
zb^aA(m2O}dSh6#Y>R_kD&$#W0HvL5lB~1U_SG{FlpsaB(Fm?eNP@C$TqH`7QXMI!V
zK!Uf9SWa5x7!Gm;m$Bt;41NhGdQX6N*b7$N6;wi$vT@FmdSf39aI&{-nOXwOyX1>}
z(tNt&aUgO2{Q1k*>U<}<Dp#$Xai@jyXXN5m=q79_-h_~KbZUWo(Txe$pvde&Fvk%X
zYt+M7hZEj)U)i!DL1#KXY^ylJEMn-wYEZfl(65Gu26=hV@)Li-Y*Du6MN>=B+;s@r
zV-KJ++6iH02paPn;Zf`ncEU4oJ$M5axE2^088JEG8$-}|bEI=xgSjGVd9%L0o{BF`
z=?u^ar3Fv9juPeA{*J13JF2f85HZ0bW#C@quA$_{E?Q};gqikP2%-x!vl(h#b#TOY
zIBk?(IF>V(1(!zds(PW%49vBQuBJ<=)Te~UWq<}zK-ue^`p%%eNDt;$526*UYXxFz
z%wR7@{<lZX5Rd|3<L!o{&w4+D3j=h~86nyUv=t+X2n;)l`yc1ea@U8fKP1~Jnbb2w
zy<=J7{jgd+wW$ZB{fjQX&oc?xZd6)Qi;iVC9>+G`1`_Uy0jVG2YCJ81j=+QU(X067
z*2S;+Ev)_5-9pp*6Qd_{83E7)f)L#5@uT^DcV<ny+fs_wN6!gzg-%%f&>o;II&K%B
zRlMz~y)&Na=qy<h4zbTK%M?BNd147@FiGlM*}B(PIL8%nmeL=KF@zov139Lf(KzQM
zg>$m4VDQ1TrBliiw%wCCC(%g(pptghveK8Yvp;H^vqc47kSEU<nMx8x&vEjtx!dCo
z6@GqAY-~$SWqM8ufP`tyI=H3-Jj1tkRji@={L}yO>Y)0{S9K=@tIx+j_balI$#H7z
zYXKyM)D?<#PfyWoOE_=lgr!KC8GXi_)54v_3-hZIIlFN5Yn_wUQvuLY9LA-Xu5f$r
z)~sh06SnC|N>>v_`PRH`P@wT|Tr#a_C*4tKnctoYfYd0BUy4mfZ5n&1efHKU4rMg_
zRn_L83AmFT+^U1wI49d#0U$vn^_RlTH)Hm~z~ho7v5}$C?|x5Re9%=Y?ct}tPO_sj
zU;mah0E*}(sEjsB<{b~GujC>QPug<KRsijltM%%rzVkh(9?Uj+GLSU@5~ihSv3~nT
z+3@gNZF9HD3Em7UC&KO8@5YN|<)@eIYg$Q$WV5A7%4u?SY&=Xibeoq)FEl6O!L|6O
zUDItv|MHqQZAC2!0nqi}n<Y9c{?z?<w_Rxo*%HUXAK*KUeY0LCSVxEK&a*qG?P}fS
wq4x>XS^pe&AIMs3L{P6@S?x{g{NHK+FEt|$0GyA(9smFU07*qoM6N<$g7hQj#sB~S

literal 3419
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

diff --git a/app/src/main/res/drawable/marker_charge_bg.png b/app/src/main/res/drawable/marker_charge_bg.png
deleted file mode 100644
index 5e72703ef37ddf59eb6564a807914c381481c710..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 928
zcmV;R17G}!P)<h;3K|Lk000e1NJLTq000jF000;W1^@s6B?YHx00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj8N=ZaPR5(wSl3i#NR}{z3xidSv+0Dlqlilu`#3-w7
z42sgKktUc>3KgwS;x`5#6dwc;1i?2yUVKz3jrbr2N~5HyEuoZ3sTxtR6{$guU&*?}
z5X~m)u4HFF<{sx<$JK1ohyI4)-t#}_KljeL7m6{yENS+4hJOggBEz9{H2>Mig0ae;
znqNKNmTquL3ZOFr`p{SLU8tjEYx#DxapWnOm*4*JdgsV?Ic_C5Rz>JV-|XM(E*nkW
z)f^Wy7i#GRje&_K=I&?iCE8*w^h&<cIO*>Qo%O6MTdyiV!A)-3iJN7uoFkh>6AV!t
z%|IrgM~sNsow|swm7Y~qef2j#-Rd{+mGoi>`l*7lGAEfQVo<w{{|XB&B%ATJXD!0F
zd)D6Kf6PD@JmjGZ^s`-RVU<=XmWW31W4X$6y|>-J3xkg%L)u(dJ&S?_ZNv>kK;Q!}
zblK*#{kTXc3nUOyVUhg9%zzMc^cp9IFK`+BMc2W!TN8k4*dyAh5u%iXylwkvWJFL8
zVrXJf5=%uH3$4&B4{7_+UYNodQbiIh=#jnHM>pUm{R0`ysE=5~xnbmH8LLW~Sm@Qd
zXt`L5F&U>A#8r{U?s=0~q2^;UL7S{y@Ccrw`CF=2n7^bhaf0#L4^uDduvIhzzaNZD
zwWz`dSV%li|CH)R^ov=+fyiS~sm-1Tb#zKQ0ZB?hhdjr-XJ93M4tw-=JditVZ~P99
z4vh}JTspW|ebu|IVu$}+xYNFG$erPC^PF=Z;FFLjk@A!uUmO2Adv)@Px?#Eg%w6t`
zvBuk`Ohrb9yUp8pvww7-*^}yKO_`Z&-{duRxYzhv-z(FZJoEbdx5pDlo$#ZX$zGeh
zsyDiqxEkDx9jQRB-@H4q<@rYY<Sa*;zCCVSpnv{-QLP6Y2}qJmw8U2D{x)wpl0rCR
z0Xbofr;a6#IH4kaA^Bsm@xL+99gHs+31=H9WJWDLYBV^RDNI{gk)=$!^UZlRwT~n}
zkbR)^B4#$*q%S3V)Oa!3rG)>523j~7P3yI;I!Bqtj4M|h3>*sIS=ev?yAk+v{*|he
zHK);qE+<`JMzdu|msKXq`6^mIS(^7+rF_Sy0`LwXi&@UvmYZ_`0000<MNUMnLSTaX
CaJMJ`

diff --git a/app/src/main/res/drawable/marker_charge_centre_bg.png b/app/src/main/res/drawable/marker_charge_centre_bg.png
deleted file mode 100644
index 9f69cb468a98656a84339cd02eb46b4d6b9adcc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 937
zcmV;a16KTrP)<h;3K|Lk000e1NJLTq000jF000;W1^@s6B?YHx00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj8Q%OWYR5(wSlwC|5RTRh1ot@bk*kxHh++7xgwpo=A
zi)ms?iKRfIO&a=EAF2?EFNleRL?to$pz)&*eW@>PX-ibv&<_GwTNRau3RD+0CT3{`
zqJm2sV{n!gSeDuOxYv6x1BER%?Qe23^Z(y-=AL`cWDum`taxf~X2VM_%a!|Tg&co?
zEXCvc#8^1_^~YV>*wrg`7-u~hDK1xb+wsnf`sW%E#kM!0{XF!|zeita#EUVNX&!`>
zOjq8KuZEmud#agEr#y>5G)Z9D62OT5dQ*M9zJ?^?aR;09ws)RUsu~XR$PHvTENI@L
zfmha{CLiF>Wdxer?-PTekT%-ai=@YPSLGiY4R0*<U@!%efWhm;kg^cyV1T-!Kv<O^
zg#{p#7+qa(HMF#*?{UFE;1U6PXJxRk0}5pkd@_K->!jPHWbSW%5&1s(ZASE$Y-6T~
z2poEtu7eRRnLyty2{gJ-gfL67$13KnsY$_+Usz;o*yY7=Z4QAV2vF)4q2o~kRe2^Y
zb8{ktw$YCY24YJnBg@T<0|5)(c*FtorU^c$T_X_qexAUHN?=$;uxPCM)<3sz3r6(j
z4X!9{I|K;1Bq&xSP<7xVVIp|GP=U@TGT?_=2`W4$k2Pi@zX)3Rv&&pjWLhpGKo982
zY$qR&XF0jY@Q4lwxmU|y8SU>wg4>(p|7hZOl$DnoP%QYclAbnw`N?S(MEJEkhd}E#
z5!%NM7+-KeY&QDGTuWs+e~tU;!%d#oy3evEFnuqGWty=!4?LqshQH;z*Qakp1lm#O
z&bm6*L>{#T?BiHC(f*2deV~u&wIhYp`1KK>{gf+f>(bk@M)HeOClfvIziZ1o$qYR*
zIxKCk*eMp5m)q7l#>{wR{)5BM0=6vMx_b%1lbh!|9hnfaeGl0d5R9?<YE88<_0x~G
z#aZpm2Jqs1EYb7cJGSI#!xt~4C;l%;a>{}8(Z7O&Iw|;4v&7=kGJ9$hcdg7IhMr0e
zo$F@LtR?2`<OH8cW6NZQ_T8rg{65lqi5m}uC`rN36DcuJvfXy>4^PuuZx{9d9S;ts
zaM5LTDYv7m8%Z+#9c*UHvav-hBe}9nOv5m=)C$#@V2k|`HURJ+X?a9%(E2w}00000
LNkvXXu0mjfHngz5

diff --git a/app/src/main/res/drawable/marker_charge_have_bag.png b/app/src/main/res/drawable/marker_charge_have_bag.png
deleted file mode 100644
index 41a5440d680d728877de3e277aa50c2691809523..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3228
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
O0000<MNUMnLSTZ?G5Rk6

diff --git a/app/src/main/res/drawable/marker_charge_have_bg.png b/app/src/main/res/drawable/marker_charge_have_bg.png
deleted file mode 100644
index 07eb88681c22196c0bcb611af66c2af483e2576c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 893
zcmV-@1A_dCP)<h;3K|Lk000e1NJLTq000jF000;W1^@s6B?YHx00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj8CrLy>R5(v{R7*=+K@^_3w=uqxNQy<Hm7tLbF`{m&
z8{1VW%_5pYSGBn4!um71=%TAq+!aBQ2BD!r+>~xasnqHssFB2CLMoM{*7qat+wV-T
z*F@6~!pwZ<oH=K{b8a{*2Jh(TaCLTeK5uMn?9=P@hD;`Ny1TpkeQj-R3cs0rKA%&4
znHF4KU47f_c271pH$POVA}ET&;_>)bpU?O7;NajVaU!^~veGm>JUm}lSLdMfb-=D9
zlSziG{Os&3HZd`A@9600mrTaN!NEzCd0%)IK&R6wy}i9DRFi6IYLfT%_Bdc{XlQT-
z0)Z*HrKP2BU|`@4e6=Uo?e;93vsSA$hm09nmeb*IxE$Fen0ak&tu>KIe3P6`=LiuZ
z>IxhIe0g~p$#vxruH0s`v5JZc)y$Z~;dsW!#>PShgTY1wN>XrHj%tIWf?x@1O9;-<
z3emJACnqNnsivmJqMn(>Vqwu}R0LF2RmuJR{k*=uUP+}=a$z6=-MMoso6TO7m6cTz
zL1npIE-p!uVl*0sGcI5&D=SJQ5@Flh+boyM2_9=oZf|dYjO=%b7#bR)>>Qb?r}^XK
zV<nwVGYpN?)z!s&dV1K##s-6k9QN<h*4CDv0tpaDtR|C*x3;#*^n>c8umDu%X0uuB
zH#avwatwfBbaeCwL@{GX6pzQl@J6<{xJczG<cLdHcXv0#bg@`0#`gF3<KyGwHc>yy
z^5CsA*lGcQun{1Zf(Fo5*!_OLXMKI$CngN_2Wb#c;sa`v>ZGBNgLto(mX_YpUIY`+
zqD7R>A=rRQ-2n9Q&d$!hRF7A|1hiuwGu{co>?)<<@bEC?^?F@sZCa(6rX+#hhMQlY
z6~9$V0Ca9{Zf*qpsY(eHWhS7n=Wss9NAXCdSSS>l#yj7tM-4@pFR{A1`u^hLB2IhC
zy0EbDN*J!8WH2Ty84L!eX^*~s#^)CnhHEGpOhBohXhlCi2%-f38;ooLl$_bw*_l_V
z8z>rvOJGDN+uGWmU^etPW>ESUw8>rACPK-~=xG#!C9uVqr~cp^Dg4X*2gd#ac<gdz
Tn+PrQ00000NkvXXu0mjf{D7#U

diff --git a/app/src/main/res/drawable/marker_facet_bag.png b/app/src/main/res/drawable/marker_facet_bag.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3d8bebc771d23c51f3b4225bc82b8eead590047
GIT binary patch
literal 1665
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
LNkvXXu0mjfut+uQ

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/marker_other_bag.png b/app/src/main/res/drawable/marker_other_bag.png
index d083f3123d3e5a946e6f6adef533c12107b72fc7..f611c32ab2aadabfbc882bd70cd0011f954b22a4 100644
GIT binary patch
literal 2491
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
FV1kq*#LoZ#

literal 2882
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

diff --git a/app/src/main/res/drawable/marker_other_bg.png b/app/src/main/res/drawable/marker_other_bg.png
deleted file mode 100644
index bd657b404733db662a6dc970cffb629af588ff1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 888
zcmV-;1Bd*HP)<h;3K|Lk000e1NJLTq000jF000;W1^@s6B?YHx00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj8B1uF+R5(w4lUqnsK^VusnR9l}dRa|vEvttVL!^un
zeW{2p4~7o~MU<2UT_}5~r?4KRi0UO@tcRW|DWtMYP>LjoN~0|B64qkc&Ae>7y6d9r
z**#}wnmLZE>~8(waOVHb{Aa$od<de*LIs7z>Y<8kykToHaxK*%;2)$N?H%TWTYdE9
zGdav6Vpc)ZcGxb~6e$OeBZRRGM_`<O`l{tg_;h&?d|nZ=%nI1GgZ8^mbCgZnh5jF-
z^y}x_q1~Hjz(1jgK&kE0^)>3weO9l4Pl@>2Nc^KVmV`1gGjL8`4{3UcmZ1E#6<SN@
z!c@0ZIl=dXNCl8vqCrEsPb$6zzKPn<-mSP;EkC)?s3ri6xlQo)8W5hQ&|Mb<M=Az;
z@_Y)2=ToTcKdO}2s;U!F`eGS}<wbUw_)b7`Vwmw!uqW}qpZ~ep|7$)Q4U(NW1!b*}
z+9Ewyg^6z_1cnJrc_?J9w}HD+hqRTd95IWyMr=YjB(;TgKn!4#uM!v}U`s?`1bHCp
z;KC4`#^UIuws5UhVcp@x$md+9KtWjoEGe+b5wrZE?oUbrN=?gEwv>oKk_&?wX7Hs!
z2T!*F<NYQireo--p8-Q>fceGhKAr`q&AfRHY2Zvf<7n&S_vdmfLO=`vV|sRgJqZEk
z3+jFbs>U@x#GseLBpVsLp>NJp2;Xynjr`8XrF%#S5as4M#6+e(+ot@W#oj5S<Z<{^
znV0putrs@RdV2_%MmFBK4RNf|aS-qOg?agGH)*&hv}G0y&=0K?h$*V+UlVkZN3}1^
ztLLPgHw%8z_Er~Km7j_8*2qu<Fa6egKYU~t<r&Hl#FSpMalT@Tjd`TB5a~7>l_w0C
z3CfT~j9G_C-%F$Vf|M3+`n>Tceg9g@2r*_s7pcD!V4fk-7OTE7YOYuvQN%S9FpN&K
zzE-q{SZDhP>*=sMqKIo2xXH68qHaae%TNseG>@~NeUzET0QvY<hGK|o7Byb!_%x;<
zoBf#9^sd}q*TU;JMRrGsYYwnK!vQw@JH(~}Q!wV4WWxg{gych=1K=->$5<1)i8NdQ
O0000<MNUMnLSTXjaG*i}

diff --git a/app/src/main/res/drawable/marker_other_have_bag.png b/app/src/main/res/drawable/marker_other_have_bag.png
deleted file mode 100644
index 3f9d470cf16574bb41f588cf61386fd5af37b9f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 894
zcmV-^1A+XBP)<h;3K|Lk000e1NJLTq000jF000;W1^@s6B?YHx00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj8C`m*?R5(w4luJxgK@^5hTUuT%1*H#A7b-{~poD-_
zAsBQ)j1NfA7#3_aMo8S6xO3%7Hn?zM<PnJ)62yps1Pw-F2mui-0+mvrlmdm8w)ggR
z+k0<yW*iEk;FnB#&VS~dnKO5$64*obkz*xg=PH|z=j2u^RVqCf;=Fd7b!>8cw9Wi`
zc7RSJ#F7&d5)v<8uWv0ioWCoPNTgJb@dsg<GY!6d)72OZ23%Mp$ugAKc)O|pMDD3e
z*#94!8|yP|&swWO!Ju1)g)6o7PYa7nZjmSjSKS`FNmZ(}nHp{0v~jXqrpwAcU3a75
z1=?zC-i3;CP^YDVPOBlK(ohN}vxP<haI$s5@<m!^sBDr*rLi7S@8EQ~!R2;CgpYu6
z#srB91t=79Is@$nQF7LBM^<yKt|c{9nMrlX*6YB-FeD+wg+U>g0~f}>3h=TloduAX
zl%$fX)#*p6PdJpJ2Dirxtj`brKmf9IS}@I7AU!>e&iIE?snSaYK?qZyu-!Vt`bYt}
zJOOw?Alhyskw`#_kDmGjZRTMpE-Z)*rBVq+1$m&;#5yB5)>o%w$tfurIeGatSV&Dt
z20;*E7M-kP(+OK>`zgsuFl{m;T>yNp96ATg$nek;>G$!`_JH5-#DXYBVcEV$f*9Pu
z!jg^H_B98D!x3ULUa$S<#P~~@h<auj&q_hjnR-zaCDCY<Ou&f97DSQQ=ysCcQC#eK
z)!E?O+%S<Fw&_@(j*3wpJ%)?BFUwx={r=eh{(*7wTNn08GG=*c;VY^t96y;`eNX|k
z)y_`?eGjR-lZ?RyG+KSWPM=jsr5G;f#@y?U=e1}7o=On+^gi@<H~W38gSrH~-M*gg
zdpyqvsYHlN=0YLQ=fQzT)Fqgvr`}l?EyL7}5toelF)`M`GTv2e<5h=;1|O5a9`;Q}
zpNvNZI<alHEsw3Q+9ye15Bnx#W`7xb@v8XIQz?!Eleb*Xd3>@q>*5HN;@J0l)?BS?
zDX*xykN*_$jar;H4|R97-wcPjod=EBcV!>Ttg&9tN|@tV{Mi`BV-p0PqhSibUrCvF
Uc}*+s#{d8T07*qoM6N<$g7~VG`2YX_

diff --git a/app/src/main/res/drawable/marker_pile_bag.png b/app/src/main/res/drawable/marker_pile_bag.png
deleted file mode 100644
index dcde29474b27bf64ba8e201fc09b6eca186c8b5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3303
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

diff --git a/app/src/main/res/drawable/marker_pile_bg.png b/app/src/main/res/drawable/marker_pile_bg.png
deleted file mode 100644
index abba110c39392cd7d737ee021a504250de245863..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 802
zcmV+-1Ks?IP)<h;3K|Lk000e1NJLTq000jF000;W1^@s6B?YHx00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj7%t=H+R5(wSlS@n!K^VusncZ&bgBIG_mjnr-wl#9}
zg@9Z<7~{c%iNRnnA%vhtj2B~K)R=fRCIk)9_=pKXg5t?YqC5_0;z5wd#UO}+Kr638
zce~qNXO?M!0!DscCNuy4H(zI_GYjbmMW!QJ&-^buBLzQwv4G+o-!<)M&3Th?!g`WT
zNr6}o$bu~Pdfx-n8Cy9bFnbMRd-UCG#dx_INrb7^Cm}PkIN#>B3kS`IsQwr7pfnIJ
z8!6Ui)EP_-`+aZy{}fUTA>-bx245o`BVoV!fU`TdXZ2R^;u{b`d-QRa)&uv{21t-d
zq7foxqs7=-m0g{FMkjJWRpK&KC+Z*{?SLA59*iKcELo9YK9^OAGmcuzn3qB#F$q)f
zn=~s}NSMI|PL^FpIBY7ycsrlNbP5l+;VQmB+C{z84mOrq0eg5422m54PGLtjxWd&!
z9ajTU63VLcCefnmA|`)*Khs-6?vr}4*tYPR=}qw>H(6U{YMEH;d<){T`E2*l&Tq(p
z9n|!a6Tj!%z=ksQNt4<%R4TR52LrmMDBt75Q-#AJ{faWrIw~?Bd7hB>rfUHVwA0Z@
zlSw4e6ita7|8XqdvGjqXM!YZ9%K-<55>qMt0lLLxqmhI@j=8$YOJd8yORDu^irBT-
zi7>`OiMf<n>sV@>eHgtRzRBcDF-7WJ>=5>u3i*H#WL64!K<xi>`qwG4oz%Upd6pE;
z$-CTN^M{a&b1@4vRa3*Iqeb$k*hgmR=wH=p5)maFy%V{`q>k9U(3D=dDaeS7zOmgC
z{&-OHi-Ck8XbiE`8rH2$(Iib;dOr7*j^o{8mpmj5>WMTqET+U>&9~BCY@Tn@jV)n7
z27fdt@p(cXbJnrp%C>9UuIG#eCdflGct00>aWv*UMn-I8=@c8Enb!=mtSIzFDG5bY
gd6lQv#nKFbzkm$@<C{4AyZ`_I07*qoM6N<$f*spzwEzGB

diff --git a/app/src/main/res/drawable/marker_pile_centre_bg.png b/app/src/main/res/drawable/marker_pile_centre_bg.png
deleted file mode 100644
index 043039eeb22eb828eadd25f5717fbb5f62193319..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq000jF000;W1^@s6B?YHx00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj7&`Cr=R5(wSlS@ccQ5eU+`<OeAOs6s*lMAg>93wJF
zLIWpg(V~Q;jieAQN^R9b5L%SA3lhp8l$=bB9%O2ei#9nbWNI(1luU{;)5)%*<2>)<
zbkFg4eT<d<;BwFZf4=WL?)O~=R$xrupA&WHbg7WxaIi7)iO4_Wkw$xae6D(@zqhRg
z5JEH*^kl|pu~<)4-!$hG6$8UWEDC@iJnZTatBVWOnaK(4kRV2|ShiHOKNHe&a<Tpw
z^2FznsY{Ln>a5$%Vk73{wHs?m#PA6_Q>`V=20UgAJN9MAUhMACPO2aE+-?<8qBt@h
zoK~RrBdgtnNS)tTjvVHqk5^t6lJ{g$k8pMuf|_9&21Er4wgW_)BpC6qAghZjFuWkJ
zf<5mb)jHlVg8oSZ^tpLZK>-toAl<5eWCFe>%WY0dqFN``#6V%1427u**vve{Tj<0R
zv@#~JND2n2)`>H5a5dXZ9>2svKwiEp1_kHlSb6Njd#cxk^ljiB8|;75O7&l{8bQ1J
z^4){Ij~}tV=eKIrIZ>n@*fuDzRlD;7DH|E+9A{xjBrQQurpL$qTDy`cbMA>ETzFh-
zo<R_2CNVlc{kS>j7euP6id6;qp||Z%NhiqP2M4e#WaK%tAjT^(u=Jr_jQ<JbeQ>@a
z(A7|n^?Vy?gonF2@wCzIh^YGlf$qDFv-c{>sa#CPXbZUbZT3t<l0B1JI`YKGC$Z{S
zJ}8nzEm-^t6pyp4M453<Qc1wa_0*M}K_S17T7-yX<eL_~&6O9ZBm`fzwT6dW9aR1Y
z&LG5J|1xH43ZulvkZMTI+Dm7a5wSBtk;4AYJGb#r8hzO#eSPzq_$ydFStHoj(v07M
z7Z2|fV_h&To9OiTcw1UJb=F4I(eesg&5vKUrjTl@o0{EJs&$`Wj`%TGKQ_nniloT6
kM5>}HzzPODq_Y%&KO~nSw)LbO4*&oF07*qoM6N<$g0q@)p8x;=

diff --git a/app/src/main/res/drawable/marker_pile_have_bg.png b/app/src/main/res/drawable/marker_pile_have_bg.png
deleted file mode 100644
index f678b97fd8222e4e89b5ff183d812d845e602ebf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 832
zcmV-G1Hb%<P)<h;3K|Lk000e1NJLTq000jF000;W1^@s6B?YHx00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj7>PbXFR5(wSlx;{;VHC%YcRF=1zH2kHTDm}1)`U4o
zGe><e6hV7IK`DY>zXyKnLw)ay5lE;Qf>Bl$3Tl*A#5K*ikqvdt>C$b!rEbo=?%wr0
zchBz3Y1D6AIOl)P|31&%dG3vXZDcByCv=5HH<j6{VriT-ompp=?NgKV5KT9ljUz8m
zi$Bl_Aef_~#FDae7atza)7C~Hh#Uf0Can{FPg|R-J#M!XOMDYHUb=RxXaB)N1vvj3
ziwpA;j~?7FT=RJ5C@hp#oUi{EBPKZ|RaIG4+k#_JM&^P1vWg4!Teqs$7eKxy7t}e2
zAwDS%>~;sK1VA^)wolt=(dm-XyL&S-HALspXf^Qe;|H+Xr$K#01<|q?SX%fA9Ltdo
zw5ljlOewQedXft;3<HbK75)Md02PT=OHL%!0QfPf`1pi<Bo~lNWuVm^g?wEu#Kp)!
zCXtXz2$@{2pnN{xFOmyLV`JfLQ8APhodTBO0QHbc2!`44P%fwAE6M*0=j@D;GLM>G
zl6+SrXxp4W^k-p4O(V~!A^KB;*SoevG>|7qAwe384piWml9UMMF)Pfwgcev`U70lu
z(vAFVkL77=DywQ*_*o+*S}f+9f^2LsBtoau@8?>Z8p_Abqn&6F04~R@$?peFnU!6P
z+z~9x!qzJYGWvVFUey_f2AXlsn=w;X%X_>}^frafJ&5tk;N$Mjj@u*+nK3r2r9V}n
zP^axlR})EKaei*RwYj03W7$n20smrb<#qd$8y=6_MN%HT-H!IQ>zfR-MkJmv^Sal&
z^tQL_4oP|NIBnl8eIykKGh+;&>84fp@(hmgs{L<z?(v0f>}Y0vEHgYf(1hb3b{p-O
zu@CcwZR}{qd^3%-<8P12XlNr+7`vMB>^E7T*D`MICQ=xGj4H@U{h7MzD_5UKi(}$6
zTHWQ;G)0bO%-qd!oG>QLjw@5>Gl8Dl$Dc)(V?`oS6b?z50Pq{*RW#d7K7i@~0000<
KMNUMnLSTYqMR@iA

diff --git a/app/src/main/res/drawable/marker_poi_bag.png b/app/src/main/res/drawable/marker_poi_bag.png
deleted file mode 100644
index bfc05f9b55a2cb43eac8a428dbfd0d8aaef36469..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2854
zcmV+>3)%FEP)<h;3K|Lk000e1NJLTq001xm002n{1^@s6doQJq00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1pojF&`Cr=RA@uhn+bRnMHa_jRnL)35(tM$Ae@p7%DD)#
zD#)dHAfPLX$a*d7D!Ti5g6ry{e(Iur?0T`va;yllqH+jm5Cwx^5-<=52>~PtAqkL6
za*%6|?y9ZV6oHVLOwUZmxWDh4r0YMO>3UV~RlTaI5HN}Eok`E%Tt=@Q+=mYD*PZn5
z-i7pv41-9kh1eTiy#7oBR2Nt9f+Hu`!TotGJtLQ;)j6S7{&~=ZWI#+bbelHHa?jMO
zl^K`!BtsNR6hi!eCg;GN9^Ux<LAGsus<vwDK5diB11|Y?Km=vLrEw(jPg5+<ii+PA
zZX*sU2L&2aQpry&-J-s=Dp_6J=z<3MmLUQ%po0UVpSs=p(tXz{vu##lm$GRTSFq!+
zu2$zJrE6=Y<QKyRj2}vGeq)wxvGDDlQfd>pASs=#ef9(Q?CN@`l(J9!8lX_H%)P_%
z@}rY2&rspxQf_k!%UJ%y3*C1fJkIw^$t$fI;IKo)yN}pDx^cL2n~~r&n==i(diFy1
z^qtvktCU*cvqeSaBR`yD`(oS><)-$iJYu(!ut_78X$Ow6J%#1`n3S90wPH34*q1+T
z+cb8ta)XrGm3k+yn?Bz);lMGzM@mgl`MU{W5&8QA*7wE?QYK2N-H8Yzk;|U2trPQ3
zoRpeqVZhAs%7Zh;Dzn<lZG6$KGwu22L$>9VG_P~B80Z^I5|%t}TZg_UrC$`iV@N-o
z^u)-tPfE?LdHFu;yOH6fgDn2yAcDW%Wu4zK0y;_QyqioIN++$DWBU?sl9Ep%5@$ol
zD_#@kTcr{j%vA|hX%B*{<Qu89&c8N!UVHsB^*OxOD=Vr@H@;|3y&{2Lh2_>zB6>mW
zluW2SxB#3b+oT!_1RR(C4#Im(hO$kAfouL#q3SwbIqGR=LQOqX=>}YxNJp=qXWMC{
z^`nN&gYaI{pgd`~nD;fQh6b@jK-_IVLiOIc(0F{cR9ok{58aQh+@>wkW8m&_IO_PX
zJQCh>s(8pJrd1x{YCSklZV{h7MJoOgY5cwTo7$}qHgT9TRagC>IC_Gm<7MD1O_qvz
zI7_#KEoQXgxEj)zjEL<-y3-+j>4@k^=q&YCv343HB2ERhI!7wz;i=3Nt=R>X@OY`T
zjzuAstNPP1bYy=z%BcHL@!>dPV3(T>bC&9EsW`exrFBG&$*=p-krbDLQu7O;ig<=o
zmM#SCZ!xJ0Q1j9@Ub1q|JmM$w`kpT??M4!5?^xPTmi?kNmWf`75y8-WqK+Im2fAGM
zg)E(?^Vm-zYUqoyBoRIyd+T8ci@!w*XHgtIMCGmG86{HjPka~Bi$+Hn^MAzsQ@ZFn
z3pje;Ar*XP2XOS60rpF-221o{sR|$MkO=nJvEtroKy2q95hlia#SssVga^bQTcmn+
zF3=i^L8~j2nt!51)<DwV2`dU@nTW03VaVUWUA_x6SB0qfC=u6npq|MEd)!!Xm41i*
zAg;%OyJELqS!(YJuJZ4J+B$(<j5G~}YeWy+B;x6`9=w*Q1h7UAfXdY0gR^*}e3F04
zt9c38{kFZJM_1ZMYKE|h)^_x}U%0FrJXP7yQ1FR9gQ8p5<Hm?Ph^TO?sLUqe(sl^%
zGaYQ5hXM1{iSd53Fg``NVjMX7&eSXK=sN?d_dEp+`5&HrfI*7N*)g(pzWu=Ey{O?p
zM#ADJLG;LXp>#w4&?hwEMsd>$peFrsXe?SUMPp<Yunc;tk{8ReVF(7XXjyFO_N2Ii
zAE$Yz_z_wDzvD<T%c7b2EFE{pq!u#77A=O<%@B8cLDLI|&8VR-$vZAWxS;doSKv8w
zR0_txI`7M4KhX4}EJbBpm3qk7W3B~T*O5@O|9Pm%ct(FUieQeq{4sgQ#c-(J^^izU
z4$87I8r{5MZ!SxtWmWuCb^*_jdg$OxDrVKj!gb=cMt`}*h$N<Qc|%K-h=2w`ogG>1
z>v|{D>YutkRb8d4?En#TL+sQnk>w7MihpqXaczpa60dawHl%5*aTg4)e{P8AF+wfk
zWqf&hyo~21XR^(Bts8)ws2^|Fmg2QxL|TnAt{I316+ev)$r!v#zEa=xXn@(@`4n=|
zm!1VR^~QRE<K%_D-ilwh6~{{1(NA`0AIM^Jv;TOr<;fRjTK|c;wv@c0MD&K3$r<|E
z00Z_yaD7X|x`I|;q&L@D%^|cHk*FQl%NIf{;rIi}HVzc)jMl$#Vw|)47r1ZPp2fCE
zsd+^$3RpM1U{Aq?f|PuML5IVoSFm?3PBFY{q6bAj<tp8wXQKZ2Y^S>XsU@CSvZ&Ld
zr4!@HfK4yicSnYkC@K9S$Unu7On%XIRc#~GNJ*!~^5=9dRFqWl6E_W4ZuRF%KNqzP
zyyl(-?n$RkgYe7dv@ifUT*R}&?IdEvugEn<*UN2%N9FE^7rLkKIm*Rs*b=V>AgMVl
zxl0Ff$<V%JM0**bYFwSW%=3q&bhb`PE%0f87(cj}EWSdY8$FO-PwCG)X5wu7%E#)Q
zRms{CDS5@G0p}1I-|m7ko_oU;bSi$4E#)=^C#!#NR{!zN2K5yw`NU9#emubs;=19+
z;q+Ev#JQDtTfsN)(bhftfoC>)fz*6rxJ7eM@<X@+!k%bLcgiVbnX}$<-{w}09X$xh
zB@P$!ET_nnuN_1uwnbo9)$-Fb-*DepQ3It?@=L%zosr9S;Wo^`-ej1WMqrxo*dq5m
zdvkf3lnfEDE1+LKzryopZ(n%^3kL0qt=jur_OcC9GEC4d*e8}GB)x1;?-)UvzOM?F
z+>`9kq<O9@8{L7OR6&9s7I6*n(-~eSf?A{;!Ml=}tUM3D<GHi2oaaj^AVL~V)_kw6
z_%@Rz$zo7^^sTlSHx^_uU_uVU9$iWA<Tva&4v{-a$uPK~F#a#jfp{EEN&yqJ3!Ote
zyhb<>xn=+zABZbq;Lcm=d2D|^|3OMYVakNGbc_17w^X+^4i&M?bt&3MvKTZW_W+`b
z1$Kjz*IhqMnS#9`WuIW8HfNdV!DFR7u<bZ6n3fW(6|GrR!MvX7xfpbt?IP2a#gH(~
z0L)#MY*yctMW3MWFWl&vZzNGOf@uaIq8C<H*YVS`=#@ONwoN`@PU|D48c^?qy7j5r
ze`V1tE4QidYYa@=Og7a3Wc7FIGRC}b+2PT#&(m5rFi=c4K&0H+hl=<CS!~8P`?QTB
z1*wunQ!w2CBq?26BQKl4q4RS;?iCDeV!*cjT9T-5GdIHIFC~YWeoCZG3^;m{=ag2#
zDOuFnk)?fYbeR|kZDN2JWwibItXYmDhE9Dy-)!2%0OZFLtm#aSN9CThLu|V&nu;m8
z(1mpCOnQtOKqrhEpiD^YK?kCS>2iJvKcY}ja1_EG(r-3_kk<nUZp;7n8s+YLud_UY
zC#mo-l6<QfI1*LW!D)<#Pj_m|ar-jVlp<sUaEIbQPueyN3UHSKbE2Ku+Bc8B=e`?H
zA4)l3LUy6oXW15y8LR}nPlRcApIDlJBh#+K>^mt3Ovpi;lB0c#ttpEE;r4LX&TMAv
zw5tz7?g2c<TqQD4{8}o^M#7CQX!1l*Ke5<ze<-bwm=eTDgdHNs45kyW?5~W*|8k1!
zMB>A25Jm|oxMIWq89VV4FFaDrva!+`d2BZec{Bp}A9yNeTd|7&VgLXD07*qoM6N<$
Ef&spT+W-In

diff --git a/app/src/main/res/drawable/marker_poi_bags.png b/app/src/main/res/drawable/marker_poi_bags.png
index 879770e0bb11edfbbb2260bb6264a91989d57b84..73e44157dafc370e2dbedbd43bc52bc18f73ef79 100644
GIT binary patch
literal 2472
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

literal 2801
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
D*=|Hq

diff --git a/app/src/main/res/drawable/marker_poi_bg.png b/app/src/main/res/drawable/marker_poi_bg.png
deleted file mode 100644
index 7502c02fe402052648e0da81256a39254e26a470..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 844
zcmV-S1GD^zP)<h;3K|Lk000e1NJLTq000jF000;W1^@s6B?YHx00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj7_DMuRR5(wSlwC+vK@`XTb3b-hQ%g59OVjY9GBWZZ
zA%j!`eNyTvrHG&&BzloTA;^cK4<dpHf*vfYhZ4*RGPHuMKr@UoGfhd;lv*v;)YaX)
zccz)U)3$CF_TvtB&i~9gcg~%AE<qTZY-CGWv{I34SMrytNSvf_zwxoQ`YE&a;S6hF
z0KWnRgChtcYvR;PrIE@W!jbYE+GpvL%5i_$IK>xXTZ<e#uy&c&oMTt=g#9l*8LY4T
ztFiSPg-a2_u~_xuLIMRTI>|Wg)UJs+$+nTrw-U6r(5(_j1Y$~eK~G78?_)0}@700%
zywV$Bzso2lC*#!Gol)vOsX=wdBl%`C?3r0o0cN{iW4Npc^oLt2z=LU8r{p@60%=>s
zSD%0_V;#m$9mPOlHpb5%hkgA<EUi2yR|LqhlRVOutQ#63n$(ciJ_uvv6NYwdlM0a9
z)B$3%VW41xQ~;APQ}Hp(O51|@4XfrL{8bRUgX?}N1n@9Ssf7_r$#RV(Nex<JGNOt~
zpv5oenJAnGtFS1q0PY)?G1J;2R{@<~){X-)N>$G)8~ZhS*T%A`=Z{$sO4;P&M%J4V
z9b6;E?kMFDiBS;SoT&FNQAwOkYHc-gOFs0}bolyvF!SP>bOdmjY_xdP$W*<&W|xW4
z?Ga>0=vf=XgYdq61^>v9R02@Gm&4=!@;*P_sY2*ASSSD5>1I304^0q`sN$U4tZwkI
ztHQQ|1uwnqDFb2Q=N`&k550cYO^-<Pcd&pbXi3+}dNHIFWYAzAD#rXJ{J;z;{cg!$
zELITLn5cI<RgxejYrA`0{=#-Idm<$ZtE)npp!j}a!mN>|#iJQ^Cp_@4=zy(dh5lKb
z=lf)xX6YnHy5{i5lLfpe-|cC7Ma;!7sM}z#EJqmg1`C=zv|ilrd+1F|_#b#y<#m!i
zy;{Q>DJ=~Cy;rxc)W<}<9ZC9+GfwrI_|Hjqka@Swn_Dvh(Sy9NVDcBJGX_2l1^5Yq
W;V(bt?&IhH0000<MNUMnLSTXj(TnZ?

diff --git a/app/src/main/res/drawable/marker_poi_have_bag.png b/app/src/main/res/drawable/marker_poi_have_bag.png
deleted file mode 100644
index 530fa5dcd7a500bdd45f665c33cf39e197a79e7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2574
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

diff --git a/app/src/main/res/drawable/marker_poi_have_bg.png b/app/src/main/res/drawable/marker_poi_have_bg.png
deleted file mode 100644
index cd90eb3030c28823f59ff07d0e547529370d88fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 844
zcmV-S1GD^zP)<h;3K|Lk000e1NJLTq000jF000;W1^@s6B?YHx00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj7_DMuRR5(wKl;2C5VHC%YzL{jxgi^vriY=)nWs4C+
zT_m_hjBWzi#Tdw7m+LPW?4pa^>~4d>Zd_v^L`()EN)R-pWf07PY2_+c+USRc8UD<j
z^YrYUOE>m`7oKyT^L^gu{CHmpT%o<a-DWnMAL(?up@xPAO)i&9?eFgg!{PAE=H})H
z3@Kkm0*GR{T&^A)8*_GabWEUGbttj7xA)28@!Zd3G6}L-P<?&9(r&jeYBU-P+5h77
z^z@s{<r+FaKmQ>m$LQ$j%l{D)O-)Tkyy06~3tFxAmep!~B|+FOg1N%T$OsG!3_x>p
zGbEEqxVX6By8vpn`bHv=2nd6NgHKyqTW@neoeWb`Q(&=JsCdxb-3>iGJ+QjE3dLfP
zM`6AaiBuRK9)7M+D74%MlarHxMT5DyIhdWDg={tp{r&wE4D0LbJc`xnnpCM&UgtKH
z%VjW`Ot8JZ4S_&_iUWSXAC8WWptG}+M_tm`*r=11N~Juv8HGZD<@~Dzf*?>EnZFWD
zAuAY-#(OH2%0Lbh;7y>nw-;JkT0ka~!T9(%w6(Rt!omW?<8dY=u!x@p8V-ZOaF_dF
zYikQ|x}dMGPdsF0Wd*!mFORqc3;05UiK`qA$3|t*2&y#pp0x=lOH6|}J3C7_olcX0
zIp<DJPBySmb_@_Bs8}RSr_+B3v8ZLA&-d`~@bIfZj#MfY&FAxJy<UH(@_<?dgTd)g
zDD;}vOiWM#aEgj}T`PB05s5_JW8t1~^S79wuLj4_jL%K(5;;CTj=0_K34DRrTJ~X7
zGCx267(clrHyJ1>;jlQcw;AqYREg>1Us_sv#!bfB+S)rxi<=@<VgmmfPHG3O>8;Dl
z%hPP*3N^(vviP<cTJP-a_^@p;wsD1;Vj>oceWad7qfr-kRq<Ex!NI{7ymDc8cXyGy
zs;D^-Hk<8DS6A1Ay1F_!rclIr$N!$kPKWUjM$I?lNPeewVQX^qqeDB68I<@o2jC}~
Ws8QEJ_{+Tj0000<MNUMnLSTaG#fqT-

diff --git a/app/src/main/res/drawable/marker_road_bag.png b/app/src/main/res/drawable/marker_road_bag.png
index ed92c3f111bd2c2117ab0307f14f1166406831a2..c5bff52f700584f1002d15483dd04f2439c1aa59 100644
GIT binary patch
literal 2529
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

literal 4252
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

diff --git a/app/src/main/res/drawable/marker_road_have_bag.png b/app/src/main/res/drawable/marker_road_have_bag.png
deleted file mode 100644
index cab9fc89440ebce629b56d2716aef038b9efe62c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4200
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

diff --git a/app/src/main/res/drawable/marker_road_have_bg.png b/app/src/main/res/drawable/marker_road_have_bg.png
deleted file mode 100644
index fe556d9c8c970d0a51482075daa9069743a7828f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1037
zcmV+o1oHcdP)<h;3K|Lk000e1NJLTq000jF000;W1^@s6B?YHx00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj8w@E}nR5(v{R9SBuRTTba#!H;kF3swsiR~;XP+CxE
z8&J!ZMxr8Bn@VogMl2FS2rBW4#2?@V@dDxniI$40K%kJSqES<kDpDZes&!*Kt`jGr
zOE$-LoOmVUWrlNaCRWpgPdanw-g~}#&Uen85%3sl>vlfB|Ahl*8k<@=wwWzfSzcY4
zefYrTzU4X_oCx%5ZX89jPNy>-?mG6x-u*AWFG-R}fFNqyDxj#UIyn&-_@(#a+nG!{
z%9i=AM8uxA-o4t?{A8!3lR#uJvM7i!o6E4>Y{uL|2)SGyq0qel?AKqt@^2;+lNkB%
z8%Mv~wdc80j7S-9vbDMj&f`bWzON1GOa{AmwIUP_L#H=ZS5#KEj(JCWrRo~%vt7rW
z-{>SsSdXfw1KvF4gvnHbx%m)Z8yX&gEN4l9it>u8*8BfV4T)`g+dmWpQYQ#lx6;y5
zY`2*4_f0p-cRYcq>3bl_Bt_s-m~-2{_V+}aqp5=n*B)$;S7l_gIkYr6aCbb2mkzX}
z)MQ$7Vh&_ByW^l}wpi+^n7pFw!G?mO@Mv~hJ$BYwDSZ=8pF9rpwleNVNuaFEY!&nQ
zyv$N6n!-i}D~SY`5RNXvJ?i5!4!wGiTBdNnY*tQ-(eR?5O{kAhC?d0xk`nBB<|&p6
zj0OV|bP$8X-k=3g5L%e`iq!baoXm+TTACerr{@GL)Z4{y1aTsEzV<RFugWqC`2v>}
z@cS-_-qG9V(&<#B)>?zpC%WP6K7wQ_g)3JFaPGp7@QejuFd8`7OYen30r8dPS>k;s
z(L_!r;xjdM4NjjwAPkSV;J)L<!eWFR71-+QK$jKED{=H+8-$$A7A{}<p(h%N1o#b$
zM#5vNQph#f8xN5LfmNJqBa1G@;12}h@!h5CnNx3E@Bi56xpRT>IGJH~=D{!(B42NF
zbkI~-uS0R9dU!pz&kqd_e6q%Pgv`JWD6gn|dPjNHZq}|x4~Q*AC;EQ6*iG}C<_=LC
zi}?N8Z)Z};M2P9lQ*pTE3+na$D<4qW8O@DjLu3ZJG^=z0lJ>^tqieTG#q{KO-!0e3
zXPQe9n<6v#eV%XAspOoNwtDlgKR(sAHegG#LX{5&#?Bk`dc>k(S9o#3t!-_<mSl#h
z$?;$Hdc8Uo4D@PCoAAHn<=E0BwJt{;_)}Zj1pXC2j?UM+KBphyN0Ov7Qp*bW?@bT(
z{rvq&S(ewn5Di;KrdG`-6NwqBdLo@lg_803L)HatTLbVP#h3clIRY+)00000NkvXX
Hu0mjfIzsbG

diff --git a/app/src/main/res/drawable/poi_video_bag.png b/app/src/main/res/drawable/poi_video_bag.png
index bfc05f9b55a2cb43eac8a428dbfd0d8aaef36469..027f4894207e29660e828aac9335655b132786a2 100644
GIT binary patch
literal 2854
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
Ef{QO`<^TWy

literal 2854
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
Ef&spT+W-In

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 645066f..b10b825 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -118,7 +118,7 @@
         app:layout_constraintTop_toBottomOf="@id/et_login_paw" />
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/tv_statement"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="2dp"
diff --git a/app/src/main/res/layout/activity_picture.xml b/app/src/main/res/layout/activity_picture.xml
index 4f8f697..95752ac 100644
--- a/app/src/main/res/layout/activity_picture.xml
+++ b/app/src/main/res/layout/activity_picture.xml
@@ -86,6 +86,7 @@
         app:layout_constraintTop_toTopOf="@+id/btn_switch"
         android:background="@color/whiteAlpha50"
         android:padding="@dimen/default_widget_padding"
+        android:textColor="@color/colorRead"
         android:format="00:00:00"
         android:layout_marginTop="@dimen/default_widget_padding"></TextView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_statement.xml b/app/src/main/res/layout/activity_statement.xml
new file mode 100644
index 0000000..90bf4fd
--- /dev/null
+++ b/app/src/main/res/layout/activity_statement.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.StatementActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml
index 8bba08f..26b9e6f 100644
--- a/app/src/main/res/layout/activity_web.xml
+++ b/app/src/main/res/layout/activity_web.xml
@@ -23,7 +23,7 @@
             android:id="@+id/tv_title"
             style="@style/text_style_toolbar_title"
             android:layout_width="wrap_content"
-            android:text="webView"
+            android:text="详情页面"
             android:layout_toRightOf="@id/iv_icon"
             android:textColor="#fff" />
     </RelativeLayout>
diff --git a/app/src/main/res/layout/has_sumit_item.xml b/app/src/main/res/layout/has_sumit_item.xml
index 5069660..b60c9e7 100644
--- a/app/src/main/res/layout/has_sumit_item.xml
+++ b/app/src/main/res/layout/has_sumit_item.xml
@@ -45,7 +45,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="10dp"
-        android:text="2222"
         app:layout_constraintRight_toLeftOf="@+id/tv_auditStatus"
         app:layout_constraintTop_toTopOf="@+id/tv_createTime" />
 
diff --git a/app/src/main/res/layout/icon.xml b/app/src/main/res/layout/icon.xml
index 35c1a5e..925379d 100644
--- a/app/src/main/res/layout/icon.xml
+++ b/app/src/main/res/layout/icon.xml
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:background="@drawable/marker_poi_bg"
+        android:background="@drawable/marker_poi_bags"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/mine_fragment.xml b/app/src/main/res/layout/mine_fragment.xml
index 1df7beb..ce68e56 100644
--- a/app/src/main/res/layout/mine_fragment.xml
+++ b/app/src/main/res/layout/mine_fragment.xml
@@ -151,7 +151,6 @@
                 style="@style/main_text_style"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-
                 android:text="我的等级" />
 
             <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0fec131..58b24d9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">navinfo</string>
+    <string name="app_name">地图寻宝</string>
     <string name="title_activity_home">HomeActivity</string>
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>