From 97edfa228cd47dd0f2dcfb6b8b3f76cfc35ead0a Mon Sep 17 00:00:00 2001
From: jiaogan <job@chiao.vip>
Date: Mon, 25 Nov 2024 11:21:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/player/player.ts   |  9 +++++
 components/player/player.ttml | 70 +++++++++--------------------------
 components/player/player.ttss | 63 +++++++++++++++++++++++++++++--
 pages/videoByte/videoByte.ts  |  2 +-
 project.private.config.json   |  5 +--
 5 files changed, 89 insertions(+), 60 deletions(-)

diff --git a/components/player/player.ts b/components/player/player.ts
index 8f69629..8d5304b 100644
--- a/components/player/player.ts
+++ b/components/player/player.ts
@@ -8,6 +8,7 @@ Component({
     adBanner: null,
     videoAlbumId: null,
     videoEpisodeId: null,
+     lockStatus: false
   },
   ready() {
     const pm = getPlayletManager();
@@ -32,8 +33,13 @@ Component({
     })
 
     pm.onChangeEpisode((e) => {
+      let lock = false;
+      if(e.status =='lock'){
+        lock = true;
+      }
       //更新剧集信息
       this.setData({
+        lockStatus: lock,
         videoAlbumId: e.albumId,
         videoEpisodeId: e.episodeId,
       })
@@ -86,6 +92,9 @@ Component({
           console.log(res, "resres")
           if (res.isEnded) {
             this.emitInfoToParent('advunlock',{album_id: this.data.videoAlbumId,episode_id:this.data.videoEpisodeId})
+            this.setData({
+              lockStatus: false
+            })
           } else {
             tt.showToast({
               title: '看完广告方可解锁',
diff --git a/components/player/player.ttml b/components/player/player.ttml
index 1672f7a..c745a78 100644
--- a/components/player/player.ttml
+++ b/components/player/player.ttml
@@ -1,55 +1,19 @@
-<view class="video-header">
-
-    <view hidden="{{!playerShow}}">
-        <text style="background-color: deeppink;">这是顶部</text>
-        <!-- <text style="color: aliceblue;">111111111111111111111111122\n22222222222222222222222222233333</text> -->
-
-
-        <view style="width:100%;height:100%;display: flex;justify-content: space-between;">
-            <view style="width: 30%;">
-                <button bindtap="showDetailChange" style="font-size: 10px;margin-top: 20rpx;height: 80rpx;display: flex; justify-content: center; align-items: center; ">
-                    <label tt:if="{{showDetail}}"> 当前显示详细日志 </label>
-                    <label tt:else> 当前显示简易日志 </label>
-                </button>
-                <button bindtap="showOnTimeUpdateChange" style="font-size:8px;margin-top: 20rpx;height: 80rpx;display: flex; justify-content: center; align-items: center; ">
-                    <label tt:if="{{showOnTimeUpdate}}"> 当前OnTimeUpdate日志开 </label>
-                    <label tt:else> 当前OnTimeUpdate日志关 </label>
-                </button>
-                <button bindtap="getPlayletInfo" style="font-size: 10px;margin-top: 20rpx;height: 80rpx;display: flex; justify-content: center; align-items: center; ">调用getPlayletInfo</button>
-             
-                <button bindtap="setPlayStatusPlay" style="font-size: 10px;margin-top: 20rpx;height: 80rpx;display: flex; justify-content: center; align-items: center; ">调用播放</button>
-
-                <button bindtap="setPlayStatusPause" style="font-size: 10px;margin-top: 20rpx;height: 80rpx;display: flex; justify-content: center; align-items: center; ">调用暂停</button>
-
-                <button bindtap="clearLog" style="font-size: 10px;margin-top: 20rpx;height: 80rpx;display: flex; justify-content: center; align-items: center; ">清除日志</button>
-
-                <!-- <button bindtap="changeSettings" style="font-size: small;">切换用户播放设置changeSettings</button> -->
-
-            </view>
-
-            <view style="width: 70%;">
-
-                <scroll-view scroll-y="{{true}}" scroll-with-animation="{{true}}" style="height: 500rpx;">
-                    <text space="nbsp" style="margin-top: 20rpx;word-break:break-all;font-size: smaller;"
-                        tt:if="{{showDetail && showOnTimeUpdate}}"> {{logDetail}} </text>
-                    <text space="nbsp" style="margin-top: 20rpx;word-break:break-all;font-size: smaller;"
-                        tt:elif="{{!showDetail && showOnTimeUpdate}}"> {{log}} </text>
-                    <text space="nbsp" style="margin-top: 20rpx;word-break:break-all;font-size: smaller;"
-                        tt:elif="{{showDetail && !showOnTimeUpdate}}"> {{logDetailWithoutOnTimeUpdate}} </text>
-                    <text space="nbsp" style="margin-top: 20rpx;word-break:break-all;font-size: smaller;"
-                        tt:else> {{logWithoutOnTimeUpdate}} </text>
-                    <!-- <text space="nbsp" style="margin-top: 20rpx;word-break:break-all;font-size: smaller;">
-                        {{log}}
-
-                    </text> -->
-                </scroll-view>
-            </view>
-
-        </view>
-        <button bindtap="emitInfoToParent" style="font-size:8px;margin-top: 20rpx;height: 80rpx;display: flex; justify-content: center; align-items: center; ">
-            第{{emitTimesPlayer}}次调用父组件方法
-        </button>
-        <text style="margin-bottom: 0;background-color: deeppink;">这是底部</text>
+<view class="lock-container" tt:if="{{lockStatus}}">
+    <view style="width: 100%;height: 100%">
+        <view class="unlock_in_con_wa_operate">
+            <view class="unlock_in_con_wa_oper_left">
+              <!-- <view class="unlock_in_con_wa_i_vip" @tap="openPay">
+                <text class="unlock_in_con_wa_i_vi_text">立即充值</text>
+              </view> -->
+             <view class="unlock_in_con_wa_oper_right" style="width: auto">
+               <view class="unlock_in_con_wa_i_btn" bindtap="adOpen">
+                 <text class="unlock_in_con_wa_i_tepp">
+                    <text class="unlock_in_con_wa_i_vi_text">看广告解锁</text>
+                 </text>
+               </view>
+               <text>{{lockStatuss}}</text>
+             </view>
+             </view>
+         </view>
     </view>
-
 </view>
diff --git a/components/player/player.ttss b/components/player/player.ttss
index 4633de2..c22ee16 100644
--- a/components/player/player.ttss
+++ b/components/player/player.ttss
@@ -1,6 +1,63 @@
-.video-header {
+.unlock_in_con_wa_operate {
     z-index: 9;
-    background-color: yellow;
+    /* background-color: yellow; */
+    bottom: 5rem;
     width: 100%;
     position: fixed;
-}
\ No newline at end of file
+    
+    display        : flex;
+    flex-direction : row;
+    justify-content: space-between;
+}
+
+
+.unlock_in_con_wa_oper_left {
+    width        : 45%;
+    padding-right: 10rpx;
+}
+
+.unlock_in_con_wa_oper_right {
+    width       : 45%;
+    padding-left: 10rpx;
+}
+
+.unlock_in_con_wa_i_vip {
+    display        : flex;
+    justify-content: center;
+    align-items    : center;
+    width          : 100%;
+    height         : 68rpx;
+    background     : linear-gradient(87deg, #F7DD60 0%, #FC8704 100%);
+    border-radius  : 34rpx 34rpx 34rpx 34rpx;
+    padding        : 0 32rpx;
+}
+
+.unlock_in_con_wa_i_vi_text {
+    line-height     : 68rpx;
+    font-size  : 28rpx;
+    color      : #fff;
+}
+
+.unlock_in_con_wa_i_btn {
+    display        : flex;
+    justify-content: center;
+    align-items    : center;
+    width          : 100%;
+    height         : 68rpx;
+    background     : linear-gradient(90deg, #FC8197 0%, #FE830C 100%);
+    border-radius  : 34rpx 34rpx 34rpx 34rpx;
+    /* padding        : 0 32rpx; */
+}
+
+.unlock_in_con_wa_i_text {
+    display      : inline-block;
+    width        : 100%;
+    line-height  : 1;
+    font-size    : 28rpx;
+    color        : #fff;
+    overflow     : hidden;
+    text-overflow: ellipsis;
+    white-space  : nowrap;
+	text-align: center;
+}
+
diff --git a/pages/videoByte/videoByte.ts b/pages/videoByte/videoByte.ts
index 9104c3d..7ba5fa4 100644
--- a/pages/videoByte/videoByte.ts
+++ b/pages/videoByte/videoByte.ts
@@ -55,7 +55,7 @@ PlayletExtension({
 
             //是否展示解锁页
             this.pm.setConfig({
-                showLockPage: true
+                showLockPage: false
             });
 
             //播放器分享按钮
diff --git a/project.private.config.json b/project.private.config.json
index 9ee90d9..b09384d 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,7 +1,7 @@
 {
     "condition": {
         "miniprogram": {
-            "current": 1732245477906,
+            "current": -1,
             "list": [
                 {
                     "id": 1715845062520,
@@ -131,8 +131,7 @@
                     "scene": "011002",
                     "launchFrom": "search_suggest_list_top",
                     "location": "",
-                    "mockUpdateType": "Noupdate",
-                    "addType": "manual"
+                    "mockUpdateType": "Noupdate"
                 }
             ]
         }