Merge branch 'dev-activitycb' into 'dev'

[activity-callback]添加条件编译

See merge request !6

uni_modules/uts-syntaxcase/utssdk/index.uts

@@ -98,8 +98,8 @@ export async function testAsync(opts : AsyncOptions) : Promise<SyntaxResult> {
 }
 
 
-export async function testAsyncParam3(id:number,name:string,opts : AsyncOptions) : Promise<SyntaxResult> {
-    console.log("id",id,"name",name)
+export async function testAsyncParam3(id : number, name : string, opts : AsyncOptions) : Promise<SyntaxResult> {
+  console.log("id", id, "name", name)
   if (opts.type == "success") {
     opts.success("success");
   } else {
@@ -166,9 +166,8 @@ class RequestTaskImpl implements RequestTask {
 export function request(url : string) : RequestTask | null {
   return new RequestTaskImpl(url)
 }
-
-
- // #ifdef UNI-APP-X
+// #ifdef APP-ANDROID
+// #ifdef UNI-APP-X
 import KeyEvent from 'android.view.KeyEvent';
 import Configuration from 'android.content.res.Configuration';
 import Bundle from 'android.os.Bundle';
@@ -332,4 +331,5 @@ export class UTSActivityComponentCallback extends UniActivityComponentCallback {
     callback('onPreConfigurationChanged')
   }
 }
-  // #endif
\ No newline at end of file
+// #endif
+// #endif
\ No newline at end of file