抽奖需求开发完成

video/app/src/main/java/com/mints/helivideo/mvp/model/NineListBean.java

@@ -8,6 +8,8 @@ public class NineListBean implements Serializable {
 
     private List<NineBean> list;
 
+    private String rule;
+
     public class NineBean implements Serializable {
         private String pid;
         private String remark;
@@ -47,6 +49,14 @@ public class NineListBean implements Serializable {
         }
     }
 
+    public String getRule() {
+        return rule;
+    }
+
+    public void setRule(String rule) {
+        this.rule = rule;
+    }
+
     public List<NineBean> getList() {
         return list;
     }

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

@@ -57,7 +57,7 @@ class AboutusActivity : BaseActivity(), View.OnClickListener {
         tvAboutasVersion.setOnLongClickListener {
             ToastUtil.showLong(this, "包名：" + Constant.MINTS_PKG_NAME)
 
-//            readyGo(NineActivity::class.java)
+//            readyGo(NinePayActivity::class.java)
 //            VoiceRedEnvelopeManager.load(23,23)
             true
         }

video/app/src/main/java/com/mints/helivideo/ui/activitys/NineActivity.kt

@@ -93,6 +93,13 @@ class NineActivity : BaseActivity(), View.OnClickListener, NineView {
     override fun getTurnIphoneMsgSuc(data: NineListBean) {
         lucky_panel.setImgArray(data.list)
         initLuckyIndexForPid(data.list)
+
+        if (TextUtils.isEmpty(data.rule)) {
+            ll_nine_rule.visibility = View.GONE
+        } else {
+            ll_nine_rule.visibility = View.VISIBLE
+            tv_nine_rule.text = data.rule
+        }
     }
 
     private fun initLuckyIndexForPid(list: List<NineListBean.NineBean>) {
@@ -118,7 +125,7 @@ class NineActivity : BaseActivity(), View.OnClickListener, NineView {
             ninePresenter.toTurn()
         }
         // 展示 5/20
-
+        tv_nine_count.text = "${data.complete}/${data.need}次"
     }
 
     private fun luckyAward() {
@@ -204,19 +211,19 @@ class NineActivity : BaseActivity(), View.OnClickListener, NineView {
     private fun initData() {
         val messages = ArrayList<String>()
         messages.add("恭喜用户183******66抽中 +7天会员")
-        messages.add("恭喜用户177******34抽中 +7天会员")
-        messages.add("恭喜用户134******49抽中 +7天会员")
-        messages.add("恭喜用户159******51抽中 +7天会员")
+        messages.add("恭喜用户177******34抽中 +1天会员")
+        messages.add("恭喜用户134******49抽中 +3天会员")
+        messages.add("恭喜用户159******51抽中 +5天会员")
         messages.add("恭喜用户150******87抽中 +7天会员")
-        messages.add("恭喜用户134******65抽中 +7天会员")
-        messages.add("恭喜用户183******40抽中 +7天会员")
-        messages.add("恭喜用户131******08抽中 +7天会员")
+        messages.add("恭喜用户134******65抽中 +3天会员")
+        messages.add("恭喜用户183******40抽中 +5天会员")
+        messages.add("恭喜用户131******08抽中 +1天会员")
         messages.add("恭喜用户177******65抽中 +7天会员")
-        messages.add("恭喜用户180******39抽中 +7天会员")
-        messages.add("恭喜用户150******43抽中 +7天会员")
-        messages.add("恭喜用户152******05抽中 +7天会员")
+        messages.add("恭喜用户180******39抽中 +1天会员")
+        messages.add("恭喜用户150******43抽中 +3天会员")
+        messages.add("恭喜用户152******05抽中 +5天会员")
         messages.add("恭喜用户133******87抽中 +7天会员")
-        messages.add("恭喜用户151******64抽中 +7天会员")
+        messages.add("恭喜用户151******64抽中 +5天会员")
         marqueeView.startWithList(SplitArrayUtils.getRandomList(messages) as List<Nothing>?)
     }
 }
\ No newline at end of file

video/app/src/main/java/com/mints/helivideo/ui/activitys/NinePayActivity.kt

@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.text.TextUtils
+import android.view.KeyEvent
 import android.view.View
 import com.jobo.alipay.AliPay
 import com.jobo.alipay.AlipayInfoImpl
@@ -22,6 +23,7 @@ import com.mints.helivideo.mvp.views.NinePayView
 import com.mints.helivideo.mvp.views.NineView
 import com.mints.helivideo.ui.activitys.base.BaseActivity
 import com.mints.library.utils.nodoubleclick.AntiShake
+import kotlinx.android.synthetic.main.activity_nine_pay.*
 
 /**
  * 抽奖弹窗
@@ -57,6 +59,7 @@ class NinePayActivity : BaseActivity(), View.OnClickListener, NinePayView {
     override fun initViewsAndEvents() {
         ninePayPresenter.attachView(this)
         initListener()
+        tv_nine_pay_title.text = title
     }
 
     override fun finish() {
@@ -69,12 +72,22 @@ class NinePayActivity : BaseActivity(), View.OnClickListener, NinePayView {
         ninePayPresenter.detachView()
     }
 
+    override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
+        return if (keyCode == KeyEvent.KEYCODE_BACK) {
+            true
+        } else super.onKeyDown(
+            keyCode,
+            event
+        )
+    }
+
     override fun onClick(v: View?) {
         if (AntiShake.check(v?.id)) return
 
-//        when (v?.id) {
-//            R.id.iv_left_icon -> finish()
-//        }
+        when (v?.id) {
+            R.id.iv_nine_left_next -> finish()
+            R.id.iv_nine_right_next -> ninePayPresenter.getVipPayParams(pid)
+        }
     }
 
     override fun getVipPayParamsSuc(payChannel: String, paramsBean: WxPayParamBean) {
@@ -150,6 +163,7 @@ class NinePayActivity : BaseActivity(), View.OnClickListener, NinePayView {
     }
 
     private fun initListener() {
-//        iv_left_icon.setOnClickListener(this)
+        iv_nine_left_next.setOnClickListener(this)
+        iv_nine_right_next.setOnClickListener(this)
     }
 }

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

@@ -27,7 +27,11 @@ import com.mints.helivideo.utils.SpanUtils
 import com.mints.helivideo.utils.TimeRender
 import com.mints.helivideo.utils.rxutil.CommonRxTask
 import com.mints.helivideo.utils.rxutil.RxjavaUtil
+import kotlinx.android.synthetic.main.activity_nine.*
 import kotlinx.android.synthetic.main.fragment_main_my.*
+import kotlinx.android.synthetic.main.fragment_main_my.btn_action
+import kotlinx.android.synthetic.main.fragment_main_my.lucky_panel
+import kotlinx.android.synthetic.main.fragment_main_my.tv_nine_count
 
 /**
  * 描述：我
@@ -234,7 +238,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
             if (isClick && data.complete >= data.need) {
                 myPresenter.toTurn()
             }
-            // 展示 5/20
+            tv_nine_count.text = "${data.complete}/${data.need}次"
         } else {
             rl_lucky.visibility = View.GONE
         }

video/app/src/main/java/com/mints/helivideo/ui/widgets/luckymonkeypanel/LuckyMonkeyPanelView.java

@@ -69,7 +69,6 @@ public class LuckyMonkeyPanelView extends FrameLayout {
         itemView7 = (PanelItemView) findViewById(R.id.item7);
         itemView8 = (PanelItemView) findViewById(R.id.item8);
         itemView9 = (PanelItemView) findViewById(R.id.item9);
-
     }
 
     public void setImgArray(List<NineListBean.NineBean> list) {

video/app/src/main/java/com/mints/helivideo/ui/widgets/luckymonkeypanel/PanelItemView.java

@@ -39,10 +39,10 @@ public class PanelItemView extends FrameLayout implements ItemView {
     public void setStyle(String type, String text) {
         if (TextUtils.equals(type, "p")) {
             // 支付
-            iv_panel_item_pic.setImageResource(R.mipmap.ic_kefu);
+            iv_panel_item_pic.setImageResource(R.mipmap.ic_nine_vip);
         } else {
             // 手机
-            iv_panel_item_pic.setImageResource(R.mipmap.ic_kefu);
+            iv_panel_item_pic.setImageResource(R.mipmap.ic_nine_mobile);
         }
         tv_panel_item_text.setText(text);
     }

video/app/src/main/java/com/mints/helivideo/video/DramaApiDetailActivity.kt

@@ -32,8 +32,11 @@ import com.mints.helivideo.ui.adapter.VideoEpisodeAdapter
 import com.mints.helivideo.ui.widgets.DialogListener
 import com.mints.helivideo.ui.widgets.VideoEpisodeDialog
 import com.mints.helivideo.ui.widgets.VipCountDialog
+import com.mints.helivideo.utils.AppPreferencesManager
 import com.mints.library.utils.nodoubleclick.AntiShake
 import kotlinx.android.synthetic.main.drama_activity_api_detail.*
+import kotlinx.android.synthetic.main.drama_activity_api_detail.ll_lucky
+import kotlinx.android.synthetic.main.fragment_tx_video.*
 
 /**
  *  @author Assen
@@ -230,6 +233,15 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
 
     override fun onResume() {
         super.onResume()
+        if (AppPreferencesManager.get()
+                .getBoolean(Constant.LUCKY_FLAG, false)) {
+            // 匹配
+            ll_lucky.visibility = View.VISIBLE
+        } else {
+            // 未匹配
+            ll_lucky.visibility = View.GONE
+        }
+
         if (mVipFlag != UserManager.getInstance().vipFlag && UserManager.getInstance().vipFlag) {
             // 重置状态
             resetData()

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="#64000000" />
+    <solid android:color="#20000000" />
     <corners android:radius="10dp" />
 
 </shape>
\ No newline at end of file

video/app/src/main/res/drawable/bg_lucky_monkey_item1.xml → video/app/src/main/res/drawable/shape_bg_nine.xml

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

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

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/iv_nine_back"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:layout_marginTop="10dp"
-        android:padding="15dp"
-        android:src="@mipmap/ic_arrow_back" />
-
-    <TextView
-        android:id="@+id/tv_nine_count"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="12dp"
-        android:text="剩余抽奖次数：-"
-        android:textColor="@color/white"
-        android:textSize="16sp" />
-
-    <RelativeLayout
-        android:layout_width="300dp"
-        android:layout_height="300dp"
-        android:layout_gravity="center_horizontal">
-
-        <com.mints.helivideo.ui.widgets.luckymonkeypanel.LuckyMonkeyPanelView
-            android:id="@+id/lucky_panel"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@mipmap/bg_nine"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/iv_nine_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:padding="10dp"
+            android:src="@mipmap/ic_arrow_white" />
+
+        <RelativeLayout
+            android:layout_width="300dp"
+            android:layout_height="300dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="30dp">
+
+            <com.mints.helivideo.ui.widgets.luckymonkeypanel.LuckyMonkeyPanelView
+                android:id="@+id/lucky_panel"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <RelativeLayout
+                android:id="@+id/btn_action"
+                android:layout_width="82dp"
+                android:layout_height="82dp"
+                android:layout_centerInParent="true"
+                android:background="@mipmap/ic_luckly_btn">
+
+                <TextView
+                    android:id="@+id/tv_nine_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginBottom="20dp"
+                    android:text="-/-"
+                    android:textColor="@color/white"
+                    android:textSize="10dp"></TextView>
+            </RelativeLayout>
+
+        </RelativeLayout>
+
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <Button
-            android:id="@+id/btn_action"
-            android:layout_width="82dp"
-            android:layout_height="82dp"
-            android:layout_centerInParent="true"
-            android:background="@mipmap/ic_nine_go"
-            android:textColor="#4d1c01"
-            android:textSize="34sp" />
-
-    </RelativeLayout>
-
-    <com.sunfusheng.marqueeview.MarqueeView
-        android:id="@+id/marqueeView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        app:mvAnimDuration="1000"
-        app:mvInterval="3000"
-        app:mvSingleLine="true"
-        app:mvTextColor="@color/white"
-        app:mvTextSize="14sp" />
-</LinearLayout>
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="36dp"
+                android:layout_marginLeft="40dp"
+                android:layout_marginRight="40dp"
+                android:background="@drawable/shape_bg_nine">
+
+                <com.sunfusheng.marqueeview.MarqueeView
+                    android:id="@+id/marqueeView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="40dp"
+                    app:mvAnimDuration="1000"
+                    app:mvInterval="3000"
+                    app:mvSingleLine="true"
+                    app:mvTextColor="@color/white"
+                    app:mvTextSize="14sp" />
+            </RelativeLayout>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:src="@mipmap/ic_nine_good"></ImageView>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_nine_rule"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
+            android:background="@drawable/shape_bg_nine"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="20dp"
+                android:src="@mipmap/ic_nine_rule"></ImageView>
+
+            <TextView
+                android:id="@+id/tv_nine_rule"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginBottom="20dp"
+                android:layout_marginTop="10dp"
+                android:textColor="#FFC1C3"
+                android:textSize="14sp"></TextView>
+        </LinearLayout>
+
+    </LinearLayout>
+</ScrollView>
 

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

@@ -7,15 +7,59 @@
     android:background="#80000000">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="400dp"
+        android:layout_width="290dp"
+        android:layout_height="360dp"
         android:layout_gravity="center"
-        android:layout_margin="20dp"
-        android:background="@color/red"
+        android:layout_marginTop="-30dp"
+        android:background="@mipmap/bg_ninepay"
         android:orientation="vertical">
 
+        <LinearLayout
+            android:layout_width="120dp"
+            android:layout_height="120dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="156dp"
+            android:background="@drawable/shape_banner_write"
+            android:gravity="center"
+            android:orientation="vertical">
 
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/ic_nine_vip_big"></ImageView>
 
+            <TextView
+                android:id="@+id/tv_nine_pay_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginRight="10dp"
+                android:gravity="center"
+                android:text="12312312312312313123123123"
+                android:textColor="#A24240"
+                android:textSize="12sp"></TextView>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:gravity="center_horizontal"
+            android:layout_marginTop="20dp"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/iv_nine_left_next"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/ic_ninepay_left"></ImageView>
+
+            <ImageView
+                android:id="@+id/iv_nine_right_next"
+                android:layout_marginLeft="20dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/ic_ninepay_right"></ImageView>
+        </LinearLayout>
     </LinearLayout>
 </FrameLayout>
 

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

@@ -62,7 +62,7 @@
             android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="5dp"
+            android:layout_marginEnd="11dp"
             android:layout_marginBottom="220dp"
             android:gravity="center"
             android:orientation="vertical"
@@ -70,17 +70,9 @@
             app:layout_constraintRight_toRightOf="parent">
 
             <ImageView
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_marginTop="10dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="看剧抽手机"
-                android:textColor="@color/white"
-                android:textSize="14sp" />
+                android:layout_width="60dp"
+                android:layout_height="50dp"
+                android:src="@mipmap/ic_get_mobile" />
 
         </LinearLayout>
 
@@ -88,7 +80,7 @@
             android:id="@+id/ll_collect"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="15dp"
+            android:layout_marginEnd="20dp"
             android:gravity="center"
             android:orientation="vertical"
             android:layout_marginBottom="110dp"

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

@@ -119,14 +119,24 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent" />
 
-                    <Button
+                    <RelativeLayout
                         android:id="@+id/btn_action"
                         android:layout_width="82dp"
                         android:layout_height="82dp"
                         android:layout_centerInParent="true"
-                        android:background="@mipmap/ic_nine_go"
-                        android:textColor="#4d1c01"
-                        android:textSize="34sp" />
+                        android:background="@mipmap/ic_luckly_btn">
+
+                        <TextView
+                            android:id="@+id/tv_nine_count"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentBottom="true"
+                            android:layout_centerHorizontal="true"
+                            android:layout_marginBottom="20dp"
+                            android:text="-/-"
+                            android:textColor="@color/white"
+                            android:textSize="10dp"></TextView>
+                    </RelativeLayout>
 
                 </RelativeLayout>
 

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

@@ -14,24 +14,16 @@
         android:id="@+id/ll_lucky"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="5dp"
+        android:layout_marginEnd="11dp"
         android:layout_marginBottom="190dp"
         android:gravity="center"
         android:layout_gravity="bottom|right"
         android:orientation="vertical">
 
         <ImageView
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:layout_marginTop="10dp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="看剧抽手机"
-            android:textColor="@color/white"
-            android:textSize="14sp" />
+            android:layout_width="60dp"
+            android:layout_height="50dp"
+            android:src="@mipmap/ic_get_mobile" />
 
     </LinearLayout>
 

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

@@ -13,10 +13,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
+        android:layout_marginBottom="8dp"
         android:text="年卡会员"
         android:textColor="#454A69"
         android:layout_marginLeft="15dp"
-        android:textSize="16sp"
+        android:textSize="15sp"
         android:textStyle="bold" />
 
     <RelativeLayout
@@ -38,10 +39,11 @@
             android:id="@+id/tv_orderrecord_money"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
             android:text="¥50"
             android:textColor="@color/red"
-            android:textSize="22sp" />
+            android:textSize="20sp" />
 
     </RelativeLayout>
 

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

@@ -94,7 +94,7 @@
         android:id="@+id/ll_collect"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="15dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="90dp"
         android:gravity="center"
         android:orientation="vertical"

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

@@ -52,27 +52,18 @@
         android:id="@+id/ll_lucky2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="5dp"
-        android:visibility="gone"
+        android:layout_marginEnd="11dp"
         android:layout_marginBottom="190dp"
         android:gravity="center"
+        android:visibility="gone"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent">
 
         <ImageView
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:src="@mipmap/ic_kefu"
-            android:layout_marginTop="10dp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="看剧抽手机"
-            android:textColor="@color/white"
-            android:textSize="14sp" />
+            android:layout_width="60dp"
+            android:layout_height="50dp"
+            android:src="@mipmap/ic_get_mobile" />
 
     </LinearLayout>
 
@@ -80,7 +71,7 @@
         android:id="@+id/ll_collect"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="15dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="80dp"
         android:gravity="center"
         android:orientation="vertical"

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

@@ -23,7 +23,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="20dp"
-        android:padding="3dp"
+        android:padding="5dp"
         android:background="@drawable/bg_lucky_monkey_panel_nei"
         android:orientation="vertical">
 
@@ -36,7 +36,7 @@
                 android:id="@+id/item1"
                 android:layout_width="76dp"
                 android:layout_height="76dp"
-                android:background="@drawable/bg_lucky_monkey_item1" />
+                android:background="@mipmap/ic_nine_item_bg" />
 
             <View
                 android:layout_width="0dp"
@@ -47,7 +47,7 @@
                 android:id="@+id/item2"
                 android:layout_width="76dp"
                 android:layout_height="76dp"
-                android:background="@drawable/bg_lucky_monkey_item2" />
+                android:background="@mipmap/ic_nine_item_bg" />
 
             <View
                 android:layout_width="0dp"
@@ -58,7 +58,7 @@
                 android:id="@+id/item3"
                 android:layout_width="76dp"
                 android:layout_height="76dp"
-                android:background="@drawable/bg_lucky_monkey_item3" />
+                android:background="@mipmap/ic_nine_item_bg" />
         </LinearLayout>
 
         <View
@@ -75,7 +75,7 @@
                 android:id="@+id/item4"
                 android:layout_width="76dp"
                 android:layout_height="76dp"
-                android:background="@drawable/bg_lucky_monkey_item4" />
+                android:background="@mipmap/ic_nine_item_bg" />
 
             <View
                 android:layout_width="0dp"
@@ -97,7 +97,7 @@
                 android:id="@+id/item6"
                 android:layout_width="76dp"
                 android:layout_height="76dp"
-                android:background="@drawable/bg_lucky_monkey_item6" />
+                android:background="@mipmap/ic_nine_item_bg" />
         </LinearLayout>
 
         <View
@@ -114,7 +114,7 @@
                 android:id="@+id/item7"
                 android:layout_width="76dp"
                 android:layout_height="76dp"
-                android:background="@drawable/bg_lucky_monkey_item7" />
+                android:background="@mipmap/ic_nine_item_bg" />
 
             <View
                 android:layout_width="0dp"
@@ -125,7 +125,7 @@
                 android:id="@+id/item8"
                 android:layout_width="76dp"
                 android:layout_height="76dp"
-                android:background="@drawable/bg_lucky_monkey_item8" />
+                android:background="@mipmap/ic_nine_item_bg" />
 
             <View
                 android:layout_width="0dp"
@@ -136,7 +136,7 @@
                 android:id="@+id/item9"
                 android:layout_width="76dp"
                 android:layout_height="76dp"
-                android:background="@drawable/bg_lucky_monkey_item9" />
+                android:background="@mipmap/ic_nine_item_bg" />
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file

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

@@ -18,14 +18,18 @@
             <ImageView
                 android:id="@+id/iv_panel_item_pic"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@mipmap/ic_kefu"></ImageView>
+                android:layout_height="wrap_content"></ImageView>
 
             <TextView
                 android:id="@+id/tv_panel_item_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="3123"></TextView>
+                android:layout_marginLeft="6dp"
+                android:layout_marginTop="2dp"
+                android:layout_marginRight="6dp"
+                android:gravity="center_horizontal"
+                android:textColor="#A24240"
+                android:textSize="12sp"></TextView>
         </LinearLayout>