Explorar o código

web socket ping pong

huanggang %!s(int64=7) %!d(string=hai) anos
pai
achega
19cb7d37ec

+ 18 - 10
data/resource/mobile/comm/websocket.js

@@ -110,10 +110,17 @@ var WebsocketConnect = function(wshost,fAutoConnect,fAutojoin,callbacks,room_msg
         socket.close();
     };
 
-    var connect = function(){
-        if(socket) {
-            return;
-        }
+    var reconnect = function(){
+        setTimeout(function(){
+            if(fauto_connect) {
+                connect();
+            }
+        },1000);
+    };
+
+    function connect()
+    {
+        socket = null;
         if(window.WebSocket) {
             socket = new WebSocket(wshost);
         }
@@ -130,9 +137,13 @@ var WebsocketConnect = function(wshost,fAutoConnect,fAutojoin,callbacks,room_msg
             }
         };
         socket.onerror = function(){
-            webSocket_callbacks.onerror();
+            console.log('error');
+        };
+        socket.onclose = function(e){
+            console.log('onclose:'+ e);
+            webSocket_callbacks.onclose();
+            reconnect();
         };
-
         socket.onmessage = function(msg)
         {
             var datasJsonParse = JSON.parse(msg.data);
@@ -162,11 +173,8 @@ var WebsocketConnect = function(wshost,fAutoConnect,fAutojoin,callbacks,room_msg
                     msg_handler.message(datasJsonParse);
             }
         };
-        socket.onclose = function(){
-            webSocket_callbacks.onclose();
-        };
         is_connect = true;
-    };
+    }
     if(fauto_connect) {
         connect();
     }

+ 2 - 2
mobile/control/bargain.php

@@ -399,12 +399,12 @@ class tpl_bargain
         {
             if($this->bargained()) {
                 $str = '<span class="just_buy" id="just_buy"></span>
-                        <span class="invite_btn join_btn" id="invite_btn"></span>';
+                        <span class="invite_btn" id="invite_btn"></span>';
             }
             else {
                 $str = '<span class="mine_bargain_btn" id="mine_bargain_btn"></span>
                         <span class="just_buy" id="just_buy"></span>
-                        <span class="invite_btn join_btn" id="invite_btn"></span>';
+                        <span class="invite_btn" id="invite_btn"></span>';
             }
         }
         else

+ 2 - 2
mobile/control/control.php

@@ -297,9 +297,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2018020501";
+    return "v=2018020504";
 }
 function shop_version()
 {
-    return "v=2018020501";
+    return "v=2018020502";
 }

+ 2 - 13
mobile/templates/default/bargain/bargain.php

@@ -305,12 +305,7 @@
     });
     $('.join_btn').on('click',function()
     {
-        if(from_app){
-            window.location.href = 'xmmz://'+location.host+'/block/special?title=56CN5Lu35ZuiCg==&special_id=1181';
-        }
-        else {
-            download_app();
-        }
+        download_app();
     });
 
     var room    =  <?php echo $output['room']['room']; ?>;
@@ -322,7 +317,6 @@
     };
     var callbacks = {
         onOpen:sOpen,
-        onError:sError,
         onClose:sClose
     };
     var msg_handler = {
@@ -333,12 +327,7 @@
 
     function sOpen(){
     }
-    function sError(e){
-        console.log('网络连接失败!请刷新重试');
-        online = false;
-    }
-    function sClose(e){
-        console.log('网络连接关闭!');
+    function sClose(){
         online = false;
     }