Merge branch 'master' of http://git.yabolive.net:88/libai/Static

js/url.js

@@ -3,12 +3,15 @@ var _url2 = 'https://test.ybact.yazhaiyabo.com/';
 var _url3 = 'https://ceshi.yabolive.tv';
 var _url3 = 'https://ceshi.yabolive.tv';
 var _url4 = 'http://ceshi.yabolive.tv';
 var _url4 = 'http://ceshi.yabolive.tv';
 var _url5 = 'https://httest.webapp.yabolive.net'; // 跳转夜间选秀
 var _url5 = 'https://httest.webapp.yabolive.net'; // 跳转夜间选秀
+var _url6 = 'https://testactweb.yabolive.tv/web';
 
 
-if(location.href.indexOf('activity.yazhaiyabo.com')>-1){
+if (location.href.indexOf('activity.yazhaiyabo.com') > -1) {
 	_url = 'https://webserver.yabolive.net';
 	_url = 'https://webserver.yabolive.net';
 	_url2 = 'https://activity.yazhaiyabo.com/';
 	_url2 = 'https://activity.yazhaiyabo.com/';
 	_url3 = 'https://webserver.yabolive.net';
 	_url3 = 'https://webserver.yabolive.net';
 	_url4 = 'https://www.yabolive.tv';
 	_url4 = 'https://www.yabolive.tv';
 	_url5 = 'https://cloudgamehall.yabolive.net';
 	_url5 = 'https://cloudgamehall.yabolive.net';
+	_url6 = 'https://actweb.yabolive.net';
 }
 }
+
 var cdn = 'https://big.bgp.ourpow.com/comm';
 var cdn = 'https://big.bgp.ourpow.com/comm';
\ No newline at end of file

js/webAppComm.js

@@ -821,15 +821,17 @@ webAppComm.prototype.jumpToTaskCenter = function (type) {
 }
 }
 
 
 // 54：添加系统日历提醒
 // 54：添加系统日历提醒
-webAppComm.prototype.calendarReminders = function (title, content, time) {
+webAppComm.prototype.calendarReminders = function (title, content, time, tipContent) {
     let obj = {
     let obj = {
         "cid": 54,
         "cid": 54,
         "data": {
         "data": {
             "title": title,
             "title": title,
             "content": content,
             "content": content,
-            "time": time,
+            "time": time, //时间戳
             "type": 1, // 1：只提醒一次 2：每周都提醒一次
             "type": 1, // 1：只提醒一次 2：每周都提醒一次
-            "durationTime": 10 //
+            "durationTime": 10,//持续时间
+            "reminderTime": 5,//提前多久提醒
+            "tipContent": tipContent // 添加日历提示内容
         }
         }
     }
     }
     let obj2 = JSON.stringify(obj);
     let obj2 = JSON.stringify(obj);