Browse Source

no message

qiuruirong 1 year ago
parent
commit
36f7d65e89

+ 14 - 13
.hbuilderx/launch.json

@@ -4,23 +4,24 @@
     "version" : "0.0",
     "configurations" : [
         {
-        	"app-plus" : 
-        	{
-        		"launchtype" : "local"
-        	},
-        	"default" : 
-        	{
-        		"launchtype" : "local"
-        	},
-        	"mp-weixin" : 
-        	{
-        		"launchtype" : "local"
-        	},
-        	"type" : "uniCloud"
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
         },
         {
             "playground" : "custom",
             "type" : "uni-app:app-android"
+        },
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-ios"
         }
     ]
 }

+ 10 - 8
uni_modules/equnphp-streaming/components/live-push/live-push.nvue

@@ -25,26 +25,26 @@
 			<view class="tool-box" :class="showToolBox?'up':''">
 				<view class="tool-item" @click="shearRoom">
 					<view class="tool-img">
-						<image src="@/uni_modules/equnphp-streaming/static/icon-shear.png" mode="widthFix"></image>
+						<image src="@/uni_modules/equnphp-streaming/static/icon-shear.png" class="icon-img" mode="widthFix"></image>
 					</view>
 					<text class="tool-text">分享</text>
 				</view>
 				<view class="tool-item" @click="changePushStatus">
 					<view class="tool-img">
-						<image src="@/uni_modules/equnphp-streaming/static/icon-bpush.png" mode="widthFix" v-if="pushStatus=='暂停推流'"></image>
-						<image src="@/uni_modules/equnphp-streaming/static/icon-push.png" mode="widthFix" v-if="pushStatus=='恢复推流'"></image>
+						<image src="@/uni_modules/equnphp-streaming/static/icon-bpush.png" class="icon-img" mode="widthFix" v-if="pushStatus=='暂停推流'"></image>
+						<image src="@/uni_modules/equnphp-streaming/static/icon-push.png" class="icon-img" mode="widthFix" v-if="pushStatus=='恢复推流'"></image>
 					</view>
 					<text class="tool-text">{{pushStatus}}</text>
 				</view>
 				<view class="tool-item" @click="switchCamera">
 					<view class="tool-img">
-						<image src="@/uni_modules/equnphp-streaming/static/icon-turn.png" mode="widthFix"></image>
+						<image src="@/uni_modules/equnphp-streaming/static/icon-turn.png" class="icon-img" mode="widthFix"></image>
 					</view>
 					<text class="tool-text">翻转</text>
 				</view>
 				<view class="tool-item" @click="stopPush">
 					<view class="tool-img">
-						<image src="@/uni_modules/equnphp-streaming/static/icon-close.png" mode="widthFix"></image>
+						<image src="@/uni_modules/equnphp-streaming/static/icon-close.png" class="icon-img" mode="widthFix"></image>
 					</view>
 					<text class="tool-text">结束直播</text>
 					</view>
@@ -193,6 +193,7 @@
 			startPush() {
 				var self = this;
 				stream.startStream().then(res=>{
+					console.log(res,'====0000')
 					if(res.code == 200){
 						stream.startPush(res.data.push_url).then(ret =>{
 							if(ret.status){
@@ -215,7 +216,6 @@
 							icon: 'none'
 						})
 					}
-					
 				}).catch(err=>{
 					uni.showToast({
 						title: res.message,
@@ -384,10 +384,12 @@
 	.tool-img{
 		width: 70rpx;
 		height: 70rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 		margin-bottom: 20rpx;
 	}
-	.tool-img image{
-		display: flex;
+	.tool-img .icon-img{
 		width: 70rpx;
 		width: 70rpx;
 	}

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


File diff suppressed because it is too large
+ 5 - 0
unpackage/dist/dev/app-plus/pages/live/push.js


Some files were not shown because too many files changed in this diff