From 87d32db367dd08e8a4b012c3d25cf36e8dd7153a Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Tue, 23 Jul 2024 11:21:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commonComponents/video/index.vue          | 765 ++++++++++++------
 pages/course/index.vue                        |  10 +-
 pages/peanut/home.vue                         |  17 +-
 3 files changed, 524 insertions(+), 268 deletions(-)

diff --git a/pages/component/commonComponents/video/index.vue b/pages/component/commonComponents/video/index.vue
index 4d1fc15..d5002f4 100644
--- a/pages/component/commonComponents/video/index.vue
+++ b/pages/component/commonComponents/video/index.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="container" style="background-color: #000; position: relative">
+		<u-modal :show="show" :title="title" :content='content'></u-modal>
 		<!-- <u-icon
 		@click="goBack"
 		name="arrow-left"
@@ -9,25 +10,43 @@
 		  statusBarHeight + 2
 		}px; left: ${10}px;z-index: 999;`"
 	  ></u-icon>-->
+		<!-- <zhimi_aliplayer_view
+      ref="playerView"
+      style="width: 100%; height: 300px"
+    ></zhimi_aliplayer_view>
+    <button type="primary" @click="start()">开始</button>
+    <button type="primary" @click="pause()">暂停</button> -->
 		<view style="width: 100%; height: 200px">
 			<div class="" style="background-color: #000" ref="videoContent" @tap="renderScript.handleClick"
 				id="url-player-test" :videoData="videoData" :winWidth="winWidth" :winHeight="winHeight"
-				:currentVideoList="currentVideoList" :firstTime="firstTime" :isfresh="isfresh"
-				:change:videoData="renderScript.receiveMsg" :change:winWidth="renderScript.receiveWinWidth"
-				:change:winHeight="renderScript.receiveWinHeight" :change:firstTime="renderScript.receiveFirstTime"
-				:change:isfresh="renderScript.receiveIsfresh" :change:currentVideoList="renderScript.receiveVideoList">
-			</div>
+				:currentVideoList="currentVideoList" :firstTime="firstTime" :isfresh="isfresh" :platform="platform"
+				:isSetFirstTime="isSetFirstTime" :isChange="isChange" :change:videoData="renderScript.receiveMsg"
+				:change:winWidth="renderScript.receiveWinWidth" :change:winHeight="renderScript.receiveWinHeight"
+				:change:firstTime="renderScript.receiveFirstTime"
+				:change:isSetFirstTime="renderScript.receiveisSetFirstTime"
+				:change:isfresh="renderScript.receiveIsfresh" :change:platform="renderScript.receiveplatform"
+				:change:isChange="renderScript.receiveIsChange"
+				:change:currentVideoList="renderScript.receiveVideoList"></div>
 			<div @tap="renderScript.emitData" ref="videoContent1" v-show="false">
 				直接调用renderjs中的emitData的方法,传递当前播放时长
 			</div>
+
 			<div @tap="renderScript.endEmitData" ref="videoContent2" v-show="false">
 				监听结束方法，记录播放时长
 			</div>
 
+			<div @tap="renderScript.changeVideoData" ref="videoContent3" v-show="false">
+				监听切换视频方法
+			</div>
+			<div @tap="renderScript.emitSetData" ref="videoContent4" v-show="false">
+				监听切换视频方法
+			</div>
+			<div @tap="renderScript.emitopenShow" ref="videoContent5" v-show="false">
+				打开视频提示
+			</div>
 			<div class="fullScreenButton-container">
 				<div :class="`prism-fullscreen-btn ${isFullScreen ? 'fullscreen' : ''}`"
 					@tap="renderScript.changeVideoScreen"></div>
-				<!-- <img class=" iconfont icon-list" src="../../../../static/icon/cate_bg.png" style="width: 60px;height: 10px;"></img> -->
 			</div>
 		</view>
 		<!-- <view style="width: 100%; height: 200px; position: relative" v-else>
@@ -57,13 +76,16 @@
 
 	// importScripts('@/static/aliplayer/aliplayer-min.js')
 	export default {
-		props: ["currentVideo", "currentVideoList", 'noRecored'],
+		props: ["currentVideo", "currentVideoList"],
 		data() {
 			return {
-				// noRecored 为true时候不记录播放时长
+				show: false,
+				content: "此设备暂不支持观看当前视频，请移步到安卓手机进行学习！",
+				platform: null,
 				//当前是否是全屏模式
 				isFullScreen: false,
 				isfresh: false,
+				isChange: false,
 				isControl: true,
 				timer: null,
 				videoTitle: "",
@@ -77,32 +99,33 @@
 				isSetFirstTime: false,
 				screenType: null,
 				videoUrl: null,
-				num: 0,
-				oprateOsName:''
 			};
 		},
 		computed: {
 			...mapState(["videoOssList"]),
 		},
+
 		watch: {
 			currentVideo: {
 				immediate: true,
 				handler(newRoute) {},
 			},
+			timer(newValue) {
+				this.$emit("child-event", newValue);
+			},
 		},
+
 		// //页面显示
-		mounted() {this.getOS()},
-		async beforeDestroy() {
+		mounted() {},
+		beforeDestroy() {
 			this.handleEnd();
 			console.log("是否走啦习销毁");
 			clearInterval(this.$store.state.videoTimer);
-			clearInterval(this.videoTimer);
-			this.videoTimer = null;
+			// this.timer = null;
 			// store.commit("setLoadingShow", null);
 			plus.screen.lockOrientation("portrait-primary");
 
 			console.log("是否走啦习销毁定时器", this.timer);
-			await this.setVideoTime();
 		},
 		async onUnload() {
 			uni.navigateTo({
@@ -113,52 +136,63 @@
 
 			// plus.screen.lockOrientation("portrait-primary");
 			// #endif
-			this.timer = null;
 
 			await this.setVideoTime();
-
-			this.player.dispose();
+			// this.player.dispose();
 		},
 
 		//第一次加载
 		onLoad(options) {
-			console.log(options, "这是传参");
-			// #ifdef APP-PLUS
-			
-			setTimeout(() => {
-				plus.screen.unlockOrientation();
-				plus.screen.lockOrientation("landscape-primary");
-			}, 10);
-			//	#endif
-
-			// #ifdef APP-PLUS
-
-			// plus.screen.lockOrientation("portrait-primary");
-			// #endif
-			if (uni.getStorageSync("videoOssList")) {
-				this.videoList = JSON.parse(uni.getStorageSync("videoOssList"));
-			}
-
-			console.log("this.videoList at line 53:", this.videoList);
-
-			this.options = JSON.parse(options.data);
-
-			this.videoId = this.options.video;
-
+			// console.log(options, "这是传参");
+			// // #ifdef APP-PLUS
+			// setTimeout(() => {
+			//   plus.screen.unlockOrientation();
+			//   plus.screen.lockOrientation("landscape-primary");
+			// }, 10);
+			// //	#endif
+			// // #ifdef APP-PLUS
+			// // plus.screen.lockOrientation("portrait-primary");
+			// // #endif
+			// if (uni.getStorageSync("videoOssList")) {
+			//   this.videoList = JSON.parse(uni.getStorageSync("videoOssList"));
+			// }
+			// console.log("this.videoList at line 53:", this.videoList);
+			// this.options = JSON.parse(options.data);
+			// this.videoId = this.options.video;
 			// this.timer = setInterval(() => {
-			// 	var that = this;
-			// 	if (this.currentTime) {
-
-			// 			that.setVideoTime();					
-			// 	}
-			// }, 60000);
-
+			//   var that = this;
+			//   if (this.currentTime) {
+			//     that.setVideoTime();
+			//   }
+			// }, 2000);
+			// this.$emit("child-event", this.timer);
+			// // this.$once("hook:beforeDestroy", () => {
+			// //   clearInterval(this.timer);
+			// // });
 		},
 
 		methods: {
-			// 获得操作系统
-			getOS() {
-				this.oprateOsName = uni.getSystemInfoSync().platform;				
+			openShow() {
+				this.show = true;
+			},
+			start() {
+				// var playerView = this.$refs.playerView;
+				this.$refs.playerView.start();
+			},
+			pause() {
+				// var playerView = ;
+				this.$refs.playerView.pause();
+			},
+			changeVideoData() {
+				this.show = false;
+				this.isChange = false;
+			},
+			async changeVideo(data) {
+				this.currentTime = "";
+				this.firstTime = 0;
+				this.isSetFirstTime = false;
+				this.isChange = false;
+				await this.init(data, true);
 			},
 			screenChange(data) {
 				console.log(
@@ -187,87 +221,148 @@
 			},
 			// 播放进度改变
 			videoTimeUpdateEvent(e) {
-
 				this.playTime = parseInt(e.detail.currentTime);
 				this.currentTime = parseInt(e.detail.currentTime);
-				console.log("实时播放时长:", e.detail.currentTime);
+
 				this.allTime = parseInt(e.detail.duration);
-				//   console.log("视频播放时长", this.playTime, "视频总时长", this.allTime);
 
 				this.recordTime({
 					time: this.playTime,
 				});
 			},
-			async init(data) {
+			async init(data, isChange) {
+				this.show = false;
+				this.platform = this.$platform;
 				this.isfresh = true;
-				console.log("at line 59:", "是否先走这里");
+				console.log("at line 59:", "是否先走init这里", this.platform);
 				if (uni.getStorageSync("videoOssList")) {
 					this.videoList = JSON.parse(uni.getStorageSync("videoOssList"));
 				}
 				this.options = data.currentVideo;
-				console.log("this.options at line 64:", this.options);
+
 				this.videoId = this.options.video;
-				// this.timer = setInterval(async () => {
-				// 	var that = this;
-				// 	if (this.currentTime) {
-				// 		console.log('我是init定义的定时');
-				// 			await that.setVideoTime();						
-				// 	}
-				// }, 60000);
-				await this.getLive();
+				console.log("这是苹果视屏id", this.videoId);
+				await this.getLive(isChange);
+				// await this.getVideo(isChange);
+				//   this.$emit("child-event", this.timer);
 			},
-			async getData(data) {
+			async getVideo() {
+				var data = {};
+				var that = this;
+				$http
+					.request({
+						url: `sociology/course/ttt`,
+						method: "Post", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data,
+						header: {
+							//默认 无 说明：请求头
+							"Content-Type": "application/json",
+						},
+					})
+					.then(async (res) => {
+						console.log(" 视频播放11111111111:", res);
+
+						var credentials = res.result.credentials;
+						// var playerView = this.$refs.playerView;
+						// console.log('playerView at line 273:', playerView)
+						/*
+				STS加密播放
+				
+			*/
+						that.$refs.playerView.setVidSts({
+							vid: this.videoData.video,
+							accessKeyId: credentials.accessKeyId,
+							securityToken: credentials.securityToken,
+							accessKeySecret: credentials.accessKeySecret,
+							expireTime: credentials.expireTime,
+							Region: "cn-shanghai",
+						});
+						// playerView.setLocalSource({
+						//   uri: "http://duoduovideo.oss-cn-beijing.aliyuncs.com/5f093c6fb6e90.mp4",
+						// });
+
+						let isFullScreen = true;
+						// fixed fullscreen play on android
+						if (plus.os.name.toLowerCase() === "android") {
+							plus.key.addEventListener("backbutton", (e) => {
+								if (isFullScreen) {
+									that.$refs.playerView.changeScreenMode(0, false);
+									isFullScreen = false;
+								} else {
+									// 这里由于安卓无法监听返回按键，这里只能通过plus监听，然后自己模拟退回
+									uni.navigateBack();
+								}
+							});
+						}
+						that.$refs.playerView.setPlayerCallBack(({
+							type,
+							data
+						}) => {
+							switch (type) {
+								case "isFullScreen":
+									isFullScreen = Boolean(data);
+									break;
+								default:
+									console.log({
+										type,
+										data,
+									});
+							}
+						});
+					});
+			},
+			async getData(data, isChange) {
+				var that = this;
 				if (!this.isSetFirstTime) {
-					var netWork = this.videoData.userCourseVideoPositionEntity ?
-						this.videoData.userCourseVideoPositionEntity.position :
+					var netWork = data.userCourseVideoPositionEntity ?
+						data.userCourseVideoPositionEntity.position :
 						0;
-					var list = JSON.parse(uni.getStorageSync("videoOssList"));
+					var list = [];
+					if (uni.getStorageSync("videoOssList")) {
+						list = JSON.parse(uni.getStorageSync("videoOssList"));
+						var index = list.findIndex((e) => e.id == data.id);
 
-					var index = list.findIndex((e) => e.id == this.videoData.id);
-
-					if (netWork) {
-						if (index >= 0) {
-							this.firstTime =
-								list[index].time > netWork ? list[index].time : netWork;
+						if (netWork) {
+							if (index >= 0) {
+								this.firstTime =
+									list[index].time > netWork ? list[index].time : netWork;
+							} else {
+								this.firstTime = netWork ? netWork : 0;
+							}
 						} else {
-							this.firstTime = netWork ? netWork : 0;
+							if (index >= 0) {
+								this.firstTime = list[index].time ? list[index].time : 0;
+							} else {
+								this.firstTime = 0;
+							}
 						}
 					} else {
-						if (index >= 0) {
-							this.firstTime = list[index].time ? list[index].time : 0;
-						} else {
-							this.firstTime = 0;
-						}
+						this.firstTime = 0;
 					}
 
-					this.currentTime = this.firstTime;
-					console.log(this.firstTime, "这是第一次播放时长222", this.noRecored);
-					await this.setVideoTime();
+					this.videoData = {
+						...data,
+					};
+					this.isChange = isChange ? isChange : false;
+					// this.currentTime = this.firstTime;
+					console.log(this.firstTime, "这是第一次播放时长222");
+					// await this.setVideoTime();
 					uni.setStorageSync("videoOssList", JSON.stringify(list));
 
-
-					console.log(this.firstTime, "这是第一次播放时长");
-					this.isSetFirstTime = true;
-					setTimeout((res) => {
-						// this.videoContext.seek(this.firstTime);
-						// this.player.seek(this.firstTime);
-						this.setVideoFirtsetTime();
-					}, 100);
-					// if (this.currentVideo.type == 0 || this.currentVideo.type == 2 ) {
-					// 	await this.playVideo();
+					// if (this.currentVideo.type == 0 || this.currentVideo.type == 2) {
+					//   await this.playVideo();
 					// }
+					console.log(this.firstTime, "这是第一次播放时长");
+					// await that.getVideo();
 				}
+				this.isSetFirstTime = true;
+			},
+			async playVideo(e) {
+				this.videoContext = uni.createVideoContext("videoId", this);
+				this.videoContext.seek(this.firstTime);
+
+				//   this.videoContext.requestFullScreen();
 			},
-			// async playVideo(e) {
-			// 	this.videoContext = uni.createVideoContext("videoId", this);
-			// 	if (this.isSetFirstTime) {
-			// 		setTimeout((res) => {
-			// 			this.videoContext.seek(this.firstTime);
-			// 			this.setVideoFirtsetTime();
-			// 		}, 100);
-			// 	}
-			// 	//   this.videoContext.requestFullScreen();
-			// },
 			recordTime(data) {
 				this.currentTime = data.time;
 
@@ -291,17 +386,16 @@
 				}
 
 				uni.setStorageSync("videoOssList", JSON.stringify(list));
-
-				// console.log(list, "走接口的方法参数");
 			},
 			// 获取数据
-			getLive() {
+			async getLive(isChange) {
+				var that = this;
 				this.isfresh = false;
 				var data = {
 					...this.options,
 				};
 
-				$http
+				await $http
 					.request({
 						url: `sociology/course/checkVideo`,
 						method: "Post", // POST、GET、PUT、DELETE，具体说明查看官方文档
@@ -311,88 +405,61 @@
 							"Content-Type": "application/json",
 						},
 					})
-					.then((res) => {
-						console.log('res',this.oprateOsName, res);
-						if (this.oprateOsName == 'ios') {
-							console.log('不符合播放条件');
-							if (this.currentVideo.type == 1 && res.video.m3u8Url == null || this.currentVideo.type == 1 && res.video.m3u8Url == '') {
-								// 只存在私有加密
-								uni.showModal({
-									content: '抱歉，苹果手机不支持此加密视频格式，您可以在安卓端观看本视频',
-									confirmText: '知道了',
-									showCancel: false,
-									success: function (res) {
-											if (res.confirm) {
-												uni.navigateBack({delta: 2})
-											}
-										}
-								})
-								return
-							}
-						}
-						// if (this.currentVideo.type == 1 && res.video.m3u8Url == null || this.currentVideo.type == 1 && res.video.m3u8Url == '') {
+					.then(async (res) => {
+						var data = {
+							...res.video,
+						};
+						console.log("/checkjieguo", data);
+						// return
 						if (this.currentVideo.type == 1) {
 							var playAuth = res.video.playAuth.replace(/=/g, "");
-							this.videoData = {
-								...res.video,
+							console.log("这是接口获取的视屏凭证111", playAuth);
+							data = {
+								...data,
 								videoId: res.video.video,
 								playAuth: playAuth,
 							};
 							this.playAuth = playAuth;
-						}
-						// else if(this.currentVideo.type == 1 && res.video.m3u8Url != null || this.currentVideo.type == 1 && res.video.m3u8Url != ''){
-						// 	this.videoData = {
-						// 		...res.video,
-						// 		playAuth: new Date().getTime(),
 
-						// 	};
-						// 	this.videoUrl =								
-						// 		res.video.m3u8Url;
-						// 		console.log('这是m3u8加密的视频');
-						// 	this.$nextTick(async () => {
-						// 	  await this.getData();
-						// 	});
-						// }
-						else {
-							this.videoData = {
-								...res.video,
-								playAuth: new Date().getTime()
+							await that.getData(data, isChange);
+						} else {
+							console.log("这是接口获取的视屏凭证222", res.video, data);
+							data = {
+								...data,
+								playAuth: new Date().getTime(),
 							};
-							this.videoUrl =
-								// "https://ehh-private-01.oss-cn-beijing.aliyuncs.com/video/taiHuClass/" +
-								res.video.videoUrl;
-							console.log('这是常规视频');
-							// this.$nextTick(async () => {
-							//   await this.getData();
-							// });
+							await that.getData(data, isChange);
 						}
+						console.log("是否获取到初始播放值", data);
 
-						this.$forceUpdate();
+						that.$forceUpdate();
 					});
 			},
 			async handleEnd() {
 				var list = JSON.parse(JSON.stringify(uni.getStorageSync("videoOssList")));
 				var data = list.find((e) => e.id == this.videoData.id);
 				this.currentTime = data.time;
-				console.log('this.currentTime at line 这是结束的时候掉的存储视频:', this.currentTime)
+				console.log(
+					"this.currentTime at line 这是结束的时候掉的存储视频:",
+					this.currentTime
+				);
 				clearInterval(this.$store.state.videoTimer);
 				this.timer = null;
-				await this.setVideoTime();
 
+				await this.setVideoTime();
 			},
 			setVideoTime(time) {
-				let thisBlur = JSON.parse(this.noRecored)
-				if (thisBlur) {
-					console.log('本条视频不记录播放记录，是未购买且试听章节', thisBlur);
-					return
-				}
-				console.log('本条视频需要记录播放时长', thisBlur);
-				console.log("是否走了存储视屏," + this.videoData.id, this.currentTime, );
+				var data = {};
+				// var list = uni.getStorageSync("videoOssList");
+
+				// data = list.find((e) => e.id == this.videoData.id);
+				// console.log("这是再走生命周期哦", this.currentTime);
+				console.log("是否走了存储视屏," + this.videoData.id, this.currentTime);
 				var data = {
 					videoId: this.videoData.id,
-					position: this.currentTime, // 秒数
+					position: this.currentTime, //秒数
 				};
-				console.log('data-------', data);
+
 				$http
 					.request({
 						url: `sociology/course/saveCoursePosition`,
@@ -404,10 +471,8 @@
 						},
 					})
 					.then((res) => {
-						console.log('存储视屏时长接口返回信息', res)
+						console.log("存储视屏时长接口返回信息", res);
 						this.$forceUpdate();
-					}).catch(e => {
-						console.log('存储进度接口报错', e)
 					});
 			},
 			changePlayerTime(player) {
@@ -419,9 +484,14 @@
 					delta: 1,
 				});
 			},
+
 			async setVideoFirtsetTime(time) {
 				this.currentTime = this.firstTime;
 				console.log("这里准备开始设置播放时间:", this.currentTime);
+				// await this.setVideoTime();
+				// setTimeout(() => {
+				// clearInterval(this.$store.state.videoTimer);
+
 				store.commit(
 					"setVideoTimer",
 					setInterval(async () => {
@@ -439,7 +509,6 @@
 </script>
 
 <script module="renderScript" lang="renderjs">
-	const firstTime = null
 	import $ from 'jquery'
 	//  import StaticADComponent from './staticadcomponent/index.js';
 	/**
@@ -459,14 +528,15 @@
 			// 在适合的生命周期，通过script和link标签引入播放器sdk、css
 			console.log(this.options, '这是monted')
 			this.loadWebPlayerSDK()
-			this.loadComponent()
+			// this.loadComponent()
 		},
 		data() {
 			return {
 				player: null,
+				videoTimer: null,
 				curTime: null,
-				curStatus: null,
 				// firstTime: null,
+				curStatus: null,
 				// currentTime:null,
 			}
 		},
@@ -474,8 +544,9 @@
 
 		watch: {
 
+
 			curTime(val) {
-				console.log('val at line 这是真正的时长:', val)
+
 				if (this.curTime !== null && this.curStatus !== null) {
 					this.$refs.videoContent1.click()
 				}
@@ -485,14 +556,15 @@
 		methods: {
 
 			handleClick(event, ownerInstance) {
-				console.log('event at line 165:', event)
+				console.log('是否了走了点击video事件', event)
 				//             this.player.on('ready',function(){
 				//    var status=  this.player.fullscreenService.getIsFullScreen()
 				//    console.log('status at line 403:', status)
 				// console.log('触发点击事件',status))
 				//   })
 
-				ownerInstance.callMethod('getData')
+				// ownerInstance.callMethod('getData')
+
 			},
 			emitData(event, ownerInstance) {
 				var that = this;
@@ -503,22 +575,79 @@
 				})
 
 			},
+
+
+			async receiveFirstTime(newValue, oldValue, ownerVm, vm) {
+
+				// if (this.player) {
+				// // this.firstTime=newValue;
+				// // console.log('这是初始播放时间111', this.firstTime,this.player)
+				// //  await this.player.seek(newValue);
+				//  await this.$refs.videoContent4.click()
+
+
+
+				// }
+
+
+			},
+			async receiveisSetFirstTime(newValue, oldValue, ownerVm, vm) {
+				console.log('是否刚开始设置播放时间', newValue, this.firstTime, this.player);
+				// if (this.player) {
+				// 	// this.firstTime=newValue;
+				// 	// await this.player.seek(this.firstTime);
+
+
+
+
+				// }
+
+
+			},
+
+			emitSetData(event, ownerInstance) {
+				var that = this;
+				// this.player.seek(this.firstTime)
+				console.log('是否设置的第一次初始播放', this.firstTime, this.videoData.id);
+
+
+				ownerInstance.callMethod('setVideoFirtsetTime')
+
+			},
+			emitopenShow(event, ownerInstance) {
+				ownerInstance.callMethod('openShow')
+			},
 			changeVideoScreen(event, ownerInstance) {
 				var that = this;
 				// this.$emit('changeScreenLoading',true)
-				var status = this.player.fullscreenService.getIsFullScreen(); // true 状态下不是全屏，false状态下是全屏
-				console.log('全屏属性status',status);
+				var status = this.player.fullscreenService.getIsFullScreen();
+
+
+
 				ownerInstance.callMethod('screenChange', {
 					status: status,
 					primary: status ? 'portrait' : 'landscape'
 				})
+
+
 				if (status) {
+
+
+
 					setTimeout(() => {
 						plus.screen.lockOrientation("portrait-primary"); //锁死屏幕方向为竖屏
 						this.player.fullscreenService.cancelFullScreen();
 						// this.$emit('changeScreenLoading',false);
+
+
 					}, 100);
+
+
 					// this.player.setPlayerSize('100%','200px');
+
+
+
+
 				} else {
 
 					//               this.player.setPlayerSize({
@@ -533,14 +662,35 @@
 
 					}, 100);
 
+
+
+
+
+
 				}
 			},
+			changeVideoData(event, ownerInstance) {
+				var that = this;
+
+				ownerInstance.callMethod('changeVideoData', )
+			},
 			endEmitData(event, ownerInstance) {
 				var that = this;
 
 				ownerInstance.callMethod('handleEnd', )
 			},
 			getLive() {
+				console.log('这是这只只是666666:', this.firstTime, this.videoData)
+
+				if (this.player) {
+
+					this.player.dispose();
+					$('#url-player-test').empty();
+					this.player = null;
+
+				}
+
+
 
 				var fullScreenButtonComponent = Aliplayer.Component({
 					/**
@@ -612,20 +762,21 @@
 					}
 				});
 
-				console.log('this.currentVideoList at line 456111111111111111111111:', this.videoList)
+				console.log('这是查看是否获取到hlstoken', this.videoData.mtsHlsUriToken, this.videoData)
 
 
 				var playerOptions = {
 					id: "url-player-test",
-					"vid": this.videoData
-						.videoId, // 必选参数，可以通过点播控制台（路径：媒资库>音/视频）查询。示例：1e067a2831b641db90d570b6480f****。
+					// preload: false,
+					// "vid": this.videoData
+					// 	.videoId, // 必选参数，可以通过点播控制台（路径：媒资库>音/视频）查询。示例：1e067a2831b641db90d570b6480f****。
 
 					width: '100%', //容器的大小
 					// videoWidth: '100vw', //容器的大小
 					// videoHeight: '100vh', //容器的大小
 					height: '100%', //容器的大小
-					playsinline: true,
-					controlBarVisibility: "click",
+					// playsinline: true,
+					// controlBarVisibility: "click",
 					cover: "",
 					components: [
 						//  {
@@ -636,7 +787,7 @@
 						//    * style: The style of the scrolling text
 						//    * bulletPosition: The position of the scrolling text. Valid values: 'top', 'bottom', and 'random'. The default is 'random'.
 						//    */
-						//   args: ['本课程版权归天津众妙之门科技有限公司所有，翻版必究!', {fontSize: '16px', color: 'red',}, 'random']
+						//   args: ['http://101.201.146.165:8088/Pf-EH/statics/uploadFile/2024-05-10/b0f420c7-9178-41ad-9dd6-f59a64a6e190.png']
 						// },
 						{
 							name: 'adComponent',
@@ -736,29 +887,34 @@
 
 				}
 
-
-				if (this.videoData.type == 1 && this.videoData.m3u8Url == null || this.videoData.type == 1 && this
-					.videoData.m3u8Url == '') {
-					playerOptions = {
-						...playerOptions,
-						"playauth": this.videoData.playAuth, // 必选参数，参数值可通过调用GetVideoPlayAuth接口获取。
-						"encryptType": 1, // 必选参数，当播放私有加密流时需要设置本参数值为1。其它情况无需设置。
-						"playConfig": {
-							"EncryptType": 'AliyunVoDEncryption'
+				if (this.videoData.type == 1) {
+					if (this.videoData.m3u8Url == null || this
+						.videoData.m3u8Url == '') {
+						//console.log('这是私有加密的视频');
+						if (this.$platform == 'ios') {
+							this.$refs.videoContent5.click()
+						} else {
+							playerOptions = {
+								...playerOptions,
+								"playauth": this.videoData.playAuth, // 必选参数，参数值可通过调用GetVideoPlayAuth接口获取。
+								"encryptType": 1, // 必选参数，当播放私有加密流时需要设置本参数值为1。其它情况无需设置。
+								"playConfig": {
+									"EncryptType": 'AliyunVoDEncryption'
+								}
+							}
+							console.log('这是私有加密的视频');
 						}
-					}
-					console.log('这是私有加密的视频');
-
-				} else if (this.videoData.type == 1 && this.videoData.m3u8Url != null && this.videoData.type == 1 && this
-					.videoData.m3u8Url != '') {
-					playerOptions = {
-						...playerOptions,
-						source: this.videoData.m3u8Url,
-						playConfig: {
-							"EncryptType": 'AliyunVoDEncryption'
+					} else if (this.videoData.m3u8Url != null || this.videoData.m3u8Url != '') {
+						playerOptions = {
+							...playerOptions,
+							source: this.videoData.m3u8Url,
+							playConfig: {
+								"EncryptType": 'HLSEncryption'
+							}
 						}
+						console.log('这是标准加密的视频');
 					}
-					console.log('这是标准加密的视频');
+
 				} else {
 					playerOptions = {
 						...playerOptions,
@@ -766,38 +922,107 @@
 					}
 					console.log('这是没有加密的视频');
 				}
-				var player = new Aliplayer(playerOptions, function(player) {
-
-
-
-				});
-
-
+					console.log('playerOptions',playerOptions);
+				// if (this.videoData.type == 1 && this.videoData.m3u8Url == null || this.videoData.type == 1 && this
+				// 	.videoData.m3u8Url == '') {
+				// 	playerOptions = {
+				// 		...playerOptions,
+				// 		"playauth": this.videoData.playAuth, // 必选参数，参数值可通过调用GetVideoPlayAuth接口获取。
+				// 		"encryptType": 1, // 必选参数，当播放私有加密流时需要设置本参数值为1。其它情况无需设置。
+				// 		"playConfig": {
+				// 			"EncryptType": 'AliyunVoDEncryption'
+				// 		}
+				// 	}
+				// 	console.log('这是私有加密的视频');
 
+				// } else if (this.videoData.type == 1 && this.videoData.m3u8Url != null && this.videoData.type == 1 && this
+				// 	.videoData.m3u8Url != '') {
+				// 	playerOptions = {
+				// 		...playerOptions,
+				// 		source: this.videoData.m3u8Url,
+				// 		playConfig: {
+				// 			"EncryptType": 'HLSEncryption'
+				// 		}
+				// 	}
+				// 	console.log('这是标准加密的视频');
+				// }
+				var player = new Aliplayer(playerOptions, function(player) {});
 				this.player = player;
-				this.$refs.videoContent.click()
+				console.log('是否拿到第一次初始值呢', this.platform, typeof this.firstTime, this.firstTime)
+				if (this.platform == 'ios') {
 
-				var timer = setInterval(() => {
+					this.player.one('timeupdate', () => {
+						this.player.seek(this.firstTime);
+					})
+
+					player.on('canplay', function() {
+						console.log('这是ios数据缓冲初次设置播放位置判断！！！！')
+						this.player.seek(this.firstTime);
+					})
+					//   var seeked = false;
+					// player.on('loadedmetadata',function  (e) {
+					//   if(!seeked)
+					//   {
+					//     seeked = true;
+					//     this.player.seek(20);
+					//   }
+					// });
+					// player.on('waiting',function(){
+					//   console.log('这是ios数据缓冲初次设置播放位置判断！！！！')
+					//   setTimeout(()=>{
+					//      player.seek(this.firstTime)
+					//   },500)
+
+					//     })
+				} else {
+					this.player.seek(this.firstTime)
+				}
+
+
+
+
+
+				// var seeked = false;
+				//         this.player.on('loadedmetadata',function  (e) {
+				//   if(!seeked)
+				//   {
+				//     seeked = true;
+				//     player.seek(this.firstTime);
+				//   }
+				// });
+
+
+
+
+				clearInterval(this.videoTimer);
+
+				this.videoTimer = null;
+				this.videoTimer = setInterval(() => {
 					var that = this;
 					that.curTime = parseInt(this.player.getCurrentTime());
 					that.curStatus = this.player.getStatus()
 
-				}, 1000);
-				// player.on('ready',function(){
-				// 	// this.firstTime = 20
-				// 	console.log('播放器准备完毕',this.firstTime);
 
-				//      // player.fullscreenService.requestFullScreen()
-				// 	if (this.firstTime > 0) {
-				// 						 console.log('进入seek了吗？',this.firstTime)
-				// 						player.seek(this.firstTime);
-				// 	}
-				//   })
+				}, 1000);
+				this.$refs.videoContent4.click()
+				player.on('ready', function() {
+
+					//  player.fullscreenService.requestFullScreen()
+
+				})
+
+				//  this.
+
+
+				// this.$refs.videoContent.click()
 				this.player.on('ended', function() {
-					console.log('that.curTime at line 242:', this.curTime)
-					console.log('that.curStatus at line 210:', this.curStatus)
+					// console.log('that.curTime at line 242:', this.curTime)
+					// console.log('that.curStatus at line 210:', this.curStatus)
 					this.$refs.videoContent2.click()
 
+
+
+
 				})
 
 
@@ -806,20 +1031,17 @@
 
 				//全屏播放
 
-				 player.one('canplay', function() {
-				     console.log('进入了canplay', this.firstTime);
-					 // this.firstTime = 20
-					// if (this.firstTime > 0) {
-					//  	console.log('进入seek了吗？',this.firstTime)
-					// 	player.seek(this.firstTime);
-					//  	}
-				 //  player.tag.play();
+				// player.one('canplay', function() {
+				//     // console.log('canplay', this.player.tag);
+				//     player.tag.play();
+
+				// });
+
 
-				 });
 
 			},
 			showPreview(e) {
-				console.log('e at line 56:', e)
+				// console.log('e at line 56:', e)
 				let conimg = e.target.dataset.nodes;
 				let imgs = conimg.match(/<img[^>]+>/g); //选择节点中的img
 				console.log('imgs at line 59:', imgs)
@@ -852,42 +1074,66 @@
 			},
 
 			receiveScreenType(newValue) {
-				console.log('newValue at line 427屏幕方向111111111111:', newValue)
+				// console.log('newValue at line 427屏幕方向111111111111:', newValue)
 
 			},
 			async receiveIsfresh(newValue) {
-				if (newValue) {
-					if (this.player) {
-						this.timer = null;
 
-						await this.setVideoTime();
-
-						this.player.dispose();
-						this.player.seek(newValue);
-					}
-				}
-				console.log('newValue at line 427屏幕方向111111111111:', newValue)
-
-			},
-			receiveFirstTime(newValue, oldValue, ownerVm, vm) {
-				// //数据变化				
-				
-				this.firstTime = newValue
-				console.log('第一次播放的值receiveFirstTime', newValue, this.firstTime)
-				// console.log('vm4444', vm)
-				// console.log('this.firstTime at line 215:', newValue)
+				console.log('是否走了刷新销毁方法:', this.player)
 				if (this.player) {
-				 console.log('进入seek了吗？')
-				    this.player.seek(newValue);
+					clearInterval(this.$store.state.videoTimer)
+					// await this.setVideoTime();
+					this.player.dispose();
+					// $('#url-player-test').empty()
+
+					// this.player.seek(newValue);
 				}
 
 
 			},
+			async receiveplatform(newValue) {
+
+
+
+
+
+
+			},
+			async receiveIsChange(newValue) {
+
+
+				// this.timer=null
+
+				if (this.isChange) {
+
+					this.checkValue()
+
+					// if (this.videoData.type == 1) {
+					// 	console.log('是否走了切换加密视频方法:', this.isChange, this.videoData)
+					// 	await this.player.replayByVidAndPlayAuth(this.videoData.video, this.videoData.playAuth)
+					//   this.$refs.videoContent.click()
+					// } else {
+					// 	console.log('是否走了切换老视频/音频方法:', this.isChange, this.videoData)
+					// await	this.player.loadByUrl(this.videoData.videoUrl)
+					// this.$refs.videoContent.click()
+					// }
+
+				}
+
+
+				// this.$refs.videoContent3.click()
+
+			},
+
 			receiveVideoList(newValue, oldValue, ownerVm, vm) {
 				// //数据变化
 
 				console.log('currentVideoListcurrentVideoListcurrentVideoList', newValue)
 
+
+
+
+
 			},
 			receiveMsg(newValue, oldValue, ownerVm, vm) {
 				//数据变化
@@ -911,19 +1157,22 @@
 				// console.log('vm', vm)
 			},
 			checkValue() {
-				console.log(this.videoId, this.authId, "1111888888")
+				console.log(this.videoId, this.authId, this.videoData, "1111888888")
 				if ((!this.videoData.playAuth || !this.currentVideoList)) {
 					setTimeout(() => {
 						this.checkValue();
 					}, 1000);
 				} else {
 
-					console.log('this.videoList at line 这是这只只是594:', this.currentVideoList)
+					console.log('这是这只只是594:', this.firstTime, this.videoData)
 					this.getLive();
 				}
 			},
 			loadWebPlayerSDK() {
 				return new Promise((resolve, reject) => {
+
+
+
 					const s_tag = document.createElement('script'); // 引入播放器js
 					s_tag.type = 'text/javascript';
 					s_tag.src = 'https://g.alicdn.com/apsara-media-box/imp-web-player/2.20.3/aliplayer-min.js';
diff --git a/pages/course/index.vue b/pages/course/index.vue
index 7502312..2b2ff8b 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -379,11 +379,14 @@
 	.subCate {
 		padding-top:10px;
 		padding-bottom: 10px;
-
-		.item {
+		display: flex;
+		.item {		
+			border: 1px solid #bfcad9;
+			display: inline-block;
+			text-align: center;
 			font-size: 26rpx;
 			background-color: #fff;
-			border-radius: 10px;
+			border-radius: 4px; width: 100%;
 			color: #333;
 			margin-right: 16rpx;
 			padding: 14rpx 30rpx;
@@ -394,6 +397,7 @@
 		}
 
 		.item.active {
+			border-color: $themeColor;
 			background-color: $themeColor;
 			color: #fff;
 		}
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 8cc5296..b32b8c3 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -46,7 +46,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="fourBox" style="padding: 0;" v-if="sbuMedicalTagsList && sbuMedicalTagsList.length > 0">
+		<view class="fourBox" style="padding: 0; padding-bottom: 8rpx;" v-if="sbuMedicalTagsList && sbuMedicalTagsList.length > 0">
 			<view class="childrenBox fourIcon flexbox" style="justify-content: space-around;">
 				<div class="item flexbox" @click="curseClickJump(item)" v-for="(item, index) in sbuMedicalTagsList"
 					:key="index">
@@ -1058,13 +1058,15 @@
 	}
 
 	.childrenBox {		
-		background-color: #e4eefa !important;
+		// background-color: #e4eefa !important;
+		border:1px solid #e4eefa;
+		border-radius: 6rpx !important;
 		// @include mshadow(10px, 1);
 		background-color: #fff;
 		justify-content: center;
 		box-shadow: none !important;
-		border-radius: 0 !important;		
-
+		// border-radius: 0 !important;	
+		
 		.item {
 			text {
 				color: #3361a5;
@@ -1114,7 +1116,7 @@
 	.fourIcon {
 		justify-content: space-between;
 		box-shadow: 0px 0px 10px 0px rgba(167, 187, 228, 1);
-		margin-bottom: 8px;
+		// margin-bottom: 8px;
 		// border: 1px solid #fff;
 		text-align: center;
 		height: 60px;
@@ -1350,6 +1352,7 @@
 	background-color: #fff;
 	padding: 0 10rpx;
 	border-top: 1px solid #eee;
+	padding-top: 4rpx;
 	// padding-bottom:2rpx;
 }
 	.home_nar {
@@ -1372,7 +1375,7 @@
 			// box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.3);
 
 			image {
-				width: 120rpx;
+				width: 100rpx;
 				height: 90rpx;
 				display: block;
 				margin: 0 auto;
@@ -1400,7 +1403,7 @@
 			// position: relative;
 			text {
 				color: #3361a5;
-				font-weight: bold;
+				// font-weight: bold;
 			}
 		}
 		// .hn_cl_tit.active::after{