代码优化

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

@@ -22,6 +22,7 @@ class MusicPresenter : BasePresenter<MusicView>() {
                     override fun onError(e: Throwable) {
                         if (isLinkView) return
                         view.showToast(e.message)
+                        view.rdSongMsgFail()
                     }
 
                     override fun onNext(baseResponse: BaseResponse<MusicBean>) {
@@ -35,6 +36,7 @@ class MusicPresenter : BasePresenter<MusicView>() {
                                 view.rdSongMsgSuc(baseResponse.data)
                             }
                             else -> {
+                                view.rdSongMsgFail()
                                 view.showToast(message)
                             }
                         }
@@ -43,8 +45,9 @@ class MusicPresenter : BasePresenter<MusicView>() {
     }
 
     // 添加金币
-    fun reportAddCoinMsg(carrierType: String) {
+    fun reportAddCoinMsg(carrierType: String, ecpmId: String = "") {
         val vo = HashMap<String, Any>()
+        vo["ecpmId"] = ecpmId
         vo["carrierType"] = carrierType
         AppHttpManager.getInstance(loanApplication)
             .call(loanService.reportAddCoinMsg(vo),

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

@@ -4,5 +4,6 @@ import com.duben.dayplaylet.mvp.model.MusicBean
 
 interface MusicView : BaseView {
     fun rdSongMsgSuc(data: MusicBean)
+    fun rdSongMsgFail()
     fun reportAddCoinMsgSuc()
 }
\ No newline at end of file

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

@@ -217,7 +217,7 @@ public interface LoanService {
      *
      * @return
      */
-    @POST("api/reportAddCoinMsg")
+    @POST("api/reward/reportAddCoinMsg")
     Observable<BaseResponse<JsonObject>> reportAddCoinMsg(@Body Map<String, Object> vo);
 
     /**

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

@@ -281,7 +281,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
             // 弹出新人红包
             if (!isShowNewuserFlag) {
                 isShowNewuserFlag = true
-                showNewcomerDialog(data.userMsg.rewardCoin)
+//                showNewcomerDialog(data.userMsg.rewardCoin)
             }
         }
 

video/app/src/main/res/layout/fragment_music.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:id="@+id/rl"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -11,4 +12,128 @@
 
     <include layout="@layout/layout_draw_header" />
 
+    <RelativeLayout
+        android:id="@+id/rl_open_cash"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="160dp"
+        android:layout_marginEnd="20dp">
+
+        <ImageView
+            android:id="@+id/iv_open_cash"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:src="@mipmap/pic_dttx" />
+
+        <ProgressBar
+            android:id="@+id/pb_open_cash"
+            style="@android:style/Widget.ProgressBar.Horizontal"
+            android:layout_width="52dp"
+            android:layout_height="14dp"
+            android:layout_alignBottom="@id/iv_open_cash"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="22dp"
+            android:progressDrawable="@drawable/progressbar_versus_changevedio_bg" />
+
+        <TextView
+            android:id="@+id/tv_open_cash_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/iv_open_cash"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="21dp"
+            android:text="3/5"
+            android:textColor="@color/red"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/tv_open_cash_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/iv_open_cash"
+            android:layout_centerHorizontal="true"
+            android:background="@drawable/shape_bg_write"
+            android:paddingStart="6dp"
+            android:paddingTop="2dp"
+            android:paddingEnd="6dp"
+            android:paddingBottom="2dp"
+            android:text="@string/app_name"
+            android:textSize="12sp" />
+
+    </RelativeLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_reward"
+        android:layout_width="match_parent"
+        android:layout_height="260dp"
+        android:layout_centerInParent="true"
+        android:layout_marginStart="40dp"
+        android:layout_marginEnd="40dp"
+        android:background="@drawable/shape_half_trans"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/tv_reward"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:drawablePadding="15dp"
+            android:text="恭喜获得"
+            android:textColor="@color/white"
+            android:textSize="22sp"
+            app:drawableEndCompat="@mipmap/vs_icon_anim_star"
+            app:drawableStartCompat="@mipmap/vs_icon_anim_star"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/iv_cash_reward"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_marginTop="40dp"
+            android:layout_marginEnd="20dp"
+            android:src="@mipmap/ic_redpkg"
+            app:layout_constraintEnd_toStartOf="@id/iv_gold_reward"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_reward" />
+
+        <ImageView
+            android:id="@+id/iv_gold_reward"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="40dp"
+            android:src="@mipmap/ic_yuanbao"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/iv_cash_reward"
+            app:layout_constraintTop_toBottomOf="@id/tv_reward" />
+
+        <TextView
+            android:id="@+id/tv_cash_reward"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:text="+5"
+            android:textColor="@color/red"
+            android:textSize="30sp"
+            app:layout_constraintEnd_toEndOf="@id/iv_cash_reward"
+            app:layout_constraintStart_toStartOf="@id/iv_cash_reward"
+            app:layout_constraintTop_toBottomOf="@id/iv_cash_reward" />
+
+        <TextView
+            android:id="@+id/tv_gold_reward"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:text="+5"
+            android:textColor="@color/red"
+            android:textSize="30sp"
+            app:layout_constraintEnd_toEndOf="@id/iv_gold_reward"
+            app:layout_constraintStart_toStartOf="@id/iv_gold_reward"
+            app:layout_constraintTop_toBottomOf="@id/iv_gold_reward" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
 </RelativeLayout>
\ No newline at end of file

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

@@ -10,39 +10,40 @@
         android:id="@+id/quiz_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true" />
+        android:layout_centerInParent="true"
+        android:layout_marginBottom="10dp" />
 
     <TextView
         android:id="@+id/quiz_tv_qus"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@id/fl_option0"
+        android:layout_above="@id/rl_option0"
         android:layout_centerHorizontal="true"
         android:layout_marginStart="48dp"
         android:layout_marginEnd="48dp"
-        android:layout_marginBottom="80dp"
+        android:layout_marginBottom="70dp"
         android:background="@drawable/shape_mild_trans"
         android:gravity="center"
         android:padding="@dimen/dp_10"
         android:text="背景音乐是什么歌 _ _ _ _ ？"
         android:textColor="@color/white" />
 
-    <FrameLayout
-        android:id="@+id/fl_option0"
+    <RelativeLayout
+        android:id="@+id/rl_option0"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@id/fl_option1"
+        android:layout_above="@id/rl_option1"
         android:layout_centerHorizontal="true"
         android:layout_marginStart="48dp"
         android:layout_marginEnd="48dp"
-        android:layout_marginBottom="20dp">
+        android:layout_marginBottom="20dp"
+        android:background="@drawable/icon_quiz_button_bg">
 
         <TextView
             android:id="@+id/quiz_option0"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/icon_quiz_button_bg"
-            android:gravity="center"
+            android:layout_centerInParent="true"
             android:paddingBottom="5dp"
             android:textColor="@color/main_mints"
             android:textStyle="bold"
@@ -52,8 +53,8 @@
             android:id="@+id/quiz_iv_redbox0"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="50dp"
+            android:layout_centerVertical="true"
+            android:layout_toStartOf="@id/quiz_option0"
             android:paddingBottom="5dp"
             android:src="@mipmap/ic_redpkg"
             android:visibility="gone" />
@@ -62,29 +63,30 @@
             android:id="@+id/quiz_iv_option0"
             android:layout_width="26dp"
             android:layout_height="26dp"
-            android:layout_gravity="end|center_vertical"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
             android:layout_marginEnd="20dp"
             android:paddingBottom="5dp"
             android:visibility="gone" />
 
-    </FrameLayout>
+    </RelativeLayout>
 
-    <FrameLayout
-        android:id="@+id/fl_option1"
+    <RelativeLayout
+        android:id="@+id/rl_option1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginStart="48dp"
         android:layout_marginEnd="48dp"
-        android:layout_marginBottom="50dp">
+        android:layout_marginBottom="50dp"
+        android:background="@drawable/icon_quiz_button_bg">
 
         <TextView
             android:id="@+id/quiz_option1"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/icon_quiz_button_bg"
-            android:gravity="center"
+            android:layout_centerInParent="true"
             android:paddingBottom="5dp"
             android:textColor="@color/main_mints"
             android:textStyle="bold"
@@ -94,8 +96,8 @@
             android:id="@+id/quiz_iv_redbox1"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="50dp"
+            android:layout_centerVertical="true"
+            android:layout_toStartOf="@id/quiz_option1"
             android:paddingBottom="5dp"
             android:src="@mipmap/ic_redpkg"
             android:visibility="gone" />
@@ -104,12 +106,13 @@
             android:id="@+id/quiz_iv_option1"
             android:layout_width="26dp"
             android:layout_height="26dp"
-            android:layout_gravity="end|center_vertical"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
             android:layout_marginEnd="20dp"
             android:paddingBottom="5dp"
             android:visibility="gone" />
 
-    </FrameLayout>
+    </RelativeLayout>
 
     <TextView
         android:id="@+id/quiz_tv_pop"
@@ -136,7 +139,7 @@
         android:id="@+id/quiz_ll_pop"
         android:layout_width="128dp"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@id/fl_option0"
+        android:layout_alignTop="@id/rl_option0"
         android:layout_alignParentEnd="true"
         android:layout_marginTop="-30dp"
         android:layout_marginEnd="30dp"
@@ -171,7 +174,7 @@
         android:id="@+id/finger_view"
         android:layout_width="60dp"
         android:layout_height="60dp"
-        android:layout_alignTop="@id/fl_option1"
+        android:layout_alignTop="@id/rl_option1"
         android:layout_alignParentEnd="true"
         android:layout_marginTop="26dp"
         android:layout_marginEnd="48dp" />