Merge branch 'dev_vedio_quwuxian_241122_wxsign' of...

Merge branch 'dev_vedio_quwuxian_241122_wxsign' of http://gitlab.mints-id.com/android/android_vedio into dev_vedio_quwuxian_241122_wxsign

video/app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.duben.infinitefunjia"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 729
-        versionName "7.2.9"
+        versionCode 730
+        versionName "7.3.0"
         flavorDimensions "default"
 
         // dex突破65535的限制

video/app/src/main/AndroidManifest.xml

@@ -136,6 +136,7 @@
             android:exported="false"
             android:screenOrientation="portrait"
             android:theme="@style/TransparentTheme"
+            android:launchMode="singleTask"
             tools:node="merge">
             <intent-filter tools:node="replace">
                 <category android:name="android.intent.category.BROWSABLE" />

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

@@ -133,6 +133,14 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
         super_short_video_view.setOnCustomChildClickListener(this)
         super_short_video_view.setOnPageChangeListener {
             if (super_short_video_view.isAdPosition(it) || super_short_video_view.isLuckPosition(it)) {
+                Handler(Looper.getMainLooper()).postDelayed({
+                    val bundle = Bundle()
+                    bundle.putString(VipForDialogActivity.VEDIO_ID, mVedioBean!!.vedioId.toString())
+                    bundle.putString(VipForDialogActivity.THIRD_ID, mVedioBean!!.thirdId)
+                    bundle.putBoolean(VipForDialogActivity.IS_DETAIL, true)
+                    readyGo(VipForDialogActivity::class.java, bundle)
+                }, 100)
+
                 fm_bottom.visibility = View.GONE
                 ll_lucky.visibility = View.GONE
                 super_short_video_view.pause()
@@ -283,8 +291,16 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
 
     override fun onEpisodeClick(position: Int) {
         dialog?.dismiss()
+
         val data = super_short_video_view.data
         if (position >= mVedioBean!!.unlockIndex) {
+            Handler(Looper.getMainLooper()).postDelayed({
+                val bundle = Bundle()
+                bundle.putString(VipForDialogActivity.VEDIO_ID, mVedioBean!!.vedioId.toString())
+                bundle.putString(VipForDialogActivity.THIRD_ID, mVedioBean!!.thirdId)
+                bundle.putBoolean(VipForDialogActivity.IS_DETAIL, true)
+                readyGo(VipForDialogActivity::class.java, bundle)
+            }, 100)
             super_short_video_view.onItemClick(data.size - 1)
 //            super_short_video_view.onItemClick(mVedioBean!!.unlockIndex)
             return

video/app/src/main/java/com/duben/infinitefunjia/video/tx/newrecommend/NewTxVideoActivity.kt

@@ -127,6 +127,13 @@ class NewTxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
                     it
                 )
             ) {
+                Handler(Looper.getMainLooper()).postDelayed({
+                    val bundle = Bundle()
+                    bundle.putString(VipForDialogActivity.VEDIO_ID, mVedioBean!!.vedioId.toString())
+                    bundle.putString(VipForDialogActivity.THIRD_ID, mVedioBean!!.thirdId)
+                    bundle.putBoolean(VipForDialogActivity.IS_DETAIL, true)
+                    readyGo(VipForDialogActivity::class.java, bundle)
+                }, 100)
 //                fm_bottom.visibility = View.GONE
                 new_super_short_video_view.pause()
                 return@setOnPageChangeListener
@@ -259,7 +266,15 @@ class NewTxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
         dialog?.dismiss()
         val data = new_super_short_video_view.data
         if (position >= mVedioBean!!.unlockIndex) {
+            Handler(Looper.getMainLooper()).postDelayed({
+                val bundle = Bundle()
+                bundle.putString(VipForDialogActivity.VEDIO_ID, mVedioBean!!.vedioId.toString())
+                bundle.putString(VipForDialogActivity.THIRD_ID, mVedioBean!!.thirdId)
+                bundle.putBoolean(VipForDialogActivity.IS_DETAIL, true)
+                readyGo(VipForDialogActivity::class.java, bundle)
+            }, 100)
             new_super_short_video_view.onItemClick(data.size - 1)
+
             return
         }
 

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

@@ -44,7 +44,7 @@
             android:layout_gravity="center_horizontal"
             android:text="超多精彩内容一键解锁"
             android:textColor="@color/black"
-            android:layout_marginBottom="4dp"
+            android:layout_marginBottom="6dp"
             android:textSize="18sp"
             android:textStyle="bold" />
 

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

@@ -10,6 +10,9 @@
         android:layout_height="match_parent"
         app:srlAccentColor="@color/black"
         app:srlPrimaryColor="#f0f2f5">
+        <com.scwang.smartrefresh.layout.header.ClassicsHeader
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
         <FrameLayout
             android:layout_width="match_parent"

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

@@ -13,7 +13,7 @@
     <FrameLayout
         android:id="@+id/rlVipItemRoot"
         android:layout_width="match_parent"
-        android:layout_height="150dp"
+        android:layout_height="140dp"
         android:layout_marginTop="8dp"
         android:background="@drawable/shape_vip_adapter_none"
         android:orientation="vertical">
@@ -28,7 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="26dp"
+                android:layout_marginTop="24dp"
                 android:textColor="#efbc6a"
                 android:textSize="16sp"
                 tools:text="$78" />
@@ -38,9 +38,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="6dp"
                 android:textColor="#efbc6a"
-                android:textSize="20sp"
+                android:textSize="18sp"
                 android:textStyle="bold"
                 tools:text="包年会员" />