删除无用资源

video/app/src/main/AndroidManifest.xml

@@ -75,7 +75,7 @@
             android:name=".ui.activitys.SplashActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:exported="true"
-            android:theme="@style/AppTheme.TranslucentSplish">
+            android:theme="@style/AppTheme.TranslucentSplash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -160,12 +160,6 @@
             android:hardwareAccelerated="true"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".video.tx.newrecommend.NewTxVideoActivity"
-            android:exported="false"
-            android:hardwareAccelerated="true"
-            android:screenOrientation="portrait" />
-
         <service
             android:name=".ui.service.UpdateService"
             android:exported="true" />

video/app/src/main/java/com/duben/dayplaylet/manager/LocalVedioManager.kt

@@ -14,7 +14,6 @@ import com.duben.dayplaylet.mvp.model.VedioBean
 import com.duben.dayplaylet.utils.AppPreferencesManager
 import com.duben.dayplaylet.utils.ToastUtil
 import com.duben.dayplaylet.video.csj.DramaApiDetailActivity
-import com.duben.dayplaylet.video.tx.newrecommend.NewTxVideoActivity
 import com.duben.dayplaylet.video.tx.TxVideoActivity
 
 /**
@@ -108,12 +107,6 @@ object LocalVedioManager {
 //                bundle.putBoolean(Constant.VEDIO_NEXT, isPlayNext)
 //                bundle.putBoolean(Constant.VEDIO_THIRD, isThirdId)
 //                readyGo(activity, TxVideoActivity::class.java, bundle)
-//            }
-//            3 -> {
-//                //推荐短剧
-//                val bundle = Bundle()
-//                bundle.putString(Constant.VEDIO_BEAN, JsonUtil.toJson(data))
-//                readyGo(activity, NewTxVideoActivity::class.java, bundle)
 //            }
             else -> {
                 requestDrama(activity, data)

video/app/src/main/java/com/duben/dayplaylet/mvp/presenters/VideoPresenter.kt

 package com.duben.dayplaylet.mvp.presenters
 
-import com.duben.library.net.neterror.BaseSubscriber
-import com.duben.library.net.neterror.Throwable
 import com.duben.dayplaylet.manager.AppHttpManager
 import com.duben.dayplaylet.mvp.model.BaseResponse
 import com.duben.dayplaylet.mvp.model.IndexList
-import com.duben.dayplaylet.mvp.model.NineShowBean
 import com.duben.dayplaylet.mvp.views.VideoView
-import java.util.HashMap
+import com.duben.library.net.neterror.BaseSubscriber
+import com.duben.library.net.neterror.Throwable
+import com.google.gson.JsonObject
 
 class VideoPresenter : BasePresenter<VideoView>() {
 
@@ -53,44 +52,6 @@ class VideoPresenter : BasePresenter<VideoView>() {
                 })
     }
 
-    fun getIndexList2(thirdId: String, csj: Boolean = false) {
-        val vo = HashMap<String, Any>()
-        vo["vedioId"] = thirdId
-        AppHttpManager.getInstance(loanApplication)
-            .call(loanService.getIndexList2(vo),
-                object : BaseSubscriber<BaseResponse<IndexList>>() {
-                    override fun onCompleted() {
-                        if (isLinkView) return
-                        view.hideLoading()
-                    }
-
-                    override fun onNext(baseResponse: BaseResponse<IndexList>) {
-                        if (isLinkView) return
-
-                        view.hideLoading()
-                        val code = baseResponse.status
-                        val message = baseResponse.message
-
-                        when (code) {
-                            200 -> view.getIndexListSuc(baseResponse.data)
-                            else -> {
-                                view.getIndexListFail()
-                                view.showToast(message)
-                            }
-                        }
-                    }
-
-                    override fun onError(e: Throwable?) {
-                        if (isLinkView) return
-                        view.hideLoading()
-                        view.showToast(e?.message)
-
-                        view.getIndexListFail()
-                    }
-
-                })
-    }
-
     fun unlock(vo: HashMap<String, Any>) {
         AppHttpManager.getInstance(loanApplication)
             .call(
@@ -129,16 +90,16 @@ class VideoPresenter : BasePresenter<VideoView>() {
 
     }
 
-    fun showTurn() {
+    fun rdVedioMsg() {
         AppHttpManager.getInstance(loanApplication)
-            .call(loanService.showTurn(),
-                object : BaseSubscriber<BaseResponse<NineShowBean>>() {
+            .call(loanService.rdVedioMsg(),
+                object : BaseSubscriber<BaseResponse<JsonObject>>() {
                     override fun onCompleted() {
                         if (isLinkView) return
                         view.hideLoading()
                     }
 
-                    override fun onNext(baseResponse: BaseResponse<NineShowBean>) {
+                    override fun onNext(baseResponse: BaseResponse<JsonObject>) {
                         if (isLinkView) return
 
                         view.hideLoading()
@@ -146,8 +107,17 @@ class VideoPresenter : BasePresenter<VideoView>() {
                         val message = baseResponse.message
 
                         when (code) {
-                            200 -> view.showTurnSuc(baseResponse.data)
+                            200 -> {
+                                val data = baseResponse.data
+                                if (data != null) {
+                                    view.rdVedioMsgSuc(
+                                        data["surplusCount"].asInt,
+                                        data["surplusSeconds"].asInt
+                                    )
+                                }
+                            }
                             else -> {
+                                view.rdVedioMsgSuc(0, 0)
                                 view.showToast(message)
                             }
                         }

video/app/src/main/java/com/duben/dayplaylet/mvp/views/VideoView.kt

@@ -11,6 +11,6 @@ interface VideoView : BaseView {
     fun unlockSuc(indexList: IndexList)
     fun unlockFail()
 
-    fun showTurnSuc(data: NineShowBean)
+    fun rdVedioMsgSuc(surplusCount: Int, surplusSeconds: Int)
 
 }
\ No newline at end of file

video/app/src/main/java/com/duben/dayplaylet/net/LoanService.java

@@ -138,14 +138,6 @@ public interface LoanService {
     @POST("api/vedio/getIndexList")
     Observable<BaseResponse<IndexList>> getIndexList(@Body Map<String, Object> vo);
 
-    /**
-     * 优选剧 剧情列表
-     *
-     * @return
-     */
-    @POST("api/vedio/getIndexList/vedio3")
-    Observable<BaseResponse<IndexList>> getIndexList2(@Body Map<String, Object> vo);
-
     /**
      * 收藏
      *
@@ -234,6 +226,14 @@ public interface LoanService {
     @POST("api/reward/rdSongMsg")
     Observable<BaseResponse<MusicBean>> rdSongMsg();
 
+    /**
+     * 短剧内视频-转圈广告
+     *
+     * @return
+     */
+    @POST("api/reward/rdVedioMsg")
+    Observable<BaseResponse<JsonObject>> rdVedioMsg();
+
     /**
      * 默认http工厂
      */

video/app/src/main/java/com/duben/dayplaylet/ui/activitys/SplashActivity.kt

@@ -5,14 +5,11 @@ import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
 import com.duben.dayplaylet.R
-import com.duben.dayplaylet.ad.AdManager
 import com.duben.dayplaylet.ad.splash.SplashManager
 import com.duben.dayplaylet.common.Constant
 import com.duben.dayplaylet.common.Constant.PRIVACY_URL
 import com.duben.dayplaylet.common.Constant.REGISTER_URL
-import com.duben.dayplaylet.manager.LocalVedioManager
 import com.duben.dayplaylet.manager.TrackManager
-import com.duben.dayplaylet.manager.UserManager
 import com.duben.dayplaylet.ui.activitys.base.BaseActivity
 import com.duben.dayplaylet.ui.widgets.CycleProgress
 import com.duben.dayplaylet.ui.widgets.DialogListener
@@ -20,7 +17,6 @@ import com.duben.dayplaylet.ui.widgets.PowerDialog
 import com.duben.dayplaylet.ui.widgets.PowerDialog2
 import com.duben.dayplaylet.ui.widgets.countdowntimer.CountDownTimerSupport
 import com.duben.dayplaylet.ui.widgets.countdowntimer.OnCountDownTimerListener
-import com.duben.dayplaylet.utils.AppPreferencesManager
 import com.duben.dayplaylet.utils.AppPreferencesManager.get
 import com.duben.dayplaylet.utils.LogUtil
 import java.util.*

video/app/src/main/java/com/duben/dayplaylet/ui/fragment/MainFragment.kt

@@ -31,6 +31,7 @@ import com.duben.dayplaylet.mvp.model.*
 import com.duben.dayplaylet.mvp.presenters.HomePresenter
 import com.duben.dayplaylet.mvp.views.HomeView
 import com.duben.dayplaylet.ui.activitys.LoadingActivity
+import com.duben.dayplaylet.ui.activitys.MainActivity
 import com.duben.dayplaylet.ui.activitys.WatchRecordActivity
 import com.duben.dayplaylet.ui.adapter.HomeVideoPageAdapter
 import com.duben.dayplaylet.ui.adapter.ImageTitleAdapter
@@ -139,6 +140,12 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
 //                showSignDialog(7)
                 showDrawAlipayDialog()
             }
+            R.id.btn_draw_gold -> {
+                (requireActivity() as MainActivity).clickTab4Layout()
+            }
+            R.id.btn_draw_cash -> {
+                (requireActivity() as MainActivity).clickTab4Layout()
+            }
         }
     }
 

video/app/src/main/java/com/duben/dayplaylet/ui/fragment/MyFragment.kt

@@ -13,6 +13,7 @@ import com.duben.dayplaylet.ui.activitys.SettingsActivity
 import com.duben.dayplaylet.ui.adapter.TasksAdapter
 import com.duben.dayplaylet.ui.fragment.base.LazyLoadBaseFragment
 import com.duben.dayplaylet.ui.fragment.draw.DrawCashDialog
+import com.duben.dayplaylet.utils.BubbleUtils
 import com.duben.dayplaylet.utils.SpanUtils
 import com.duben.library.utils.nodoubleclick.AntiShake
 import kotlinx.android.synthetic.main.fragment_main_my.*
@@ -102,6 +103,8 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
 
         rg_my_income.setOnCheckedChangeListener { group, checkedId ->
             if (checkedId == R.id.rb_my_cash) {
+                tv_my_cash.visibility = View.VISIBLE
+                tv_my_gold.visibility = View.INVISIBLE
                 tv_my_title.text = "红包余额(元)"
                 tv_my_money.text = SpanUtils()
                     .setFontSize(30, true)
@@ -110,6 +113,8 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
                     .append(" ≈ ")
                     .create()
             } else {
+                tv_my_cash.visibility = View.INVISIBLE
+                tv_my_gold.visibility = View.VISIBLE
                 tv_my_title.text = "金元宝余额(个)"
                 tv_my_money.text = SpanUtils()
                     .setFontSize(30, true)
@@ -122,7 +127,12 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
     }
 
     private fun showDrawCashDialog() {
-        drawCashDialog = DrawCashDialog()
+        val dialogIndex = if (rb_my_cash.isChecked) {
+            0
+        } else {
+            1
+        }
+        drawCashDialog = DrawCashDialog(dialogIndex)
         drawCashDialog?.let {
             if (!it.isAdded && !it.isVisible && !it.isRemoving) {
                 it.show(supportFragmentManager, this.javaClass.simpleName)

video/app/src/main/java/com/duben/dayplaylet/ui/fragment/draw/DrawCashDialog.kt

@@ -20,7 +20,7 @@ import com.duben.dayplaylet.ui.widgets.bottomsheet.BaseBottomSheetDialog
  *
  *  @desc 提现弹框
  */
-class DrawCashDialog : BaseBottomSheetDialog() {
+class DrawCashDialog(private val index: Int = 0) : BaseBottomSheetDialog() {
 
     private lateinit var tabLayout: TabLayout
     private lateinit var vp2: ViewPager2
@@ -73,6 +73,8 @@ class DrawCashDialog : BaseBottomSheetDialog() {
 
             }
         })
+
+        vp2.currentItem = index
     }
 
     private fun updateTab(tab: TabLayout.Tab?, isSelected: Boolean) {

video/app/src/main/java/com/duben/dayplaylet/ui/widgets/CountDownVideoView.java

+package com.duben.dayplaylet.ui.widgets;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import androidx.annotation.Nullable;
+
+import com.daimajia.androidanimations.library.Techniques;
+import com.daimajia.androidanimations.library.YoYo;
+import com.duben.dayplaylet.R;
+
+
+public class CountDownVideoView extends LinearLayout {
+
+    private CountDownVideoListener countDownVideoListener;
+
+    private CountDownView cdCountVedioView;
+    private ImageView ivCountVedioRedbox;
+
+    private boolean isPlaying = false;
+    private YoYo.YoYoString rope;
+
+    public CountDownVideoView(Context context) {
+        this(context, null);
+    }
+
+    public CountDownVideoView(Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public CountDownVideoView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        initView(context);
+        initListener();
+    }
+
+    private void initView(Context context) {
+        View view = View.inflate(context, R.layout.view_countdown_video, this);
+
+        ivCountVedioRedbox = view.findViewById(R.id.iv_count_redbox);
+        cdCountVedioView = view.findViewById(R.id.cd_count_vedio);
+    }
+
+    private void initListener() {
+        cdCountVedioView.setOnLoadingFinishListener(() -> {
+            if (countDownVideoListener != null) {
+                countDownVideoListener.onLoadingFinish();
+            }
+        });
+    }
+
+    public void start() {
+        cdCountVedioView.start();
+        isPlaying = true;
+    }
+
+    public void pause() {
+        cdCountVedioView.pause();
+    }
+
+    public void resume() {
+        cdCountVedioView.resume();
+    }
+
+    public void reset() {
+        cdCountVedioView.reset();
+        isPlaying = true;
+    }
+
+    public void stop() {
+        stopStatus();
+        cdCountVedioView.reset();
+        cdCountVedioView.pause();
+    }
+
+    public void stopStatus() {
+        isPlaying = false;
+    }
+
+    public boolean isPlaying() {
+        return isPlaying;
+    }
+
+    public void setTime(int time) {
+        cdCountVedioView.setTime(time);
+    }
+
+    public void setRedpkgImg(int img) {
+        ivCountVedioRedbox.setImageResource(img);
+    }
+
+    public void setCountDownVideoListener(CountDownVideoListener countDownVideoListener) {
+        this.countDownVideoListener = countDownVideoListener;
+    }
+
+    public interface CountDownVideoListener {
+        void onLoadingFinish();
+    }
+
+    /**
+     * 显示红包动画
+     */
+    public void showRedbox() {
+        if (ivCountVedioRedbox != null) {
+            rope = null;
+            rope = YoYo.with(Techniques.Tada).duration(600).repeat(-1).playOn(ivCountVedioRedbox);
+        }
+    }
+
+    /**
+     * 开始红包动画
+     */
+    public void startAnim() {
+        if (rope != null && !rope.isRunning()) {
+            showRedbox();
+        }
+    }
+
+    /**
+     * 暂停红包动画
+     */
+    public void stopAnim() {
+        if (rope != null && rope.isRunning()) {
+            rope.stop();
+        }
+    }
+
+    public void stopRedbox() {
+        if (ivCountVedioRedbox != null && rope != null) {
+            rope.stop();
+        }
+    }
+
+    public void destroy() {
+        if (cdCountVedioView.callOnClick())
+
+            if (rope != null) {
+                rope.stop();
+                rope = null;
+            }
+    }
+}

video/app/src/main/java/com/duben/dayplaylet/ui/widgets/CountDownView.java

@@ -10,7 +10,9 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.RectF;
+
 import androidx.core.content.ContextCompat;
+
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -91,6 +93,7 @@ public class CountDownView extends View {
         mPaintArc.setAntiAlias(true);
         mPaintArc.setColor(mPaintArcColor);
         mPaintArc.setStrokeWidth(mPaintArcWidth);
+        mPaintArc.setStrokeCap(Paint.Cap.ROUND);//线条尾部设置成圆角
 
 //        mPaintText = new Paint();
 //        mPaintText.setStyle(Paint.Style.STROKE);
@@ -184,7 +187,6 @@ public class CountDownView extends View {
                 , mWidth - mPaintArcWidth / 2, mHeight - mPaintArcWidth / 2);
         canvas.drawArc(rectF, startAngle, mSweepAngle, false, mPaintArc);
 
-
 //        //画文字
 //        float mTetxWidth = mPaintText.measureText(mText, 0, mText.length());
 //        float dx = mWidth / 2 - mTetxWidth / 2;

video/app/src/main/java/com/duben/dayplaylet/video/csj/DramaApiDetailActivity.kt

@@ -14,19 +14,19 @@ import com.duben.dayplaylet.ad.express.ExpressManager
 import com.duben.dayplaylet.common.Constant
 import com.duben.dayplaylet.manager.LocalVedioManager
 import com.duben.dayplaylet.mvp.model.IndexList
-import com.duben.dayplaylet.mvp.model.NineShowBean
 import com.duben.dayplaylet.mvp.model.VedioBean
 import com.duben.dayplaylet.mvp.presenters.VideoPresenter
 import com.duben.dayplaylet.mvp.views.VideoView
 import com.duben.dayplaylet.ui.activitys.base.BaseActivity
 import com.duben.dayplaylet.ui.adapter.VideoEpisodeAdapter
+import com.duben.dayplaylet.ui.widgets.CountDownVideoView
 import com.duben.dayplaylet.ui.widgets.DialogListener
 import com.duben.dayplaylet.ui.widgets.VideoEpisodeDialog
 import com.duben.dayplaylet.ui.widgets.VideoLockDialog
-import com.duben.dayplaylet.utils.AppPreferencesManager
-import com.duben.library.utils.GlideUtils
 import com.duben.library.utils.nodoubleclick.AntiShake
 import kotlinx.android.synthetic.main.drama_activity_api_detail.*
+import kotlinx.android.synthetic.main.layout_draw_header.*
+import kotlinx.android.synthetic.main.layout_red_box.*
 
 /**
  *  @author Assen
@@ -34,7 +34,7 @@ import kotlinx.android.synthetic.main.drama_activity_api_detail.*
  *  @desc
  */
 class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClickListener,
-    VideoView, View.OnClickListener {
+    VideoView, View.OnClickListener, CountDownVideoView.CountDownVideoListener {
 
     companion object {
         private const val TAG = "DramaApiDetailActivity"
@@ -95,6 +95,7 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
 
         ExpressManager.instance.preLoadAd()
 
+        leave.visibility = View.VISIBLE
         fm_bottom.setOnClickListener(this)
         leave.setOnClickListener(this)
         iv_pause.setOnClickListener(this)
@@ -115,7 +116,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
             }
             info_tv.text = String.format("第%d集", mVedioBean!!.seeIndex)
         }
-        ll_lucky.setOnClickListener(this)
 
         if (DPSdk.isStartSuccess()) {
             init()
@@ -136,6 +136,11 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
         }
 
         isInited = true
+
+        cl_red_box.visibility = View.VISIBLE
+        cdvv.setTime(10)
+        cdvv.setCountDownVideoListener(this)
+        cdvv.start()
     }
 
     private fun initWidget() {
@@ -165,13 +170,16 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
     override fun onDestroy() {
         dpWidget?.destroy()
         ExpressManager.instance.destroy()
+
+        cdvv.destroy()
+        cdvv.setCountDownVideoListener(null)
         super.onDestroy()
     }
 
     override fun onResume() {
         super.onResume()
 
-        videoPresenter.showTurn()
+        videoPresenter.rdVedioMsg()
     }
 
     private var dramaListener: IDPDramaListener = object : IDPDramaListener() {
@@ -197,11 +205,19 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
         override fun onDPVideoPause(map: MutableMap<String, Any>?) {
             super.onDPVideoPause(map)
             Log.d(TAG, "onDPVideoPause:" + map?.toString())
+
+            if (cdvv.isPlaying) {
+                cdvv.pause()
+            }
         }
 
         override fun onDPVideoContinue(map: MutableMap<String, Any>?) {
             super.onDPVideoContinue(map)
             Log.d(TAG, "onDPVideoContinue:" + map?.toString())
+
+            if (cdvv.isPlaying) {
+                cdvv.resume()
+            }
         }
 
         override fun onDPVideoCompletion(map: MutableMap<String, Any>?) {
@@ -212,6 +228,10 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
         override fun onDPVideoOver(map: MutableMap<String, Any>?) {
             super.onDPVideoOver(map)
             Log.d(TAG, "onDPVideoOver:" + map?.toString())
+
+            if (cdvv.isPlaying) {
+                cdvv.pause()
+            }
         }
 
         override fun onDPClose() {
@@ -253,7 +273,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
 
             info_tv.text = String.format("第%d集", index)
             mCurrentIndex = index
-            localShowLucky(index - 1)
 
             val needBlock = index > unlockIndex && hasUnlockList.contains(index).not()
             if (!needBlock) {
@@ -376,7 +395,18 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
 
     }
 
-    override fun showTurnSuc(data: NineShowBean) {
+    override fun rdVedioMsgSuc(surplusCount: Int, surplusSeconds: Int) {
+//        if (surplusCount > 0) {
+//            cl_red_box.visibility = View.VISIBLE
+//            cdvv.setTime(surplusSeconds)
+//            cdvv.setCountDownVideoListener(this)
+//        } else {
+//            cl_red_box.visibility = View.GONE
+//        }
+    }
+
+    override fun onLoadingFinish() {
+
     }
 
     override fun onClick(v: View?) {
@@ -395,31 +425,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
         }
     }
 
-    private fun localShowLucky(position: Int) {
-        val localLucky = AppPreferencesManager.get()
-            .getBoolean(Constant.LUCKY_FLAG, false)
-        if (mVedioBean != null && localLucky) {
-            if (position > mVedioBean!!.unlockIndex - 1) {
-                // 解锁界面
-                ll_lucky.visibility = View.GONE
-            } else {
-                // 超过免费剧
-                if (position >= mVedioBean!!.freeIndex) {
-                    ll_lucky.visibility = View.VISIBLE
-                    context?.let {
-                        GlideUtils.loadRoundImageViewGif(
-                            it,
-                            R.drawable.ic_nine,
-                            iv_lucky_gif
-                        )
-                    }
-                } else {
-                    ll_lucky.visibility = View.GONE
-                }
-            }
-        }
-    }
-
     private fun showLockDialog(drama: DPDrama, widget: IDPWidget) {
         mVideoLockDialog = VideoLockDialog(
             this,

video/app/src/main/java/com/duben/dayplaylet/video/tx/TxVideoActivity.kt

@@ -22,10 +22,7 @@ import com.duben.dayplaylet.ui.adapter.VideoEpisodeAdapter
 import com.duben.dayplaylet.ui.widgets.DialogListener
 import com.duben.dayplaylet.ui.widgets.VideoEpisodeDialog
 import com.duben.dayplaylet.ui.widgets.VipCountDialog
-import com.duben.dayplaylet.utils.AppPreferencesManager
-import com.duben.dayplaylet.utils.SpanUtils
 import com.duben.dayplaylet.video.tx.adapter.TxVideoAdapter
-import com.duben.library.utils.GlideUtils
 import com.duben.library.utils.nodoubleclick.AntiShake
 import kotlinx.android.synthetic.main.activity_tx_video.*
 
@@ -37,7 +34,6 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
     var videos = ArrayList<VedioEpisodeBean>()
 
     private var dialog: VideoEpisodeDialog? = null
-    private var isLuckyShow = false
 
     private val videoPresenter by lazy { VideoPresenter() }
 
@@ -75,7 +71,6 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
     override fun onResume() {
         super.onResume()
         super_short_video_view.resume()
-        videoPresenter.showTurn()
 
         if (mVipFlag != UserManager.getInstance().vipFlag && UserManager.getInstance().vipFlag) {
             // 重置状态
@@ -116,7 +111,6 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
         super_short_video_view.setOnPageChangeListener {
             if (super_short_video_view.isAdPosition(it) || super_short_video_view.isLuckPosition(it)) {
                 fm_bottom.visibility = View.GONE
-                ll_lucky.visibility = View.GONE
                 super_short_video_view.pause()
                 return@setOnPageChangeListener
             }
@@ -125,7 +119,6 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
 
             val readIndex = getRealIndex(it)
             showVipCountDialog(readIndex)
-            localShowLucky(readIndex)
 
             // videoIndex -> seeIndex
             val data = super_short_video_view.data
@@ -138,7 +131,6 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
 
         fm_bottom.setOnClickListener(this)
         close_iv.setOnClickListener(this)
-        ll_lucky.setOnClickListener(this)
     }
 
 
@@ -152,8 +144,6 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
             R.id.fm_bottom -> {
                 showEpisodeDialog()
             }
-            R.id.ll_lucky -> {
-            }
             else -> {}
         }
     }
@@ -206,34 +196,8 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
     override fun unlockFail() {
     }
 
-    override fun showTurnSuc(data: NineShowBean) {
-        AppPreferencesManager.get()
-            .put(Constant.LUCKY_FLAG, data.isShow)
-        isLuckyShow = data.isShow
-
-        if (isLuckyShow) {
-            val complete = data.complete
-            val need = data.need
-            if (complete >= need) {
-                tv_lucky_status.text = SpanUtils()
-                    .append("可领取")
-                    .setForegroundColor(resources.getColor(R.color.apk_uninstalled))
-                    .create()
-            } else {
-                tv_lucky_status.text = SpanUtils()
-                    .append(complete.toString())
-                    .setForegroundColor(resources.getColor(R.color.red))
-                    .append("/")
-                    .append(need.toString())
-                    .create()
-            }
+    override fun rdVedioMsgSuc(surplusCount: Int, surplusSeconds: Int) {
 
-            // 匹配
-//            ll_lucky.visibility = View.VISIBLE
-        } else {
-            // 未匹配
-//            ll_lucky.visibility = View.GONE
-        }
     }
 
     override fun onEpisodeClick(position: Int) {
@@ -346,22 +310,6 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
 
     }
 
-    /**
-     * @param index 当前下标的集数
-     */
-    private fun localShowLucky(index: Int) {
-        val localLucky = AppPreferencesManager.get()
-            .getBoolean(Constant.LUCKY_FLAG, false)
-
-        if (isLuckyShow || localLucky) {
-            ll_lucky.visibility = View.VISIBLE
-            context?.let { GlideUtils.loadRoundImageViewGif(it, R.drawable.ic_nine, iv_lucky_gif) }
-
-        } else {
-            ll_lucky.visibility = View.GONE
-        }
-    }
-
     // 获取当前下标真正代表的集数
     private fun getRealIndex(position: Int): Int {
         var readIndex = position

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

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@mipmap/ic_cb_selected" android:state_checked="true" />
+    <item android:drawable="@mipmap/ic_cb_selected" android:state_selected="true" />
+    <item android:drawable="@mipmap/ic_cb_selected" android:state_pressed="true" />
+    <item android:drawable="@mipmap/ic_cb_unselected" android:state_checked="false" />
+</selector>
\ No newline at end of file

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/loading_bg" />
-
-    <!-- 边缘线的宽度和颜色 -->
-    <stroke
-        android:width="1dp"
-        android:color="@color/full_transparent" />
-
-    <corners android:radius="5dip" />
-
-</shape>
\ 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_pay_left.xml

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

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

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

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

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

video/app/src/main/res/drawable/shape_back_cash_selected.xml → video/app/src/main/res/drawable/shape_tips.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#FFFBF0" />
     <corners android:radius="6dp" />
-    <stroke
-        android:width="1dp"
-        android:color="#F9B601" />
+    <solid android:color="@color/color_20000000" />
 </shape>
\ No newline at end of file

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

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

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

-<?xml version="1.0" encoding="UTF-8"?>
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:oneshot="false">
-<!--    <item android:duration="100">-->
-<!--        <clip-->
-<!--            android:clipOrientation="horizontal"-->
-<!--            android:drawable="@mipmap/loading_u0"-->
-<!--            android:gravity="left" />-->
-<!--    </item>-->
-
-    <item android:duration="100">
-        <clip
-            android:clipOrientation="horizontal"
-            android:drawable="@mipmap/loading_u1"
-            android:gravity="left" />
-    </item>
-
-    <item android:duration="100">
-        <clip
-            android:clipOrientation="horizontal"
-            android:drawable="@mipmap/loading_u2"
-            android:gravity="left" />
-    </item>
-
-    <item android:duration="100">
-        <clip
-            android:clipOrientation="horizontal"
-            android:drawable="@mipmap/loading_u3"
-            android:gravity="left" />
-    </item>
-
-    <item android:duration="100">
-        <clip
-            android:clipOrientation="horizontal"
-            android:drawable="@mipmap/loading_u4"
-            android:gravity="left" />
-    </item>
-
-    <item android:duration="100">
-        <clip
-            android:clipOrientation="horizontal"
-            android:drawable="@mipmap/loading_u5"
-            android:gravity="left" />
-    </item>
-
-    <item android:duration="100">
-        <clip
-            android:clipOrientation="horizontal"
-            android:drawable="@mipmap/loading_u6"
-            android:gravity="left" />
-    </item>
-</animation-list>
\ No newline at end of file

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

-<?xml version="1.0" encoding="UTF-8"?>
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:oneshot="false">
-    <item
-        android:drawable="@mipmap/loading_u1"
-        android:duration="100" />
-    <item
-        android:drawable="@mipmap/loading_u2"
-        android:duration="100" />
-    <item
-        android:drawable="@mipmap/loading_u3"
-        android:duration="100" />
-    <item
-        android:drawable="@mipmap/loading_u4"
-        android:duration="100" />
-    <item
-        android:drawable="@mipmap/loading_u5"
-        android:duration="100" />
-    <item
-        android:drawable="@mipmap/loading_u7"
-        android:duration="100" />
-    <item
-        android:drawable="@mipmap/loading_u8"
-        android:duration="100" />
-    <item
-        android:drawable="@mipmap/loading_u9"
-        android:duration="100" />
-    <item
-        android:drawable="@mipmap/loading_u10"
-        android:duration="100" />
-    <item
-        android:drawable="@mipmap/loading_u11"
-        android:duration="100" />
-    <item
-        android:drawable="@mipmap/loading_u12"
-        android:duration="100" />
-</animation-list>
\ No newline at end of file

video/app/src/main/res/layout/activity_backcash2.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" />
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:overScrollMode="never">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="20dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/tv_order_nickname"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="16sp" />
-
-            <EditText
-                android:id="@+id/et_order_nickname"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="20dp"
-                android:hint="请输入"
-                android:inputType="text"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/tv_order_mobile"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="16sp" />
-
-            <EditText
-                android:id="@+id/et_order_mobile"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="20dp"
-                android:hint="请输入"
-                android:inputType="phone"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/tv_order_cause"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="16sp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:orientation="horizontal">
-
-                <RadioButton
-                    android:id="@+id/rb_1"
-                    android:layout_width="0dp"
-                    android:layout_height="40dp"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/shape_back_cash_selector"
-                    android:button="@null"
-                    android:gravity="center"
-                    android:text="7天无理由"
-                    android:textColor="@drawable/shape_back_cash_text_selector" />
-
-                <RadioButton
-                    android:id="@+id/rb_2"
-                    android:layout_width="0dp"
-                    android:layout_height="40dp"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="20dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/shape_back_cash_selector"
-                    android:button="@null"
-                    android:gravity="center"
-                    android:text="没有我想要的功能"
-                    android:textColor="@drawable/shape_back_cash_text_selector" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:layout_marginBottom="20dp"
-                android:orientation="horizontal">
-
-                <RadioButton
-                    android:id="@+id/rb_3"
-                    android:layout_width="0dp"
-                    android:layout_height="40dp"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/shape_back_cash_selector"
-                    android:button="@null"
-                    android:gravity="center"
-                    android:text="产品体验较差"
-                    android:textColor="@drawable/shape_back_cash_text_selector" />
-
-                <RadioButton
-                    android:id="@+id/rb_4"
-                    android:layout_width="0dp"
-                    android:layout_height="40dp"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="20dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/shape_back_cash_selector"
-                    android:button="@null"
-                    android:gravity="center"
-                    android:text="其他"
-                    android:textColor="@drawable/shape_back_cash_text_selector" />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/tv_order_suggest"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="16sp" />
-
-            <EditText
-                android:id="@+id/et_order_suggest"
-                android:layout_width="match_parent"
-                android:layout_height="120dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/shape_back_cash_unselected"
-                android:gravity="top"
-                android:hint="请留下您的批评、表扬或者建议，我们会虚心听取， 认真改正。(请保持在5-150字内)"
-                android:maxLength="150"
-                android:padding="10dp"
-                android:textSize="14sp" />
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-
-    <Button
-        android:id="@+id/btn_submit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="20dp"
-        android:background="@drawable/shape_yellow"
-        android:text="提 交"
-        android:textColor="@color/white"
-        android:textSize="18sp"
-        android:textStyle="bold" />
-
-</LinearLayout>
\ No newline at end of file

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

@@ -23,7 +23,7 @@
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:layout_alignParentBottom="true"
-        android:background="@color/authentic_text"
+        android:background="@color/white"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 

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

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@mipmap/bg_manage_order"
-    android:orientation="vertical">
-
-    <include layout="@layout/header_layout" />
-
-    <com.duben.dayplaylet.ui.widgets.ElasticScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:padding="20dp">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <com.duben.dayplaylet.ui.widgets.CircleImageView
-                    android:id="@+id/civ_my"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginEnd="10dp"
-                    android:src="@mipmap/ic_my_avat" />
-
-                <TextView
-                    android:id="@+id/tv_my_account"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignTop="@id/civ_my"
-                    android:layout_marginTop="4dp"
-                    android:layout_toEndOf="@id/civ_my"
-                    android:text="手机号"
-                    android:textColor="@color/black"
-                    android:textSize="18sp" />
-
-                <TextView
-                    android:id="@+id/tv_my_hint"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignBottom="@id/civ_my"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="4dp"
-                    android:layout_toEndOf="@id/civ_my"
-                    android:text="用户ID"
-                    android:textSize="14sp" />
-
-            </RelativeLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:text="自动续费订单"
-                android:textColor="@color/black"
-                android:textSize="18sp"
-                android:textStyle="bold" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:background="@mipmap/bg_manage_order_content"
-                android:padding="20dp">
-
-                <TextView
-                    android:id="@+id/tv_1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="0.01元试用会员"
-                    android:textColor="#74380C"
-                    android:textSize="16sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/tv_2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tv_1"
-                    android:layout_marginTop="20dp"
-                    android:text="下次扣款日期"
-                    android:textColor="#74380C"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:id="@+id/tv_date"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignTop="@id/tv_2"
-                    android:layout_alignParentEnd="true"
-                    android:text="-"
-                    android:textColor="#74380C"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/tv_3"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tv_2"
-                    android:layout_marginTop="10dp"
-                    android:text="下次扣款金额"
-                    android:textColor="#74380C"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:id="@+id/tv_coin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignTop="@id/tv_3"
-                    android:layout_alignParentEnd="true"
-                    android:text="-"
-                    android:textColor="#74380C"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/tv_4"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tv_3"
-                    android:layout_marginTop="10dp"
-                    android:text="支付方式"
-                    android:textColor="#74380C"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:id="@+id/tv_channel"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignTop="@id/tv_4"
-                    android:layout_alignParentEnd="true"
-                    android:text="-"
-                    android:textColor="#74380C"
-                    android:textStyle="bold" />
-
-
-                <TextView
-                    android:id="@+id/tv_cancel"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tv_4"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginTop="20dp"
-                    android:background="@drawable/shape_cancel_order"
-                    android:paddingStart="20dp"
-                    android:paddingTop="5dp"
-                    android:paddingEnd="20dp"
-                    android:paddingBottom="5dp"
-                    android:text="取消自动续费"
-                    android:textColor="#763904" />
-
-            </RelativeLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:text="会员权益"
-                android:textColor="@color/black"
-                android:textSize="18sp"
-                android:textStyle="bold" />
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="220dp"
-                android:layout_marginTop="20dp"
-                android:src="@mipmap/bg_my_hint2" />
-
-        </LinearLayout>
-    </com.duben.dayplaylet.ui.widgets.ElasticScrollView>
-
-
-</LinearLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:orientation="vertical">
-
-    <com.duben.dayplaylet.video.tx.newrecommend.NewSuperShortVideoView
-        android:id="@+id/new_super_short_video_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <ImageView
-        android:id="@+id/close_iv"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:layout_marginTop="20dp"
-        android:padding="10dp"
-        android:src="@mipmap/ic_arrow_white" />
-
-    <FrameLayout
-        android:id="@+id/fm_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_gravity="bottom">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_40"
-            android:layout_gravity="center"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            android:background="@drawable/shape_half_trans"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingStart="@dimen/dp_10"
-            android:paddingEnd="@dimen/dp_10">
-
-            <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:src="@mipmap/ic_video_epsiode" />
-
-            <TextView
-                android:id="@+id/episode_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_weight="1"
-                android:text="共100集 已完结"
-                android:textColor="@color/white" />
-
-            <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:src="@mipmap/ic_arrow_top" />
-
-        </LinearLayout>
-
-    </FrameLayout>
-
-    <LinearLayout
-        android:id="@+id/ll_lucky"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|right"
-        android:layout_marginEnd="1dp"
-        android:layout_marginBottom="220dp"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <ImageView
-            android:id="@+id/iv_lucky_gif"
-            android:layout_width="80dp"
-            android:layout_height="70dp" />
-
-        <TextView
-            android:id="@+id/tv_lucky_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:background="@drawable/shape_bg_black2"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:text="0/5"
-            android:textColor="@color/white"
-            android:textSize="12sp" />
-    </LinearLayout>
-
-</FrameLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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:background="#90000000"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            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="10dp"
-                android:layout_marginTop="6dp"
-                android:layout_marginRight="10dp"
-                android:layout_marginBottom="6dp"
-                app:mvAnimDuration="1000"
-                app:mvInterval="3000"
-                app:mvSingleLine="true"
-                app:mvTextColor="@color/white"
-                app:mvTextSize="12sp" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/rl_lucky"
-            android:layout_width="315dp"
-            android:layout_height="315dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="14dp">
-
-            <com.duben.dayplaylet.ui.widgets.luckymonkeypanel.LuckyMonkeyPanelView2
-                android:id="@+id/lucky_panel2"
-                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>
-
-
-        <LinearLayout
-            android:id="@+id/ll_nine_rule"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="14dp"
-            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: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_margin="6dp"
-                android:textColor="#FFC1C3"
-                android:textSize="12sp"></TextView>
-        </LinearLayout>
-
-        <ImageView
-            android:id="@+id/iv_nine_back"
-            android:layout_width="44dp"
-            android:layout_height="44dp"
-            android:layout_gravity="center_horizontal"
-            android:padding="4dp"
-            android:src="@mipmap/ic_quit_yuan" />
-    </LinearLayout>
-</RelativeLayout>
-

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

-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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:background="#80000000">
-
-    <LinearLayout
-        android:layout_width="290dp"
-        android:layout_height="360dp"
-        android:layout_gravity="center"
-        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:id="@+id/iv_nine_pay_type"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:src="@mipmap/ic_nine_vip"></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="8dp"
-                android:layout_marginRight="10dp"
-                android:gravity="center"
-                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/activity_order_record.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#F9FAFB"
-    android:orientation="vertical">
-
-    <include layout="@layout/header_layout" />
-
-    <com.scwang.smartrefresh.layout.SmartRefreshLayout
-        android:id="@+id/srl_drawcash"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:srlAccentColor="@color/gray"
-        app:srlPrimaryColor="@color/white">
-
-        <com.scwang.smartrefresh.layout.header.ClassicsHeader
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recy_drawcash"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="5dp"
-            android:background="@null"
-            android:overScrollMode="never"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
-
-</LinearLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#90000000"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="2dp"
-            android:layout_marginBottom="8dp"
-            android:text="刚刚看的"
-            android:textColor="@color/white"
-            android:textSize="18sp" />
-
-        <RelativeLayout
-            android:layout_width="310dp"
-            android:layout_height="440dp">
-
-            <androidx.cardview.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:cardBackgroundColor="@android:color/transparent"
-                app:cardCornerRadius="@dimen/dp_10">
-
-                <com.duben.dayplaylet.video.tx.TXVideoBaseView
-                    android:id="@+id/baseItemView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-
-                <TextView
-                    android:id="@+id/tv_recommend_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
-                    android:layout_marginLeft="14dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginBottom="65dp"
-                    android:singleLine="true"
-                    android:textColor="@color/white"
-                    android:textSize="14sp"
-                    android:textStyle="bold" />
-
-
-                <TextView
-                    android:id="@+id/tv_recommend_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginBottom="35dp"
-                    android:drawableLeft="@mipmap/ic_recommend_vedio"
-                    android:drawablePadding="2dp"
-                    android:gravity="center_vertical"
-                    android:singleLine="true"
-                    android:textColor="@color/white"
-                    android:textSize="12sp" />
-            </androidx.cardview.widget.CardView>
-
-            <ImageView
-                android:id="@+id/ic_recommend_quit"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_alignParentEnd="true"
-                android:layout_gravity="end"
-                android:layout_marginTop="2dp"
-                android:elevation="2dp"
-                android:padding="10dp"
-                android:scaleType="centerCrop"
-                android:src="@mipmap/ic_quit_yuan" />
-
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="100dp"
-            android:layout_marginTop="10dp">
-
-            <ImageView
-                android:id="@+id/iv_recommend_top"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:scaleType="centerCrop" />
-
-            <Button
-                android:id="@+id/btn_recommend_next"
-                android:layout_width="210dp"
-                android:layout_height="50dp"
-                android:layout_centerInParent="true"
-                android:background="@drawable/shape_bg_recommend"
-                android:text="立即试看"
-                android:textColor="@color/white"
-                android:textSize="16sp" />
-        </RelativeLayout>
-
-    </LinearLayout>
-</RelativeLayout>
-

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

@@ -60,32 +60,4 @@
 
     </FrameLayout>
 
-    <LinearLayout
-        android:id="@+id/ll_lucky"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="1dp"
-        android:visibility="gone"
-        android:layout_gravity="bottom|right"
-        android:layout_marginBottom="220dp"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/iv_lucky_gif"
-            android:layout_width="80dp"
-            android:layout_height="70dp" />
-
-        <TextView
-            android:id="@+id/tv_lucky_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:background="@drawable/shape_bg_black2"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:text="0/5"
-            android:textColor="@color/white"
-            android:textSize="12sp" />
-    </LinearLayout>
 </FrameLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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:background="@color/black"
-    android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/ic_vip_top"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@mipmap/bg_vip_black"
-        android:scaleType="fitXY" />
-
-    <ImageView
-        android:id="@+id/ic_vip_quit"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_gravity="right"
-        android:layout_marginTop="30dp"
-        android:layout_marginRight="10dp"
-        android:padding="10dp"
-        android:scaleType="centerCrop"
-        android:src="@mipmap/ic_quit_yuan" />
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_marginBottom="30dp"
-        android:orientation="vertical">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="30dp"
-            android:src="@mipmap/bg_vip_top"></ImageView>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rvVip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:background="@null"
-            android:overScrollMode="never" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:id="@+id/ll_vip_alipay"
-                android:layout_width="0dp"
-                android:layout_height="40dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingLeft="20dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@mipmap/ic_alipay"
-                    android:drawablePadding="6dp"
-                    android:gravity="center_vertical"
-                    android:text="支付宝支付"
-                    android:textColor="@color/white"
-                    android:textSize="14sp"
-                    android:textStyle="bold" />
-
-                <ImageView
-                    android:id="@+id/iv_vip_alipay"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:scaleType="center"
-                    android:src="@mipmap/ic_vip_enable_blue" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/ll_vip_wx"
-                android:layout_width="0dp"
-                android:layout_height="40dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingRight="20dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@mipmap/ic_call_wx"
-                    android:drawablePadding="6dp"
-                    android:gravity="center_vertical"
-                    android:text="微信支付"
-                    android:textColor="@color/white"
-                    android:textSize="14sp"
-                    android:textStyle="bold" />
-
-
-                <ImageView
-                    android:id="@+id/iv_vip_wx"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:scaleType="center"
-                    android:src="@mipmap/ic_vip_none" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/tv_vip_hint"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:text="试用到期后将按终身xx元自动续费，可随时关闭"
-            android:textColor="#97ffffff"
-            android:textSize="10sp" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <CheckBox
-                android:id="@+id/cbVipAgreement"
-                style="@style/CustomCheckboxTheme"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="true" />
-
-            <TextView
-                android:id="@+id/tvVipAgreement"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="6dp"
-                android:text="点击购买即表示您同意《会员付费协议》"
-                android:textColor="@color/white"
-                android:textSize="10sp" />
-        </LinearLayout>
-
-        <io.supercharge.shimmerlayout.ShimmerLayout
-            android:id="@+id/shimmer_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginLeft="30dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginRight="30dp"
-            android:layout_marginBottom="10dp"
-            app:shimmer_animation_duration="1200"
-            app:shimmer_color="#50ffffff">
-
-            <TextView
-                android:id="@+id/tvVipPay"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@mipmap/bg_vip_btn"
-                android:gravity="center"
-                android:text="立即开通"
-                android:textColor="@color/white"
-                android:textSize="18sp" />
-        </io.supercharge.shimmerlayout.ShimmerLayout>
-
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:background="@drawable/shape_bg_write"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="10dp"
-                android:text="每日小短剧自动续费协议"
-                android:textColor="@color/black"
-                android:textSize="16sp"
-                android:textStyle="bold"></TextView>
-
-            <ImageView
-                android:id="@+id/iv_agreement_quit"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:paddingTop="10dp"
-                android:paddingRight="20dp"
-                android:src="@mipmap/ic_activity_quit"></ImageView>
-        </RelativeLayout>
-
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:layout_marginTop="8dp"
-            android:background="#E1E1E1" />
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="300dp"
-            android:fadingEdge="none"
-            android:overScrollMode="never">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="300dp"
-                android:orientation="vertical">
-
-                <EditText
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_margin="10dp"
-                    android:enabled="false"
-                    android:inputType="textMultiLine"
-                    android:scrollbars="vertical"
-                    android:text="@string/str_agreement_vip"
-                    android:textColor="@color/black"
-                    android:textSize="13sp" />
-            </LinearLayout>
-        </ScrollView>
-
-        <TextView
-            android:id="@+id/tv_agreement_next"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="40dp"
-            android:layout_marginRight="40dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:background="@mipmap/bg_vip_btn"
-            android:gravity="center"
-            android:text="同意并继续"
-            android:textColor="@color/white"
-            android:textSize="18sp" />
-    </LinearLayout>
-</RelativeLayout>

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

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:orientation="vertical">
-
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="260dp"
-            android:background="@mipmap/bg_pay_top"></FrameLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/iv_dialog_backpay_cancel"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginLeft="30dp"
-                android:layout_marginTop="22dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginBottom="20dp"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:background="@drawable/shape_pay_left"
-                android:gravity="center"
-                android:text="忍痛拒绝"
-                android:textColor="@color/white"
-                android:textSize="20sp"></TextView>
-
-            <FrameLayout
-                android:id="@+id/tv_dialog_backpay"
-                android:layout_width="0dp"
-                android:layout_height="70dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginTop="12dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginBottom="10dp"
-                android:layout_weight="1">
-
-                <TextView
-                    android:id="@+id/tv_vip_next"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:background="@drawable/shape_pay_right"
-                    android:gravity="center"
-                    android:layout_marginBottom="20dp"
-                    android:text="试用"
-                    android:textColor="@color/white"
-                    android:textSize="20sp"></TextView>
-
-                <ImageView
-                    android:id="@+id/iv_vip_new"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="right"
-                    android:visibility="gone"
-                    android:layout_marginRight="10dp"
-                    android:src="@mipmap/ic_my_new"/>
-            </FrameLayout>
-        </LinearLayout>
-    </LinearLayout>
-</RelativeLayout>

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

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="300dp"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:background="@drawable/shape_banner_write"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="40dp"
-        android:layout_marginBottom="20dp"
-        android:gravity="center"
-        android:text="会员到期后将无法享受服\n务，是否取消订阅？"
-        android:textColor="@color/black"
-        android:textSize="18sp"
-        android:textStyle="bold" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="#EEEEEE" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/tv_cancel"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:text="确认取消"
-            android:textSize="18sp" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="#EEEEEE" />
-
-        <TextView
-            android:id="@+id/tv_go"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:text="继续订阅"
-            android:textColor="#EB904C"
-            android:textSize="18sp" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:layout_width="250dp"
-        android:layout_height="170dp"
-        android:layout_centerInParent="true"
-        android:orientation="vertical">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="fitXY"
-            android:src="@mipmap/bg_vip_count" />
-
-        <ImageView
-            android:id="@+id/tv_nine_close"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="10dp"
-            android:src="@mipmap/ic_close" />
-
-        <TextView
-            android:id="@+id/tv_nine_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="50dp"
-            android:gravity="center"
-            android:textColor="@color/black"
-            android:textSize="16sp" />
-
-        <TextView
-            android:id="@+id/tv_nine_next"
-            android:layout_width="200dp"
-            android:layout_height="40dp"
-            android:layout_below="@id/tv_nine_text"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="24dp"
-            android:layout_marginBottom="18dp"
-            android:background="@mipmap/bg_vip_count_btn"
-            android:gravity="center"
-            android:text="继续观看"
-            android:textColor="#6C4D22"
-            android:textSize="14sp" />
-    </RelativeLayout>
-</RelativeLayout>
-

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

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="400dp"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:layout_marginLeft="30dp"
-        android:layout_marginRight="30dp"
-        android:background="@drawable/shape_bg_write"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="40dp"
-                android:text="请选择支付方式"
-                android:textColor="@color/gray"
-                android:textSize="14sp" />
-
-            <ImageView
-                android:id="@+id/iv_dialogpay_cancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginTop="12dp"
-                android:layout_marginRight="20dp"
-                android:src="@mipmap/ic_activity_quit" />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="#E1E1E1" />
-        <LinearLayout
-            android:id="@+id/ll_dialogpay_alipay"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-
-            android:paddingTop="16dp"
-            android:paddingBottom="34dp"
-            android:gravity="center_vertical|center_horizontal"
-            android:orientation="horizontal"
-            >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:drawableLeft="@mipmap/ic_alipay"
-                android:drawablePadding="6dp"
-                android:gravity="center_vertical"
-                android:text="支付宝支付"
-                android:textColor="@color/black"
-                android:textSize="16sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/shape_red"
-                android:paddingLeft="4dp"
-                android:paddingTop="1dp"
-                android:paddingRight="4dp"
-                android:paddingBottom="1dp"
-                android:text="单单立减 最高免单"
-                android:textColor="@color/white"
-                android:textSize="10sp" />
-
-            <ImageView
-                android:id="@+id/iv_dialogpay_alipay"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginLeft="20dp"
-                android:scaleType="center"
-                android:src="@mipmap/ic_vip_enable" />
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/ll_dialogpay_wx"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical|center_horizontal"
-            android:orientation="horizontal"
-            android:paddingTop="26dp"
-            android:paddingBottom="24dp"
-            >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:drawableLeft="@mipmap/ic_call_wx"
-                android:drawablePadding="6dp"
-                android:gravity="center_vertical"
-                android:text="微信支付    "
-                android:textColor="@color/black"
-                android:textSize="16sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/shape_red"
-                android:paddingLeft="4dp"
-                android:paddingTop="1dp"
-                android:paddingRight="4dp"
-                android:paddingBottom="1dp"
-                android:text="单单立减 最高免单"
-                android:textColor="@color/white"
-                android:textSize="10sp" />
-
-            <ImageView
-                android:id="@+id/iv_dialogpay_wx"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginLeft="20dp"
-                android:scaleType="center"
-                android:src="@mipmap/ic_vip_none" />
-        </LinearLayout>
-
-
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="#E1E1E1" />
-
-        <TextView
-            android:id="@+id/tv_dialogpay_pay"
-            android:layout_width="280dp"
-            android:layout_height="50dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="30dp"
-            android:background="@drawable/shape_green"
-            android:gravity="center"
-            android:text="立即订阅"
-            android:textColor="@color/white"
-            android:textSize="16sp" />
-    </LinearLayout>
-</RelativeLayout>

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

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:id="@+id/rl_dialog_vip_bg"
-        android:layout_width="340dp"
-        android:layout_height="550dp"
-        android:layout_centerInParent="true"
-        android:background="@mipmap/bg_vip_dialog_zero"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/iv_dialog_vip_quit"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_alignParentRight="true"
-            android:src="@mipmap/ic_quit_yuan"></ImageView>
-
-        <TextView
-            android:id="@+id/tv_dialog_vip_next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="70dp"
-            android:background="@mipmap/bg_vip_dialog_btn"
-            android:gravity="center"
-            android:text="立即开通"
-            android:textColor="#6B3D1A"
-            android:textSize="20sp"></TextView>
-
-        <FrameLayout
-            android:id="@+id/fl_dialog_vip_money_root"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone">
-
-
-            <TextView
-                android:id="@+id/tv_dialog_vip_money_left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="45dp"
-                android:layout_marginTop="200dp"
-                android:text="￥123"
-                android:textColor="@color/red"
-                android:textSize="22sp"></TextView>
-
-            <TextView
-                android:id="@+id/tv_dialog_vip_money_right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:layout_marginTop="200dp"
-                android:layout_marginRight="45dp"
-                android:text="￥123"
-                android:textColor="@color/red"
-                android:textSize="22sp"></TextView>
-
-            <TextView
-                android:id="@+id/tv_dialog_vip_money_center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="260dp"
-                android:text="￥123"
-                android:textColor="@color/red"
-                android:textSize="22sp"></TextView>
-        </FrameLayout>
-    </RelativeLayout>
-</RelativeLayout>

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

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#77090909">
@@ -12,18 +11,17 @@
         android:layout_marginBottom="50dp"
         android:keepScreenOn="true" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
             android:layout_marginStart="15dp"
             android:layout_marginBottom="100dp"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent">
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/title_tv"
@@ -47,42 +45,28 @@
                 android:maxLines="3"
                 android:text="-"
                 android:textColor="#fff"
-                android:textSize="14sp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent" />
+                android:textSize="14sp" />
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/ll_lucky"
+        <include
+            layout="@layout/layout_red_box"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="1dp"
-            android:layout_marginBottom="220dp"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintRight_toRightOf="parent">
+            android:layout_gravity="bottom|end"
+            android:layout_marginEnd="@dimen/dp_10"
+            android:layout_marginBottom="200dp" />
 
         <ImageView
-                android:id="@+id/iv_lucky_gif"
-                android:layout_width="80dp"
-                android:layout_height="70dp" />
-
-            <TextView
-                android:id="@+id/tv_lucky_status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
-                android:background="@drawable/shape_bg_black2"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:text="0/5"
-                android:textColor="@color/white"
-                android:textSize="12sp" />
-        </LinearLayout>
+            android:id="@+id/iv_pause"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_gravity="center"
+            android:background="@drawable/shape_round_trans"
+            android:src="@mipmap/player_pause"
+            android:visibility="gone" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <include layout="@layout/layout_draw_header" />
+    </FrameLayout>
 
     <FrameLayout
         android:id="@+id/fm_bottom"
@@ -126,20 +110,4 @@
 
     </FrameLayout>
 
-    <ImageView
-        android:id="@+id/iv_pause"
-        android:layout_width="70dp"
-        android:layout_height="70dp"
-        android:layout_gravity="center"
-        android:background="@drawable/shape_round_trans"
-        android:src="@mipmap/player_pause"
-        android:visibility="gone" />
-
-    <ImageView
-        android:id="@+id/leave"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:padding="10dp"
-        android:src="@mipmap/ic_arrow_white" />
 </FrameLayout>
\ No newline at end of file

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:clipChildren="false">
+    android:background="@color/my_color_gray">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -61,6 +61,7 @@
                     android:id="@+id/tv_my_explain"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="@drawable/shape_round_trans"
                     android:paddingStart="@dimen/dp_10"
                     android:paddingTop="6dp"
                     android:paddingEnd="@dimen/dp_10"
@@ -73,12 +74,17 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:layout_marginTop="20dp">
+
                 <RadioGroup
                     android:id="@+id/rg_my_income"
                     android:layout_width="match_parent"
-                android:layout_height="70dp"
+                    android:layout_height="50dp"
                     android:layout_marginTop="20dp"
-                android:background="@color/red"
+                    android:background="@drawable/shape_bg_write"
                     android:orientation="horizontal">
 
                     <RadioButton
@@ -87,10 +93,16 @@
                         android:layout_height="50dp"
                         android:layout_gravity="bottom"
                         android:layout_weight="1"
-                    android:background="@mipmap/ic_launcher_main"
                         android:button="@null"
+                        android:checked="true"
+                        android:drawableStart="@mipmap/ic_redpkg_small"
+                        android:drawablePadding="-30dp"
                         android:gravity="center"
-                    android:text="红包券收益" />
+                        android:paddingStart="30dp"
+                        android:text="红包券收益"
+                        android:textColor="@color/red"
+                        android:textSize="@dimen/font_size_16"
+                        android:textStyle="bold" />
 
                     <RadioButton
                         android:id="@+id/rb_my_gold"
@@ -99,15 +111,66 @@
                         android:layout_gravity="bottom"
                         android:layout_weight="1"
                         android:button="@null"
+                        android:drawableStart="@mipmap/ic_yuanbao_small"
+                        android:drawablePadding="-26dp"
                         android:gravity="center"
-                    android:text="金元宝收益" />
+                        android:paddingStart="30dp"
+                        android:text="金元宝收益"
+                        android:textColor="@color/red"
+                        android:textSize="@dimen/font_size_16"
+                        android:textStyle="bold" />
 
                 </RadioGroup>
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:id="@+id/tv_my_cash"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="bottom"
+                        android:layout_marginEnd="-20dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_bg_blue"
+                        android:checked="true"
+                        android:drawablePadding="-30dp"
+                        android:gravity="center"
+                        android:paddingStart="30dp"
+                        android:text="红包券收益"
+                        android:textColor="@color/red"
+                        android:textSize="@dimen/font_size_16"
+                        android:textStyle="bold"
+                        app:drawableStartCompat="@mipmap/ic_redpkg_small" />
+
+                    <TextView
+                        android:id="@+id/tv_my_gold"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="bottom"
+                        android:layout_marginStart="-20dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_bg_blue"
+                        android:drawablePadding="-30dp"
+                        android:gravity="center"
+                        android:paddingStart="30dp"
+                        android:text="金元宝收益"
+                        android:textColor="@color/red"
+                        android:textSize="@dimen/font_size_16"
+                        android:textStyle="bold"
+                        android:visibility="invisible"
+                        app:drawableStartCompat="@mipmap/ic_yuanbao_small" />
+
+                </LinearLayout>
+
+            </FrameLayout>
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="100dp"
                 android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/shape_bg_write"
                 android:padding="@dimen/dp_10">
 
                 <TextView
@@ -141,7 +204,10 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
+                android:layout_marginStart="@dimen/dp_10"
+                android:layout_marginEnd="@dimen/dp_10"
+                android:layout_marginBottom="@dimen/dp_10"
+                android:background="@drawable/shape_bg_write"
                 android:padding="@dimen/dp_10">
 
                 <ImageView

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

-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fl_sign"
-    android:layout_width="76dp"
-    android:layout_height="76dp"
-    android:background="@drawable/shape_bg_nine"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:paddingTop="2dp"
-    android:paddingBottom="2dp">
-
-    <ImageView
-        android:id="@+id/iv"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_gravity="center_horizontal"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/tv2"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_gravity="center_horizontal"
-        android:gravity="center"
-        android:lineSpacingExtra="-3dp"
-        android:text="最高\n10元"
-        android:textColor="@color/white"
-        android:textSize="15sp"
-        android:visibility="visible" />
-
-    <TextView
-        android:id="@+id/tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center_horizontal"
-        android:text="第一天"
-        android:textColor="@color/white"
-        android:textSize="12sp" />
-
-</FrameLayout>
\ No newline at end of file

video/app/src/main/res/layout/item_list_orderrecord.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="wrap_content"
-    android:layout_marginLeft="10dp"
-    android:layout_marginTop="10dp"
-    android:layout_marginRight="10dp"
-    android:background="@drawable/shape_banner_write"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/tv_orderrecord_name"
-        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="15sp"
-        android:textStyle="bold" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="10dp">
-
-        <TextView
-            android:id="@+id/tv_orderrecord_date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="2020-10-19"
-            android:layout_centerVertical="true"
-            android:textColor="#9D9D9D"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/tv_orderrecord_money"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:text="¥50"
-            android:textColor="@color/red"
-            android:textSize="20sp" />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/tv_orderrecord_no"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="15dp"
-            android:text="订单编号:123123123123"
-            android:textColor="#9D9D9D"
-            android:textSize="12sp" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="10dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="10dp"
-            android:background="#9D9D9D"></View>
-
-        <TextView
-            android:id="@+id/tv_orderrecord_copy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:padding="10dp"
-            android:text="复制"
-            android:textColor="#9D9D9D"
-            android:textSize="12sp" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="48dp"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/item_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/color_8D8F90"
-        android:textStyle="bold"
-        android:textSize="16sp" />
-
-    <View
-        android:id="@+id/item_line"
-        android:layout_width="20dp"
-        android:layout_height="2dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="6dp" />
-
-</LinearLayout>
\ No newline at end of file

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

@@ -5,36 +5,47 @@
     android:paddingTop="40dp"
     android:paddingBottom="10dp">
 
+    <ImageView
+        android:id="@+id/leave"
+        android:layout_width="20dp"
+        android:layout_height="40dp"
+        android:contentDescription="@string/app_name"
+        android:src="@mipmap/ic_arrow_white"
+        android:visibility="gone" />
+
     <RelativeLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="4dp">
+        android:layout_height="42dp"
+        android:layout_marginStart="16dp">
 
         <LinearLayout
             android:id="@+id/ll_draw_cash"
-            android:layout_width="150dp"
-            android:layout_height="40dp"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_centerVertical="true"
             android:layout_marginStart="12dp"
             android:background="@drawable/shape_half_trans"
             android:gravity="center_vertical">
 
             <TextView
                 android:id="@+id/tv_cash"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_marginStart="30dp"
                 android:gravity="center"
-                android:paddingLeft="30dp"
-                android:text="0元"
+                android:maxWidth="60dp"
+                android:minWidth="40dp"
+                android:text="-"
                 android:textColor="@color/white"
                 android:textSize="14sp" />
 
             <Button
+                android:id="@+id/btn_draw_cash"
                 android:layout_width="50dp"
-                android:layout_height="28dp"
+                android:layout_height="26dp"
                 android:layout_marginEnd="6dp"
                 android:background="@drawable/shape_green"
-                android:text="提现"
+                android:text="@string/draw_cash"
                 android:textColor="@color/white"
                 android:textSize="15sp" />
 
@@ -42,46 +53,46 @@
 
         <ImageView
             android:id="@+id/iv_cash"
-            android:layout_width="wrap_content"
-            android:layout_marginBottom="-4dp"
-            android:layout_height="wrap_content"
+            android:layout_width="42dp"
+            android:layout_height="42dp"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
             android:src="@mipmap/ic_redpkg" />
     </RelativeLayout>
 
     <RelativeLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:layout_marginRight="3dp">
+        android:layout_height="42dp"
+        android:layout_gravity="end"
+        android:layout_marginEnd="16dp">
 
         <LinearLayout
             android:id="@+id/ll_draw_gold"
-            android:layout_width="150dp"
-            android:layout_height="40dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="12dp"
             android:background="@drawable/shape_half_trans"
             android:gravity="center_vertical">
 
             <TextView
                 android:id="@+id/tv_gold"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_marginStart="30dp"
                 android:gravity="center"
-                android:paddingLeft="30dp"
-                android:text="0个"
+                android:maxWidth="60dp"
+                android:minWidth="40dp"
+                android:text="-"
                 android:textColor="@color/white"
                 android:textSize="14sp" />
 
             <Button
+                android:id="@+id/btn_draw_gold"
                 android:layout_width="50dp"
-                android:layout_height="28dp"
+                android:layout_height="26dp"
                 android:layout_marginEnd="6dp"
                 android:background="@drawable/shape_green"
-                android:text="提现"
+                android:text="@string/draw_cash"
                 android:textColor="@color/white"
                 android:textSize="15sp" />
 
@@ -89,10 +100,8 @@
 
         <ImageView
             android:id="@+id/iv_gold"
-            android:layout_width="46dp"
-            android:layout_height="46dp"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="-4dp"
+            android:layout_width="42dp"
+            android:layout_height="42dp"
             android:src="@mipmap/ic_yuanbao" />
     </RelativeLayout>
 </FrameLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cl_red_box"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/tv_tips"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_tips"
+        android:elevation="2dp"
+        android:padding="5dp"
+        android:text="点击红包可以领取金币哦~"
+        android:textColor="@color/white"
+        android:textSize="14sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/linearLayout"
+        app:layout_constraintEnd_toStartOf="@+id/linearLayout" />
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="@id/tv_tips">
+
+        <ImageView
+            android:id="@+id/iv_red_box"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="20dp"
+            android:visibility="gone" />
+
+        <com.duben.dayplaylet.ui.widgets.CountDownVideoView
+            android:id="@+id/cdvv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/shape_loading_bg"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:paddingLeft="14dp"
-    android:paddingRight="14dp"
-    android:paddingTop="10dp">
-    
-    <!-- 正在加载 -->
-
-    <ProgressBar
-        android:id="@+id/loading_bar"
-        style="@style/loading_small"
-        android:layout_width="74dip"
-        android:layout_height="74dip" />
-
-    <LinearLayout
-        android:id="@+id/loading_ll"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8.0dip"
-        android:layout_marginTop="4.0dip">
-
-        <TextView
-            android:id="@+id/loading_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="加载中..."
-            android:textColor="@color/white"
-            android:textSize="14sp" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_write">
+
+    <com.duben.dayplaylet.ui.widgets.CountDownView
+        android:id="@+id/cd_count_vedio"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="4dp"
+        app:cd_animator_time="8"
+        app:cd_arc_color="@color/color_FF9837"
+        app:cd_arc_width="3dp"
+        app:cd_bg_color="#20FF9837"
+        app:cd_circle_radius="25dp"
+        app:cd_location="top"
+        app:cd_retreat_type="forward"
+        app:cd_text_color="#00000000"
+        app:cd_text_size="14sp" />
+
+    <ImageView
+        android:id="@+id/iv_count_redbox"
+        android:layout_width="28dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center"
+        android:src="@mipmap/ic_launcher_main"
+        tools:visibility="gone" />
+</FrameLayout>

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

@@ -65,7 +65,7 @@
                     android:enabled="true"
                     android:background="@drawable/btn_user_loginselecter"
                     android:text="@string/dialog_update_now"
-                    android:textColor="@color/authentic_text"
+                    android:textColor="@color/white"
                     android:textSize="14sp" />
 
             </RelativeLayout>