bugfix: fix Android Compilation Error

1. some struct has macro scope but USTRUCT cannot be inside the macro scope
2. macro sope problem: in USTRUCT member EUABT_TYPE type = UABT::WrapWithUE(native_enum); use special rule for default value
3. struct default val: int64 a = NULL; change NULL to 0
4. AsyncTask add include files

Author: WinterPu

docs/src/BlueprintGeneration/BPGen-Struct.md

@@ -25,3 +25,19 @@ int64 uid = 0;
 
 
 
+
+### USTRUCT 没法包在Macro Scope 内
+```
+#if PLATFORM_WINDOWS
+
+USTRUCT(BlueprintType)
+struct FUABT_Test{
+	GENERATED_BODY()
+public:
+
+}
+
+#endif
+
+Error: USTRUCT must not be inside preprocessor blocks, except for WITH_EDITORONLY_DATA
+```

renders/utility/blueprint_special/bp_helper.ts

@@ -37,6 +37,7 @@ import {
   map_method_param_size_count,
   map_return_bptype_default_value,
   map_return_bptype_fix,
+  map_return_context_default_value,
   map_struct_member_variable_size_count,
 } from './bptype_data_conv';
 import * as BPContextReplacedHelper from './bptype_data_replaced/helper';
@@ -502,7 +503,8 @@ function genContext_BPMethodReturnValBegin(
   // should be default value not a failed value.
   let defaultVal =
     bpTypeConvData?.defaultBPValue ??
-    map_return_bptype_default_value[return_type.source] ??
+    map_return_context_default_value[decl_type] ?? // ref bp
+    map_return_bptype_default_value[return_type.source] ?? // ref cpp
     '';
 
   if (Tools.IsNotEmptyStr(defaultVal)) {

renders/utility/blueprint_special/bptype_data_conv.ts

@@ -1041,6 +1041,10 @@ export const map_struct_member_variable_default_value: {
   // therefore it shows: EUABT_VIDEO_CONTENT_HINT contentHint = UABTEnum::WrapWithUE(undefined);
   'agora::rtc::ScreenVideoParameters.contentHint':
     'EUABT_VIDEO_CONTENT_HINT::CONTENT_HINT_NONE',
+
+  // for macro scope problem:
+  'agora::rtc::ScreenCaptureSourceInfo.type':
+    'EUABT_ScreenCaptureSourceType::ScreenCaptureSourceType_Unknown',
 };
 
 // In Struct, the corresponding size count variable to the target member variable
@@ -1129,3 +1133,7 @@ export const map_return_bptype_default_value: Record<string, string> = {
 };
 
 export const map_return_bptype_fix: { [key: string]: string } = {};
+
+export const map_return_context_default_value: { [key: string]: string } = {
+  int64: '0',
+};

renders/utility/blueprint_special/bptype_data_makeup.ts

@@ -545,7 +545,11 @@ export const map_class_initialization: {
     Inst: `
       static UAgoraBPuScreenCaptureSourceList* InsScreenCaptureSourceList;
       
+      #if defined(_WIN32) || (defined(__APPLE__) && TARGET_OS_MAC && !TARGET_OS_IPHONE)
+
       agora::rtc::IScreenCaptureSourceList* _NativePtr = nullptr;
+      
+      #endif
       `,
     InitDecl: `
       UFUNCTION(BlueprintCallable,Category = "Agora|IScreenCaptureSourceList")
@@ -581,3 +585,26 @@ export const map_class_initialization: {
 
   // MusicCollection: {},
 };
+
+export type MacropScopeMakeup = {
+  start: string;
+  end: string;
+};
+// key : fullName
+export const map_macrop_scope_makeup: { [key: string]: MacropScopeMakeup } = {
+  'agora::rtc::IScreenCaptureSourceList.getCount': {
+    start:
+      '#if defined(_WIN32) || (defined(__APPLE__) && TARGET_OS_MAC && !TARGET_OS_IPHONE)',
+    end: '#endif',
+  },
+  'agora::rtc::IScreenCaptureSourceList.getSourceInfo': {
+    start:
+      '#if defined(_WIN32) || (defined(__APPLE__) && TARGET_OS_MAC && !TARGET_OS_IPHONE)',
+    end: '#endif',
+  },
+  'agora::rtc::IScreenCaptureSourceList.release': {
+    start:
+      '#if defined(_WIN32) || (defined(__APPLE__) && TARGET_OS_MAC && !TARGET_OS_IPHONE)',
+    end: '#endif',
+  },
+};

renders/utility/blueprint_special/bptype_helper.ts

@@ -751,6 +751,7 @@ export function getBPMemberVariableDefaultValue(
 
   // TBD(WinterPu)
   // Special Case: FString
+  // some fix
   if (bpType.declType === 'FString') {
     if (
       valDefaultVal === '0' ||
@@ -763,6 +764,13 @@ export function getBPMemberVariableDefaultValue(
     }
   }
 
+  if (bpType.declType === 'int64') {
+    // For Android Compilation
+    if (valDefaultVal === 'NULL') {
+      valDefaultVal = '0';
+    }
+  }
+
   return [bNeedDefaultValue, valDefaultVal];
 }
 

renders/utility/cpp_helper.ts

@@ -18,6 +18,7 @@ import {
 } from '@agoraio-extensions/terra-core';
 import { List, map } from 'lodash';
 
+import { map_macrop_scope_makeup } from './blueprint_special/bptype_data_makeup';
 import * as Tools from './tools';
 export function formatAsCppComment(input: string): string {
   if (input == '' || input == undefined) {
@@ -71,6 +72,13 @@ export function createCompilationDirectivesContent(
   node: CXXTerraNode,
   isStart: boolean = true
 ): string {
+  // TBD(WinterPu)
+  // should be moved to bp helper.
+  const data_macrop_scope = map_macrop_scope_makeup[node.fullName];
+  if (data_macrop_scope) {
+    return isStart ? data_macrop_scope.start : data_macrop_scope.end;
+  }
+
   let directives = node.conditional_compilation_directives_infos;
   if (directives.length == 0) {
     return '';

renders/utility/helper.ts

@@ -115,12 +115,13 @@ export function genGeneralTerraData(
 
         const basedata_clazz = genBaseUECommonUserData(node);
         const clazzUserData: CustomUserData.ClazzUserData = {
+          ...node.user_data,
           ...basedata_clazz,
           bpContextInst: context_clazz?.Inst ?? '',
           bpContextInitDecl: context_clazz?.InitDecl ?? '',
           bpContextInitImpl: context_clazz?.InitImpl ?? '',
         };
-        node.user_data = { ...node.user_data, ...clazzUserData };
+        node.user_data = clazzUserData;
 
         // Node - Clazz Method
         node.asClazz().methods.map((method, index) => {

templates/type/file_content.mustache

@@ -15,6 +15,9 @@
 #include "UtilityUABTEnumConvertMacro.h"
 #include "UtilityUABTTypeHelper.h"
 
+// for AsyncTask
+#include "Async/Async.h"
+
 {{#user_data.bpIncludeFiles}}
 {{{.}}}
 {{/user_data.bpIncludeFiles}}