6666666

egret/project.json

 {
     "type": "activity",
-    "name": "surf_dfws"
+    "name": "hongbaoyu_szyh191113"
 }
\ No newline at end of file

egret/publish.js

@@ -24,8 +24,8 @@ class TuiaAutoUpload {
         var _this = this;
         this.client = new OSS({
             region: 'oss-cn-hangzhou',
-            accessKeyId: 'LTAIdGi1IOap7fkF',
-            accessKeySecret: 'SKrOOp6EVtDGEV47yn0t2h97gyNioQ',
+            accessKeyId: 'LTAIqO2wblIxQvwc',
+            accessKeySecret: '4brsaSRbRpjxw3oDIxJi6bNMcndIR6',
             bucket: _this.type === 'prod' ? 'duiba' : 'daily-duiba'
         });
         this.bar = new ProgressBar(chalk.yellow(`  文件上传中 [:bar] :current/${this.files().length} :percent :elapseds`), {

egret/src/startScene/StartScene.ts

@@ -157,9 +157,11 @@ export default class StartScene extends Scene {
 
         //活动结束的特殊处理
         if(this.isEnd){
+            console.log('1111111')
             idata = {isNewActivityGuide:true, todayTimesIsEnd:true};
         }else{
 
+            console.log('22222222')
             startTime = idata.scenes[0].startTime - idata.serverTime + this.desTime;
             endTime = idata.scenes[0].endTime - idata.serverTime  - this.desTime;;
             console.log('startTime='+startTime);
@@ -453,13 +455,24 @@ export default class StartScene extends Scene {
         //         this.doJion();
         //     });
         // }else{
-            this.doJion();
         // }
+        NetManager.ins.informationZhaohang((success) => {
+            if(success){
+                this.doJion();
+            }else{
+                if(DataManager.ins.getInformationZhaohangData.code == 'E1002060003'){
+                    PanelCtrl.instance.show(ModuleTypes.TOAST_PANEL, {msg:'活动结束了！'});
+                }else{
+                    PanelCtrl.instance.show(ModuleTypes.TOAST_PANEL, {msg:'获取场次信息失败，请刷新重试'});
+                }
+            }
+        }, DataManager.ins.customCfgData.actId);
     }
 
     private doJion():void{
         let type = '';
-        if(DataManager.ins.getInformationZhaohangData.data.joinTimesDetail && DataManager.ins.getInformationZhaohangData.data.joinTimesDetail.length){
+        if(DataManager.ins.getInformationZhaohangData.data.joinTimesDetail 
+            && DataManager.ins.getInformationZhaohangData.data.joinTimesDetail.length){
             type = DataManager.ins.getInformationZhaohangData.data.joinTimesDetail[0].type;
         }else{
             type = '';

mock/json/informationData.json

@@ -2,40 +2,35 @@
     "success": true,
     "code": "0000000000",
     "desc": "OK",
-    "timestamp": 1553774900820,
+    "timestamp": 1573799313549,
     "data": {
         "scenes": [
             {
                 "scene": 1,
-                "startTime": 1553738400000,
-                "endTime": 1553742000000
+                "startTime": 1573796400000,
+                "endTime": 1573798200000
             },
             {
                 "scene": 2,
-                "startTime": 1553765400000,
-                "endTime": 1553769000000
+                "startTime": 1573802400000,
+                "endTime": 1573804200000
             },
             {
                 "scene": 3,
-                "startTime": 1553776200000,
-                "endTime": 1553779800000
+                "startTime": 1573804800000,
+                "endTime": 1573806600000
             }
         ],
-        "serverTime": 1553738500000,
-        "availableTime": 3600000,
+        "serverTime": 1573799313545,
+        "availableTime": 1800000,
         "joinTimes": 0,
-        "ifCanAddJoinTimesByShare": true,
-        "joinTimesByShare": 1,
-        "currentTimes": 1553738300000,
-        "joinTimesDetail": [
-            {
-                "times": 1,
-                "type": "0"
-            },
-            {
-                "times": 1,
-                "type": "1"
-            }
-        ]
+        "ifCanAddJoinTimesByShare": false,
+        "joinTimesByShare": 0,
+        "joinTimesDetail": [],
+        "currentTimes": null,
+        "isNewActivityGuide": false,
+        "recentJoinResult": null,
+        "todayTimesIsEnd": false,
+        "newActivityGuide": false
     }
 }
\ No newline at end of file