聊天更新

components/footer/footer.vue

@@ -3,11 +3,11 @@
 		<view class="content">
 			<!-- 表情 -->
 			<image v-show="!inputFalg  && !faceFalg" src="../../static/images/biaoqing.png" mode="widthFix"
-				style="width: 68rpx;margin: 0 20rpx 0 0;" @touchend.prevent="faceFalg = true">
+				style="width: 68rpx;margin: 0 20rpx 0 0;" @touchend.prevent="jp_click(0)">
 
 			</image>
 			<image v-show="!inputFalg && faceFalg" src="../../static/images/jianpan.png" mode="widthFix"
-				style="width: 68rpx;margin: 0 20rpx 0 0;" @touchend.prevent="jp_click">
+				style="width: 68rpx;margin: 0 20rpx 0 0;" @touchend.prevent="jp_click(1)">
 			</image>
 			<!-- 输入框 -->
 			<view class="input">
@@ -18,8 +18,8 @@
 				</input> -->
 				<u--textarea autoHeight
 					style="background-color: #d9d9d9;padding-left:20rpx;border-radius: 40rpx;width: 90%;max-height: 150rpx;overflow-y: scroll;"
-				type="text" placeholder="说点什么吧..." v-model="value" @focus="inputFocus"
-					@blur="inputblur" confirm-type="send" @confirm="send" @keyup.enter="send" id="inputdata" :focus="false">
+					type="text" placeholder="说点什么吧..." v-model="value" @focus="inputFocus" @blur="inputblur"
+					confirm-type="send" @confirm="send" @keyup.enter="send" id="inputdata" :focus="false">
 				</u--textarea>
 			</view>
 			<!-- <u-button style="margin: 0 0 0 20rpx;width: 20%;height: 70%;" text="发送" type="success" v-show="!inputFalg" touchend.prevent="send">
@@ -38,7 +38,7 @@
 					style="width:68rpx" mode="widthFix" @click="iconbtn(item.title)"></image>
 			</view>
 			<!-- icontab -->
-			<component class="absolute" :is="currentTabComponent" @onClose="onClose" :show="foucsinput"
+			<component class="absolute" :is="currentTabComponent" @onClose="onClose" :show="show"
 				@specialShow="specialShow"></component>
 		</view>
 		<!-- 表情框 -->
@@ -83,7 +83,7 @@
 				inputFalg: true,
 				currentTabComponent: '',
 				show: false,
-				foucsinput:false,
+				foucsinput: false,
 				value: '',
 				facelist: face.face,
 				exc_style: {},
@@ -130,9 +130,14 @@
 		},
 		methods: {
 
-			jp_click(){
+			jp_click(e) {
+				if (e == 0) {
+					this.faceFalg = true
+					uni.hideKeyboard()
+				} else {
 					this.faceFalg = false
 					this.foucsinput = true
+				}
 			},
 			//提交输入
 			send() {
@@ -148,7 +153,7 @@
 				this.inputFalg = false
 				uni.onKeyboardHeightChange(res => {
 					this.exc_style = {
-						"height": res.height + "rpx"
+						"height": res.height*2 + "rpx"
 					}
 					console.log(res.height)
 				})

pages/index/index.vue

@@ -7,10 +7,10 @@
 		</view>
 		<tabs @skipComponent="skip"></tabs>
 		<!-- 聊天 -->
-		<component :is="currentTabComponent" :specialUrl="special" :tabType="type"></component>
+		<component :is="currentTabComponent" :specialUrl="special" :msgList="msgList" :tabType="type"></component>
 		<!-- 底部 -->
-		<view class="footer" v-show="currentTabComponent == 'chat'">
-		<foot @specialShow="specialShow"></foot>
+		<view class="footer" >
+			<foot @specialShow="specialShow" @sendmsg="sendmsg" v-show="currentTabComponent == 'chat'"></foot>
 		</view>
 	</view>
 </template>
@@ -23,7 +23,9 @@
 	import sinatv from "@/components/tabs/sinaTv/sinaTv.vue"
 	import lives from "@/components/live/live.vue"
 	import courseware from "@/components/tabs/courseware/courseware.vue"
+	import face from "@/until/face.js"
 
+	var Live
 	export default {
 		components: {
 			foot,
@@ -40,16 +42,24 @@
 				value: '',
 				currentTabComponent: 'chat',
 				special: "",
-				type:""
+				msgList: [],
+				scrollTop: 0,
+				type: ""
 			}
 		},
 		created() {
+			this.getusertoken()
 		},
 		onshow() {
 
 		},
 		methods: {
+			//触发消息
+			sendmsg(val) {
+				this.send(val)
+			},
 			skip(value) {
+				console.log(value, 3)
 				this.currentTabComponent = value.id
 				this.type = value.type
 			},
@@ -60,6 +70,193 @@
 					_this.special = ''
 				}, 1000)
 			},
+			gsnickname(val) {
+				var msgname = val
+				msgname = msgname.replace(/\d{8,}/g, "*")
+				msgname = msgname.length > 8 ? msgname.substring(0, 8) + "..." : msgname
+				return msgname
+			},
+			//获取房间token
+			getusertoken() {
+				this.$nextTick(() => {
+					if (uni.getStorageSync("login_ok") == 'success') {
+						this.$api.getusertoken().then(res => {
+							var that = this
+							var roomdid = res.data.data
+							if (uni.getStorageSync('room_token')) {
+								roomdid = uni.getStorageSync('room_token')
+							}
+							Live = new Finezb.Live(roomdid)
+							Live.login(function() {
+								console.log('登录成功', JSON.stringify(Live.getLoginUser()))
+								uni.setStorageSync("user_account", Live.getLoginUser().account)
+								Live.onMsg(function(msg) {
+									console.log(msg);
+									if (msg.type == 1) {
+										if (msg.extra) {
+											msg.extra = JSON.parse(msg.extra);
+											if (msg.extra) {
+												// role发送者角色 2-主播 3-助理 4-观众
+												if (msg.extra.role == undefined) {
+													msg.extra.role = 4
+												}
+												//观众头像
+												// if (!msg.extra.headUrl) {
+												//     msg.extra.headUrl = '';
+												// }
+											}
+										}
+										msg.msgType = 1;
+										//解析欧畅云网页观看端发送的表情
+										msg.text = face.replaceEm(msg.text);
+										if (msg.text.indexOf('<img') != -1) {
+											msg.msgType = 3;
+										}
+
+										try {
+											console.log(JSON.parse(msg.text));
+											//解析欧畅云主播端发送的图片
+											var text = JSON.parse(msg.text);
+											if (text.notifyType == 11) {
+												msg.msgType = 2;
+												msg.original = text.original;
+												msg.thumb = text.thumb;
+											}
+										} catch (e) {}
+										if (msg.extra.isDirty != 1) {
+											msg.sendName = msg.sendName.replace(/\d{8,}/g,
+												"*")
+											msg.sendName = msg.sendName.length > 8 ? msg
+												.sendName.substring(0, 8) + "..." : msg
+												.sendName
+											that.msgList.push(msg)
+										}
+									} else if (msg.type == 3) {
+										//通知消息
+										if (msg.text == 'enter') {
+											msg.sendName = msg.sendName.replace(/\d{8,}/g,
+												"*")
+											msg.sendName = msg.sendName.length > 8 ? msg
+												.sendName.substring(0, 8) + "..." : msg
+												.sendName
+											that.msgList.push(msg)
+										} else {
+											var notify = JSON.parse(decodeURIComponent(msg
+												.text));
+
+											//签到
+											if (notify.notifyType == 12) {
+												console.log(notify);
+												that.qd_info = notify
+												that.show_qd = true
+												that.qd_type = 0
+												that.qd_count = notify.timer
+												that.qd_time = setInterval(() => {
+													if (that.qd_count == 0) {
+														that.show_qd = false
+														clearInterval(that.qd_time)
+													}
+													--that.qd_count;
+												}, 1000);
+											}
+											//礼物
+											if (notify.notifyType == 5) {
+												that.tx_list.push(notify.giftPicUrl)
+												var msg1 = {
+													type: 3,
+													sendTime: new Date().getTime(),
+													extra: {
+														headUrl: that.headUrl,
+													},
+													sendName: that.name_type == 0 ?
+														localStorage.getItem(
+															'user_name') : localStorage
+														.getItem('user_name1'),
+													text: notify
+												}
+												that.msgList.push(msg1)
+											}
+											//打赏
+											if (notify.notifyType == 2) {
+												var msg2 = {
+													type: 3,
+													sendTime: new Date().getTime(),
+													extra: {
+														headUrl: that.headUrl,
+													},
+													sendName: that.name_type == 0 ?
+														localStorage.getItem(
+															'user_name') : localStorage
+														.getItem('user_name1'),
+													text: notify
+												}
+												that.msgList.push(msg2)
+											}
+										}
+									}
+								})
+							})
+
+						})
+					}
+				})
+			},
+			//发送消息
+			send(val) {
+				if (!val.sendText) {
+					return;
+				}
+				let data = {
+					text: val.sendText,
+					type: val.type,
+					nickName: uni.getStorageSync("user_name"),
+				};
+				if (uni.getStorageSync("watch_type") == 4 && uni.getStorageSync("wxnick") == 0) {
+					data.nickName = uni.getStorageSync("user_name1")
+				}
+				data.extra = {
+					headUrl: uni.getStorageSync("user_headimg"),
+					role: 4,
+					isDirty: 0
+				};
+				// var sendlist = this.chatsetinfo.sensitiveWord
+				// if (this.chatsetinfo.sensitive && sendlist.length > 0) {
+				// 	for (var index in sendlist) {
+				// 		if (sendlist[index] != "" && sendlist[index].trim() != "" && this.sendText.includes(sendlist[
+				// 				index])) {
+				// 			data.extra.isDirty = 1
+				// 			break;
+				// 		}
+				// 	}
+				// }
+				data.extra = JSON.stringify(data.extra);
+				let msg = {
+					type: val.type,
+					sendTime: new Date().getTime(),
+					extra: {
+						headUrl: uni.getStorageSync("user_headimg"),
+						role: 4
+					},
+					sendName: uni.getStorageSync("user_name"),
+					text: face.replaceEm(val.sendText)
+				}
+				if (uni.getStorageSync("watch_type") == 4 && uni.getStorageSync("wxnick") == 0) {
+					msg.sendName = uni.getStorageSync("user_name1")
+				}
+				msg.sendName = msg.sendName.replace(/\d{8,}/g, "*")
+				msg.sendName = msg.sendName.length > 8 ? msg.sendName.substring(0, 8) + "..." : msg.sendName
+				this.msgList.push(msg)
+				this.scrollTop = 9999999999
+				// console.log(that.datalist)
+				// let id = 'msg' + msg.sendTime;
+				// this.msgBoxToBottom(id);
+				Live.sendMsg(data, function(ack) {
+					console.log(ack);
+					if (ack.code === 200) {
+						this.scrollTop = 500
+					}
+				})
+			},
 		}
 	}
 </script>
@@ -88,17 +285,15 @@
 		}
 
 		.footer {
-			height: 88rpx;
 			position: fixed;
 			left: 0;
 			right: 0;
 			bottom: 0;
-			display: flex;
 			background-color: white;
 			box-shadow: 0 -2rpx 30rpx #dadada;
-			;
 		}
-		#playerback{
+
+		#playerback {
 			width: 100%;
 			height: 420rpx;
 			z-index: 0;

pages/index/index.vue.rej

+diff a/pages/index/index.vue b/pages/index/index.vue	(rejected hunks)
+@@ -40,24 +40,16 @@
+ 				value: '',
+ 				currentTabComponent: 'chat',
+ 				special: "",
+-				msgList: [],
+-				scrollTop: 0,
+-				type: ""
++				type:""
+ 			}
+ 		},
+ 		created() {
+-			this.getusertoken()
+ 		},
+ 		onshow() {
+ 
+ 		},
+ 		methods: {
+-			//触发消息
+-			sendmsg(val) {
+-				this.send(val)
+-			},
+ 			skip(value) {
+-				console.log(value, 3)
+ 				this.currentTabComponent = value.id
+ 				this.type = value.type
+ 			},

unpackage/dist/build/h5/index.html

@@ -2,4 +2,4 @@
                 .supports('top: constant(a)'))
             document.write(
                 '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-                (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2772579d.css><script src="http://pv.sohu.com/cityjson?ie=utf-8"></script><script src=https://static.oclive.cn/live.player_commons_5.2.js></script><link rel=stylesheet href=https://g.alicdn.com/de/prismplayer/2.9.19/skins/default/aliplayer-min.css><link href=https://web.sdk.qcloud.com/player/tcplayer/release/v4.5.4/tcplayer.min.css rel=stylesheet><script src=https://web.sdk.qcloud.com/player/tcplayer/release/v4.5.4/libs/TXLivePlayer-1.2.3.min.js></script><script src=https://web.sdk.qcloud.com/player/tcplayer/release/v4.5.4/libs/hls.min.1.1.5.js></script><script src=https://web.sdk.qcloud.com/player/tcplayer/release/v4.5.4/libs/flv.min.1.6.3.js></script><script src=https://web.sdk.qcloud.com/player/tcplayer/release/v4.5.4/tcplayer.v4.5.4.min.js></script><script src=//unpkg.byted-static.com/xgplayer/2.31.6/browser/index.js charset=utf-8></script><script src=//unpkg.byted-static.com/xgplayer-hls/2.5.2/dist/index.min.js charset=utf-8></script></head><body><div id=app></div><script src=/static/js/chunk-vendors.eceae362.js></script><script src=/static/js/index.cdc6bf4e.js></script></body></html>
+                (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2772579d.css><script src="http://pv.sohu.com/cityjson?ie=utf-8"></script><script src=https://static.oclive.cn/live.player_commons_5.2.js></script><link rel=stylesheet href=https://g.alicdn.com/de/prismplayer/2.9.19/skins/default/aliplayer-min.css><link href=https://web.sdk.qcloud.com/player/tcplayer/release/v4.5.4/tcplayer.min.css rel=stylesheet><script src=https://web.sdk.qcloud.com/player/tcplayer/release/v4.5.4/libs/TXLivePlayer-1.2.3.min.js></script><script src=https://web.sdk.qcloud.com/player/tcplayer/release/v4.5.4/libs/hls.min.1.1.5.js></script><script src=https://web.sdk.qcloud.com/player/tcplayer/release/v4.5.4/libs/flv.min.1.6.3.js></script><script src=https://web.sdk.qcloud.com/player/tcplayer/release/v4.5.4/tcplayer.v4.5.4.min.js></script><script src=//unpkg.byted-static.com/xgplayer/2.31.6/browser/index.js charset=utf-8></script><script src=//unpkg.byted-static.com/xgplayer-hls/2.5.2/dist/index.min.js charset=utf-8></script></head><body><div id=app></div><script src=/static/js/chunk-vendors.eceae362.js></script><script src=/static/js/index.cccbe1d9.js></script></body></html>
\ No newline at end of file