|
@@ -14,13 +14,13 @@ namespace KdanCommon.CMSCollection.Data
|
|
public partial class WindowsEventbarResponse
|
|
public partial class WindowsEventbarResponse
|
|
{
|
|
{
|
|
[JsonProperty("data")]
|
|
[JsonProperty("data")]
|
|
- public WindowsEnentbarSetting[] Data { get; set; }
|
|
|
|
|
|
+ public WindowsEventbarSetting[] Data { get; set; }
|
|
}
|
|
}
|
|
|
|
|
|
- public partial class WindowsEnentbarSetting : ISetting
|
|
|
|
|
|
+ public partial class WindowsEventbarSetting : ISetting
|
|
{
|
|
{
|
|
[JsonConstructor]
|
|
[JsonConstructor]
|
|
- private WindowsEnentbarSetting(string id, string app_type, DateTime start, DateTime end, string event_icon, string close_icon, string text_color, string background_color, EventbarInformation[] event_information)
|
|
|
|
|
|
+ private WindowsEventbarSetting(string id, string app_type, DateTime start, DateTime end, string event_icon, string close_icon, string text_color, string background_color, EventbarInformation[] event_information, bool is_close_button_show)
|
|
{
|
|
{
|
|
if (close_icon != null)
|
|
if (close_icon != null)
|
|
CloseIcon = new Uri($"{CMSCollection.CMSDomain}/assets/{close_icon}");
|
|
CloseIcon = new Uri($"{CMSCollection.CMSDomain}/assets/{close_icon}");
|
|
@@ -33,10 +33,11 @@ namespace KdanCommon.CMSCollection.Data
|
|
Id = id;
|
|
Id = id;
|
|
Start = start;
|
|
Start = start;
|
|
End = end;
|
|
End = end;
|
|
- if(event_information!=null)
|
|
|
|
|
|
+ if (event_information != null)
|
|
{
|
|
{
|
|
EventbarInformation = event_information.FirstOrDefault();
|
|
EventbarInformation = event_information.FirstOrDefault();
|
|
}
|
|
}
|
|
|
|
+ IsCloseButtonShow = is_close_button_show;
|
|
}
|
|
}
|
|
public string SettingName
|
|
public string SettingName
|
|
{
|
|
{
|
|
@@ -72,6 +73,10 @@ namespace KdanCommon.CMSCollection.Data
|
|
{
|
|
{
|
|
get;
|
|
get;
|
|
}
|
|
}
|
|
|
|
+ public bool IsCloseButtonShow
|
|
|
|
+ {
|
|
|
|
+ get;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
public partial class EventbarInformation
|
|
public partial class EventbarInformation
|