From 919579f919ce682cc19e67052b1006797763563d Mon Sep 17 00:00:00 2001
From: zwx1021249 <zhangpan70@huawei.com>
Date: Thu, 28 Mar 2024 14:18:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E4=BE=8B=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zwx1021249 <zhangpan70@huawei.com>
---
 .../src/main/ets/MainAbility/MainAbility.ts   | 44 ++++++++++++-------
 .../main/ets/pages/{index.ets => Index.ets}   |  2 +-
 .../resources/base/profile/main_pages.json    |  2 +-
 3 files changed, 29 insertions(+), 19 deletions(-)
 rename communication/dsoftbus_request/rpcserver/entry/src/main/ets/pages/{index.ets => Index.ets} (97%)

diff --git a/communication/dsoftbus_request/rpcserver/entry/src/main/ets/MainAbility/MainAbility.ts b/communication/dsoftbus_request/rpcserver/entry/src/main/ets/MainAbility/MainAbility.ts
index 4494da6..11c0df3 100644
--- a/communication/dsoftbus_request/rpcserver/entry/src/main/ets/MainAbility/MainAbility.ts
+++ b/communication/dsoftbus_request/rpcserver/entry/src/main/ets/MainAbility/MainAbility.ts
@@ -13,47 +13,57 @@
  * limitations under the License.
  */
 
-import Ability from '@ohos.app.ability.UIAbility';
+import UIAbility from '@ohos.app.ability.UIAbility';
+import hilog from '@ohos.hilog';
+import window from '@ohos.window';
 import AcCtrl from '@ohos.abilityAccessCtrl';
 import {Core} from 'deccjsunit/index';
 
-let AcManager = AcCtrl.createAtManager()
-export default class MainAbility extends Ability {
+let AcManager = AcCtrl.createAtManager();
+export default class MainAbility extends UIAbility {
     onCreate(want, launchParam) {
         console.info('AceApplication onCreate');
-        const core = Core.getInstance()
-        core.init()
-        const configService = core.getDefaultService('config')
-        configService.setConfig(this)
+        const core = Core.getInstance();
+        core.init();
+        const configService = core.getDefaultService('config');
+        configService.setConfig(this);
 
-        console.info('Calc[IndexPage] grantPermission')
+        console.info('Calc[IndexPage] grantPermission');
         AcManager.requestPermissionsFromUser(this.context, ['ohos.permission.DISTRIBUTED_DATASYNC'], function (result) {
-            console.info('Calc[IndexPage] grantPermission,requestPermissionsFromUser')
-        })
+            console.info('Calc[IndexPage] grantPermission,requestPermissionsFromUser');
+        });
     }
 
     onDestroy() {
-        console.info("onDestroy")
+        console.info("onDestroy");
     }
 
-    onWindowStageCreate(windowStage) {
+    onWindowStageCreate(windowStage: window.WindowStage) {
         // Main window is created, set main page for this ability
-        console.info("onWindowStageCreate")
-    }
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate');
+    
+        windowStage.loadContent('pages/Index', (err, data) => {
+          if (err.code) {
+            hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '');
+            return;
+          }
+            hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? '');
+        });
+      }
 
     onWindowStageDestroy() {
         // Main window is destroyed, release UI related resources
-        console.info("onWindowStageDestroy")
+        console.info("onWindowStageDestroy");
     }
 
     onForeground() {
         // Ability has brought to foreground
-        console.info("onForeground")
+        console.info("onForeground");
     }
 
     onBackground() {
         // Ability has back to background
-        console.info("onBackground")
+        console.info("onBackground");
     }
 
 };
diff --git a/communication/dsoftbus_request/rpcserver/entry/src/main/ets/pages/index.ets b/communication/dsoftbus_request/rpcserver/entry/src/main/ets/pages/Index.ets
similarity index 97%
rename from communication/dsoftbus_request/rpcserver/entry/src/main/ets/pages/index.ets
rename to communication/dsoftbus_request/rpcserver/entry/src/main/ets/pages/Index.ets
index 48beb91..c56e2a6 100644
--- a/communication/dsoftbus_request/rpcserver/entry/src/main/ets/pages/index.ets
+++ b/communication/dsoftbus_request/rpcserver/entry/src/main/ets/pages/Index.ets
@@ -28,7 +28,7 @@ struct Index {
 
   build() {
     Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
-      Text('Hello World')
+      Text('Rpcrequestserver')
         .fontSize(50)
         .fontWeight(FontWeight.Bold)
     }
diff --git a/communication/dsoftbus_request/rpcserver/entry/src/main/resources/base/profile/main_pages.json b/communication/dsoftbus_request/rpcserver/entry/src/main/resources/base/profile/main_pages.json
index feec276..1898d94 100644
--- a/communication/dsoftbus_request/rpcserver/entry/src/main/resources/base/profile/main_pages.json
+++ b/communication/dsoftbus_request/rpcserver/entry/src/main/resources/base/profile/main_pages.json
@@ -1,5 +1,5 @@
 {
   "src": [
-    "pages/index"
+    "pages/Index"
   ]
 }