From fd42381410e86ffb7ecdd502947be2d52625dc5e Mon Sep 17 00:00:00 2001 From: Mossimo Date: Fri, 5 Nov 2021 19:00:21 +0800 Subject: [PATCH] ignore tsFile --- .gitignore | 1 + src/Common.CoreLib/Common.CoreLib.csproj | 12 ++++ .../AsyncAuthoRequest.cs | 0 .../SyncAuthResponse.cs | 0 .../Models/Font/FontAlign.cs | 24 +++++++ .../Models/Font/FontDecoration.cs | 23 +++++++ .../Models/{ => Font}/FontWeight.cs | 0 .../Models/Notice/ExtendedPropeInfo.cs | 45 +++++++++++++ .../Models/Notice/NoticeContentResponse.cs | 33 ++++++++++ .../Models/Notice/NoticeTypeEnum.cs | 23 +++++++ .../Models/SelectItemResponse.cs | 12 ++++ .../ST.Services.CloudService.Models.csproj | 66 +++++++++++++++++++ src/ST/UploadImageType.cs | 5 ++ 13 files changed, 244 insertions(+) rename src/ST.Services.CloudService.Models/Models/{Request => AsyncAutho}/AsyncAuthoRequest.cs (100%) rename src/ST.Services.CloudService.Models/Models/{Response => AsyncAutho}/SyncAuthResponse.cs (100%) create mode 100644 src/ST.Services.CloudService.Models/Models/Font/FontAlign.cs create mode 100644 src/ST.Services.CloudService.Models/Models/Font/FontDecoration.cs rename src/ST.Services.CloudService.Models/Models/{ => Font}/FontWeight.cs (100%) create mode 100644 src/ST.Services.CloudService.Models/Models/Notice/ExtendedPropeInfo.cs create mode 100644 src/ST.Services.CloudService.Models/Models/Notice/NoticeContentResponse.cs create mode 100644 src/ST.Services.CloudService.Models/Models/Notice/NoticeTypeEnum.cs create mode 100644 src/ST.Services.CloudService.Models/Models/SelectItemResponse.cs diff --git a/.gitignore b/.gitignore index 87f346a31..86fff012a 100644 --- a/.gitignore +++ b/.gitignore @@ -361,3 +361,4 @@ launchSettings.json # Android KeyStore *.jks /Xamarin.Android.KeyStore.props +*.ts diff --git a/src/Common.CoreLib/Common.CoreLib.csproj b/src/Common.CoreLib/Common.CoreLib.csproj index 89743be8e..2ba085820 100644 --- a/src/Common.CoreLib/Common.CoreLib.csproj +++ b/src/Common.CoreLib/Common.CoreLib.csproj @@ -21,6 +21,10 @@ + + DtsGenerator + Platform.cs.d.ts + True True @@ -35,4 +39,12 @@ + + + True + True + Platform.cs + + + \ No newline at end of file diff --git a/src/ST.Services.CloudService.Models/Models/Request/AsyncAuthoRequest.cs b/src/ST.Services.CloudService.Models/Models/AsyncAutho/AsyncAuthoRequest.cs similarity index 100% rename from src/ST.Services.CloudService.Models/Models/Request/AsyncAuthoRequest.cs rename to src/ST.Services.CloudService.Models/Models/AsyncAutho/AsyncAuthoRequest.cs diff --git a/src/ST.Services.CloudService.Models/Models/Response/SyncAuthResponse.cs b/src/ST.Services.CloudService.Models/Models/AsyncAutho/SyncAuthResponse.cs similarity index 100% rename from src/ST.Services.CloudService.Models/Models/Response/SyncAuthResponse.cs rename to src/ST.Services.CloudService.Models/Models/AsyncAutho/SyncAuthResponse.cs diff --git a/src/ST.Services.CloudService.Models/Models/Font/FontAlign.cs b/src/ST.Services.CloudService.Models/Models/Font/FontAlign.cs new file mode 100644 index 000000000..41a321234 --- /dev/null +++ b/src/ST.Services.CloudService.Models/Models/Font/FontAlign.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace System.Application.Models +{ + public enum FontAlign:byte + { + + /// + /// 左对其 + /// + Left = 1, + /// + /// 右对其 + /// + Right = 2, + /// + /// 居中对其 + /// + Center =4 + + } +} diff --git a/src/ST.Services.CloudService.Models/Models/Font/FontDecoration.cs b/src/ST.Services.CloudService.Models/Models/Font/FontDecoration.cs new file mode 100644 index 000000000..cf4045739 --- /dev/null +++ b/src/ST.Services.CloudService.Models/Models/Font/FontDecoration.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace System.Application.Models +{ + public enum FontDecoration : byte + { + /// + /// 无 + /// + None=1, + + /// + /// 下划线 + /// + Underline=4, + /// + /// 删除线 + /// + LineThrough=8 + } +} diff --git a/src/ST.Services.CloudService.Models/Models/FontWeight.cs b/src/ST.Services.CloudService.Models/Models/Font/FontWeight.cs similarity index 100% rename from src/ST.Services.CloudService.Models/Models/FontWeight.cs rename to src/ST.Services.CloudService.Models/Models/Font/FontWeight.cs diff --git a/src/ST.Services.CloudService.Models/Models/Notice/ExtendedPropeInfo.cs b/src/ST.Services.CloudService.Models/Models/Notice/ExtendedPropeInfo.cs new file mode 100644 index 000000000..b1cd3c93c --- /dev/null +++ b/src/ST.Services.CloudService.Models/Models/Notice/ExtendedPropeInfo.cs @@ -0,0 +1,45 @@ +using System.Collections.Generic; +using MPKey = MessagePack.KeyAttribute; +using MPObj = MessagePack.MessagePackObjectAttribute; +using N_JsonProperty = Newtonsoft.Json.JsonPropertyAttribute; +using S_JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute; + +namespace System.Application.Models +{ + [MPObj] + public class NoticeExtendedPropeInfo + { + /// + /// 字体粗细 + /// + + [MPKey(0)] + [N_JsonProperty("0")] + [S_JsonProperty("0")] + public FontWeight FontWeight { get; set; } + /// + /// 字体颜色 + /// + + [MPKey(1)] + [N_JsonProperty("1")] + [S_JsonProperty("1")] + public uint FontColor { get; set; } + /// + /// 对其方式 + /// + + [MPKey(2)] + [N_JsonProperty("2")] + [S_JsonProperty("2")] + public FontAlign FontAlign { get; set; } = FontAlign.Left; + /// + /// 下划线or删除线 + /// + + [MPKey(3)] + [N_JsonProperty("3")] + [S_JsonProperty("3")] + public FontDecoration FontDecoration { get; set; } = FontDecoration.None; + } +} diff --git a/src/ST.Services.CloudService.Models/Models/Notice/NoticeContentResponse.cs b/src/ST.Services.CloudService.Models/Models/Notice/NoticeContentResponse.cs new file mode 100644 index 000000000..213b36cef --- /dev/null +++ b/src/ST.Services.CloudService.Models/Models/Notice/NoticeContentResponse.cs @@ -0,0 +1,33 @@ +using System.Collections.Generic; +using MPKey = MessagePack.KeyAttribute; +using MPObj = MessagePack.MessagePackObjectAttribute; +using N_JsonProperty = Newtonsoft.Json.JsonPropertyAttribute; +using S_JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute; + +namespace System.Application.Models +{ + [MPObj] + public class NoticeContentResponse + { + + [MPKey(0)] + [N_JsonProperty("0")] + [S_JsonProperty("0")] + public string Content { get; set; } = string.Empty; + + [MPKey(1)] + [N_JsonProperty("1")] + [S_JsonProperty("1")] + public NoticeTypeEnum NoticeType { get; set; } = NoticeTypeEnum.Text; + + [MPKey(2)] + [N_JsonProperty("2")] + [S_JsonProperty("2")] + public string Url { get; set; } = string.Empty; + + [MPKey(3)] + [N_JsonProperty("3")] + [S_JsonProperty("3")] + public IList? ExtendedPropes { get; set; } + } +} diff --git a/src/ST.Services.CloudService.Models/Models/Notice/NoticeTypeEnum.cs b/src/ST.Services.CloudService.Models/Models/Notice/NoticeTypeEnum.cs new file mode 100644 index 000000000..e295aed57 --- /dev/null +++ b/src/ST.Services.CloudService.Models/Models/Notice/NoticeTypeEnum.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace System.Application.Models +{ + public enum NoticeTypeEnum : byte + { + /// + /// url + /// + URL = 1, + /// + /// 文本 + /// + Text = 4, + /// + /// 图片 + /// + Picture = 8, + + } +} diff --git a/src/ST.Services.CloudService.Models/Models/SelectItemResponse.cs b/src/ST.Services.CloudService.Models/Models/SelectItemResponse.cs new file mode 100644 index 000000000..31576573e --- /dev/null +++ b/src/ST.Services.CloudService.Models/Models/SelectItemResponse.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace System.Application.Models +{ + public class SelectItemResponse + { + public Guid Value { get; set; } + public string Label { get; set; } = string.Empty; + } +} diff --git a/src/ST.Services.CloudService.Models/ST.Services.CloudService.Models.csproj b/src/ST.Services.CloudService.Models/ST.Services.CloudService.Models.csproj index b1970cea2..d8888d450 100644 --- a/src/ST.Services.CloudService.Models/ST.Services.CloudService.Models.csproj +++ b/src/ST.Services.CloudService.Models/ST.Services.CloudService.Models.csproj @@ -24,6 +24,34 @@ + + DtsGenerator + FontAlign.cs.d.ts + + + DtsGenerator + FontDecoration.cs.d.ts + + + DtsGenerator + FontWeight.cs.d.ts + + + DtsGenerator + ExtendedPropeInfo.cs.d.ts + + + DtsGenerator + NoticeContentResponse.cs.d.ts + + + DtsGenerator + NoticeTypeEnum.cs.d.ts + + + DtsGenerator + SelectItemResponse.cs.d.ts + True True @@ -38,4 +66,42 @@ + + + True + True + FontAlign.cs + + + True + True + FontDecoration.cs + + + True + True + FontWeight.cs + + + True + True + ExtendedPropeInfo.cs + + + True + True + NoticeContentResponse.cs + + + True + True + NoticeTypeEnum.cs + + + True + True + SelectItemResponse.cs + + + diff --git a/src/ST/UploadImageType.cs b/src/ST/UploadImageType.cs index d7ccefb42..3a585e035 100644 --- a/src/ST/UploadImageType.cs +++ b/src/ST/UploadImageType.cs @@ -11,6 +11,11 @@ namespace System.Application /// Avatar = 0x1, + /// + /// 通知封面,内容图片 + /// + Notice = 0x4, + //占位符1 = 0x2, //占位符2 = 0x4, //占位符3 = 0x8,