提交首页、个人中心、开通会员和沉浸式状态栏优化代码

app/src/main/java/com/mints/street/adapter/GridMapAdapter.kt

 package com.mints.street.adapter
 
 import android.content.Context
-import android.view.View
 import com.alibaba.android.vlayout.layout.GridLayoutHelper
 import com.bumptech.glide.Glide
 import com.fry.base.adapter.AbstractVLayoutBaseAdapter

app/src/main/java/com/mints/street/adapter/GridPaymentAdapter.kt

@@ -20,7 +20,6 @@ class GridPaymentAdapter(val context: Context, val list: List<VipBean.ListBean>)
     private var first: Int = 1
     private var datalist: List<VipBean.ListBean>? = list
     private var mposition: Int = -1
-
     override fun onBindViewHolder(holder: BindingViewHolder<ItemGridPaymentAdpaterBinding>, position: Int) {
 
         holder.binding.tvOldprice.paint.flags = Paint.STRIKE_THRU_TEXT_FLAG

app/src/main/java/com/mints/street/api/MainApi.kt

@@ -43,7 +43,7 @@ interface MainApi {
      * 开通vip
      */
     @POST("api/getVipProductsByType")
-    fun getVipProductsByType(): Observable<Response<BaseResponse<VipBean>>>
+    fun getVipProductsByType(@Body vo: @JvmSuppressWildcards Map<String, Int>): Observable<Response<BaseResponse<VipBean>>>
 
     /**
      * 获取vip支付渠道

app/src/main/java/com/mints/street/bean/VipBean.kt

@@ -7,7 +7,7 @@ class VipBean : Serializable {
 
     inner class ListBean  : Serializable{
         var id: Int = 0 // 1
-        var price: Int = 0// 78
+        var price: Double = 0.0// 78
         var days: Int = 0 // 365
         var remarks: String = "" // 看更多地图
         var title: String = ""// 包年会员

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

@@ -10,13 +10,18 @@ import com.mints.street.R
 import com.mints.street.webview.MintsWebViewActivity
 import kotlinx.android.synthetic.main.activity_aboutus.*
 import kotlinx.android.synthetic.main.include_header.*
+import me.goldze.mvvmhabit.utils.systembar.StatusBarUtil
 
 class AboutusActivity : BaseActivity<ActivityAboutusBinding, AboutusViewModel>(), View.OnClickListener {
 
     override fun initVariableId() = BR.viewModel
     override fun initContentView(savedInstanceState: Bundle?) = R.layout.activity_aboutus
+    override fun getStatusBarHeightView(): View? {
+        return null
+    }
     override fun initData() {
         super.initData()
+        StatusBarUtil.setHeightAndPadding(this, binding.tvText)
         initView()
         initListener()
     }

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

@@ -19,6 +19,7 @@ import kotlinx.android.synthetic.main.include_header.*
 import me.goldze.mvvmhabit.utils.KLog
 import me.goldze.mvvmhabit.utils.RxUtils
 import me.goldze.mvvmhabit.utils.ToastUtils
+import me.goldze.mvvmhabit.utils.systembar.StatusBarUtil
 import org.w3c.dom.Text
 
 class MoresettingsActivity : BaseActivity<ActivityMoresettingsBinding, MoresettingsViewModel>(), View.OnClickListener {
@@ -27,8 +28,12 @@ class MoresettingsActivity : BaseActivity<ActivityMoresettingsBinding, Moresetti
 
     override fun initVariableId() = BR.viewModel
     override fun initContentView(savedInstanceState: Bundle?) = R.layout.activity_moresettings
+    override fun getStatusBarHeightView(): View? {
+        return null
+    }
     override fun initData() {
         super.initData()
+        StatusBarUtil.setHeightAndPadding(this, binding.lyLinear)
         initView()
         initListener()
 

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

@@ -159,6 +159,27 @@ class MyFragment : BaseFragment<FragmentMyBinding, MyViewModel>(), OnRefreshList
         moresettings.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(privacyAgree, null, null, null)
         moresettings.findViewById<TextView>(R.id.tv_right).visibility = View.GONE
         moresettings.findViewById<ImageView>(R.id.iv_right).visibility = View.VISIBLE
+
+        ic_theme.findViewById<TextView>(R.id.tv_theme_name).text="享8大特权"
+        ic_theme.findViewById<TextView>(R.id.tv_me1).text = "无线缩放"
+        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_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)
+
     }
 
 
@@ -201,7 +222,6 @@ class MyFragment : BaseFragment<FragmentMyBinding, MyViewModel>(), OnRefreshList
             }
             R.id.tv_private -> {
                 MintsWebViewActivity.startWebView(name = "隐私协议", url = "http://test.mints-id.com/map-api/map/privacy.html")
-
             }
         }
     }

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

@@ -4,6 +4,8 @@ import android.app.Dialog
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
 import androidx.lifecycle.Observer
 import com.alibaba.android.vlayout.DelegateAdapter
 import com.alibaba.android.vlayout.VirtualLayoutManager
@@ -21,6 +23,8 @@ import com.mints.street.manager.UserManager
 import com.mints.street.widget.dialog.DialogListener
 import com.mints.street.widget.dialog.DialogUtils
 import kotlinx.android.synthetic.main.activity_openvip.*
+import kotlinx.android.synthetic.main.activity_openvip.bt_try
+import kotlinx.android.synthetic.main.fragment_my.*
 import kotlinx.android.synthetic.main.include_header.*
 import me.goldze.mvvmhabit.base.AppManager
 import me.goldze.mvvmhabit.utils.AppUtils
@@ -41,6 +45,7 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
     override fun getStatusBarHeightView(): View? {
         return null
     }
+
     override fun initData() {
         super.initData()
         StatusBarUtil.setHeightAndPadding(this, binding.viewBg)
@@ -95,14 +100,46 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
         iv_left_icon.visibility = View.VISIBLE
         header_line.visibility = View.GONE
 
+        //设置特权推荐
+        privilege.findViewById<TextView>(R.id.tv_theme_name).text = "享8大特权"
+        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_me7).text = "国内外搜索"
+        privilege.findViewById<TextView>(R.id.tv_me8).text = "景点推荐"
+        privilege.findViewById<ImageView>(R.id.iv_decorate1).setImageResource(R.mipmap.icon_privilege_tiao2)
+        privilege.findViewById<ImageView>(R.id.iv_decorate1).layoutParams.width = AppUtils.dp2Px(this, 100F)
+        privilege.findViewById<ImageView>(R.id.iv_decorate1).layoutParams.height = AppUtils.dp2Px(this, 50F)
+        privilege.findViewById<ImageView>(R.id.iv_decorate1).setPadding(0, 0, AppUtils.dp2Px(this, 50F), 0)
+        privilege.findViewById<ImageView>(R.id.iv_decorate2).setImageResource(R.mipmap.icon_privilege_tiao1)
+        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_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_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)
+
+        //套餐推荐
+        imageView.setImageResource(R.mipmap.icon_privilege_tiao2)
+        imageView.layoutParams.width = AppUtils.dp2Px(this, 80F)
+        imageView.setPadding(0, 0, AppUtils.dp2Px(this, 20F), 0)
+        imageView2.setImageResource(R.mipmap.icon_privilege_tiao1)
+        imageView2.layoutParams.width = AppUtils.dp2Px(this, 80F)
+        imageView2.setPadding(AppUtils.dp2Px(this, 20F), 0, 0, 0)
 
         //recycleView管理（展示套餐推荐）
         vLayout = VirtualLayoutManager(this)
         mAdapter = DelegateAdapter(vLayout, false)
         binding.listview.adapter = mAdapter
         binding.listview.layoutManager = vLayout
-
-
     }
 
     override fun initViewObservable() {
@@ -154,7 +191,7 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
             }
             R.id.ly_alipay -> {//支付宝支付
                 //设置选中样式
-                pw_flag=2
+                pw_flag = 2
                 setOnChecked(pw_flag)
             }
             R.id.bt_try -> {//点击开通全球会员按钮

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

@@ -23,8 +23,10 @@ class OpenvipViewModel(application: Application) : BaseViewModel(application) {
      * @param mobile
      */
     fun openvipInfo() {
+        val vo = HashMap<String, Int>()
+        vo["type"] = 1
 
-        ApiModel.openvip(lifecycleProvider).safeSubscribe(
+        ApiModel.openvip(lifecycleProvider, vo).safeSubscribe(
                 object : HttpSubscribeImpl<BaseResponse<VipBean>>(
                         this@OpenvipViewModel, true) {
                     override fun onBusinessSuccess(response: BaseResponse<VipBean>) {
@@ -33,7 +35,7 @@ class OpenvipViewModel(application: Application) : BaseViewModel(application) {
                     }
 
                     override fun onError(e: Throwable) {
-                        KLog.e("openvip", "发送验证码错误")
+                        KLog.e("openvip", "请求错误:$e")
                     }
                 })
     }

app/src/main/java/com/mints/street/model/ApiModel.kt

@@ -41,9 +41,9 @@ object ApiModel {
     /**
      * 开通会员
      */
-    fun openvip(lifecycleProvider: LifecycleProvider<Any>?): Observable<Response<BaseResponse<VipBean>>> {
+    fun openvip(lifecycleProvider: LifecycleProvider<Any>?, map: Map<String, Int>): Observable<Response<BaseResponse<VipBean>>> {
         return HttpManager.getInstance()
-                .execute(lifecycleProvider, MainApi.newInstance().getVipProductsByType())
+                .execute(lifecycleProvider, MainApi.newInstance().getVipProductsByType(map))
     }
 
     /**

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

@@ -15,6 +15,7 @@
             android:id="@+id/header"
             layout="@layout/include_header" />
         <TextView
+            android:id="@+id/tv_text"
             android:layout_below="@+id/header"
             android:paddingTop="30dp"
             android:layout_width="wrap_content"

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

@@ -15,6 +15,7 @@
         <include layout="@layout/include_header" />
 
         <com.mints.street.widget.ElasticScrollView
+            android:id="@+id/ly_linear"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:overScrollMode="never">

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

@@ -25,7 +25,8 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <include layout="@layout/include_header" />
+            <include
+                layout="@layout/include_header" />
 
             <androidx.core.widget.NestedScrollView
                 android:layout_width="match_parent"
@@ -52,7 +53,9 @@
                             android:layout_height="wrap_content" />
                     </com.mints.street.widget.CoverFlowViewPager>
 
-                    <include layout="@layout/include_privilege_show" />
+                    <include
+                        android:id="@+id/privilege"
+                        layout="@layout/include_privilege_show" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -64,9 +67,7 @@
                         <ImageView
                             android:id="@+id/imageView"
                             android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:layout_marginRight="10dp"
-                            android:src="@mipmap/icon_me_tiao" />
+                            android:layout_height="3dp"/>
 
                         <TextView
                             android:id="@+id/textView7"
@@ -79,9 +80,7 @@
                         <ImageView
                             android:id="@+id/imageView2"
                             android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:layout_marginLeft="10dp"
-                            android:src="@mipmap/icon_me_tiao" />
+                            android:layout_height="3dp" />
                     </LinearLayout>
 
                     <androidx.recyclerview.widget.RecyclerView

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

@@ -105,7 +105,9 @@
                         android:textSize="12sp" />
                 </RelativeLayout>
 
-                <include layout="@layout/include_privilege_show" />
+                <include
+                    android:id="@+id/ic_theme"
+                    layout="@layout/include_privilege_show" />
 
             </LinearLayout>
 

library_base/src/main/res/color/bottom_selector.xml

 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/main_color" android:state_checked="true"/>
-    <item android:color="@color/main_color" android:state_pressed="true"/>
+    <item android:color="@color/main_blue_lower" android:state_checked="true"/>
+    <item android:color="@color/main_blue_lower" android:state_pressed="true"/>
     <item android:color="@color/main_blue_color"/>
 </selector>
\ No newline at end of file

library_base/src/main/res/values/colors.xml

@@ -24,4 +24,5 @@
     <color name="color_BEC2CC">#BEC2CC</color>
     <color name="color_555">#555555</color>
     <color name="color_8F6D21">#8F6D21</color>
+    <color name="main_blue_lower">#2196F3</color>
 </resources>
\ No newline at end of file