转圈圈

html/SignIn/SignIn.html

@@ -187,7 +187,7 @@
                 $("#bg_box").css("transform", `scale(${WindowW / 1813}, ${WindowH / 1020})`)
             }
             var conn = $.hubConnection(getApiUrl().urlSignalr, {
-                qs: `i=888888&n=印象之旅&p=${encodeURIComponent(
+                qs: `i=888886&n=印象之旅&p=${encodeURIComponent(
                 "http://imgfile.oytour.com/New/Upload/User/20191018150051176.png"
                 )}`
             });
@@ -198,7 +198,16 @@
 			var personArray = new Array;
 			var CurPersonNum = 0;
             audio.addEventListener('ended', function () {
+				$('.show_info').hide();
+				dataList2.push({
+					bn: dataList[0].BranchName,
+					name: dataList[0].EmName,
+					photo: dataList[0].SignInPhoto,
+				})
+				dataList.splice(0, 1);
+                setTimeout(()=>{
 					showSignln()
+				}, 500)
             }, false);
             var gettokenMsg = {
                 appkey: "4gR6yRX5O3PN8hGC5FaNh5d5",
@@ -239,11 +248,10 @@
                 proxy.invoke("Hello", '1').done(msg => {
                     console.log("Hello")
                 });
-				console.log('111')
 				proxy.invoke("SendSignins", '1').done(data => {
-                    console.log('initSignins', data)
+                    console.log('initSignins', data, dataList2.length)
 					dataList2 = data
-					CurPersonNum = dataList2.length -1
+					CurPersonNum = dataList2.length === 0 ? 0 : dataList2.length -1
 					createHead()
 					init();
                 });
@@ -257,16 +265,9 @@
                 })
                 proxy.on("notifySignin", data=>{
                     var newData = JSON.parse(data)
-                    console.log(newData)
+                    console.log('notifySignin:',newData)
                     dataList.push(newData)
 				})
-				// proxy.on("initSignins", data=>{
-				// 	console.log(data)
-				// 	dataList2 = data
-				// 	CurPersonNum = dataList2.length -1
-				// 	createHead()
-				// 	init();
-				// })
 				proxy.on("barrage",data=>{
 					let barrage = data
 					createDM({img: barrage.p, name: barrage.n, text: barrage.m})
@@ -292,7 +293,7 @@
     		var _out = ['bounceOut','bounceOutDown','bounceOutLeft','bounceOutRight','bounceOutUp','fadeOut','fadeOutDown','fadeOutDownBig','fadeOutLeft','fadeOutLeftBig','fadeOutRight','fadeOutRightBig','fadeOutUp','fadeOutUpBig','rotateOut','rotateOutDownLeft','rotateOutDownRight','rotateOutUpLeft','rotateOutUpRight','slideOutDown','slideOutLeft','slideOutRight'];
     		// 推送数据
 			async function showSignln(){
-				console.log(dataList)
+				console.log('showSignln:',dataList)
                 if (dataList.length == 0) {
                     await sleep(2000);
                     showSignln()
@@ -321,17 +322,6 @@
                     var img = document.getElementsByClassName('element')[CurPersonNum].getElementsByTagName('img')[0];
                     img.setAttribute('src', data.SignInPhoto);
                     ++CurPersonNum;
-                    setTimeout(function(){
-                        setTimeout(function(){
-							$('.show_info').hide();
-							dataList2.push({
-								bn: dataList[0].BranchName,
-								name: dataList[0].EmName,
-								photo: dataList[0].SignInPhoto,
-							})
-                            dataList.splice(0, 1);
-                        },1000);
-                    },2000);
                 }
 			}
 			function chainAnimations(name){

html/SignIn/signinInfo.html

@@ -72,7 +72,13 @@
             getMsg()
             var audio = document.getElementById('audio');
             audio.addEventListener('ended', function () {
+                $('.robot').attr('src', '../../images/texiao/robot2.png');
+                setTimeout(function(){
+                    $('.info_box').removeClass('fadeOut');
+                    $('.info_box').hide();
+                    dataList.splice(0, 1);
                     showSignln()
+                }, 500);
             }, false);
             function sendMsg() {
                 proxy.invoke("Hello", '1').done(msg => {
@@ -135,17 +141,6 @@
 					$('.show_info').removeClass('fadeIn');
                     // 更改展示的图片
                     $('.robot').attr('src', '../../images/texiao/robot2.gif');
-                    if (dataList.length !== 1) {
-                        setTimeout(function(){
-                            $('.info_box').addClass('fadeOut');
-                            setTimeout(function(){
-                                $('.info_box').removeClass('fadeOut');
-                                $('.info_box').hide();
-                                dataList.splice(0, 1);
-                                $('.robot').attr('src', '../../images/texiao/robot2.png');
-                            }, 500);
-                        },2000);
-                    }
                 }
 			}
             function playVideo(txt) {