首页、个人中心修改样式

video/.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

video/app/src/main/AndroidManifest.xml

@@ -98,6 +98,10 @@
             android:name=".ui.activitys.GuideActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.activitys.FeedbackActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activitys.VipActivity"
             android:exported="false"

video/app/src/main/java/com/mints/wisdomclean/manager/TrackManager.java

@@ -56,15 +56,10 @@ public class TrackManager {
     }
 
 
-    public void saveV6Terminal() {
-        if (trackPresenter != null ) {
-            trackPresenter.saveV6Terminal();
-        }
-    }
-
     public void commitVedio() {
-        if (trackPresenter != null ) {
-//            trackPresenter.commitVedio();
+        if (trackPresenter != null) {
+            HashMap<String, Object> vo = new HashMap<>();
+            trackPresenter.commitVedio(vo);
         }
     }
 }

video/app/src/main/java/com/mints/wisdomclean/mvp/presenters/FeedbackPresenter.kt

+package com.mints.wisdomclean.mvp.presenters
+
+import com.google.gson.JsonObject
+import com.mints.library.net.neterror.BaseSubscriber
+import com.mints.library.net.neterror.Throwable
+import com.mints.wisdomclean.manager.AppHttpManager
+import com.mints.wisdomclean.mvp.model.BaseResponse
+import com.mints.wisdomclean.mvp.views.FeedbackView
+import java.util.*
+
+class FeedbackPresenter : BasePresenter<FeedbackView>() {
+
+    fun feedback(type: String, content: String) {
+        view.showLoading("")
+        val vo = HashMap<String, Any>()
+        vo["type"] = type
+        vo["content"] = content
+        AppHttpManager.getInstance(loanApplication)
+            .call(loanService.feedback(vo),
+                object : BaseSubscriber<BaseResponse<JsonObject>>() {
+                    override fun onCompleted() {
+                        if (isLinkView) return
+                        view.hideLoading()
+                    }
+
+                    override fun onError(e: Throwable) {
+                        if (isLinkView) return
+                        view.hideLoading()
+                        view.showToast(e.message)
+                    }
+
+                    override fun onNext(baseResponse: BaseResponse<JsonObject>) {
+                        if (isLinkView) return
+
+                        view.hideLoading()
+                        val code = baseResponse.status
+                        val message = baseResponse.message
+
+                        when (code) {
+                            200 -> view.feedbackSuc()
+                            else -> view.showToast(message)
+                        }
+                    }
+                })
+    }
+}
\ No newline at end of file

video/app/src/main/java/com/mints/wisdomclean/mvp/presenters/TrackPresenter.java

@@ -96,6 +96,25 @@ public class TrackPresenter extends BaseTrackPresenter {
                         });
     }
 
+    public void commitVedio(HashMap<String, Object> vo) {
+        AppHttpManager.getInstance(loanApplication)
+                .call(loanService.reporGromeEcpm(vo),
+                        new BaseSubscriber<BaseResponse<JsonObject>>() {
+                            @Override
+                            public void onCompleted() {
+                            }
+
+                            @Override
+                            public void onError(Throwable e) {
+
+                            }
+
+                            @Override
+                            public void onNext(BaseResponse<JsonObject> baseResponse) {
+                            }
+                        });
+    }
+
     public void reporGromeEcpm(HashMap<String, Object> vo) {
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.reporGromeEcpm(vo),

video/app/src/main/java/com/mints/wisdomclean/mvp/views/FeedbackView.kt

+package com.mints.wisdomclean.mvp.views
+
+
+interface FeedbackView : BaseView {
+    fun feedbackSuc()
+}

video/app/src/main/java/com/mints/wisdomclean/net/LoanService.java

@@ -176,6 +176,13 @@ public interface LoanService {
     @POST("api/ai/homeV1List")
     Observable<BaseResponse<HotStyleListBean>> getHomeV1List(@Body Map<String, Object> vo);
 
+    /**
+     * 用户反馈
+     *
+     * @return
+     */
+    @POST("api/feedback")
+    Observable<BaseResponse<Object>> feedback(@Body Map<String, Object> vo);
 
     /**
      * 默认http工厂

video/app/src/main/java/com/mints/wisdomclean/ui/activitys/AboutusActivity.kt

@@ -2,8 +2,15 @@ package com.mints.wisdomclean.ui.activitys
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.util.Log
 import android.view.View
+import android.widget.Button
+import android.widget.TextView
+import android.widget.Toast
 import com.bytedance.hume.readapk.HumeSDK
+import com.bytedance.sdk.dp.DPDrama
+import com.bytedance.sdk.dp.DPSdk
+import com.bytedance.sdk.dp.IDPWidgetFactory
 import com.mints.wisdomclean.BuildConfig
 import com.mints.wisdomclean.MintsApplication
 import com.mints.wisdomclean.R
@@ -12,6 +19,7 @@ import com.mints.wisdomclean.ui.activitys.base.BaseActivity
 import com.mints.wisdomclean.utils.MateUtils
 import com.mints.wisdomclean.utils.ToastUtil
 import com.mints.library.utils.ConstantUtil
+import com.mints.library.utils.json.JsonUtil
 import kotlinx.android.synthetic.main.activity_aboutus.*
 import kotlinx.android.synthetic.main.header_layout.*
 
@@ -28,20 +36,24 @@ class AboutusActivity : BaseActivity(), View.OnClickListener {
     override fun isApplyKitKatTranslucency() = false
 
     override fun initViewsAndEvents() {
-        tvAboutasVersion.text = getString(R.string.app_name) + " v" + ConstantUtil.getVersionName(context)
+        tvAboutasVersion.text =
+            getString(R.string.app_name) + " v" + ConstantUtil.getVersionName(context)
         tv_title.text = if (BuildConfig.DEBUG) "测试-关于我们" else "关于我们"
         iv_left_icon.visibility = View.VISIBLE
         iv_left_icon.setImageResource(R.mipmap.ic_arrow_back)
 
         ivAboutasIcon.setOnLongClickListener {
-            ToastUtil.showLong(this,"自有渠道：" + MateUtils.getAppMetaData(
-                    MintsApplication.getContext(), "CHANNEL_NAME") +
-                    "\n 头条渠道：" + HumeSDK.getChannel(context))
+            ToastUtil.showLong(
+                this, "自有渠道：" + MateUtils.getAppMetaData(
+                    MintsApplication.getContext(), "CHANNEL_NAME"
+                ) +
+                        "\n 头条渠道：" + HumeSDK.getChannel(context)
+            )
             true
         }
 
         tvAboutasVersion.setOnLongClickListener {
-            ToastUtil.showLong(this,"包名：" + Constant.MINTS_PKG_NAME)
+            ToastUtil.showLong(this, "包名：" + Constant.MINTS_PKG_NAME)
 //            readyGo(NineActivity::class.java)
 //            VoiceRedEnvelopeManager.load(23,23)
             true
@@ -73,5 +85,39 @@ class AboutusActivity : BaseActivity(), View.OnClickListener {
         iv_left_icon.setOnClickListener(this)
         tvAboutasService.setOnClickListener(this)
         tvAboutasPolicy.setOnClickListener(this)
+
+        findViewById<TextView>(R.id.tv_about_address).setOnLongClickListener {
+            if (BuildConfig.DEBUG) {
+                if (DPSdk.isStartSuccess()) {
+                    DPSdk.factory().requestAllDrama(
+                        1,
+                        Int.MAX_VALUE,
+                        true,
+                        object : IDPWidgetFactory.DramaCallback {
+                            override fun onError(code: Int, msg: String?) {
+                                Log.d("AboutusActivity", "request failed, code = $code, msg = $msg")
+                                Toast.makeText(this@AboutusActivity, "请求失败", Toast.LENGTH_SHORT)
+                                    .show()
+
+                            }
+
+                            override fun onSuccess(
+                                dataList: MutableList<out DPDrama>?,
+                                info: MutableMap<String, Any>?
+                            ) {
+                                Toast.makeText(this@AboutusActivity, "请求成功", Toast.LENGTH_SHORT)
+                                    .show()
+                                val json = JsonUtil.toJson(dataList)
+                                Log.d("AboutusActivity", "request success, drama  = " + json)
+                            }
+                        })
+                } else {
+                    Toast.makeText(this@AboutusActivity, "sdk还未初始化", Toast.LENGTH_SHORT).show()
+                }
+            }
+
+            return@setOnLongClickListener true
+
+        }
     }
 }

video/app/src/main/java/com/mints/wisdomclean/ui/activitys/FeedbackActivity.kt

+package com.mints.wisdomclean.ui.activitys
+
+import android.annotation.SuppressLint
+import android.text.Editable
+import android.text.TextUtils
+import android.text.TextWatcher
+import android.view.View
+import android.widget.RadioGroup
+import com.mints.wisdomclean.R
+import com.mints.wisdomclean.mvp.presenters.FeedbackPresenter
+import com.mints.wisdomclean.mvp.views.FeedbackView
+import com.mints.wisdomclean.ui.activitys.base.BaseActivity
+import kotlinx.android.synthetic.main.activity_feekback.*
+import kotlinx.android.synthetic.main.header_layout.*
+
+/**
+ * 描述：意见反馈
+ * 作者：孟崔广
+ * 时间：2023/7/7 19:19
+ */
+class FeedbackActivity : BaseActivity(), View.OnClickListener, FeedbackView {
+
+    private val feedbackPresenter by lazy { FeedbackPresenter() }
+    private var typeName = "界面"
+
+    private val maxLength = 150
+    private val minLength = 5
+
+    override fun getContentViewLayoutID() = R.layout.activity_feekback
+
+    override fun isApplyKitKatTranslucency() = false
+
+    override fun initViewsAndEvents() {
+        tv_title.text = "意见反馈"
+        iv_left_icon.visibility = View.VISIBLE
+        iv_left_icon.setImageResource(R.mipmap.ic_arrow_back)
+
+        etFeedbackContent.isFocusable = true
+        etFeedbackContent.isFocusableInTouchMode = true
+        etFeedbackContent.requestFocus()
+
+        initListener()
+        feedbackPresenter.attachView(this)
+    }
+
+    private fun initListener() {
+        iv_left_icon.setOnClickListener(this)
+        btn_feedback_next.setOnClickListener(this)
+
+        radioGroup.setOnCheckedChangeListener { _: RadioGroup?, checkedId: Int ->
+            when (checkedId) {
+                R.id.btn_opinion_type_1 -> typeName = "界面"
+                R.id.btn_opinion_type_2 -> typeName = "体验"
+                R.id.btn_opinion_type_3 -> typeName = "功能"
+                R.id.btn_opinion_type_4 -> typeName = "其他"
+            }
+        }
+
+        etFeedbackContent.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+
+            @SuppressLint("SetTextI18n")
+            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+                if (s.toString().trim { it <= ' ' }.length > maxLength) {
+                    etFeedbackContent.setText(s.toString().substring(0, maxLength))
+                    etFeedbackContent.setSelection(maxLength)
+                    showToast("您最多能输入150个字")
+                }
+                tvFeedbackCount.text = etFeedbackContent.text.toString().length.toString() + "/150"
+            }
+
+            override fun afterTextChanged(s: Editable) {}
+        })
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+
+        feedbackPresenter.detachView()
+    }
+
+    override fun onClick(v: View?) {
+        when (v?.id) {
+            R.id.iv_left_icon -> finish()
+            R.id.btn_feedback_next -> {
+                val opinion = etFeedbackContent.text.toString().trim { it <= ' ' }
+                if (TextUtils.isEmpty(opinion)) {
+                    showToast("请输入反馈内容")
+                    return
+                }
+                if (opinion.length < minLength) {
+                    showToast("字数太少")
+                    return
+                }
+                if (opinion.length > maxLength) {
+                    showToast("字数太多")
+                    return
+                }
+
+                feedbackPresenter.feedback(typeName, opinion)
+            }
+        }
+    }
+
+    override fun feedbackSuc() {
+        showToast("提交成功")
+        etFeedbackContent.setText("")
+    }
+}
\ No newline at end of file

video/app/src/main/java/com/mints/wisdomclean/ui/adapter/VipAdapter.kt

@@ -59,11 +59,19 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
             holder.tvVipItemLable.text = vipBean.topTitle
             holder.tvVipItemLable.visibility = View.VISIBLE
         }
-        holder.tvVipItemCurMoney.text = "￥${vipBean.price}"
+        if (vipBean.price < 1) {
+            holder.tvVipItemCurMoney.text = "￥${vipBean.price}"
+        } else {
+            holder.tvVipItemCurMoney.text = "￥${String.format("%.0f", vipBean.price)}"
+        }
         if (vipBean.oldPrice > 0) {
             holder.tvVipItemMoney.visibility = View.VISIBLE
             holder.tvVipItemMoney.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中间横线（删除线）
-            holder.tvVipItemMoney.text = "原价：${vipBean.oldPrice}"
+            if (vipBean.oldPrice < 1) {
+                holder.tvVipItemMoney.text = "原价：${vipBean.oldPrice}"
+            } else {
+                holder.tvVipItemMoney.text = "原价：${String.format("%.0f", vipBean.oldPrice)}"
+            }
         } else {
             holder.tvVipItemMoney.visibility = View.INVISIBLE
         }
@@ -88,7 +96,7 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
             holder.tvVipItemCurMoney.setTextColor(
                 ContextCompat.getColor(
                     context,
-                    R.color.color_939AA3
+                    R.color.white
                 )
             )
         }

video/app/src/main/java/com/mints/wisdomclean/ui/fragment/MyFragment.kt

@@ -84,7 +84,8 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
 
             }
             R.id.ll_my_feed -> {
-                (requireActivity() as MainActivity).backPhoneDialog()
+//                (requireActivity() as MainActivity).backPhoneDialog()
+                readyGo(FeedbackActivity::class.java)
             }
             R.id.ll_my_payrecord -> {
                 readyGo(OrderRecordActivity::class.java)
@@ -100,9 +101,11 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
         // 1-登录
         if (userManager.userIsLogin()) {
             tv_my_account.text = "用户ID:" + consumer.idcode
+            iv_my_bind.visibility = View.GONE
         } else {
             // 未登录
             tv_my_account.text = "登录/注册"
+            iv_my_bind.visibility = View.VISIBLE
         }
 
         // 2-是否vip

video/app/src/main/res/drawable/btn_index_submit.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="345dp" android:height="44dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#fffeb63d" />
+            <corners android:radius="50dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file

video/app/src/main/res/drawable/btn_index_submit_unchecked.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="345dp" android:height="44dp">
+        <shape android:shape="rectangle">
+            <stroke android:width="1dp" android:color="#fffeb63d" />
+            <solid android:color="#ffffff" />
+            <corners android:radius="50dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file

video/app/src/main/res/drawable/rb_opinion_selected.xml

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

video/app/src/main/res/drawable/shape_my.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="#5B1500" />
+    <!-- 设置按钮的四个角为弧形 -->
+    <!-- android:radius 弧形的半径 -->
+    <corners android:radius="30dip" />
+
+</shape>
\ No newline at end of file

video/app/src/main/res/drawable/shape_vip_adapter.xml

@@ -2,10 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <!-- 填充的颜色 -->
-    <stroke android:width="1dp" android:color="#FABE59" />
-    <solid android:color="#FEF5E3" />
+    <stroke android:width="3dp" android:color="@color/red" />
+    <solid android:color="@color/title_bg" />
     <!-- 设置按钮的四个角为弧形 -->
     <!-- android:radius 弧形的半径 -->
-    <corners android:radius="15dip" />
+    <corners android:radius="5dip" />
 
 </shape>
\ No newline at end of file

video/app/src/main/res/drawable/shape_vip_adapter_none.xml

@@ -2,11 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <!-- 填充的颜色 -->
-    <stroke android:width="1dp" android:color="#FABE59" />
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/title_bg" />
     <!-- 设置按钮的四个角为弧形 -->
     <!-- android:radius 弧形的半径 -->
-    <corners android:radius="15dip" />
+    <corners android:radius="5dip" />
 
 </shape>
\ No newline at end of file

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

@@ -108,6 +108,7 @@
                         </LinearLayout>
 
                         <TextView
+                            android:id="@+id/tv_about_address"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"

video/app/src/main/res/layout/activity_feekback.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="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <include layout="@layout/header_layout" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#F9F9F9"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginTop="14dp"
+            android:background="@color/white"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="15dp"
+                android:text="反馈类型"
+                android:textColor="@android:color/black"
+                android:textSize="15dp" />
+
+            <RadioGroup
+                android:id="@+id/radioGroup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/btn_opinion_type_1"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="58dp"
+                    android:layout_height="25dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@drawable/rb_opinion_selected"
+                    android:button="@null"
+                    android:checked="true"
+                    android:text="界面"
+                    android:textColor="@drawable/rb_opinion_selected"
+                    android:textSize="12sp" />
+
+                <RadioButton
+                    android:id="@+id/btn_opinion_type_2"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="58dp"
+                    android:layout_height="25dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@drawable/rb_opinion_selected"
+                    android:button="@null"
+                    android:text="体验"
+                    android:textColor="@drawable/rb_opinion_selected"
+                    android:textSize="12sp" />
+
+                <RadioButton
+                    android:id="@+id/btn_opinion_type_3"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="58dp"
+                    android:layout_height="25dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@drawable/rb_opinion_selected"
+                    android:button="@null"
+                    android:text="功能"
+                    android:textColor="@drawable/rb_opinion_selected"
+                    android:textSize="12sp" />
+
+                <RadioButton
+                    android:id="@+id/btn_opinion_type_4"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="58dp"
+                    android:layout_height="25dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@drawable/rb_opinion_selected"
+                    android:button="@null"
+                    android:text="其他"
+                    android:textColor="@drawable/rb_opinion_selected"
+                    android:textSize="12sp" />
+            </RadioGroup>
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="235dp"
+            android:layout_marginTop="13dp"
+            android:layout_marginBottom="10dp"
+            android:background="@color/white"
+            android:padding="15dp">
+
+            <EditText
+                android:id="@+id/etFeedbackContent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/full_transparent"
+                android:gravity="top"
+                android:hint="请留下您的批评、表扬或者建议，我们会虚心听取， 认真改正。(请保持在5-150字内)"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/tvFeedbackCount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentBottom="true"
+                android:text="0/150"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+        <Button
+            android:id="@+id/btn_feedback_next"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginLeft="40dp"
+            android:layout_marginTop="30dp"
+            android:layout_marginRight="40dp"
+            android:background="@drawable/shape_main"
+            android:gravity="center"
+            android:text="提交"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+
+    </LinearLayout>
+</LinearLayout>
+

video/app/src/main/res/layout/fragment_main.xml

@@ -2,12 +2,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_FDFDFD">
+    android:background="#f0f2f5">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="fitXY"
+        android:src="@mipmap/bg_main"></ImageView>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/color_FDFDFD"
         android:orientation="vertical">
 
         <TextView
@@ -40,7 +45,7 @@
                 <com.google.android.material.appbar.AppBarLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/color_FDFDFD"
+                    android:background="@android:color/transparent"
                     android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
                     app:layout_behavior=".ui.widgets.AppBarLayoutBehavior">
 
@@ -69,7 +74,7 @@
                                 android:layout_marginTop="18dp"
                                 android:layout_marginRight="16dp"
                                 android:layout_marginBottom="10dp"
-                                android:background="@drawable/shape_gray"
+                                android:background="@drawable/shape_bg_write"
                                 android:orientation="vertical">
 
                                 <TextView
@@ -226,4 +231,6 @@
                 android:textStyle="bold" />
         </RelativeLayout>
     </LinearLayout>
+
+
 </RelativeLayout>

video/app/src/main/res/layout/fragment_main_my.xml

@@ -26,7 +26,7 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="280dp"
+                    android:layout_height="220dp"
                     android:background="@mipmap/bg_my"
                     android:orientation="vertical">
 
@@ -50,9 +50,16 @@
                             android:layout_gravity="center_vertical"
                             android:layout_marginStart="10dp"
                             android:text="登录/注册"
-                            android:textColor="@color/black"
+                            android:textColor="#000000"
                             android:textSize="22sp" />
 
+                        <ImageView
+                            android:id="@+id/iv_my_bind"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="10dp"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@mipmap/ic_my_bind"></ImageView>
 
 
                     </LinearLayout>
@@ -61,21 +68,22 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_marginTop="-120dp"
+                    android:layout_marginTop="-70dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="14dp"
-                    android:layout_marginRight="14dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:paddingLeft="24dp"
                     android:background="@mipmap/bg_my_vip"
-                    android:orientation="vertical"
-                    android:padding="20dp">
+                    android:orientation="vertical">
 
                     <TextView
                         android:id="@+id/tv_my_vip"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="开通VIP会员"
-                        android:textColor="@color/black"
-                        android:textSize="24sp"
+                        android:layout_marginTop="20dp"
+                        android:textColor="#5B1500"
+                        android:textSize="22sp"
                         android:textStyle="bold" />
 
                     <TextView
@@ -84,16 +92,16 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="10dp"
                         android:text="解锁全部短剧"
-                        android:textColor="@color/black" />
+                        android:textColor="#5B1500" />
 
                     <Button
                         android:id="@+id/tv_my_btn"
                         android:layout_width="120dp"
                         android:layout_height="40dp"
-                        android:layout_marginTop="40dp"
-                        android:background="@drawable/shape_red"
+                        android:layout_marginTop="20dp"
+                        android:background="@drawable/shape_my"
                         android:text="立即开通"
-                        android:textColor="@color/white"
+                        android:textColor="#FFEED3"
                         android:textSize="16sp"
                         android:textStyle="bold" />
 

video/app/src/main/res/layout/fragment_movie.xml

@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:srlAccentColor="@color/black"
-        app:srlPrimaryColor="@color/color_FDFDFD">
+        app:srlPrimaryColor="#f0f2f5">
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -28,6 +28,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:srlAccentColor="@color/black"
-            app:srlPrimaryColor="@color/color_FDFDFD" />
+            app:srlPrimaryColor="#f0f2f5" />
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 </FrameLayout>
\ No newline at end of file

video/app/src/main/res/layout/item_rv_vip.xml

@@ -29,7 +29,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="16dp"
-        android:textColor="#656567"
+        android:textColor="@color/white"
         android:textSize="18sp"
         tools:text="包年会员" />
 
@@ -52,7 +52,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="16dp"
-        android:textColor="@color/color_939AA3"
+        android:textColor="@color/white"
         android:textSize="14sp"
         tools:text="原价：123" />
 

video/app/src/main/res/values/colors.xml

@@ -5,7 +5,7 @@
     <color name="white">#FFFFFF</color>
     <color name="black">#000000</color>
     <color name="gray">#808080</color>
-    <color name="red">#cb4a39</color>
+    <color name="red">#ED385B</color>
     <color name="graya">#AAAAAA</color>
     <color name="color_939AA3">#373737</color>
     <color name="color_FF7563">#FF7563</color>