!5331 【dsoftbus】【配置文件修改】

Merge pull request !5331 from 杨启博/master

communication/BUILD.gn

@@ -21,6 +21,7 @@ group("communication") {
       "bluetooth_profile:ActsBluetoothProFileJsTest",
       "bluetooth_standard:ActsBluetoothJsTest",
       "dsoftbus/rpc:ActsRpcJsTest",
+      "dsoftbus/rpc_server:ActsRpcJsServer",
       "wifi_p2p:ActsP2PJSTest",
       "wifi_standard:ActsWifiJSTest",
     ]

communication/dsoftbus/BUILD.gn

-# 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.
-
-import("//build/ohos_var.gni")
-group("communication") {
-  testonly = true
-  if (is_standard_system) {
-    deps = [
-      "bluetooth_ble:ActsBluetoothBleJsTest",
-      "bluetooth_on:ActsBluetoothOnJsTest",
-      "bluetooth_profile:ActsBluetoothProFileJsTest",
-      "bluetooth_standard:ActsBluetoothJsTest",
-      "dsoftbus/rpc:ActsRpcJsTest",
-      "dsoftbus/rpc_server:ActsRpcJsServer",
-      "wifi_p2p:ActsP2PJSTest",
-      "wifi_standard:ActsWifiJSTest",
-    ]
-  } else {
-    deps = [ "wifi_standard:ActsWifiJSTest" ]
-  }
-}

communication/dsoftbus/rpc/Test.json

@@ -13,7 +13,7 @@
         {
             "test-file-name": [
                 "ActsRpcHapTest.hap",
-                "./resource/dsoftbus/ipcserver/entry-release-standard-signed.hap"
+                "./testcases/ActsRpcHapServer.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

communication/dsoftbus/rpc_server/src/main/config.json

-{
-  "app": {
-    "bundleName": "ohos.rpc.test.server",
-    "vendor": "rpc",
-    "version": {
-      "code": 1000000,
-      "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 7,
-      "target": 8
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "reqPermissions": [
-      {
-        "name": "ohos.permission.DISTRIBUTED_DATASYNC"
-      },
-      {
-        "name": "ohos.permission.GET_DISTRIBUTED_DEVICE_INFO"
-      },
-      {
-        "name": "ohos.permission.GET_BUNDLE_INFO"
-      }
-    ],
-    "package": "ohos.rpc.test.server",
-    "name": ".MyApplication",
-    "mainAbility": ".MainAbility",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "orientation": "unspecified",
-        "visible": true,
-        "srcPath": "MainAbility",
-        "name": ".MainAbility",
-        "srcLanguage": "js",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "formsEnabled": false,
-        "label": "$string:entry_MainAbility",
-        "type": "page",
-        "launchType": "standard"
-      },
-      {
-        "srcPath": "ServiceAbility",
-        "name": ".ServiceAbility",
-        "icon": "$media:icon",
-        "srcLanguage": "js",
-
-        "description": "$string:serviceability_description",
-        "type": "service",
-        "visible": true,
-        "formsEnabled": false
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index",
-          "pages/second/second"
-        ],
-        "name": ".MainAbility",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ]
-  }
+{
+  "app": {
+    "bundleName": "ohos.rpc.test.server",
+    "vendor": "rpc",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    },
+    "apiVersion": {
+      "compatible": 7,
+      "target": 8
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "reqPermissions": [
+      {
+        "name": "ohos.permission.DISTRIBUTED_DATASYNC"
+      },
+      {
+        "name": "ohos.permission.GET_DISTRIBUTED_DEVICE_INFO"
+      },
+      {
+        "name": "ohos.permission.GET_BUNDLE_INFO"
+      }
+    ],
+    "package": "ohos.rpc.test.server",
+    "name": ".MyApplication",
+    "mainAbility": ".MainAbility",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": false
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "orientation": "unspecified",
+        "visible": true,
+        "srcPath": "MainAbility",
+        "name": ".MainAbility",
+        "srcLanguage": "js",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "formsEnabled": false,
+        "label": "$string:entry_MainAbility",
+        "type": "page",
+        "launchType": "standard"
+      },
+      {
+        "srcPath": "ServiceAbility",
+        "name": ".ServiceAbility",
+        "icon": "$media:icon",
+        "srcLanguage": "js",
+
+        "description": "$string:serviceability_description",
+        "type": "service",
+        "visible": true,
+        "formsEnabled": false
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index",
+          "pages/second/second"
+        ],
+        "name": ".MainAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
 }
\ No newline at end of file

communication/dsoftbus/rpc_server/src/main/js/MainAbility/pages/index/index.js

@@ -14,30 +14,19 @@
  */
 
 import router from '@system.router'
-import featureAbility from '@ohos.ability.featureAbility';
 
 export default {
     data: {
         title: ""
     },
-
     onInit() {
-        this.grantPermission();
+        this.title = this.$t('strings.world');
     },
     onclick: function () {
         router.replace({
             uri: "pages/second/second"
         })
-    },
-    grantPermission() {
-        console.info('Calc[IndexPage] grantPermission')
-        let context = featureAbility.getContext()
-        context.requestPermissionsFromUser(['ohos.permission.DISTRIBUTED_DATASYNC'], 666, function (result) {
-            console.info('Calc[IndexPage] grantPermission,requestPermissionsFromUser,'+result.requestCode)
-
-        })
-    },
-
+    }
 }
 
 

communication/dsoftbus/rpc_server/src/main/resources/Test.json:Zone.Identifier

-/*
- * Copyright (c) 2021 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.
- */
- 
-[ZoneTransfer]
-ZoneId=1
-ReferrerUrl=vscode-file://vscode-app/d:/Microsoft%20VS%20Code/resources/app/out/vs/code/electron-browser/workbench/workbench.html
-HostUrl=file:///z%3A/home/yqb/openharmony/master/test/xts/acts/communication/dsoftbus/rpc_server/Test.json

communication/dsoftbus/rpc_server/src/main/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "entry_MainAbility",
-      "value": "RpcServer"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Empty Ability"
-    },
-    {
-      "name": "serviceability_description",
-      "value": "hap sample empty service"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "entry_MainAbility",
+      "value": "RpcServer"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Empty Ability"
+    },
+    {
+      "name": "serviceability_description",
+      "value": "hap sample empty service"
+    }
+  ]
 }
\ No newline at end of file