From 0012445c0109fa67987800a1bac8f32e989b2d19 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 15 八月 2018 15:16:01 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/SystemSetting/SetPrivateModel.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/System/SystemSetting/SetPrivateModel.cs b/System/SystemSetting/SetPrivateModel.cs
index 7e0d36e..590fea3 100644
--- a/System/SystemSetting/SetPrivateModel.cs
+++ b/System/SystemSetting/SetPrivateModel.cs
@@ -98,7 +98,6 @@
for (int i = 0; i < switchBtnLength; i++)
{
bool isOpen = MathUtility.GetBitValue(setting.OnoffBit, (ushort)i);
- DebugEx.Log("SetServerPushModel:" + i + "bool:" + isOpen);
pushSetDict.Add(i, isOpen);
}
AnalysisFreeTime(setting.TimeStr);
@@ -164,6 +163,14 @@
}
}
+ public void RemoveActivityPushByKey(int dailyId, string pushKey)
+ {
+ if(pushAtcivityKeyDict[dailyId].Contains(pushKey))
+ {
+ SDKUtility.Instance.GeTui_RemoveLocalMessage(pushKey);
+ }
+ }
+
public void AddActivityPush(int dailyId)
{
var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(dailyId);
@@ -175,6 +182,7 @@
SDKUtility.Instance.GeTui_SendLocalMessage(pushNotifylist[j]);
}
}
+
public List<JsonData> GetPushJsonData(int dailyId)
{
@@ -194,7 +202,6 @@
_params["subtitle"] = "";// 鍓爣棰�
_params["content"] = content;// 鍏蜂綋鍐呭
_params["badge"] = -1;// 瑙掓爣
-
// 浠ヤ笅涓哄喅瀹氬簲璇ュ涔呭悗寮瑰嚭姝ら�氱煡
System.TimeSpan ts = System.DateTime.UtcNow - new System.DateTime(1970, 1, 1, 0, 0, 0, 0);
long ret = System.Convert.ToInt64(ts.TotalSeconds) + pushNotifyTimelist[i];// 琛ㄧず3绉掑悗
@@ -538,11 +545,8 @@
float minuteOffset = (hourMinutes[i].hourBegin * 60 + hourMinutes[i].minuteBegin) - minutes;
if (minuteOffset <= 2 && minuteOffset > 0)
{
- RemoveActivityPush(dailyId);
- }
- else if (minuteOffset < 0 && minuteOffset >= -2)
- {
- AddActivityPush(dailyId);
+ string key = StringUtility.Contact(dailyId, dayOfWeek, hourMinutes[i].hourBegin);
+ RemoveActivityPushByKey(dailyId,key);
}
}
}
--
Gitblit v1.8.0