代码优化

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/MorningClockActivity.kt

@@ -13,6 +13,8 @@ import com.mints.goodmoney.mvp.presenters.MorningClockPresenter
 import com.mints.goodmoney.mvp.views.MorningClockView
 import com.mints.goodmoney.ui.activitys.base.BaseActivity
 import com.mints.goodmoney.ui.adapter.MorningClockAdapter
+import com.mints.goodmoney.utils.SpanUtils
+import kotlinx.android.synthetic.main.activity_drawcash.*
 import kotlinx.android.synthetic.main.activity_morning_clock.*
 
 /**
@@ -75,6 +77,12 @@ class MorningClockActivity : BaseActivity()
             tvMorningClockClick.isEnabled = false
         }
         tvMorningClockClick.text = data.buttonMsg
+        tvMorningClockDay.setText(
+                SpanUtils()
+                        .append("打卡领金币    已连续打卡")
+                        .append("${data.continuityDays}").setForegroundColor(resources.getColor(R.color.main_mints))
+                        .append("天")
+                        .create())
 
         initRvView()
     }

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/DrawcashAdapter.kt

@@ -54,10 +54,10 @@ class DrawcashAdapter(val priceList: MutableList<DrawcashBean.CashOutMoneyArrBea
         } else {
             holder.tvDrawItemCash.text = "${priceBean.money}元"
         }
-        if (TextUtils.isEmpty(priceBean.remark)) {
-            holder.tvDrawItemHint.visibility = View.GONE
-        } else {
-            holder.tvDrawItemHint.visibility = View.VISIBLE
+        if (priceBean.money == 0.3) {
+            priceBean.remark = "天天可提现"
+        }
+        if (!TextUtils.isEmpty(priceBean.remark)) {
             holder.tvDrawItemHint.text = priceBean.remark
         }
         holder.tvDrawItemGold.text = "约${String.format("%.0f", priceBean.money * 10000)}金币"

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/CountDownVedioView.java

@@ -110,7 +110,7 @@ public class CountDownVedioView extends LinearLayout {
      */
     public void showRedbox() {
         if (ivCountVedioRedbox != null) {
-            rope = YoYo.with(Techniques.Tada).duration(2000).repeat(-1).playOn(ivCountVedioRedbox);
+            rope = YoYo.with(Techniques.Tada).duration(600).repeat(-1).playOn(ivCountVedioRedbox);
         }
     }
 

GoodMoney/app/src/main/res/layout/activity_morning_clock.xml

@@ -61,6 +61,7 @@
             android:orientation="vertical">
 
             <TextView
+                android:id="@+id/tvMorningClockDay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="14dp"

GoodMoney/app/src/main/res/layout/fragment_main_dh.xml

@@ -17,11 +17,9 @@
             android:layout_centerVertical="true"
             android:gravity="center_vertical"
             android:layout_marginLeft="20dp"
-            android:text="返回"
-            android:drawablePadding="2dp"
+            android:text="主菜单"
             android:textColor="@color/black"
-            android:textSize="16sp"
-            android:drawableLeft="@mipmap/ic_arrow_back" />
+            android:textSize="16sp" />
 
         <TextView
             android:id="@+id/tvDhRefresh"

GoodMoney/app/src/main/res/layout/item_rv_drawcash.xml

@@ -17,15 +17,11 @@
         android:id="@+id/tvDrawItemHint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:visibility="gone"
-        android:layout_marginBottom="-4dp"
         android:textSize="12sp" />
 
     <TextView
         android:id="@+id/tvDrawItemCash"
         android:layout_width="wrap_content"
-        android:layout_marginTop="8dp"
         android:layout_height="wrap_content"
         android:text="0.3元"
         android:textStyle="bold"
@@ -37,8 +33,8 @@
         android:text="约300000金币"
         android:singleLine="true"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="10dp"
         android:gravity="center"
         android:textSize="12sp" />
 

GoodMoney/app/src/main/res/layout/view_countdown_vedio.xml

@@ -25,8 +25,8 @@
 
     <ImageView
         android:id="@+id/iv_count_redbox"
-        android:layout_width="26dp"
-        android:layout_height="30dp"
+        android:layout_width="28dp"
+        android:layout_height="32dp"
         android:layout_gravity="center"
         android:src="@mipmap/ic_main_red" />
 </FrameLayout>