代码优化

video/app/src/main/AndroidManifest.xml

@@ -138,6 +138,11 @@
             android:exported="false"
             android:theme="@style/TransparentTheme" />
 
+        <activity
+            android:name=".ui.activitys.NineKnowActivity"
+            android:exported="false"
+            android:theme="@style/TransparentTheme" />
+
         <activity
             android:name=".ui.activitys.NinePayActivity"
             android:exported="false"

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

@@ -92,7 +92,16 @@ class NineActivity : BaseActivity(), View.OnClickListener, NineView {
                     return
                 }
 
-                luckyAward()
+                if (nineShowBean != null) {
+                    if (nineShowBean!!.complete >= nineShowBean!!.need) {
+                        luckyAward()
+                    } else {
+                        val bundle = Bundle()
+                        bundle.putInt(NineKnowActivity.COMPLETE,nineShowBean!!.complete)
+                        bundle.putInt(NineKnowActivity.NEED, nineShowBean!!.need)
+                        readyGoThenKill(NineKnowActivity::class.java, bundle)
+                    }
+                }
             }
         }
     }
@@ -214,7 +223,7 @@ class NineActivity : BaseActivity(), View.OnClickListener, NineView {
                         bundle.putString(NinePayActivity.PID, data.pid)
                         bundle.putString(NinePayActivity.TITLE, data.title)
                         readyGoThenKill(NinePayActivity::class.java, bundle)
-                    }, 500)
+                    }, 1500)
                 }
             })
         }

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

+package com.mints.helivideo.ui.activitys
+
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.View
+import com.mints.helivideo.R
+import com.mints.helivideo.mvp.model.OrderRecordBean
+import com.mints.helivideo.ui.activitys.base.BaseActivity
+import com.mints.helivideo.utils.SpanUtils
+import com.mints.library.utils.nodoubleclick.AntiShake
+import kotlinx.android.synthetic.main.activity_nine_know.*
+import kotlinx.android.synthetic.main.fragment_main_my.*
+
+/**
+ * 描述：9宫格手机
+ * 作者：孟崔广
+ */
+class NineKnowActivity : BaseActivity(), View.OnClickListener {
+
+    companion object {
+        const val COMPLETE = "COMPLETE"
+        const val NEED = "NEED"
+    }
+
+    private var complete = 0
+    private var need = 0
+
+    override fun getContentViewLayoutID() = R.layout.activity_nine_know
+
+    override fun isApplyKitKatTranslucency() = false
+
+    override fun toggleOverridePendingTransition() = true
+
+    override fun getOverridePendingTransitionMode() = TransitionMode.SCALE
+
+    override fun getBundleExtras(extras: Bundle?) {
+        super.getBundleExtras(extras)
+        extras?.let {
+            complete = it.getInt(COMPLETE, 0)
+            need = it.getInt(NEED, 0)
+        }
+    }
+
+    override fun initViewsAndEvents() {
+        tv_nine_know_text.text = SpanUtils()
+            .append("再看")
+            .append("${need - complete}")
+            .setForegroundColor(resources.getColor(R.color.red))
+            .append("次广告后抽")
+            .append("手机")
+            .setForegroundColor(resources.getColor(R.color.red))
+            .create()
+
+        initListener()
+    }
+
+
+    private fun initListener() {
+        tv_nine_know_next.setOnClickListener(this)
+    }
+
+    override fun finish() {
+        super.finish()
+        overridePendingTransition(0, R.anim.scale_out)
+    }
+
+    override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
+        return if (keyCode == KeyEvent.KEYCODE_BACK) {
+            true
+        } else super.onKeyDown(
+            keyCode,
+            event
+        )
+    }
+
+    override fun onClick(v: View) {
+        if (AntiShake.check(v.id)) return
+
+        when (v.id) {
+            R.id.tv_nine_know_next -> {
+                finish()
+            }
+        }
+    }
+}
\ No newline at end of file

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

@@ -24,6 +24,7 @@ import com.mints.helivideo.ui.activitys.*
 import com.mints.helivideo.ui.fragment.base.LazyLoadBaseFragment
 import com.mints.helivideo.utils.SpanUtils
 import com.mints.helivideo.utils.TimeRender
+import com.mints.helivideo.utils.ToastUtil
 import com.mints.helivideo.utils.rxutil.CommonRxTask
 import com.mints.helivideo.utils.rxutil.RxjavaUtil
 import com.mints.library.utils.nodoubleclick.AntiShake
@@ -129,7 +130,17 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
                     return
                 }
 
-                luckyAward()
+                if (nineShowBean != null) {
+                    if (nineShowBean!!.complete >= nineShowBean!!.need) {
+                        luckyAward()
+                    } else {
+                        val bundle = Bundle()
+                        bundle.putInt(NineKnowActivity.COMPLETE,nineShowBean!!.complete)
+                        bundle.putInt(NineKnowActivity.NEED, nineShowBean!!.need)
+                        readyGo(NineKnowActivity::class.java, bundle)
+                    }
+                }
+
 
 //                if (nineShowBean != null) {
 //                    if (nineShowBean!!.complete >= nineShowBean!!.need) {
@@ -330,7 +341,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
                         bundle.putString(NinePayActivity.PID, data.pid)
                         bundle.putString(NinePayActivity.TITLE, data.title)
                         readyGo(NinePayActivity::class.java, bundle)
-                    }, 1000)
+                    }, 1500)
                 }
             })
         }

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

@@ -13,62 +13,33 @@
         android:layout_centerInParent="true"
         android:orientation="vertical">
 
-<!--        <RelativeLayout-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content">-->
-
-<!--            <RelativeLayout-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                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"-->
-<!--                    app:mvAnimDuration="1000"-->
-<!--                    app:mvInterval="3000"-->
-<!--                    app:mvSingleLine="true"-->
-<!--                    app:mvTextColor="@color/white"-->
-<!--                    app:mvTextSize="8sp" />-->
-<!--            </RelativeLayout>-->
-
-<!--            <ImageView-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:visibility="gone"-->
-<!--                android:layout_centerVertical="true"-->
-<!--                android:src="@mipmap/ic_nine_good"></ImageView>-->
-<!--        </RelativeLayout>-->
-
         <RelativeLayout
             android:layout_width="wrap_content"
-            android:layout_gravity="center_horizontal"
             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_marginLeft="6dp"
-                android:layout_marginRight="6dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
                 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="10sp" />
+                app:mvTextSize="12sp" />
         </RelativeLayout>
 
         <RelativeLayout
-            android:layout_width="220dp"
-            android:layout_height="220dp"
-            android:layout_marginTop="10dp"
-            android:layout_gravity="center_horizontal">
+            android:layout_width="276dp"
+            android:layout_height="276dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="14dp">
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.LuckyMonkeyPanelView2
                 android:id="@+id/lucky_panel2"
@@ -77,13 +48,12 @@
 
             <RelativeLayout
                 android:id="@+id/btn_action"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
+                android:layout_width="68dp"
+                android:layout_height="68dp"
                 android:layout_centerInParent="true"
                 android:background="@mipmap/ic_lucky_vedio">
 
                 <TextView
-                    android:visibility="gone"
                     android:id="@+id/tv_nine_count"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -91,7 +61,8 @@
                     android:layout_centerHorizontal="true"
                     android:layout_marginBottom="6dp"
                     android:textColor="@color/white"
-                    android:textSize="8dp"></TextView>
+                    android:textSize="8dp"
+                    android:visibility="gone"></TextView>
             </RelativeLayout>
 
         </RelativeLayout>
@@ -101,9 +72,10 @@
             android:id="@+id/ll_nine_rule"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="14dp"
             android:background="@drawable/shape_bg_nine"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -117,15 +89,15 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="6dp"
                 android:textColor="#FFC1C3"
-                android:textSize="10sp"></TextView>
+                android:textSize="12sp"></TextView>
         </LinearLayout>
 
         <ImageView
             android:id="@+id/iv_nine_back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
             android:layout_gravity="center_horizontal"
-            android:padding="10dp"
+            android:padding="4dp"
             android:src="@mipmap/ic_quit_yuan" />
     </LinearLayout>
 </RelativeLayout>

video/app/src/main/res/layout/activity_nine_know.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="250dp"
+        android:layout_height="170dp"
+        android:layout_centerInParent="true"
+        android:background="@mipmap/bg_vip_count"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_nine_know_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:layout_marginTop="44dp"
+            android:layout_gravity="center_horizontal"
+            android:textColor="@color/black"
+            android:textSize="16sp"></TextView>
+
+
+        <TextView
+            android:id="@+id/tv_nine_know_next"
+            android:layout_width="200dp"
+            android:layout_height="44dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="40dp"
+            android:layout_marginBottom="18dp"
+            android:background="@mipmap/bg_vip_count_btn"
+            android:gravity="center"
+            android:text="知道了"
+            android:textColor="#6C4D22"
+            android:textSize="14sp" />
+    </LinearLayout>
+</RelativeLayout>
+

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

@@ -8,7 +8,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:layout_margin="50dp"
+        android:layout_marginStart="50dp"
+        android:layout_marginTop="50dp"
+        android:layout_marginEnd="50dp"
+        android:layout_marginBottom="50dp"
         android:background="@mipmap/bg_vip_count"
         android:orientation="vertical">
 

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

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="220dp"
-    android:layout_height="220dp"
+    android:layout_width="276dp"
+    android:layout_height="276dp"
     android:background="@drawable/bg_lucky_monkey_panel">
 
 
@@ -34,8 +34,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item1"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
+                android:layout_width="76dp"
+                android:layout_height="76dp"
                 android:background="@mipmap/ic_nine_item_bg" />
 
             <View
@@ -45,8 +45,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item2"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
+                android:layout_width="76dp"
+                android:layout_height="76dp"
                 android:background="@mipmap/ic_nine_item_bg" />
 
             <View
@@ -56,8 +56,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item3"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
+                android:layout_width="76dp"
+                android:layout_height="76dp"
                 android:background="@mipmap/ic_nine_item_bg" />
         </LinearLayout>
 
@@ -73,8 +73,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item4"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
+                android:layout_width="76dp"
+                android:layout_height="76dp"
                 android:background="@mipmap/ic_nine_item_bg" />
 
             <View
@@ -84,8 +84,8 @@
 
 
             <View
-                android:layout_width="60dp"
-                android:layout_height="60dp" />
+                android:layout_width="76dp"
+                android:layout_height="76dp" />
 
 
             <View
@@ -95,8 +95,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item6"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
+                android:layout_width="76dp"
+                android:layout_height="76dp"
                 android:background="@mipmap/ic_nine_item_bg" />
         </LinearLayout>
 
@@ -112,8 +112,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item7"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
+                android:layout_width="76dp"
+                android:layout_height="76dp"
                 android:background="@mipmap/ic_nine_item_bg" />
 
             <View
@@ -123,8 +123,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item8"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
+                android:layout_width="76dp"
+                android:layout_height="76dp"
                 android:background="@mipmap/ic_nine_item_bg" />
 
             <View
@@ -134,8 +134,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item9"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
+                android:layout_width="76dp"
+                android:layout_height="76dp"
                 android:background="@mipmap/ic_nine_item_bg" />
         </LinearLayout>
     </LinearLayout>

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

@@ -17,8 +17,8 @@
 
             <ImageView
                 android:id="@+id/iv_panel_item_pic"
-                android:layout_width="25dp"
-                android:layout_height="25dp"></ImageView>
+                android:layout_width="30dp"
+                android:layout_height="30dp"></ImageView>
 
             <TextView
                 android:id="@+id/tv_panel_item_text"
@@ -28,7 +28,7 @@
                 android:layout_marginRight="4dp"
                 android:gravity="center_horizontal"
                 android:textColor="#A24240"
-                android:textSize="9sp"></TextView>
+                android:textSize="11sp"></TextView>
         </LinearLayout>