Merge branch 'branche_zsf' into dev_ad

app/src/main/java/com/mints/street/main/MainActivity.kt

@@ -42,21 +42,21 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
         binding.mainBottom.init {
             when (it) {
                 R.id.menu_home -> binding.mainViewpager.setCurrentItem(0, false)
-//                R.id.menu_square -> binding.mainViewpager.setCurrentItem(1, false)
+                R.id.menu_square -> binding.mainViewpager.setCurrentItem(1, false)
                 R.id.menu_my -> {
                     binding.mainViewpager.setCurrentItem(2, false)
-                    // stopAnim()
+//                     stopAnim()
                 }
             }
         }
         //加载本地GIF动图
-//        ImageLoader.ImageBuilder.with(this)
-//                .setDrawable(R.mipmap.ic_earth_map)
-//                .setTargetView(binding.ivTakephoto).start()
+        ImageLoader.ImageBuilder.with(this)
+                .setDrawable(R.mipmap.ic_earth_map)
+                .setTargetView(binding.ivTakephoto).start()
 
         binding.mainBottom.interceptLongClick(
                 R.id.menu_home,
-//                R.id.menu_square,
+                R.id.menu_square,
                 R.id.menu_my
         )
 
@@ -134,10 +134,10 @@ private fun ViewPager2.initMain(activity: FragmentActivity): ViewPager2 {
                     //首页
                     HomeFragment()
                 }
-//                1 -> {
-//                    //广场
-//                    VRFragment()
-//                }
+                1 -> {
+                    //广场
+                    VRFragment()
+                }
                 2 -> {
                     //个人中心
                     MyFragment()

app/src/main/java/com/mints/street/main/my/MyFragment.kt

@@ -70,7 +70,7 @@ class MyFragment : BaseFragment<FragmentMyBinding, MyViewModel>(), OnRefreshList
         super.initData()
         srl_my.setOnRefreshListener(this)
         //隐藏立即领取
-        bt_try.visibility = View.GONE
+//        bt_try.visibility = View.GONE
         initView()
         initListener()
     }

app/src/main/java/com/mints/street/main/my/PermissionsActivity.kt

@@ -11,6 +11,7 @@ import com.mints.street.R
 import com.mints.street.common.Constant
 import com.mints.street.databinding.ActivityPermissionsBinding
 import com.mints.street.main.MainActivity
+import com.mints.street.webview.MintsWebViewActivity
 import com.tbruyelle.rxpermissions2.RxPermissions
 import com.tencent.mmkv.MMKV
 import kotlinx.android.synthetic.main.activity_permissions.*
@@ -34,6 +35,8 @@ class PermissionsActivity  : BaseActivity<ActivityPermissionsBinding, Permission
     private fun initListener() {
         btnPermissionsDont.setOnClickListener(this)
         btnPermissionsNext.setOnClickListener(this)
+        tv_private.setOnClickListener(this)
+        tv_regist.setOnClickListener(this)
     }
 
     private fun initView() {
@@ -86,6 +89,12 @@ class PermissionsActivity  : BaseActivity<ActivityPermissionsBinding, Permission
 
                 MMKV.mmkvWithID(Constant.FIRST_OPEN_PERMISSIONS).encode(Constant.FIRST_OPEN_PERMISSIONS, true)
             }
+            R.id.tv_regist->{
+                MintsWebViewActivity.startWebView(name = "用户协议",url = "http://test.mints-id.com/map-api/map/register.html")
+            }
+            R.id.tv_private->{
+                MintsWebViewActivity.startWebView(name = "隐私协议",url = "http://test.mints-id.com/map-api/map/privacy.html")
+            }
         }
     }
 }
\ No newline at end of file

app/src/main/res/anim/dialog_bottom_in.xml

-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="300"
-        android:fromYDelta="100%p"
-        android:toYDelta="0" />
-    <alpha
-        android:duration="500"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0" />
-</set>

app/src/main/res/anim/dialog_bottom_out.xml

-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="750"
-        android:fromYDelta="0"
-        android:toYDelta="100%p" />
-    <alpha
-        android:duration="300"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
-</set>
\ No newline at end of file

app/src/main/res/anim/fade_in.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 [1076559197@qq.com | tchen0707@gmail.com]
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License”);
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<alpha
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromAlpha="0.0"
-    android:toAlpha="1.0" />
\ No newline at end of file

app/src/main/res/anim/fade_out.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 [1076559197@qq.com | tchen0707@gmail.com]
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License”);
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<alpha
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromAlpha="1.0"
-    android:toAlpha="0.0" />
\ No newline at end of file

app/src/main/res/anim/in_from_left.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--
-author:Remex Huang
-website:feelyou.info
--->
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromXDelta="-100%p"
-    android:fromYDelta="0"
-    android:toXDelta="0"
-    android:toYDelta="0" >
-
-</translate>
\ No newline at end of file

app/src/main/res/anim/in_from_right.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--
-author:Remex Huang
-website:feelyou.info
--->
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromXDelta="100%p"
-    android:fromYDelta="0"
-    android:toXDelta="0"
-    android:toYDelta="0" >
-
-</translate>
\ No newline at end of file

app/src/main/res/anim/left_in.xml

-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2015 [1076559197@qq.com | tchen0707@gmail.com]
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License”);
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromXDelta="-100%p"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-    android:toXDelta="0" />

app/src/main/res/anim/left_out.xml

-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2015 [1076559197@qq.com | tchen0707@gmail.com]
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License”);
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromXDelta="0"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-    android:toXDelta="100%p" />
\ No newline at end of file

app/src/main/res/anim/out_from_left.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--
-author:Remex Huang
-website:feelyou.info
--->
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromXDelta="0"
-    android:fromYDelta="0"
-    android:toXDelta="-100%p"
-    android:toYDelta="0" >
-
-</translate>
\ No newline at end of file

app/src/main/res/anim/out_from_right.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--
-author:Remex Huang
-website:feelyou.info
--->
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromXDelta="0"
-    android:fromYDelta="0"
-    android:toXDelta="100%p"
-    android:toYDelta="0" >
-
-</translate>
\ No newline at end of file

app/src/main/res/anim/pophidden.xml

-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="800"
-        android:fromYDelta="0"
-        android:toYDelta="50%p" />
-    <alpha
-        android:duration="1000"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
-</set>
\ No newline at end of file

app/src/main/res/anim/popshow_anim.xml

-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="800"
-        android:fromYDelta="100%p"
-        android:toYDelta="0" />
-
-    <alpha
-        android:duration="500"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0" />
-</set>
\ No newline at end of file

app/src/main/res/anim/push_bottom_in.xml

-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="200"
-        android:fromYDelta="100%p"
-        android:toYDelta="0" />
-    <alpha
-        android:duration="200"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0" />
-</set>
\ No newline at end of file

app/src/main/res/anim/push_bottom_out.xml

-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="200"
-        android:fromYDelta="0"
-        android:toYDelta="50%p" />
-    <alpha
-        android:duration="200"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
-</set>
\ No newline at end of file

app/src/main/res/anim/right_in.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 [1076559197@qq.com | tchen0707@gmail.com]
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License”);
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<translate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-    android:fromXDelta="100%p"
-    android:toXDelta="0"/>

app/src/main/res/anim/right_out.xml

-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2015 [1076559197@qq.com | tchen0707@gmail.com]
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License”);
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromXDelta="0"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-    android:toXDelta="-100%p" />
\ No newline at end of file

app/src/main/res/anim/scale_in.xml

-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2015 [1076559197@qq.com | tchen0707@gmail.com]
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License”);
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-
-<scale xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fillAfter="false"
-    android:fromXScale="0.0"
-    android:fromYScale="0.0"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:toXScale="1"
-    android:toYScale="1" />
\ No newline at end of file

app/src/main/res/anim/scale_out.xml

-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2015 [1076559197@qq.com | tchen0707@gmail.com]
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License”);
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromAlpha="1.0"
-    android:toAlpha="0" />
\ No newline at end of file

app/src/main/res/anim/top_in.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 [1076559197@qq.com | tchen0707@gmail.com]
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License”);
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<translate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromYDelta="-100%p"
-    android:toYDelta="0"/>
\ No newline at end of file

app/src/main/res/anim/top_out.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 [1076559197@qq.com | tchen0707@gmail.com]
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License”);
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<translate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromYDelta="0"
-    android:toYDelta="-100%p"/>

app/src/main/res/animator/appbar_elevation.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <!--折叠状态下的阴影-->
-    <item app:state_collapsed="true">
-        <objectAnimator
-            android:propertyName="elevation"
-            android:valueTo="1.5dp"
-            android:valueType="floatType" />
-    </item>
-    <!--展开状态下的阴影-->
-    <item app:state_collapsed="false">
-        <objectAnimator
-            android:propertyName="elevation"
-            android:valueTo="1.5dp"
-            android:valueType="floatType" />
-    </item>
-</selector>
\ No newline at end of file

app/src/main/res/drawable-v24/ic_launcher_foreground.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>
\ No newline at end of file

app/src/main/res/drawable/btn_friends_selectored.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/shape_btn_friends_enabled" android:state_enabled="true" />
-    <item android:drawable="@drawable/shape_btn_friends_unenabled" android:state_enabled="false" />
-</selector>
\ No newline at end of file

app/src/main/res/drawable/btn_friends_text_color_selectored.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/color_E72C2B" android:state_enabled="true" />
-    <item android:color="@android:color/white" android:state_enabled="false" />
-</selector>
\ No newline at end of file

app/src/main/res/drawable/btn_payment_selectored.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/shape_bg_payment" android:state_enabled="true"/>
-    <item android:drawable="@drawable/shape_bg_payment_down" android:state_enabled="false"/>
-</selector>
\ No newline at end of file

app/src/main/res/drawable/ic_launcher_background.xml

-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-</vector>

app/src/main/res/drawable/search_map_radio_check.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/shape_gold_card" android:state_checked="true"/>
-    <item android:drawable="@drawable/shape_gold" android:state_checked="false"/>
-</selector>
\ No newline at end of file

app/src/main/res/drawable/search_map_radio_text_check.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="false" android:drawable="@color/blue" />
-    <item android:state_checked="true" android:drawable="@color/black" />
-</selector>
\ No newline at end of file

app/src/main/res/drawable/shape_btn_friends_enabled.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <solid android:color="@color/color_FFC7C7" />
-
-    <corners android:radius="100dp" />
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/shape_tab_friends.xml

-<?xml version="1.0" encoding="utf-8"?><!-- 中心背景 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <!-- 实心 -->
-    <solid android:color="#ffffff" />
-    <corners
-        android:topLeftRadius="20dp"
-        android:topRightRadius="20dp" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/ufo_loading.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:oneshot="false">
-<!--    <item android:duration="100">-->
-<!--        <clip-->
-<!--            android:clipOrientation="horizontal"-->
-<!--            android:drawable="@mipmap/loading_u0"-->
-<!--            android:gravity="left" />-->
-<!--    </item>-->
-
-    <item android:duration="100">
-        <clip
-            android:clipOrientation="horizontal"
-            android:drawable="@mipmap/loading_u1"
-            android:gravity="left" />
-    </item>
-
-    <item android:duration="100">
-        <clip
-            android:clipOrientation="horizontal"
-            android:drawable="@mipmap/loading_u2"
-            android:gravity="left" />
-    </item>
-
-    <item android:duration="100">
-        <clip
-            android:clipOrientation="horizontal"
-            android:drawable="@mipmap/loading_u3"
-            android:gravity="left" />
-    </item>
-
-    <item android:duration="100">
-        <clip
-            android:clipOrientation="horizontal"
-            android:drawable="@mipmap/loading_u4"
-            android:gravity="left" />
-    </item>
-
-    <item android:duration="100">
-        <clip
-            android:clipOrientation="horizontal"
-            android:drawable="@mipmap/loading_u5"
-            android:gravity="left" />
-    </item>
-
-    <item android:duration="100">
-        <clip
-            android:clipOrientation="horizontal"
-            android:drawable="@mipmap/loading_u6"
-            android:gravity="left" />
-    </item>
-</animation-list>
\ No newline at end of file

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

@@ -36,11 +36,9 @@
         </FrameLayout>
 
         <FrameLayout
-            android:visibility="gone"
             android:id="@+id/flTakephoto"
             android:layout_width="68dp"
             android:layout_height="68dp"
-            android:layout_marginBottom="20dp"
             android:background="@mipmap/bg_tab_takephone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"

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

@@ -232,6 +232,7 @@
                 android:textSize="12sp" />
 
             <TextView
+                android:id="@+id/tv_regist"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="《注册协议》"
@@ -239,6 +240,7 @@
                 android:textSize="12sp" />
 
             <TextView
+                android:id="@+id/tv_private"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="《隐私协议》"

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

-<?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.AppCompatTextView
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:textSize="15sp"
-    android:singleLine="true"
-    android:gravity="center_horizontal"
-    android:textColor="@color/main_color">
-
-</androidx.appcompat.widget.AppCompatTextView>
\ No newline at end of file

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

 <?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"
-    android:id="@+id/include_header"
     android:layout_width="match_parent"
     android:layout_height="70dp"
     android:paddingTop="25dp">
@@ -17,7 +16,6 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/tv_left_subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:lines="1"
@@ -46,7 +44,6 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
-        android:id="@+id/iv_right_icon2"
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:layout_marginEnd="10dp"
@@ -66,7 +63,6 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/tv_right_subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="10dp"

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

-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/iv_empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:src="@mipmap/ic_record_empty" />
-
-</FrameLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/recy_friends"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:overScrollMode="never"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="50dp"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="10dp">
-
-    <ImageView
-        android:id="@+id/item_invite_iv_ranking"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginTop="3dp"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/item_invited_tv_num"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:gravity="center"
-        android:textColor="@color/color_333"
-        android:textSize="16dp"
-        android:visibility="gone" />
-
-    <ImageView
-        android:id="@+id/item_invited_iv_avatar"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginStart="10dp" />
-
-    <TextView
-        android:id="@+id/item_invited_tv_name"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:layout_weight="1"
-        android:textColor="@color/color_333"
-        android:textSize="16sp" />
-
-    <TextView
-        android:id="@+id/item_invited_tv_coin"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/color_FB560C"
-        android:textSize="22sp" />
-
-    <TextView
-        android:id="@+id/item_invited_tv_str"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:textColor="@color/color_FB560C"
-        android:textSize="14sp" />
-
-</LinearLayout>
\ No newline at end of file

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

@@ -46,7 +46,6 @@
             tools:ignore="MissingConstraints" />
 
         <TextView
-            android:id="@+id/textView6"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"