From 6c4a6ea804c1a467dba4df2b426cbd61469a349f Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 17 Jan 2025 17:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dios=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE=E9=A2=98=EF=BC=8C=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=90=8Ch5=E6=92=AD=E6=94=BE=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/my-video-list/list-item.vue     |  21 +++--
 components/my-video-list/my-video-list.vue | 104 ++++++++++++++-------
 pages/video/detail.nvue                    |   1 +
 3 files changed, 81 insertions(+), 45 deletions(-)

diff --git a/components/my-video-list/list-item.vue b/components/my-video-list/list-item.vue
index 112acbe..2d3f324 100644
--- a/components/my-video-list/list-item.vue
+++ b/components/my-video-list/list-item.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="item" @appear="appear" @disappear="disappear" @click.stop 	:style="{height:height+'px'}">
+	<view class="item" @appear="appear" @disappear="disappear" @click.stop 	:style="{height:height+'px'}" :key="index">
 
 		<video class="u-flex-1 video" :show-fullscreen-btn="false" @controlstoggle="controlstoggles" v-if="showVideo"
 			play-btn-position="center"
@@ -78,6 +78,10 @@
 	// #endif
 
 	const props = defineProps({
+		isAndriod:{
+			type: Boolean,
+			default: false
+		},
 		height:{
 			type:Number,
 			default:0
@@ -296,19 +300,18 @@
 
 	let video = null
 
-	function disappear() {
-		emits('disappear')
+	function disappear(e) {
+		emits('disappear',e)
 		if (video) {
 			video.pause()
 		}
 	}
 	const showVideo = computed(() => {
-		// #ifdef H5
-		return props.current === props.index && props.item.videoUrl
-		// #endif
-		// #ifdef APP
-		return props.nowIndex === props.index && props.item.videoUrl ?true :false
-		// #endif
+		if(props.isAndriod){
+			return props.nowIndex === props.index && props.item.videoUrl ?true :false
+		}else{
+			return props.current === props.index && props.item.videoUrl
+		}
 	})
 	onMounted(() => {
 		init()
diff --git a/components/my-video-list/my-video-list.vue b/components/my-video-list/my-video-list.vue
index 21a9493..7ae1af1 100644
--- a/components/my-video-list/my-video-list.vue
+++ b/components/my-video-list/my-video-list.vue
@@ -1,11 +1,11 @@
 <template>
-	<!-- #ifdef H5 -->
-	<view class=" w-full box" style="width: 100vw;">
+	<view v-if="isH5||isIos" class=" w-full box" style="width: 100vw;">
 		<swiper @longpress="popupShow('speed')" :style="{height:wHeight+'px'}" v-if="videoList.length"
 			@change="swiperChange" :current="current" :circular="true" vertical class="u-flex-1"
 			@transition="transition" :indicator-dots="false" :autoplay="false" :interval="0" :duration="200">
 			<swiper-item v-for="(item,index) in videoList" :key="index">
 				<list-item-vue :total="list.length" :item="item" :isCommand="isCommand" :height="wHeight"
+				:isAndriod="isAndriod"
 					:isTabbar="isTabbar" @playStatusChange="playStatusChange" :showControls="control.showControls"
 					:current="current" :isCollect="isCollect" @toDetail="toDetail(item,index)"
 					@controlstoggles="controlstoggles" :playSpeeds="playSpeeds" :index="index" :nowIndex="nowIndex"
@@ -14,26 +14,25 @@
 			</swiper-item>
 		</swiper>
 	</view>
-	<!-- #endif -->
 
-	<!-- #ifdef APP -->
-	<list :bounce="false" :loadmoreoffset="wHeight*3" :show-scrollbar="false" ref="listBox" :pagingEnabled="true"
+
+	<list v-if="showAndriod" :bounce="false" :loadmoreoffset="wHeight*3" :show-scrollbar="false" ref="listBox" :pagingEnabled="true"
 		@loadmore="loadmore" :scrollable="true">
 		<cell v-for="(item,index) in list" :key="item.courseDetailsId" :ref="setRefList(index)">
 			<view class="swipers-items" :style="boxStyle" @longpress="popupShow('speed')">
 				<list-item-vue :total="list.length" :item="item" :current="current" :isCollect="isCollect"
+								:isAndriod="isAndriod"
 					:isTabbar="isTabbar" @playStatusChange="playStatusChange" :height="wHeight" :isCommand="isCommand"
 					:showControls="control.showControls" @toDetail="toDetail(item,index)" @itemMounted="itemMounted"
 					@controlstoggles="controlstoggles" :index="index" :instance="instance" :nowIndex="nowIndex"
-					@appear="appear($event,item,index)" :playSpeeds="playSpeeds" @disappear="disappear(item,index)"
-					@dianzanClick="dianzanClick(item,index)" @share="share(item)" @zhuijuClick="zhuijuClick(item)"
+					@appear="appear($event,item,index)" :playSpeeds="playSpeeds"
+					@disappear="disappear($event, item,index)" @dianzanClick="dianzanClick(item,index)"
+					@share="share(item)" @zhuijuClick="zhuijuClick(item)"
 					@popupShow="popupShow($event,item,index)"></list-item-vue>
 			</view>
 		</cell>
 	</list>
 
-	<!-- #endif -->
-
 	<!-- 返回按钮 -->
 	<view class="back-icon" v-if="!isTabbar&&control.showBack">
 		<u-icon name="arrow-left" color="#fff" :size="28" @click="back"></u-icon>
@@ -76,7 +75,7 @@
 
 
 	<!-- 暂时舍弃，因为在ios上会有奇怪问题导致经常不出现 -->
-	<!-- 选集--> 
+	<!-- 选集-->
 	<!-- <view class="mask" :class="{'mask-show':popup.show}">
 		<view class="u-p-30 bg-fff box">
 			<view class="u-flex u-flex-row u-row-between">
@@ -263,7 +262,17 @@
 		getCurrentInstance,
 		onUnmounted
 	} from 'vue';
-
+	
+	let isH5=true
+	// #ifdef H5
+	isH5=false
+	// #endif
+	const sysinfo=uni.getSystemInfoSync()
+	const isIos=sysinfo.platform=='ios'?true:false
+	const isAndriod=sysinfo.platform=='android'?true:false
+	
+	const showAndriod=!isH5&&isAndriod
+	
 	let initing = true
 	const refPoster = ref(null)
 
@@ -404,18 +413,17 @@
 		console.log(e);
 	}
 	async function xuanjiInit() {
-		// #ifdef APP
+		
 		const height = 44
 		const marginBottom = 10
 		const oneItemHeight = height + marginBottom
 		const scrollTop = Math.ceil((nowIndex.value + 1) / 3) * oneItemHeight - (xuanjiData.height) / 2 +
 			oneItemHeight / 2
-		if(props.list.length<=15){
-			xuanjiData.scrollTop=0
-			return 
-		}	
-		xuanjiData.scrollTop = scrollTop * 1 <0 ? 0 : scrollTop
-		// #endif
+		if (props.list.length <= 15) {
+			xuanjiData.scrollTop = 0
+			return
+		}
+		xuanjiData.scrollTop = scrollTop * 1 < 0 ? 0 : scrollTop
 
 		// #ifdef H5
 		if (!xuanjiData.items[props.list.length - 1]) {
@@ -456,17 +464,42 @@
 		if (isFirst) {
 			$mountedComponents[index] = true
 		}
+		console.log('appear:' + index);
+		// if($common.isIos&&!initing){
+		// 	console.log('appear:'+index);
+		// 	nowIndex.value = index
+		// 	const item = props.list[nowIndex.value]
+		// 	if (!item.videoUrl) {
+		// 		popupShow('pay', item, nowIndex.value)
+		// 	}
+		// 	cacheIndex = null
+		// 	return
+		// }
+		if($common.isIos){
+			nowIndex.value = index
+			const item = props.list[nowIndex.value]
+			if (!item.videoUrl) {
+				popupShow('pay', item, nowIndex.value)
+			}
+			cacheIndex = null
+			return 
+		}
 		if (!initing) {
 			cacheIndex = index
 		}
-		if($common.isIos){
-			console.log('appear:'+index);
-		}
+
 	}
 
-	function disappear(item, index) {
-
-		if (index == nowIndex.value && cacheIndex != null && !initing) {
+	function disappear(e, item, index) {
+		if ($common.isIos) {
+			if(e.direction=='up'){
+				cacheIndex=nowIndex.value-1<0?0:nowIndex.value-1
+			}else{
+				cacheIndex=(nowIndex.value+1>(props.list.length-1)) ? props.list.length-1:nowIndex.value+1
+			}
+			return 
+		}
+		if (index == nowIndex.value && cacheIndex !== null && !initing) {
 			console.log('disappear' + index);
 			console.log('disappear nowIndex' + nowIndex.value);
 			console.log('cacheIndex' + cacheIndex);
@@ -693,15 +726,14 @@
 		let item = props.list.find(v => props.options.courseDetailsId == v.courseDetailsId)
 		item = item ? item : props.info.current;
 		if (JSON.stringify(item) !== '{}') {
-			// #ifdef H5
-			setVideoList(item)
-			// #endif
-			// #ifdef APP
-			nextTick(() => {
-				const index = props.list.findIndex(v => v.courseDetailsId == item.courseDetailsId)
-				goListPosition(index)
-			})
-			// #endif
+			if(showAndriod){
+				nextTick(() => {
+					const index = props.list.findIndex(v => v.courseDetailsId == item.courseDetailsId)
+					goListPosition(index)
+				})
+			}else{
+				setVideoList(item)
+			}
 		}
 	}
 
@@ -884,9 +916,9 @@
 	})
 	watch(() => props.list.length, (newval) => {
 		console.log('props.list.length change' + newval);
-		// #ifdef H5
-		init()
-		// #endif
+		if(!showAndriod){
+			init()
+		}
 	})
 	watch(() => nowIndex.value, (newval) => {})
 	const nowDanjiPrice = computed(() => {
diff --git a/pages/video/detail.nvue b/pages/video/detail.nvue
index 8e55400..979c033 100644
--- a/pages/video/detail.nvue
+++ b/pages/video/detail.nvue
@@ -39,6 +39,7 @@
 			isFirstLoad = false
 			Object.assign(state, res)
 			state.list = res.list
+			console.log(state.list);
 		} catch (error) {
 			// if(getCurrentPages().length>=2){
 			// 	uni.navigateBack()