PHXH
/
csharp-sdk-upm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* AppRouterState.cs: chore: 格式化代码 

* AVUser.cs:
* AVFile.cs:
* AVQuery.cs:
* AVFile.cs:
* AVCloud.cs:
* AVUser.cs:
* AVClient.cs:
* AVObject.cs:
* IAVQuery.cs:
* AVCloud.cs:
* AVObject.cs:
* AVExtensions.cs:
* AVQueryExtensions.cs:
* AVQueryExtensions.cs:
* QiniuUploader.cs:
* HttpClient.Unity.cs:
* IAVFileController.cs:
* AWSS3FileController.cs:
* IAVConfigController.cs:
* ObjectSubclassInfo.cs:
* IAVCloudCodeController.cs:
* ObjectSubclassingController.cs:
oneRain 2019-08-28 17:00:03 +08:00
parent 6a42f1f74a
commit 7a5aef733d
23 changed files with 290 additions and 517 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Storage/Source/Internal/AppRouter/AppRouterState.cs
View File

@ -46,11 +46,11 @@ namespace LeanCloud.Storage.Internal
return new AppRouterState()
{
TTL = -1,
ApiServer = String.Format("{0}.api.lncld.net", prefix),
EngineServer = String.Format("{0}.engine.lncld.net", prefix),
PushServer = String.Format("{0}.push.lncld.net", prefix),
RealtimeRouterServer = String.Format("{0}.rtm.lncld.net", prefix),
StatsServer = String.Format("{0}.stats.lncld.net", prefix),
ApiServer = string.Format("{0}.api.lncld.net", prefix),
EngineServer = string.Format("{0}.engine.lncld.net", prefix),
PushServer = string.Format("{0}.push.lncld.net", prefix),
RealtimeRouterServer = string.Format("{0}.rtm.lncld.net", prefix),
StatsServer = string.Format("{0}.stats.lncld.net", prefix),
Source = "initial",
};
case 1:

2
Storage/Source/Internal/Cloud/Controller/IAVCloudCodeController.cs
View File

@ -7,7 +7,7 @@ namespace LeanCloud.Storage.Internal
{
public interface IAVCloudCodeController
{
Task<T> CallFunctionAsync<T>(String name,
Task<T> CallFunctionAsync<T>(string name,
IDictionary<string, object> parameters,
string sessionToken,
CancellationToken cancellationToken);

2
Storage/Source/Internal/Config/Controller/IAVConfigController.cs
View File

@ -16,6 +16,6 @@ namespace LeanCloud.Storage.Internal {
/// <returns>The config async.</returns>
/// <param name="sessionToken">Session token.</param>
/// <param name="cancellationToken">Cancellation token.</param>
Task<AVConfig> FetchConfigAsync(String sessionToken, CancellationToken cancellationToken);
Task<AVConfig> FetchConfigAsync(string sessionToken, CancellationToken cancellationToken);
}
}

2
Storage/Source/Internal/File/Controller/AWSS3FileController.cs
View File

@ -18,7 +18,7 @@ namespace LeanCloud.Storage.Internal
}
public override Task<FileState> SaveAsync(FileState state, Stream dataStream, string sessionToken, IProgress<AVUploadProgressEventArgs> progress, CancellationToken cancellationToken = default(System.Threading.CancellationToken))
public override Task<FileState> SaveAsync(FileState state, Stream dataStream, string sessionToken, IProgress<AVUploadProgressEventArgs> progress, CancellationToken cancellationToken = default)
{
if (state.Url != null)
{

2
Storage/Source/Internal/File/Controller/IAVFileController.cs
View File

@ -9,7 +9,7 @@ namespace LeanCloud.Storage.Internal
{
Task<FileState> SaveAsync(FileState state,
Stream dataStream,
String sessionToken,
string sessionToken,
IProgress<AVUploadProgressEventArgs> progress,
CancellationToken cancellationToken);

2
Storage/Source/Internal/HttpClient/Unity/HttpClient.Unity.cs
View File

@ -64,7 +64,7 @@ namespace LeanCloud.Storage.Internal
var statusCode = GetResponseStatusCode(request);
// Returns HTTP error if that's the only info we have.
// if (!String.IsNullOrEmpty(www.error) && String.IsNullOrEmpty(www.text))
if (!String.IsNullOrEmpty(request.error) && String.IsNullOrEmpty(request.downloadHandler.text))
if (!string.IsNullOrEmpty(request.error) && string.IsNullOrEmpty(request.downloadHandler.text))
{
var errorString = string.Format("{{\"error\":\"{0}\"}}", request.error);
tcs.TrySetResult(new Tuple<HttpStatusCode, string>(statusCode, errorString));

2
Storage/Source/Internal/Utilities/AVQueryExtensions.cs
View File

@ -17,7 +17,7 @@ namespace LeanCloud.Storage.Internal {
return query.ClassName;
}
public static IDictionary<String, object> BuildParameters<T>(this AVQuery<T> query) where T: AVObject {
public static IDictionary<string, object> BuildParameters<T>(this AVQuery<T> query) where T: AVObject {
return query.BuildParameters(false);
}

6
Storage/Source/Public/AVClient.cs
View File

@ -85,17 +85,17 @@ namespace LeanCloud
/// <summary>
/// The build number of your app.
/// </summary>
public String BuildVersion { get; set; }
public string BuildVersion { get; set; }
/// <summary>
/// The human friendly version number of your happ.
/// </summary>
public String DisplayVersion { get; set; }
public string DisplayVersion { get; set; }
/// <summary>
/// The operating system version of the platform the SDK is operating in..
/// </summary>
public String OSVersion { get; set; }
public string OSVersion { get; set; }
}

7
Storage/Source/Public/AVCloud.cs
View File

@ -181,7 +181,6 @@ namespace LeanCloud {
/// <param name="template">Sms's template</param>
/// <param name="env">Template variables env.</param>
/// <param name="sign">Sms's sign.</param>
/// <param name="cancellationToken">Cancellation token.</param>
/// <returns></returns>
public static Task<bool> RequestSMSCodeAsync(
string mobilePhoneNumber,
@ -200,11 +199,11 @@ namespace LeanCloud {
{ "mobilePhoneNumber", mobilePhoneNumber },
};
strs.Add("template", template);
if (String.IsNullOrEmpty(sign))
if (string.IsNullOrEmpty(sign))
{
strs.Add("sign", sign);
}
if (String.IsNullOrEmpty(validateToken))
if (string.IsNullOrEmpty(validateToken))
{
strs.Add("validate_token", validateToken);
}
@ -318,7 +317,7 @@ namespace LeanCloud {
/// <returns>an instance of Captcha.</returns>
public static Task<Captcha> RequestCaptchaAsync(int width = 85, int height = 30, CancellationToken cancellationToken = default)
{
var path = String.Format("requestCaptcha?width={0}&height={1}", width, height);
var path = string.Format("requestCaptcha?width={0}&height={1}", width, height);
var command = new AVCommand(path, "GET", null, data: null);
return AVPlugins.Instance.CommandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).OnSuccess(t =>
{

2
Storage/Source/Public/AVFile.cs
View File

@ -386,7 +386,7 @@ namespace LeanCloud
{
get
{
String str;
string str;
lock (this.mutex)
{
str = state.ObjectId;

3
Storage/Source/Public/AVObject.cs
View File

@ -241,8 +241,7 @@ namespace LeanCloud
private static string GetFieldForPropertyName(string className, string propertyName)
{
String fieldName = null;
SubclassingController.GetPropertyMappings(className).TryGetValue(propertyName, out fieldName);
SubclassingController.GetPropertyMappings(className).TryGetValue(propertyName, out string fieldName);
return fieldName;
}

4
Storage/Source/Public/AVQuery.cs
View File

@ -86,7 +86,7 @@ namespace LeanCloud
int? limit = null,
IEnumerable<string> includes = null,
IEnumerable<string> selectedKeys = null,
String redirectClassNameForKey = null)
string redirectClassNameForKey = null)
: base(source, where, replacementOrderBy, thenBy, skip, limit, includes, selectedKeys, redirectClassNameForKey)
{
@ -114,7 +114,7 @@ namespace LeanCloud
int? limit = null,
IEnumerable<string> includes = null,
IEnumerable<string> selectedKeys = null,
String redirectClassNameForKey = null)
string redirectClassNameForKey = null)
{
return new AVQuery<T>(this, where, replacementOrderBy, thenBy, skip, limit, includes, selectedKeys, redirectClassNameForKey);
}

711
Storage/Source/Public/AVUser.cs
View File

File diff suppressed because it is too large Load Diff

10
Storage/Source/Public/IAVQuery.cs
View File

@ -140,7 +140,7 @@ namespace LeanCloud
protected readonly ReadOnlyCollection<string> orderBy;
protected readonly ReadOnlyCollection<string> includes;
protected readonly ReadOnlyCollection<string> selectedKeys;
protected readonly String redirectClassNameForKey;
protected readonly string redirectClassNameForKey;
protected readonly int? skip;
protected readonly int? limit;
@ -184,7 +184,7 @@ namespace LeanCloud
int? limit = null,
IEnumerable<string> includes = null,
IEnumerable<string> selectedKeys = null,
String redirectClassNameForKey = null);
string redirectClassNameForKey = null);
/// <summary>
/// Private constructor for composition of queries. A Source query is required,
@ -199,7 +199,7 @@ namespace LeanCloud
int? limit = null,
IEnumerable<string> includes = null,
IEnumerable<string> selectedKeys = null,
String redirectClassNameForKey = null)
string redirectClassNameForKey = null)
{
if (source == null)
{
@ -295,13 +295,13 @@ namespace LeanCloud
return newIncludes;
}
private HashSet<String> MergeSelectedKeys(IEnumerable<String> selectedKeys)
private HashSet<string> MergeSelectedKeys(IEnumerable<string> selectedKeys)
{
if (this.selectedKeys == null)
{
return new HashSet<string>(selectedKeys);
}
var newSelectedKeys = new HashSet<String>(this.selectedKeys);
var newSelectedKeys = new HashSet<string>(this.selectedKeys);
foreach (var item in selectedKeys)
{
newSelectedKeys.Add(item);

2
Storage/Storage/Internal/File/Controller/QiniuUploader.cs
View File

@ -225,7 +225,7 @@ namespace LeanCloud.Storage.Internal {
}
public static string Encode(string text) {
if (String.IsNullOrEmpty(text))
if (string.IsNullOrEmpty(text))
return "";
byte[] bs = Encoding.UTF8.GetBytes(text);
string encodedStr = Convert.ToBase64String(bs);

6
Storage/Storage/Internal/Object/Subclassing/ObjectSubclassInfo.cs
View File

@ -24,8 +24,8 @@ namespace LeanCloud.Storage.Internal
}
public TypeInfo TypeInfo { get; private set; }
public String ClassName { get; private set; }
public IDictionary<String, String> PropertyMappings { get; private set; }
public string ClassName { get; private set; }
public IDictionary<string, string> PropertyMappings { get; private set; }
private ConstructorInfo Constructor { get; set; }
public AVObject Instantiate()
@ -33,7 +33,7 @@ namespace LeanCloud.Storage.Internal
return (AVObject)Constructor.Invoke(null);
}
internal static String GetClassName(TypeInfo type)
internal static string GetClassName(TypeInfo type)
{
var attribute = type.GetCustomAttribute<AVClassNameAttribute>();
return attribute != null ? attribute.ClassName : null;

7
Storage/Storage/Internal/Object/Subclassing/ObjectSubclassingController.cs
View File

@ -15,7 +15,7 @@ namespace LeanCloud.Storage.Internal {
public ObjectSubclassingController() {
mutex = new ReaderWriterLockSlim();
registeredSubclasses = new Dictionary<String, ObjectSubclassInfo>();
registeredSubclasses = new Dictionary<string, ObjectSubclassInfo>();
registerActions = new Dictionary<string, Action>();
// Register the AVObject subclass, so we get access to the ACL,
@ -112,7 +112,7 @@ namespace LeanCloud.Storage.Internal {
mutex.ExitWriteLock();
}
public AVObject Instantiate(String className) {
public AVObject Instantiate(string className) {
ObjectSubclassInfo info = null;
mutex.EnterReadLock();
@ -124,8 +124,7 @@ namespace LeanCloud.Storage.Internal {
: new AVObject(className);
}
public IDictionary<String, String> GetPropertyMappings(String className) {
ObjectSubclassInfo info = null;
public IDictionary<string, string> GetPropertyMappings(string className) {
mutex.EnterReadLock();
registeredSubclasses.TryGetValue(className, out info);
if (info == null) {

2
Storage/Storage/Internal/Utilities/AVQueryExtensions.cs
View File

@ -17,7 +17,7 @@ namespace LeanCloud.Storage.Internal {
return query.ClassName;
}
public static IDictionary<String, object> BuildParameters<T>(this AVQuery<T> query) where T: AVObject {
public static IDictionary<string, object> BuildParameters<T>(this AVQuery<T> query) where T: AVObject {
return query.BuildParameters(false);
}

10
Storage/Storage/Public/AVCloud.cs
View File

@ -38,7 +38,7 @@ namespace LeanCloud {
/// AVObjects themselves.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>The result of the cloud call.</returns>
public static Task<T> CallFunctionAsync<T>(String name, IDictionary<string, object> parameters = null, CancellationToken cancellationToken = default) {
public static Task<T> CallFunctionAsync<T>(string name, IDictionary<string, object> parameters = null, CancellationToken cancellationToken = default) {
return CloudCodeController.CallFunctionAsync<T>(name, parameters, cancellationToken);
}
@ -50,7 +50,7 @@ namespace LeanCloud {
/// <param name="parameters"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
public static Task<T> RPCFunctionAsync<T>(String name, IDictionary<string, object> parameters = null, CancellationToken cancellationToken = default) {
public static Task<T> RPCFunctionAsync<T>(string name, IDictionary<string, object> parameters = null, CancellationToken cancellationToken = default) {
return CloudCodeController.RPCFunction<T>(name, parameters, cancellationToken);
}
@ -134,10 +134,10 @@ namespace LeanCloud {
{ "mobilePhoneNumber", mobilePhoneNumber },
};
strs.Add("template", template);
if (String.IsNullOrEmpty(sign)) {
if (string.IsNullOrEmpty(sign)) {
strs.Add("sign", sign);
}
if (String.IsNullOrEmpty(validateToken)) {
if (string.IsNullOrEmpty(validateToken)) {
strs.Add("validate_token", validateToken);
}
foreach (var key in env.Keys) {
@ -233,7 +233,7 @@ namespace LeanCloud {
/// <param name="cancellationToken">CancellationToken.</param>
/// <returns>an instance of Captcha.</returns>
public static Task<Captcha> RequestCaptchaAsync(int width = 85, int height = 30, CancellationToken cancellationToken = default) {
var path = String.Format("requestCaptcha?width={0}&height={1}", width, height);
var path = string.Format("requestCaptcha?width={0}&height={1}", width, height);
var command = new AVCommand {
Path = $"requestCaptcha?width={width}&height={height}",
Method = HttpMethod.Get

4
Storage/Storage/Public/AVExtensions.cs
View File

@ -97,11 +97,11 @@ namespace LeanCloud {
CancellationToken cancellationToken = default) where T : AVObject {
var queryString = new Dictionary<string, object>();
if (keys != null) {
var encode = String.Join(",", keys.ToArray());
var encode = string.Join(",", keys.ToArray());
queryString.Add("keys", encode);
}
if (includes != null) {
var encode = String.Join(",", includes.ToArray());
var encode = string.Join(",", includes.ToArray());
queryString.Add("include", encode);
}
if (includeACL != null) {

2
Storage/Storage/Public/AVFile.cs
View File

@ -353,7 +353,7 @@ namespace LeanCloud {
/// </summary>
public string ObjectId {
get {
String str;
string str;
lock (this.mutex) {
str = state.ObjectId;
}

5
Storage/Storage/Public/AVObject.cs
View File

@ -210,7 +210,6 @@ namespace LeanCloud {
}
private static string GetFieldForPropertyName(string className, string propertyName) {
String fieldName = null;
SubclassingController.GetPropertyMappings(className).TryGetValue(propertyName, out fieldName);
return fieldName;
}
@ -1631,7 +1630,7 @@ string propertyName
/// </summary>
protected virtual void OnFieldsChanged(IEnumerable<string> fieldNames) {
var mappings = SubclassingController.GetPropertyMappings(ClassName);
IEnumerable<String> properties;
IEnumerable<string> properties;
if (fieldNames != null && mappings != null) {
properties = from m in mappings
@ -1640,7 +1639,7 @@ string propertyName
} else if (mappings != null) {
properties = mappings.Keys;
} else {
properties = Enumerable.Empty<String>();
properties = Enumerable.Empty<string>();
}
foreach (var property in properties) {

4
Storage/Storage/Public/AVUser.cs
View File

@ -309,7 +309,7 @@ namespace LeanCloud {
Dictionary<string, object> strs = new Dictionary<string, object> {
{ "mobilePhoneNumber", mobilePhoneNumber },
};
if (String.IsNullOrEmpty(validateToken)) {
if (string.IsNullOrEmpty(validateToken)) {
strs.Add("validate_token", validateToken);
}
var command = new AVCommand {
@ -423,7 +423,7 @@ namespace LeanCloud {
Dictionary<string, object> strs = new Dictionary<string, object> {
{ "mobilePhoneNumber", mobilePhoneNumber },
};
if (String.IsNullOrEmpty(validateToken)) {
if (string.IsNullOrEmpty(validateToken)) {
strs.Add("validate_token", validateToken);
}
var command = new AVCommand {