diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/package.json b/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/package.json deleted file mode 100755 index 3e64cf5..0000000 --- a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "license":"ISC", - "devDependencies":{}, - "name":"entry", - "ohos":{ - "org":"ohos", - "directoryLevel":"module", - "buildTool":"hvigor" - }, - "description":"example description", - "repository":{}, - "version":"1.0.0", - "dependencies":{} -} \ No newline at end of file diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/resources/base/profile/main_pages.json b/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/resources/base/profile/main_pages.json deleted file mode 100755 index feec276..0000000 --- a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/resources/base/profile/main_pages.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "src": [ - "pages/index" - ] -} diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/package.json b/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/package.json deleted file mode 100755 index 21886de..0000000 --- a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "license": "ISC", - "devDependencies": {}, - "name": "serviceextensiondemo", - "ohos": { - "org": "ohos", - "directoryLevel": "project", - "buildTool": "hvigor" - }, - "description": "example description", - "repository": {}, - "version": "1.0.0", - "dependencies": { - "@ohos/hypium": "1.0.1", - "@ohos/hvigor-ohos-plugin": "1.1.6", - "@ohos/hvigor": "1.1.6" - } -} diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/AppScope/app.json5 b/services/dtbschedmgr/test/samples/StageManualTestSuite/AppScope/app.json5 old mode 100755 new mode 100644 similarity index 91% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/AppScope/app.json5 rename to services/dtbschedmgr/test/samples/StageManualTestSuite/AppScope/app.json5 index 9e7a49f..ac2cbed --- a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/AppScope/app.json5 +++ b/services/dtbschedmgr/test/samples/StageManualTestSuite/AppScope/app.json5 @@ -15,7 +15,7 @@ { "app": { - "bundleName": "com.example.serviceextensiondemo", + "bundleName": "com.dms.stage_manual_test_suite", "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/AppScope/resources/base/element/string.json b/services/dtbschedmgr/test/samples/StageManualTestSuite/AppScope/resources/base/element/string.json old mode 100755 new mode 100644 similarity index 54% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/AppScope/resources/base/element/string.json rename to services/dtbschedmgr/test/samples/StageManualTestSuite/AppScope/resources/base/element/string.json index 73a440d..31eeef6 --- a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/AppScope/resources/base/element/string.json +++ b/services/dtbschedmgr/test/samples/StageManualTestSuite/AppScope/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "ServiceExtensionDemo" + "value": "StageManualTestSuite" } ] -} +} \ No newline at end of file diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/AppScope/resources/base/media/app_icon.png b/services/dtbschedmgr/test/samples/StageManualTestSuite/AppScope/resources/base/media/app_icon.png old mode 100755 new mode 100644 similarity index 100% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/AppScope/resources/base/media/app_icon.png rename to services/dtbschedmgr/test/samples/StageManualTestSuite/AppScope/resources/base/media/app_icon.png diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/README_zh.md b/services/dtbschedmgr/test/samples/StageManualTestSuite/README_zh.md similarity index 77% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/README_zh.md rename to services/dtbschedmgr/test/samples/StageManualTestSuite/README_zh.md index 8ddb4fa..f1abb61 100644 --- a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/README_zh.md +++ b/services/dtbschedmgr/test/samples/StageManualTestSuite/README_zh.md @@ -1,4 +1,14 @@ -# 跨设备绑定ServiceExtensionAbility示例 +# Stage模型手工测试套示例 + +本示例展示了分布式调度子系统基于stage模型手工测试套，包含: + +1、跨设备绑定ServiceExtensionAbility + +效果图 + +![](screenshots/MainPage.png) + +## 跨设备绑定ServiceExtensionAbility示例 ### 简介 本示例展示了在eTS中如何构建stage模型跨设备绑定ServiceExtensionAbility，包含: @@ -11,6 +21,9 @@ 4、绑定成功获取远端 ServiceExtensionAbility 句柄，发起端使用句柄的 sendRequest() 接口调用远端定义的方法 +效果图 + +![](screenshots/ConnectServiceExtensionAbility.png) ### 测试步骤 1、两台设备都安装此应用，并组网成功（计算器可以跨端拉起） diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/build-profile.json5 b/services/dtbschedmgr/test/samples/StageManualTestSuite/build-profile.json5 old mode 100755 new mode 100644 similarity index 100% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/build-profile.json5 rename to services/dtbschedmgr/test/samples/StageManualTestSuite/build-profile.json5 diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/build-profile.json5 b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/build-profile.json5 old mode 100755 new mode 100644 similarity index 100% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/build-profile.json5 rename to services/dtbschedmgr/test/samples/StageManualTestSuite/entry/build-profile.json5 diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/hvigorfile.js b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/hvigorfile.js old mode 100755 new mode 100644 similarity index 100% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/hvigorfile.js rename to services/dtbschedmgr/test/samples/StageManualTestSuite/entry/hvigorfile.js diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/package-lock.json b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/package-lock.json old mode 100755 new mode 100644 similarity index 100% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/package-lock.json rename to services/dtbschedmgr/test/samples/StageManualTestSuite/entry/package-lock.json diff --git a/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/package.json b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/package.json new file mode 100644 index 0000000..95779fe --- /dev/null +++ b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/package.json @@ -0,0 +1,14 @@ +{ + "name": "entry", + "version": "1.0.0", + "ohos": { + "org": "ohos", + "buildTool": "hvigor", + "directoryLevel": "module" + }, + "description": "example description", + "repository": {}, + "license": "ISC", + "dependencies": {} + } + \ No newline at end of file diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/Application/MyAbilityStage.ts b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/Application/MyAbilityStage.ts old mode 100755 new mode 100644 similarity index 100% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/Application/MyAbilityStage.ts rename to services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/Application/MyAbilityStage.ts diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/MainAbility/MainAbility.ts b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/MainAbility/MainAbility.ts old mode 100755 new mode 100644 similarity index 69% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/MainAbility/MainAbility.ts rename to services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/MainAbility/MainAbility.ts index d482754..d36ca1b --- a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/MainAbility/MainAbility.ts @@ -18,69 +18,69 @@ import Ability from '@ohos.application.Ability' import RemoteDeviceModel from '../Model/RemoteDeviceModel' import rpc from '@ohos.rpc' -var printLog = '[ServiceExtensionDemo]' +var printLog = '[MainAbility]' var remoteDeviceModel = new RemoteDeviceModel var messageProxy = null var connectedAbility var options = { onConnect: async function (elementName, proxy) { - showLog("service extension ability connect success") + showLog(printLog + "service extension ability connect success") if (proxy === null) { showLog("can not get proxy") return } messageProxy = proxy - showLog("get proxy, elementName: " + elementName) + showLog(printLog + "get proxy, elementName: " + elementName) }, onDisconnect: function () { - showLog("service extension ability disconnect success") + showLog(printLog + "service extension ability disconnect success") }, onFailed: function () { - showLog("service extension ability connect fail") + showLog(printLog + "service extension ability connect fail") } } function ConnectRemoteAbility() { - showLog("connect service extension ability begin") - showLog("connect remote device id is " + globalThis.selectDevice) + showLog(printLog + "connect service extension ability begin") + showLog(printLog + "connect remote device id is " + globalThis.selectDevice) let want = { - bundleName: "com.example.serviceextensiondemo", + bundleName: "com.dms.stage_manual_test_suite", abilityName: "MyServiceExtensionAbility", deviceId: globalThis.selectDevice } connectedAbility = globalThis.context.connectAbility(want, options) - showLog("connect service extension ability, connectId = " + connectedAbility) + showLog(printLog + "connect service extension ability, connectId = " + connectedAbility) } async function DisconnectRemoteAbility() { - showLog("disconnect service extension ability begin") - showLog("disconnect remote device id is " + globalThis.selectDevice) + showLog(printLog + "disconnect service extension ability begin") + showLog(printLog + "disconnect remote device id is " + globalThis.selectDevice) await globalThis.context.disconnectAbility(connectedAbility) - showLog("disconnect service extension ability, connectId = " + connectedAbility) + showLog(printLog + "disconnect service extension ability, connectId = " + connectedAbility) connectedAbility = null } async function SendMessage() { if (messageProxy === null) { - showLog("can not get proxy") + showLog(printLog + "can not get proxy") return } - showLog("send message : " + AppStorage.Get("message")) + showLog(printLog + "send message : " + AppStorage.Get("message")) let option = new rpc.MessageOption() let data = new rpc.MessageParcel() let reply = new rpc.MessageParcel() data.writeString(AppStorage.Get("message")) await messageProxy.sendRequest(1, data, reply, option) - showLog("send message success") + showLog(printLog + "send message success") globalThis.receiveMessage = reply.readString() - showLog("receive reply message : " + globalThis.receiveMessage) + showLog(printLog + "receive reply message : " + globalThis.receiveMessage) } function showLog(logMessage) { - console.log(printLog + logMessage) + console.log(logMessage) AppStorage.Set("receiveMessage", AppStorage.Get("receiveMessage") + logMessage + "\n") } @@ -111,11 +111,11 @@ export default class MainAbility extends Ability { onWindowStageCreate(windowStage) { // Main window is created, set main page for this ability - console.log("[ServiceExtensionDemo] MainAbility onWindowStageCreate") + console.log("[ServiceExtension] MainAbility onWindowStageCreate") globalThis.ConnectRemoteAbility = ConnectRemoteAbility globalThis.DisconnectRemoteAbility = DisconnectRemoteAbility globalThis.SendMessage = SendMessage - windowStage.loadContent("pages/index", (err, data) => { + windowStage.loadContent("pages/MainPage", (err, data) => { if (err.code) { console.error('Failed to load the content. Cause:' + JSON.stringify(err)); return; @@ -126,16 +126,16 @@ export default class MainAbility extends Ability { onWindowStageDestroy() { // Main window is destroyed, release UI related resources - console.log("[ServiceExtensionDemo] MainAbility onWindowStageDestroy") + console.log("[ServiceExtension] MainAbility onWindowStageDestroy") } onForeground() { // Ability has brought to foreground - console.log("[ServiceExtensionDemo] MainAbility onForeground") + console.log("[ServiceExtension] MainAbility onForeground") } onBackground() { // Ability has back to background - console.log("[ServiceExtensionDemo] MainAbility onBackground") + console.log("[ServiceExtension] MainAbility onBackground") } }; diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/Model/RemoteDeviceModel.ts b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/Model/RemoteDeviceModel.ts old mode 100755 new mode 100644 similarity index 83% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/Model/RemoteDeviceModel.ts rename to services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/Model/RemoteDeviceModel.ts index d6ddd01..398f500 --- a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/Model/RemoteDeviceModel.ts +++ b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/Model/RemoteDeviceModel.ts @@ -22,13 +22,13 @@ export default class RemoteDeviceModel { discoverList = []; callback; authCallback = null; - #deviceManager; + MyDeviceManager; constructor() { } registerDeviceListCallback(callback) { - if (typeof (this.#deviceManager) === 'undefined') { + if (typeof (this.MyDeviceManager) === 'undefined') { console.log('[ServiceExtensionDemo] deviceManager.createDeviceManager begin'); let self = this; deviceManager.createDeviceManager('com.example.serviceextensiondemo', (error, value) => { @@ -36,7 +36,7 @@ export default class RemoteDeviceModel { console.error('createDeviceManager failed.'); return; } - self.#deviceManager = value; + self.MyDeviceManager = value; self.registerDeviceListCallback_(callback); console.log('[ServiceExtensionDemo] createDeviceManager callback returned, error=' + error + ' value=' + value); }); @@ -49,14 +49,14 @@ export default class RemoteDeviceModel { registerDeviceListCallback_(callback) { console.info('[ServiceExtensionDemo] registerDeviceListCallback'); this.callback = callback; - if (this.#deviceManager == undefined) { + if (this.MyDeviceManager == undefined) { console.error('[ServiceExtensionDemo] deviceManager has not initialized'); this.callback(); return; } console.info('[ServiceExtensionDemo] getTrustedDeviceListSync begin'); - var list = this.#deviceManager.getTrustedDeviceListSync(); + var list = this.MyDeviceManager.getTrustedDeviceListSync(); console.info('[ServiceExtensionDemo] getTrustedDeviceListSync end, deviceList=' + JSON.stringify(list)); if (typeof (list) != 'undefined' && typeof (list.length) != 'undefined') { this.deviceList = list; @@ -67,7 +67,7 @@ export default class RemoteDeviceModel { getTrustDeviceList(callback) { console.info('[ServiceExtensionDemo] getTrustDeviceListSync begin'); - var list = this.#deviceManager.getTrustedDeviceListSync(); + var list = this.MyDeviceManager.getTrustedDeviceListSync(); console.info('[ServiceExtensionDemo] getTrustedDeviceListSync end, deviceList=' + JSON.stringify(list)); if (typeof (list) != 'undefined' && typeof (list.length) != 'undefined') { this.deviceList = list; @@ -79,11 +79,11 @@ export default class RemoteDeviceModel { unregisterDeviceListCallback() { console.info('[dmsDemo] stopDeviceDiscovery ' + SUBSCRIBE_ID); - this.#deviceManager.stopDeviceDiscovery(SUBSCRIBE_ID); - this.#deviceManager.off('deviceStateChange'); - this.#deviceManager.off('deviceFound'); - this.#deviceManager.off('discoverFail'); - this.#deviceManager.off('serviceDie'); + this.MyDeviceManager.stopDeviceDiscovery(SUBSCRIBE_ID); + this.MyDeviceManager.off('deviceStateChange'); + this.MyDeviceManager.off('deviceFound'); + this.MyDeviceManager.off('discoverFail'); + this.MyDeviceManager.off('serviceDie'); this.deviceList = []; } } \ No newline at end of file diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/MyServiceExtensionAbility/MyServiceExtensionAbility.ts b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/MyServiceExtensionAbility/MyServiceExtensionAbility.ts old mode 100755 new mode 100644 similarity index 74% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/MyServiceExtensionAbility/MyServiceExtensionAbility.ts rename to services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/MyServiceExtensionAbility/MyServiceExtensionAbility.ts index 76df4b9..523e3ce --- a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/MyServiceExtensionAbility/MyServiceExtensionAbility.ts +++ b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/MyServiceExtensionAbility/MyServiceExtensionAbility.ts @@ -16,7 +16,7 @@ import rpc from '@ohos.rpc'; import ServiceExtensionAbility from '@ohos.application.ServiceExtensionAbility'; -var printLog = '[ServiceExtensionDemo]' +var printLog = '[ServiceExtension]' class MyServiceExtensionAbilityStub extends rpc.RemoteObject { constructor(des) { @@ -24,12 +24,12 @@ class MyServiceExtensionAbilityStub extends rpc.RemoteObject { } onRemoteRequest(code, data, reply, option) { - console.log(printLog + "MyServiceExtensionAbility onRemoteRequest call") + showLog(printLog + "MyServiceExtensionAbility onRemoteRequest call") if (code === 1) { globalThis.receiveMessage = data.readString() - console.log(printLog + "receive message : " + globalThis.receiveMessage) + showLog(printLog + "receive message : " + globalThis.receiveMessage) } else { - console.log(printLog + "unknown request code") + showLog(printLog + "unknown request code") } reply.writeString("MyServiceExtensionAbility receive your message") return true @@ -58,6 +58,11 @@ class MyServiceExtensionAbilityStub extends rpc.RemoteObject { attachLocalInterface(localInterface, descriptor) {} } +function showLog(logMessage) { + console.log(logMessage) + AppStorage.Set("receiveMessage", AppStorage.Get("receiveMessage") + logMessage + "\n") +} + export default class MyServiceExtensionAbility extends ServiceExtensionAbility { onCreate(want) { console.log(printLog + 'MyServiceExtensionAbility OnCreate, want : ' + want.abilityName) @@ -66,11 +71,11 @@ export default class MyServiceExtensionAbility extends ServiceExtensionAbility { console.log(printLog + 'MyServiceExtensionAbility onRequest, want : ' + want.abilityName) } onConnect(want) { - console.log(printLog + 'MyServiceExtensionAbility onConnect, want : ' + want.abilityName) + showLog(printLog + 'MyServiceExtensionAbility onConnect, want : ' + want.abilityName) return new MyServiceExtensionAbilityStub('test') } onDisconnect(want) { - console.log(printLog + 'MyServiceExtensionAbility onDisconnect, want : ' + want.abilityName) + showLog(printLog + 'MyServiceExtensionAbility onDisconnect, want : ' + want.abilityName) } onDestroy() { console.log(printLog + 'MyServiceExtensionAbility onDestroy') diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/pages/index.ets b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/pages/ConnectServiceExtensionAbility.ets old mode 100755 new mode 100644 similarity index 85% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/pages/index.ets rename to services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/pages/ConnectServiceExtensionAbility.ets index 9b49353..7c5e1aa --- a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/ets/pages/index.ets +++ b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/pages/ConnectServiceExtensionAbility.ets @@ -59,8 +59,9 @@ struct Index { .width('100%').height(50).fontSize(10) .onClick(() => { console.log(printLog + "select device : " + item) - AppStorage.Set('receiveMessage', AppStorage.Get("receiveMessage") + - "select device:" + item + '\n') + this.selectDeviceName = item + globalThis.selectDevice = item + AppStorage.Set('receiveMessage', AppStorage.Get("receiveMessage") + "select device:" + item + '\n') }) }.editable(this.editFlag) }, (item : string) => item.toString()) @@ -79,12 +80,12 @@ struct Index { Scroll() { Text(this.receiveMessage) .width('100%') - .fontSize(20) + .fontSize(15) .textAlign(TextAlign.Start) - }.scrollable(BarState.Auto) - .height('55%') - .align(ItemAlign.Start) - .borderWidth(1) + }.scrollBar(BarState.Auto) + .height('55%') + .align(ItemAlign.Start) + .borderWidth(1) Text("待发送数据：") .height('5%') @@ -97,13 +98,13 @@ struct Index { Text(this.message) .height('10%') .width('100%') - .fontSize(20) + .fontSize(15) .borderWidth(1) .textAlign(TextAlign.Start) TextInput("输入消息") - .width('10%') - .height('100%') + .width('100%') + .height('10%') .borderStyle(BorderStyle.Solid) .type(InputType.Normal) .onChange((value : string) => { @@ -118,7 +119,7 @@ struct Index { globalThis.SendMessage() }) }.height('15%') - }.width('70%') + }.width('70%').height('100%') }.width('100%').height('90%') }.width('100%').height('100%') } diff --git a/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/pages/MainPage.ets b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/pages/MainPage.ets new file mode 100644 index 0000000..2816c00 --- /dev/null +++ b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/ets/pages/MainPage.ets @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-nocheck +import router from '@system.router' + +@Entry +@Component +struct Index { + build() { + Column() { + Text("StageManualTestSuite") + .width('100%') + .height('10%') + .fontSize(20) + .textAlign(TextAlign.Center) + + Button('ConnectServiceExtensionAbility') + .width("90%") + .height(50) + .onClick(() => { + router.push({uri : 'pages/ConnectServiceExtensionAbility'}) + }) + + Button('other') + .width("90%") + .height(50) + .onClick(() => { + }) + }.width('100%').height('100%') + } +} \ No newline at end of file diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/module.json5 b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/module.json5 old mode 100755 new mode 100644 similarity index 100% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/module.json5 rename to services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/module.json5 diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/resources/base/element/color.json b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/resources/base/element/color.json old mode 100755 new mode 100644 similarity index 100% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/resources/base/element/color.json rename to services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/resources/base/element/color.json diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/resources/base/element/string.json b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/resources/base/element/string.json old mode 100755 new mode 100644 similarity index 80% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/resources/base/element/string.json rename to services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/resources/base/element/string.json index fc57044..72d89a0 --- a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/resources/base/element/string.json +++ b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/resources/base/element/string.json @@ -10,7 +10,7 @@ }, { "name": "MainAbility_label", - "value": "ServiceExtensionDemo" + "value": "StageManualTestSuite" } ] } \ No newline at end of file diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/resources/base/media/icon.png b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/resources/base/media/icon.png old mode 100755 new mode 100644 similarity index 100% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/entry/src/main/resources/base/media/icon.png rename to services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/resources/base/media/icon.png diff --git a/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/resources/base/profile/main_pages.json b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000..1661fdb --- /dev/null +++ b/services/dtbschedmgr/test/samples/StageManualTestSuite/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,6 @@ +{ + "src": [ + "pages/ConnectServiceExtensionAbility", + "pages/MainPage" + ] +} \ No newline at end of file diff --git a/services/dtbschedmgr/test/samples/ServiceExtenisonDemo/hvigorfile.js b/services/dtbschedmgr/test/samples/StageManualTestSuite/hvigorfile.js old mode 100755 new mode 100644 similarity index 100% rename from services/dtbschedmgr/test/samples/ServiceExtenisonDemo/hvigorfile.js rename to services/dtbschedmgr/test/samples/StageManualTestSuite/hvigorfile.js diff --git a/services/dtbschedmgr/test/samples/StageManualTestSuite/package.json b/services/dtbschedmgr/test/samples/StageManualTestSuite/package.json new file mode 100644 index 0000000..6ca8f9f --- /dev/null +++ b/services/dtbschedmgr/test/samples/StageManualTestSuite/package.json @@ -0,0 +1,17 @@ +{ + "name": "stagemanualtestsuite", + "version": "1.0.0", + "ohos": { + "org": "ohos", + "buildTool": "hvigor", + "directoryLevel": "project" + }, + "description": "example description", + "repository": {}, + "license": "ISC", + "dependencies": { + "@ohos/hypium": "1.0.1", + "@ohos/hvigor": "1.1.6", + "@ohos/hvigor-ohos-plugin": "1.1.6" + } + } \ No newline at end of file diff --git a/services/dtbschedmgr/test/samples/StageManualTestSuite/screenshots/ConnectServiceExtensionAbility.png b/services/dtbschedmgr/test/samples/StageManualTestSuite/screenshots/ConnectServiceExtensionAbility.png new file mode 100644 index 0000000..81ccc2b Binary files /dev/null and b/services/dtbschedmgr/test/samples/StageManualTestSuite/screenshots/ConnectServiceExtensionAbility.png differ diff --git a/services/dtbschedmgr/test/samples/StageManualTestSuite/screenshots/MainPage.png b/services/dtbschedmgr/test/samples/StageManualTestSuite/screenshots/MainPage.png new file mode 100644 index 0000000..72285d7 Binary files /dev/null and b/services/dtbschedmgr/test/samples/StageManualTestSuite/screenshots/MainPage.png differ