Merge branch 'dev_1.0.0' of http://39.97.65.143:81/android/android_street into fry_dev

 Conflicts:
	app/src/main/res/mipmap-xhdpi/icon_backvip5.png
	app/src/main/res/mipmap-xhdpi/icon_card.webp
	app/src/main/res/mipmap-xhdpi/icon_card1.webp
	app/src/main/res/mipmap-xhdpi/icon_card2.webp
	app/src/main/res/mipmap-xhdpi/icon_card3.webp
	app/src/main/res/mipmap-xhdpi/icon_card4.webp
	app/src/main/res/mipmap-xhdpi/icon_card5.webp
	app/src/main/res/mipmap-xhdpi/icon_card6.webp
	app/src/main/res/mipmap-xhdpi/icon_card7.webp
	app/src/main/res/mipmap-xhdpi/icon_privilege6.png

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

@@ -100,8 +100,22 @@ class MoresettingsActivity : BaseActivity<ActivityMoresettingsBinding, Moresetti
 
         if (userManager.userIsLogin()) {
             btn_switch.visibility = View.VISIBLE
+            item_invitedCode.visibility = View.VISIBLE
+            item_invitedCode_line.visibility = View.VISIBLE
+
+            item_invitedCode.findViewById<TextView>(R.id.tv_title).text = "用户ID"
+            val invitedCode = resources.getDrawable(R.mipmap.icon_settings_invite)
+            invitedCode.setBounds(0, 0, 56, 56)
+            item_invitedCode.findViewById<TextView>(R.id.tv_title)
+                    .setCompoundDrawables(invitedCode, null, null, null)
+            item_invitedCode.findViewById<TextView>(R.id.tv_right).visibility = View.VISIBLE
+            item_invitedCode.findViewById<ImageView>(R.id.iv_right).visibility = View.GONE
+            item_invitedCode.findViewById<TextView>(R.id.tv_right).text =
+                    "街景-${UserManager.INSTANCE.getCodeID()}"
         } else {
             btn_switch.visibility = View.GONE
+            item_invitedCode.visibility = View.GONE
+            item_invitedCode_line.visibility = View.GONE
 
         }
     }

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

@@ -176,20 +176,20 @@ class MyFragment : BaseFragment<FragmentMyBinding, MyViewModel>(), OnRefreshList
         ic_theme.findViewById<TextView>(R.id.tv_me2).text = "国内外街景"
         ic_theme.findViewById<TextView>(R.id.tv_me3).text = "VR全景"
         ic_theme.findViewById<TextView>(R.id.tv_me4).text = "3D地图"
-        ic_theme.findViewById<TextView>(R.id.tv_me5).text = "国外搜索"
-        ic_theme.findViewById<TextView>(R.id.tv_me6).text = "高清地图"
-        ic_theme.findViewById<TextView>(R.id.tv_me7).text = "历史影像"
+        ic_theme.findViewById<TextView>(R.id.tv_me5).text = "高清地图"
+        ic_theme.findViewById<TextView>(R.id.tv_me6).text = "全球景象"
+        ic_theme.findViewById<TextView>(R.id.tv_me7).text = "国内外搜索"
         ic_theme.findViewById<TextView>(R.id.tv_me8).text = "景点推荐"
         ic_theme.findViewById<ImageView>(R.id.iv_decorate1).setImageResource(R.mipmap.icon_me_tiao)
         ic_theme.findViewById<ImageView>(R.id.iv_decorate2).setImageResource(R.mipmap.icon_me_tiao)
-        ic_theme.findViewById<ImageView>(R.id.iv_me1).setImageResource(R.mipmap.icon_me1)
-        ic_theme.findViewById<ImageView>(R.id.iv_me2).setImageResource(R.mipmap.icon_me2)
-        ic_theme.findViewById<ImageView>(R.id.iv_me3).setImageResource(R.mipmap.icon_me3)
-        ic_theme.findViewById<ImageView>(R.id.iv_me4).setImageResource(R.mipmap.icon_me4)
-        ic_theme.findViewById<ImageView>(R.id.iv_me5).setImageResource(R.mipmap.icon_me5)
-        ic_theme.findViewById<ImageView>(R.id.iv_me6).setImageResource(R.mipmap.icon_me6)
-        ic_theme.findViewById<ImageView>(R.id.iv_me7).setImageResource(R.mipmap.icon_me7)
-        ic_theme.findViewById<ImageView>(R.id.iv_me8).setImageResource(R.mipmap.icon_me8)
+        ic_theme.findViewById<ImageView>(R.id.iv_me1).setImageResource(R.mipmap.icon_privilege5)
+        ic_theme.findViewById<ImageView>(R.id.iv_me2).setImageResource(R.mipmap.icon_privilege2)
+        ic_theme.findViewById<ImageView>(R.id.iv_me3).setImageResource(R.mipmap.icon_privilege4)
+        ic_theme.findViewById<ImageView>(R.id.iv_me4).setImageResource(R.mipmap.icon_privilege3)
+        ic_theme.findViewById<ImageView>(R.id.iv_me5).setImageResource(R.mipmap.icon_privilege1)
+        ic_theme.findViewById<ImageView>(R.id.iv_me6).setImageResource(R.mipmap.icon_privilege6)
+        ic_theme.findViewById<ImageView>(R.id.iv_me7).setImageResource(R.mipmap.icon_privilege7)
+        ic_theme.findViewById<ImageView>(R.id.iv_me8).setImageResource(R.mipmap.icon_privilege8)
     }
 }
 

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

@@ -108,9 +108,9 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
         list.add(page2)
         list.add(page3)
         list.add(page4)
-        list.add(page5)
         list.add(page6)
         list.add(page7)
+        list.add(page5)
         list.add(page8)
 
         //设置显示的数据
@@ -127,12 +127,12 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
 
         //设置特权推荐
         privilege.findViewById<TextView>(R.id.tv_theme_name).text = "享8大特权"
-        privilege.findViewById<TextView>(R.id.tv_me1).text = "高清地图"
+        privilege.findViewById<TextView>(R.id.tv_me1).text = "无限缩放"
         privilege.findViewById<TextView>(R.id.tv_me2).text = "国内外街景"
-        privilege.findViewById<TextView>(R.id.tv_me3).text = "3D地图"
-        privilege.findViewById<TextView>(R.id.tv_me4).text = "VR全景"
-        privilege.findViewById<TextView>(R.id.tv_me5).text = "无限缩放"
-        privilege.findViewById<TextView>(R.id.tv_me6).text = "历史影像"
+        privilege.findViewById<TextView>(R.id.tv_me3).text = "VR全景"
+        privilege.findViewById<TextView>(R.id.tv_me4).text = "3D地图"
+        privilege.findViewById<TextView>(R.id.tv_me5).text = "高清地图"
+        privilege.findViewById<TextView>(R.id.tv_me6).text = "全球景象"
         privilege.findViewById<TextView>(R.id.tv_me7).text = "国内外搜索"
         privilege.findViewById<TextView>(R.id.tv_me8).text = "景点推荐"
         privilege.findViewById<ImageView>(R.id.iv_decorate1).setImageResource(R.mipmap.icon_privilege_tiao2)
@@ -143,11 +143,11 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
         privilege.findViewById<ImageView>(R.id.iv_decorate2).layoutParams.width = AppUtils.dp2Px(this, 100F)
         privilege.findViewById<ImageView>(R.id.iv_decorate2).layoutParams.height = AppUtils.dp2Px(this, 50F)
         privilege.findViewById<ImageView>(R.id.iv_decorate2).setPadding(AppUtils.dp2Px(this, 50F), 0, 0, 0)
-        privilege.findViewById<ImageView>(R.id.iv_me1).setImageResource(R.mipmap.icon_privilege1)
+        privilege.findViewById<ImageView>(R.id.iv_me1).setImageResource(R.mipmap.icon_privilege5)
         privilege.findViewById<ImageView>(R.id.iv_me2).setImageResource(R.mipmap.icon_privilege2)
-        privilege.findViewById<ImageView>(R.id.iv_me3).setImageResource(R.mipmap.icon_privilege3)
-        privilege.findViewById<ImageView>(R.id.iv_me4).setImageResource(R.mipmap.icon_privilege4)
-        privilege.findViewById<ImageView>(R.id.iv_me5).setImageResource(R.mipmap.icon_privilege5)
+        privilege.findViewById<ImageView>(R.id.iv_me3).setImageResource(R.mipmap.icon_privilege4)
+        privilege.findViewById<ImageView>(R.id.iv_me4).setImageResource(R.mipmap.icon_privilege3)
+        privilege.findViewById<ImageView>(R.id.iv_me5).setImageResource(R.mipmap.icon_privilege1)
         privilege.findViewById<ImageView>(R.id.iv_me6).setImageResource(R.mipmap.icon_privilege6)
         privilege.findViewById<ImageView>(R.id.iv_me7).setImageResource(R.mipmap.icon_privilege7)
         privilege.findViewById<ImageView>(R.id.iv_me8).setImageResource(R.mipmap.icon_privilege8)

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

@@ -92,7 +92,7 @@
                         android:layout_marginLeft="30dp"
                         android:layout_marginRight="30dp"
                         android:gravity="center"
-                        android:text="Copyright © 2019 Inc.."
+                        android:text="Copyright © 2019-2021 Inc.."
                         android:textColor="@color/color_333"
                         android:textSize="12sp" />
                 </LinearLayout>

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

@@ -15,62 +15,56 @@
 
         <include layout="@layout/include_header" />
 
-        <com.mints.street.widget.ElasticScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:overScrollMode="never">
-
-            <LinearLayout
-                android:id="@+id/ly_linear"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:elevation="5dp"
-                android:orientation="vertical">
-
-                <include
-                    android:id="@+id/item_phone"
-                    layout="@layout/item_settings" />
-
-                <View
-                    style="@style/view_line_E6E6E6"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginStart="20dp"
-
-                    android:layout_marginEnd="20dp" />
-
-                <include
-                    android:id="@+id/item_userAgree"
-                    layout="@layout/item_settings" />
-
-                <View
-                    style="@style/view_line_E6E6E6"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginEnd="20dp" />
-
-                <include
-                    android:id="@+id/item_privacyAgree"
-                    layout="@layout/item_settings" />
-
-                <Button
-                    android:id="@+id/btn_switch"
-                    android:layout_width="200dp"
-                    android:layout_height="50dp"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="20dp"
-                    android:layout_marginBottom="20dp"
-                    android:background="@drawable/shape_btn_switch"
-                    android:text="退出登录"
-                    android:textColor="@color/white"
-                    android:textSize="16sp" />
-                <View
-                    android:id="@+id/el_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-            </LinearLayout>
-
-        </com.mints.street.widget.ElasticScrollView>
+        <include
+            android:id="@+id/item_phone"
+            layout="@layout/item_settings" />
+
+        <View
+            style="@style/view_line_E6E6E6"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp" />
+
+        <include
+            android:id="@+id/item_invitedCode"
+            layout="@layout/item_settings" />
+
+        <View
+            android:id="@+id/item_invitedCode_line"
+            style="@style/view_line_E6E6E6"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp" />
+
+        <include
+            android:id="@+id/item_userAgree"
+            layout="@layout/item_settings" />
+
+        <View
+            style="@style/view_line_E6E6E6"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp" />
+
+        <include
+            android:id="@+id/item_privacyAgree"
+            layout="@layout/item_settings" />
+
+        <Button
+            android:id="@+id/btn_switch"
+            android:layout_width="200dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"
+            android:background="@drawable/shape_btn_switch"
+            android:text="退出登录"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+        <View
+            android:id="@+id/el_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
     </LinearLayout>
 </layout>
\ No newline at end of file

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

@@ -123,7 +123,7 @@
             app:layout_constraintEnd_toStartOf="@+id/guideline10"
             app:layout_constraintStart_toStartOf="@+id/guideline9"
             app:layout_constraintTop_toTopOf="@+id/imageView9"
-            app:srcCompat="@mipmap/icon_backvip2" />
+            app:srcCompat="@mipmap/icon_backvip6" />
 
         <TextView
             android:id="@+id/textView16"
@@ -188,7 +188,7 @@
             app:layout_constraintEnd_toStartOf="@+id/guideline10"
             app:layout_constraintStart_toStartOf="@+id/guideline9"
             app:layout_constraintTop_toTopOf="@+id/imageView15"
-            app:srcCompat="@mipmap/icon_backvip5" />
+            app:srcCompat="@mipmap/icon_backvip2" />
 
         <TextView
             android:id="@+id/textView19"
@@ -209,13 +209,13 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/guideline10"
             app:layout_constraintTop_toTopOf="@+id/imageView17"
-            app:srcCompat="@mipmap/icon_backvip6" />
+            app:srcCompat="@mipmap/icon_backvip5" />
 
         <TextView
             android:id="@+id/textView20"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="历史影像"
+            android:text="全球景象"
             android:textColor="#F5CF8B"
             app:layout_constraintBottom_toBottomOf="@+id/textView19"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -28,6 +28,7 @@
         android:id="@+id/tv_right"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="@color/black"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:visibility="gone" />