【修改】修改登录注册

assets/script/app/AppInit.js

@@ -33,5 +33,9 @@ module.exports = {
         // 登录数据管理器
         ns.LoginMgr = require('LoginMgr');
         ns.LoginMgr.init();
+
+        // 玩家数据管理器
+        ns.UserMgr = require('UserMgr');
+        ns.UserMgr.init();
     }
 };

assets/script/app/model/PublicMgr.js

@@ -173,19 +173,10 @@ let PublicMgr = {
     },
 
     // # 玩家系统信息
-    // on_h5user_system_info 20100 {
+    // on_user_system_info 2000 {
     //     request {
-    //        briefs 0: DataModuleBriefInfo           # 功能简讯
-    //        confVerInfo 1: DataConfig               # 配置版本信息
-    //        clusteringInfo 2: DataClustering        # 分群信息
-    //        payInfo 3: DataPayInfo                  # 支付信息
-    //        dayStatementList 4: *DataDayStatement   # 活跃天统计信息列表
-    //        dayInfo 5: DataDayInfo                  # 玩家当天信息
-    //        sheildList 6: *integer                  # 功能ID列表
-    //        payRecord 7: *DataPayRecord             # 支付记录
-    //        hbcEntrance 8: *integer                 # 红包场入口
-    //        antiInfo 9: DataAntiAddiction           # 防沉迷信息
-    //    }
+    //         sheildList 0: *integer          # 功能ID列表
+    //     }
     // }
     _onPublishUserSystemInfo (data) {
         // 数据_onUserInfo统一处理

assets/script/app/view/login/LoginPanel.js

@@ -41,7 +41,24 @@ cc.Class({
     },
 
     gotoLoginOnClicked () {
+        var phoneNum = this.phoneEditor.string;
+        if (phoneNum.length == 0 && !G.FuncUtils.isMobile(phoneNum)) {
+            G.AppUtils.getSceneCtrl().addToast("手机号码格式不正确");
+            return;
+        }
+
+        var password = this.passwordEditor.string;
+        if (password.length == 0) {
+            G.AppUtils.getSceneCtrl().addToast("密码不能不填");
+            return;
+        }
+
+        if (password.length > 16) {
+            G.AppUtils.getSceneCtrl().addToast("密码过长");
+            return;
+        }
 
+        G.LoginMgr.requestLoginByPhone(phoneNum, password);
     },
 
     gotoRegisterOnClicked () {

assets/script/core/model/login/LoginMgr.js

@@ -61,11 +61,18 @@ let LoginMgr = {
         G.PublicMgr.emit(JMC.PUBLIC_MSG.DISCONNECTED);
     },
 
+    //* ************* 事件侦听 ************* *//
+    _handleSocketOnConected () {
+        this._stopKeepalive();
+        // 请求授权令牌
+        this.requestAuthToken();
+    },
+
     /**
      * 收到登录成功事件
      *
      */
-      handleDidLoginSuccess () {
+    handleDidLoginSuccess () {
         // 标记在线状态
         this.isOnline = true;
         // 重连计数重置
@@ -302,7 +309,7 @@ let LoginMgr = {
             password: password
         };
 
-        G.NetworkMgr.sendHttpRequestToLoginServer('usr_login', info, this._responseLogin.bind(this));
+        G.NetworkMgr.sendHttpRequestToLoginServer('usr_login_by_phone', info, this._responseLogin.bind(this));
     },
 
     /**
@@ -363,6 +370,100 @@ let LoginMgr = {
         // 将消息下发到ctrl中处理
         cc.game.emit('e_nwk_usr_login', data);
     },
+
+    /**
+     * 请求授权令牌
+     *
+     * @author Wetion
+     * @date 2019-03-26
+     */
+    requestAuthToken () {
+        let info = {
+            uid: this.loginData.uid,
+            token: this.loginData.token
+        };
+
+        G.NetworkMgr.sendSocketRequest('usr_auth_token', info, this._responseAuthToken.bind(this));
+    },
+    _responseAuthToken (data) {
+        let responseInfo = data.responseInfo;
+        if (responseInfo.code === 200) {
+            this.keepaliveTime = this.loginData.sysTime;
+            this._startKeepalive();
+
+            G.UserMgr.requestSelfInfo();
+        }
+    },
+
+    // 启动心跳，4 * 30秒后发出第一条心跳
+    _startKeepalive () {
+        this._stopKeepalive();
+
+        this.keepaliveTimeoutCount = 0;
+        this._keepaliveIntervalId = setInterval(() => {
+            this.keepaliveTimeoutCount++;
+
+            /**
+             * 定时器30秒执行一次
+             * 4 * 30秒间隔发一次保活请求
+             * 发送保活请求后30秒没返回断开当前连接进行重连
+             */
+            if (this.keepaliveTimeoutCount == 4) {
+                // G.LogUtils.log('发送心跳');
+                this._requestKeepalive();
+            } else if (this.keepaliveTimeoutCount == 5) {
+                // G.LogUtils.log('心跳不通');
+                // 清空心跳定时器
+                clearInterval(this._keepaliveIntervalId);
+                this._keepaliveIntervalId = undefined;
+
+                // 断开网络并且弹出重连窗口
+                G.NetworkMgr.closeSocket();
+                G.AppUtils.getSceneCtrl().showOfflineAlert();
+            }
+        }, 30 * 1000);
+    },
+
+     /**
+     * 连接保活, 客户端主动60s发送一次
+     *
+     * @author Wetion
+     * @date 2019-03-26
+     */
+     _requestKeepalive () {
+        G.NetworkMgr.sendSocketRequest('h5user_keepalive', undefined, this._responseKeepalive.bind(this));
+    },
+    _responseKeepalive (data) {
+        let responseInfo = data.responseInfo;
+        if (responseInfo && responseInfo.systemTime) {
+            this.keepaliveTime = responseInfo.systemTime;
+
+            // 间隔多少秒请求一次保活
+            this.keepaliveTimeoutCount = 0;
+        }
+    },
+
+    // 重置心跳定时器
+    _stopKeepalive () {
+        if (this._keepaliveIntervalId) {
+            clearInterval(this._keepaliveIntervalId);
+            this._keepaliveIntervalId = undefined;
+        }
+    },
+
+    _connectGameServer (host, port) {
+        // 链接SOCKET
+        G.NetworkMgr.connectSocket(host, port);
+
+        // 增加HTTP_GAME连接
+        G.NetworkMgr.addConnection({
+            alias: '游戏服',
+            name: 'HTTP_GAME',
+            host: host,
+            port: port,
+            path: 'pb'
+        });
+    },
 }
 
 module.exports = LoginMgr;

assets/script/core/model/user/UserMgr.js

@@ -42,6 +42,48 @@ let UserMgr = {
     setUid (uid) {
         this._uid = uid;
     },
+
+    /**
+     * 设置玩家系统信息
+     *
+     * @param {Object} data
+     */
+    setUserSystemInfo (data) {
+    },
+
+    /**
+     * 请求自己的用户信息
+     *
+     * @param {Number} uid
+     * @param {Number} sysTime
+     */
+    requestSelfInfo () {
+        G.LogUtils.log('----> UserMgr requestSelfInfo()');
+        G.NetworkMgr.sendSocketRequest('user_self_info', {}, this._responseSelfInfo.bind(this));
+    },
+
+    _responseSelfInfo (data) {
+        G.LogUtils.log('<---- UserMgr _responseSelfInfo()');
+
+        let responseInfo = data.responseInfo;
+        if (responseInfo.code === 200) {
+            // 玩家基础信息
+            this._baseInfo = responseInfo.baseInfo;
+
+            // 登录完成判断
+            G.PublicMgr.isDoneUserSelfInfo = true;
+            if (G.PublicMgr.isDoneSystemInfo) {
+                G.PublicMgr.isDoneUserSelfInfo = false;
+                G.PublicMgr.isDoneSystemInfo = false;
+
+                G.PublicMgr.emit(JMC.PUBLIC_MSG.LOGIN_SUCCESS);
+            }
+        } else {
+            // 断开网络并且弹出重连窗口
+            G.NetworkMgr.closeSocket();
+            G.AppUtils.getSceneCtrl().showOfflineAlert();
+        }
+    },
 }
 
 

assets/script/core/socket/SocketClient.js

@@ -1,4 +1,5 @@
 const sproto = require('sproto');
+const SocketUtil = require('./SocketUtil');
 
 cc.Class({
     name: 'SocketClient',
@@ -33,7 +34,7 @@ cc.Class({
      * @param {Array} protoPaths
      */
     loadProtoFiles(protoPaths) {
-        if (this._clientHost && this._clientSender) {
+        if (SocketUtil.clientHost && SocketUtil.clientSender) {
             G.LogUtils.warn('Warn：SocketClient协议文件已经加载过');
             return;
         }
@@ -58,8 +59,8 @@ cc.Class({
                 protos[proto._name] = data;
             });
 
-            this._clientHost = protos.socket_s2c.host();
-            this._clientSender = this._clientHost.attach(protos.socket_c2s);
+            SocketUtil.clientHost = protos.socket_s2c.host();
+            SocketUtil.clientSender = SocketUtil.clientHost.attach(protos.socket_c2s);
 
             G.LogUtils.log('Info：SocketClient协议文件加载成功');
             cc.game.emit('e_nwk_socket_sproto_done');
@@ -78,7 +79,7 @@ cc.Class({
      * @returns {boolean}
      */
     isReadyDone() {
-        return this._ws && this._ws.readyState === WebSocket.OPEN && this._clientHost && this._clientSender;
+        return this._ws && this._ws.readyState === WebSocket.OPEN && SocketUtil.clientHost && SocketUtil.clientSender;
     },
 
     _isValidURLArgs(host, port) {
@@ -116,7 +117,7 @@ cc.Class({
         }
         url = cc.js.formatStr('ws://%s:%s', host, port);
 
-        this._ws = new WebSocket(url, 'chat', cc.url.raw('resources/res_text/proto/cacert.pem'));
+        this._ws = new WebSocket(url);
         this._ws.binaryType = 'arraybuffer';
         this._ws.onopen = this._onConnect.bind(this);
         this._ws.onmessage = this._onMessage.bind(this);
@@ -125,7 +126,7 @@ cc.Class({
     },
 
     _send(protoName, info, session) {
-        let requestBuffer = G.FuncUtils.uint8ToBuffer(this._clientSender(protoName, info, session));
+        let requestBuffer = G.FuncUtils.uint8ToBuffer(SocketUtil.clientSender(protoName, info, session));
         this._ws.send(requestBuffer); // 发送数据
     },
 
@@ -208,7 +209,7 @@ cc.Class({
 
     _onMessage(evt) {
         // 解析数据
-        let buffer = this._clientHost.dispatch(G.FuncUtils.bufferToUint8(evt.data));
+        let buffer = SocketUtil.clientHost.dispatch(G.FuncUtils.bufferToUint8(evt.data));
         if (buffer.type === 'REQUEST') {
             // 避免native释放buffer导致 object already destroyed
             buffer.result = G.FuncUtils.clone(buffer.result);

assets/script/core/socket/SocketUtil.js

@@ -0,0 +1,8 @@
+let SocketUtil = {
+    init() {
+        this.clientHost = {};
+        this.clientSender = {}
+    }
+}
+
+module.exports = SocketUtil;

assets/script/core/socket/SocketUtil.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "baeaae9d-58ba-4d85-9abd-8bb3ba81aaf8",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}