提交会员界面

app/src/main/AndroidManifest.xml

@@ -19,6 +19,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- 调用相机，用于实现扫描二维码，预览个性化地图编辑器生成的个性化地图样式（开发者实际开发中地图SDK不需要该权限）-->
     <uses-permission android:name="android.permission.CAMERA" />
+    <!-- 获取手机状态信息 -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
 
     <application

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

@@ -61,11 +61,12 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
         // test
         UmengManager.initUm()
 
-        val rxPermissions = RxPermissions(this )
-        rxPermissions.request(Manifest.permission.ACCESS_COARSE_LOCATION)
-            .subscribe {
-
-        }
+        val rxPermissions = RxPermissions(this)
+        rxPermissions.request(Manifest.permission.ACCESS_COARSE_LOCATION,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                Manifest.permission.READ_PHONE_STATE)
+                .subscribe {
+                }
 
     }
 
@@ -134,6 +135,7 @@ private fun ViewPager2.initMain(activity: FragmentActivity): ViewPager2 {
     }
     return this
 }
+
 /**
  * 拦截BottomNavigation长按事件 防止长按时出现Toast ---- 追求完美的大屌群友提的bug
  * @receiver BottomNavigationViewEx

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

@@ -22,7 +22,7 @@ class AboutusActivity :BaseActivity<ActivityAboutusBinding, AboutusViewModel>(),
     private fun initView() {
         tv_title.text="关于我们"
         tv_title.setTextColor(Color.BLACK)
-        iv_left_icon.setImageResource(R.mipmap.iv_return)
+        iv_left_icon.setImageResource(R.mipmap.ic_arrow_back)
         iv_left_icon.visibility=View.VISIBLE
         tv_user.setOnClickListener(this)
         tv_privacy.setOnClickListener(this)
@@ -30,6 +30,7 @@ class AboutusActivity :BaseActivity<ActivityAboutusBinding, AboutusViewModel>(),
 
     override fun onClick(v: View?) {
         when(v?.id){
+            R.id.iv_left_icon -> finish()
             R.id.tv_user->{
 //                startActivity(UseragreementActivity::class.java)
             }

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

@@ -21,7 +21,7 @@ class MoresettingsActivity: BaseActivity<ActivityMoresettingsBinding, Moresettin
     private fun initView() {
         tv_title.text="更多设置"
         tv_title.setTextColor(Color.BLACK)
-        iv_left_icon.setImageResource(R.mipmap.iv_return)
+        iv_left_icon.setImageResource(R.mipmap.ic_arrow_back)
         iv_left_icon.visibility= View.VISIBLE
     }
 

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

@@ -30,8 +30,6 @@ class MyFragment : BaseFragment<FragmentMyBinding, MyViewModel>(), View.OnClickL
     private var ly_phone: LinearLayoutCompat? = null
     private var cb_checked: CheckBox? = null
 
-    //checkbox是否选中
-    private var ischecked = false
     override fun initContentView(inflater: LayoutInflater?,
                                  container: ViewGroup?,
                                  savedInstanceState: Bundle?) = R.layout.fragment_my
@@ -44,7 +42,6 @@ class MyFragment : BaseFragment<FragmentMyBinding, MyViewModel>(), View.OnClickL
     }
 
     private fun initView() {
-
         //设置登录点击事件
         binding.llMyLogin.setOnClickListener {
             //创建弹窗

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

@@ -38,7 +38,7 @@ class OpenvipActivity: BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
 
         tv_title.text="成为会员"
         tv_title.setTextColor(Color.WHITE)
-        iv_left_icon.setImageResource(R.mipmap.iv_return_white)
+        iv_left_icon.setImageResource(R.mipmap.ic_arrow_back)
         iv_left_icon.visibility= View.VISIBLE
     }
 

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

-package com.mints.street.main.my
-
-class PrivacypolicyActivity {
-
-}

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

-package com.mints.street.main.my
-
-class UseragreementActivity {
-
-}

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

@@ -5,7 +5,7 @@
     <data>
 
         <variable
-            name="ViewModel"
+            name="viewModel"
             type="com.mints.street.main.my.AboutusViewModel" />
     </data>
     <RelativeLayout

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

@@ -3,7 +3,7 @@
 
     <data>
         <variable
-            name="ViewModel"
+            name="viewModel"
             type="com.mints.street.main.my.MoresettingsViewModel" />
     </data>
 

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

@@ -6,7 +6,7 @@
     <data>
 
         <variable
-            name="ViewModel"
+            name="viewModel"
             type="com.mints.street.main.my.OpenvipViewModel" />
     </data>
 
@@ -34,9 +34,9 @@
                 android:overScrollMode="never">
 
                 <LinearLayout
-                    android:layout_marginBottom="80dp"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:layout_marginBottom="80dp"
                     android:orientation="vertical">
 
                     <com.mints.street.widget.CoverFlowViewPager
@@ -44,7 +44,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="148dp"
                         android:layout_centerHorizontal="true"
-                        android:layout_marginTop="20dp" >
+                        android:layout_marginTop="20dp">
 
                         <Space
                             android:layout_width="wrap_content"
@@ -255,10 +255,9 @@
 
                         <ImageView
                             android:id="@+id/imageView16"
-
                             android:layout_width="20dp"
                             android:layout_height="20dp"
-                            android:background="@color/blue"
+                            android:background="@drawable/shape_btn_friends_unenabled"
                             app:layout_constraintBottom_toTopOf="@+id/guideline7"
                             app:layout_constraintEnd_toStartOf="@+id/textView5"
                             app:layout_constraintStart_toStartOf="@+id/guideline5"
@@ -267,10 +266,9 @@
 
                         <ImageView
                             android:id="@+id/imageView18"
-
                             android:layout_width="20dp"
                             android:layout_height="20dp"
-                            android:background="@color/blue"
+                            android:background="@drawable/shape_btn_friends_unenabled"
                             app:layout_constraintBottom_toTopOf="@+id/guideline7"
                             app:layout_constraintEnd_toStartOf="@+id/guideline6"
                             app:layout_constraintHorizontal_bias="0.481"
@@ -417,12 +415,14 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content" />
                     </LinearLayout>
+
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:layout_marginLeft="10dp"
                         android:layout_marginRight="10dp"
                         android:background="#979797" />
+
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -454,14 +454,15 @@
                 </LinearLayout>
             </androidx.core.widget.NestedScrollView>
         </LinearLayout>
+
         <Button
             android:id="@+id/bt_try"
             android:layout_width="match_parent"
             android:layout_height="50dp"
+            android:layout_gravity="bottom"
             android:layout_margin="10dp"
             android:background="@drawable/shape_btn_friends_unenabled"
             android:text="开通全球会员"
-            android:layout_gravity="bottom"
             android:textColor="@color/white"
             android:textSize="10sp" />
     </FrameLayout>

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

@@ -3,7 +3,7 @@
 
     <data>
         <variable
-            name="ViewModel"
+            name="viewModel"
             type="com.mints.street.main.my.PermissionsViewModel" />
     </data>