getUserInfo接口增加非必传参数

qq_minigame_release/SDK.ts

@@ -518,11 +518,12 @@ class QQSDK {
         }))
     }
     // 定义wechat方法
-    public async getUserInfo(): Promise<any> {
+    public async getUserInfo(_info?): Promise<any> {
         const _selt = this;
+        const isNeed = _info ? _info.necessary : true;  // 是否必须授权
         return new Promise(async function (resolve, reject) {
             let status = await _selt._getSetting();
-            console.log("@@SDK用户授权状态", status)
+            console.log("@@SDK用户授权状态", status, isNeed)
             switch (status) {
                 case 1:
                     try {
@@ -540,9 +541,6 @@ class QQSDK {
                             function (res) {
                                 if (res.userInfo) {
                                     //上报授权
-                                    userBtn.offTap(this);
-                                    userBtn.destroy();
-                                    userBtn = null;
                                     var userInfo = res["userInfo"];
                                     // 上报用户授权
                                     _selt.ReportData(_selt.deepCopy({}, userInfo, {
@@ -551,6 +549,12 @@ class QQSDK {
                                     }))
                                     resolve(userInfo);
                                 }
+                                if (!isNeed) resolve(0);
+                                if (isNeed && !res.userInfo) { } else {
+                                    userBtn.offTap(this);
+                                    userBtn.destroy();
+                                    userBtn = null;
+                                }
                             }
                         );
                     }
@@ -573,9 +577,6 @@ class QQSDK {
                         let t_status = await _selt._getSetting();
                         console.log("@@SDK:点击设置按钮返回t_status=", t_status);
                         if (t_status == 1) {
-                            OpenSettingButton.offTap(this);
-                            OpenSettingButton.destroy();
-                            OpenSettingButton = null;
                             var userInfo = await _selt._getUserInfo();
                             // 上报用户授权
                             _selt.ReportData(_selt.deepCopy({}, userInfo, {
@@ -584,6 +585,12 @@ class QQSDK {
                             }))
                             resolve(userInfo);
                         }
+                        if (!isNeed) resolve(0);
+                        if (isNeed && t_status != 1) { } else {
+                            OpenSettingButton.offTap(this);
+                            OpenSettingButton.destroy();
+                            OpenSettingButton = null;
+                        }
                     });
                     break;
                 case -1:
@@ -592,9 +599,6 @@ class QQSDK {
                         function (res) {
                             if (res.userInfo) {
                                 //上报授权
-                                userBtn.offTap(this);
-                                userBtn.destroy();
-                                userBtn = null;
                                 var userInfo = res["userInfo"];
                                 // 上报用户授权
                                 _selt.ReportData(_selt.deepCopy({}, userInfo, {
@@ -603,6 +607,12 @@ class QQSDK {
                                 }))
                                 resolve(userInfo);
                             }
+                            if (!isNeed) resolve(0);
+                            if (isNeed && !res.userInfo) { } else {
+                                userBtn.offTap(this);
+                                userBtn.destroy();
+                                userBtn = null;
+                            }
                         }
                     );
                     break;
@@ -614,6 +624,7 @@ class QQSDK {
         // 未询问过用户授权，调用相关 API 或者 qq.authorize 会弹窗询问用户
         var w = (qq as any).getSystemInfoSync().windowWidth;
         var h = (qq as any).getSystemInfoSync().windowHeight;
+        console.log('##createUserInfoButton:', w, h);
         let userBtn = (qq as any).createUserInfoButton({
             type: "text",
             text: "",