Merge pull request #8 from harryphone/main

feat: 3.16.5

.gitignore

@@ -0,0 +1,2 @@
+Binaries/
+Intermediate/

AntiAddiction/AntiAddiction.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
-	"Version": 31602001,
-	"VersionName": "3.16.2",
+	"Version": 31605001,
+	"VersionName": "3.16.5",
 	"FriendlyName": "AntiAddiction",
 	"Description": "",
 	"Category": "TapTap",

AntiAddiction/Source/AntiAddiction/AntiAddiction_Android_UPL.xml

@@ -18,8 +18,8 @@
 
     <buildGradleAdditions>
         <insert>
-dependencies.implementation(name: 'AntiAddiction_3.16.2',ext:'aar')
-dependencies.implementation(name: 'AntiAddictionUI_3.16.2',ext:'aar')
+dependencies.implementation(name: 'AntiAddiction_3.16.5',ext:'aar')
+dependencies.implementation(name: 'AntiAddictionUI_3.16.5',ext:'aar')
         </insert>
     </buildGradleAdditions>
 </root>

AntiAddiction/Source/AntiAddiction/Private/Model/AAUPayableModel.h

@@ -9,7 +9,7 @@ struct FAAUPayableModel
 	GENERATED_BODY()
 
 	UPROPERTY()
-	bool status; 
+	bool status = false; 
 
 	UPROPERTY()
 	FString title; 

AntiAddiction/Source/AntiAddiction/Private/Model/AAUPlayableModel.h

@@ -14,10 +14,10 @@ struct FAAUPlayableModel
 	GENERATED_BODY()
 
 	UPROPERTY()
-	int restrict_type; // 0-不限制1-宵禁 2-时长
+	int restrict_type = 0; // 0-不限制1-宵禁 2-时长
 
 	UPROPERTY()
-	int remain_time;  //   防沉迷剩余时间，单位秒
+	int remain_time = 0;  //   防沉迷剩余时间，单位秒
 
 	UPROPERTY()
 	FString title; // 实名的宵禁临近文案
@@ -26,9 +26,9 @@ struct FAAUPlayableModel
 	FString description; // 距离健康保护时间还剩余14分钟，请注意适当休息。
 
 	UPROPERTY()
-	int cost_time; //  今日游戏已玩时长，单位秒
+	int cost_time = 0; //  今日游戏已玩时长，单位秒
 
 	UPROPERTY()
-	int status;
+	int status = 0;
 
 };

AntiAddiction/Source/AntiAddiction/Private/Model/AAURealNameResultModel.h

@@ -16,16 +16,16 @@ struct FAAURealNameResultModel
 	GENERATED_BODY()
 
 	UPROPERTY()
-	int status;
+	int status = 0;
 
 	UPROPERTY()
-	int age_limit;
+	int age_limit = 0;
 
 	UPROPERTY()
 	FString anti_addiction_token;
 
 	UPROPERTY()
-	bool has_auth_record;
+	bool has_auth_record = false;
 
 	AuthState GetAuthState() {
 		if (status == Success) {

AntiAddiction/Source/AntiAddiction/Private/Model/AAUServerTimeModel.h

@@ -9,7 +9,7 @@ struct FAAUServerTimeModel
 	GENERATED_BODY()
 
 	UPROPERTY()
-	int64 timestamp;
+	int64 timestamp = 0;
 
 };
 

AntiAddiction/Source/AntiAddiction/Private/Model/AAUSettingsModel.h

@@ -9,6 +9,6 @@ struct FAAUSettingsModel
 	GENERATED_BODY()
 
 	UPROPERTY()
-	bool stand_alone_mode;
+	bool stand_alone_mode = false;
 
 };

AntiAddiction/Source/AntiAddiction/Private/Model/China/AAUChinaConfigModel.h

@@ -51,22 +51,22 @@ struct FAAUChinaChildProtectedConfig
 	GENERATED_BODY()
 
 	UPROPERTY()
-	bool share_time_switch;
+	bool share_time_switch = false;
 
 	UPROPERTY()
-	bool use_time_switch;
+	bool use_time_switch = false;
 
 	UPROPERTY()
-	int no_identify_time;
+	int no_identify_time = 0;
 
 	UPROPERTY()
-	bool charge_amount_switch;
+	bool charge_amount_switch = false;
 
 	UPROPERTY()
-	int child_common_time;
+	int child_common_time = 0;
 
 	UPROPERTY()
-	int child_holiday_time;
+	int child_holiday_time = 0;
 
 	UPROPERTY()
 	FString night_strict_start;
@@ -75,10 +75,10 @@ struct FAAUChinaChildProtectedConfig
 	FString night_strict_end;
 
 	UPROPERTY()
-	int night_strict_warn;
+	int night_strict_warn = 0;
 
 	UPROPERTY()
-	int remain_time_warn;
+	int remain_time_warn = 0;
 
 };
 
@@ -94,10 +94,10 @@ struct FAAUChinaPayLimitWord
 	FString single_description;
 
 	UPROPERTY()
-	int single_limit;
+	int single_limit = 0;
 
 	UPROPERTY()
-	int account_type;
+	int account_type = 0;
 
 	UPROPERTY()
 	FString month_title;
@@ -106,7 +106,7 @@ struct FAAUChinaPayLimitWord
 	FString month_description;
 
 	UPROPERTY()
-	int month_limit;
+	int month_limit = 0;
 
 };
 
@@ -116,7 +116,7 @@ struct FAAUChinaHealthReminderWordTip
 	GENERATED_BODY()
 
 	UPROPERTY()
-	int type;
+	int type = 0;
 
 	UPROPERTY()
 	FString title;
@@ -133,7 +133,7 @@ struct FAAUChinaHealthReminderWord
 	GENERATED_BODY()
 
 	UPROPERTY()
-	int account_type;
+	int account_type = 0;
 
 	UPROPERTY()
 	TArray<FAAUChinaHealthReminderWordTip> tips;
@@ -189,7 +189,7 @@ struct FAAUChinaConfigModel
 	FString name;
 
 	UPROPERTY()
-	bool upload_user_action;
+	bool upload_user_action = false;
 
 	UPROPERTY()
 	FAAUChinaChildProtectedConfig child_protected_config;

AntiAddiction/Source/AntiAddiction/Private/Model/Vietnam/AAUVietnamConfigModel.h

@@ -76,7 +76,7 @@ struct FAAUVietnamConfigModel
 	GENERATED_BODY()
 
 	UPROPERTY()
-	bool upload_user_action;
+	bool upload_user_action = false;
 
 	UPROPERTY()
 	FAAUVietnamUIConfig ui_config;

AntiAddiction/Source/AntiAddiction/Private/Server/China/AAUChinaSever.cpp

@@ -220,7 +220,7 @@ void AAUChinaSever::SubmitPayResult(int Amount, TFunction<void(bool Success)> Ca
 }
 
 FDateTime AAUChinaSever::GetCurrentTime() {
-	return AAUHelper::GetChinaCurrentTime() + TimeSpan * ETimespan::TicksPerSecond;
+	return AAUHelper::GetChinaCurrentTime() + FTimespan(TimeSpan * ETimespan::TicksPerSecond);
 }
 
 int64 AAUChinaSever::CalculateRemainTime(AAUTimeBoundary& Boundary) {

AntiAddiction/Source/AntiAddiction/Private/Server/China/iOS/AAUChinaIOSImpl.cpp

@@ -19,7 +19,7 @@
 @implementation AAUChinaIOSImplDelegate
 
 - (void)antiAddictionCallbackWithCode:(AntiAddictionResultHandlerCode)code extra:(NSString * _Nullable)extra {
-	FString Msg = IOSHelper::convertString(extra);
+	FString Msg = IOSHelper::Convert(extra);
 	AsyncTask(ENamedThreads::GameThread, [=]() {
 		AntiAddictionUE::OnCallBack.ExecuteIfBound((AntiAddictionUE::ResultHandlerCode)code, Msg);
 	});
@@ -38,7 +38,7 @@ AAUChinaIOSImpl::~AAUChinaIOSImpl() {
 
 void AAUChinaIOSImpl::InitImpl(const FAAUConfig& _Config) {
 	AntiAddictionConfig *config = [[AntiAddictionConfig alloc] init];
-	config.clientID = IOSHelper::convertString(_Config.ClientID);
+	config.clientID = IOSHelper::Convert(_Config.ClientID);
 	config.useTapLogin = _Config.UseTapLogin;
 	config.showSwitchAccount = _Config.ShowSwitchAccount;
 
@@ -48,7 +48,7 @@ void AAUChinaIOSImpl::InitImpl(const FAAUConfig& _Config) {
 }
 
 void AAUChinaIOSImpl::Startup(const FString& UserID) {
-	NSString *userID = IOSHelper::convertString(UserID);
+	NSString *userID = IOSHelper::Convert(UserID);
 	dispatch_async(dispatch_get_main_queue(), ^{
 		[AntiAddiction startupWithUserID:userID];
 	});
@@ -90,7 +90,7 @@ void AAUChinaIOSImpl::CheckPayLimit(int Amount, TFunction<void(bool Status)> Cal
 				}
 			});
 		} failureHandler:^(NSString *Msg) {
-			FString Message = IOSHelper::convertString(Msg);
+			FString Message = IOSHelper::Convert(Msg);
 			AsyncTask(ENamedThreads::GameThread, [=]() {
 				if (FailureHandler) {
 					FailureHandler(Message);
@@ -110,7 +110,7 @@ void AAUChinaIOSImpl::SubmitPayResult(int Amount, TFunction<void(bool Success)>
 				}
 			});
 		} failureHandler:^(NSString *Msg) {
-			FString Message = IOSHelper::convertString(Msg);
+			FString Message = IOSHelper::Convert(Msg);
 			AsyncTask(ENamedThreads::GameThread, [=]() {
 				if (FailureHandler) {
 					FailureHandler(Message);
@@ -121,5 +121,5 @@ void AAUChinaIOSImpl::SubmitPayResult(int Amount, TFunction<void(bool Success)>
 }
 
 FString AAUChinaIOSImpl::CurrentToken() {
-	return IOSHelper::convertString([AntiAddiction currentToken]);
+	return IOSHelper::Convert([AntiAddiction currentToken]);
 }

AntiAddiction/Source/AntiAddiction/Private/Server/Vietnam/AAUVietnamServer.cpp

@@ -214,7 +214,7 @@ void AAUVietnamServer::StartTimeLimitTimer() {
 }
 
 FDateTime AAUVietnamServer::GetCurrentTime() {
-	return AAUHelper::GetVietnamCurrentTime() + TimeSpan * ETimespan::TicksPerSecond;
+	return AAUHelper::GetVietnamCurrentTime() + FTimespan(TimeSpan * ETimespan::TicksPerSecond);
 }
 
 void AAUVietnamServer::LoginSuccess(const FAAUUser& User) {

AntiAddiction/Source/AntiAddiction/Public/AntiAddiction.h

@@ -4,8 +4,8 @@
 
 #include "Modules/ModuleManager.h"
 
-#define AntiAddictionUE_VERSION_NUMBER "31602001"
-#define AntiAddictionUE_VERSION "3.16.2"
+#define AntiAddictionUE_VERSION_NUMBER "31605001"
+#define AntiAddictionUE_VERSION "3.16.5"
 
 class FAntiAddictionModule : public IModuleInterface
 {

LeanCloud/LeanCloud.uplugin

@@ -0,0 +1,24 @@
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "1.0",
+	"FriendlyName": "LeanCloud",
+	"Description": "LeanCloud",
+	"Category": "LeanCloud",
+	"CreatedBy": "TapTap",
+	"CreatedByURL": "",
+	"DocsURL": "",
+	"MarketplaceURL": "",
+	"SupportURL": "",
+	"CanContainContent": true,
+	"IsBetaVersion": false,
+	"IsExperimentalVersion": false,
+	"Installed": false,
+	"Modules": [
+		{
+			"Name": "LeanCloud",
+			"Type": "Runtime",
+			"LoadingPhase": "PreLoadingScreen"
+		}
+	]
+}