From 263cd4361b4ae2d850d2ad547731c1392e37f622 Mon Sep 17 00:00:00 2001
From: wangdantong <wangdantong@huawei.com>
Date: Mon, 22 May 2023 09:33:54 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9xml=E4=B8=BAjson=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangdantong <wangdantong@huawei.com>
Change-Id: I2e99aaa0714cd601229c8f3f936c9afabebced9d
---
 sa_profile/4807.json   | 12 ++++++++++++
 sa_profile/4807.xml    | 27 ---------------------------
 sa_profile/4808.json   | 12 ++++++++++++
 sa_profile/4808.xml    | 27 ---------------------------
 sa_profile/BUILD.gn    |  4 ++--
 sa_profile/dscreen.cfg |  2 +-
 6 files changed, 27 insertions(+), 57 deletions(-)
 create mode 100644 sa_profile/4807.json
 delete mode 100644 sa_profile/4807.xml
 create mode 100644 sa_profile/4808.json
 delete mode 100644 sa_profile/4808.xml

diff --git a/sa_profile/4807.json b/sa_profile/4807.json
new file mode 100644
index 00000000..2a21c7b7
--- /dev/null
+++ b/sa_profile/4807.json
@@ -0,0 +1,12 @@
+{
+    "process": "dscreen",
+    "systemability": [
+        {
+            "name": 4807,
+            "libpath": "libdistributed_screen_source.z.so",
+            "run-on-create": false,
+            "distributed": true,
+            "dump_level": 1
+        }
+    ]
+}
\ No newline at end of file
diff --git a/sa_profile/4807.xml b/sa_profile/4807.xml
deleted file mode 100644
index 6cc4818f..00000000
--- a/sa_profile/4807.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * 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.
- -->
-<info>
-    <process>dscreen</process>
-    <systemability> <!-- Declare a sytem ability and its profile -->
-        <name>4807</name> <!-- Declare the name of system ability -->
-        <libpath>libdistributed_screen_source.z.so</libpath> <!-- Declare the path of .so file which includes the system ability; Note: 1 .so file can have 1 to N system abilities. -->
-        <!--<depend></depend> --> <!-- Declare the name of system abilities which the system ability depends on, using ";" as separator among names. If there are dependencies, it needs to check if all those dependencies are avliable in service manager before starting the system ability. -->
-        <!--<depend-time-out></depend-time-out> --> <!-- Check all dependencies are avaliable before the timeout period ended. The MAX_DEPENDENCY_TIMEOUT is 60s. -->
-        <run-on-create>false</run-on-create> <!-- "true" means the system ability would start imediately, "false" means the system ability would start on demand. -->
-        <distributed>true</distributed> <!-- "true" means the system ability supports distributed scheduling while "false" is not. -->
-        <dump-level>1</dump-level> <!-- Declare the dump level. 1-high; 2-media; 3-low -->
-    </systemability>
-</info>
diff --git a/sa_profile/4808.json b/sa_profile/4808.json
new file mode 100644
index 00000000..2eef84d5
--- /dev/null
+++ b/sa_profile/4808.json
@@ -0,0 +1,12 @@
+{
+    "process": "dscreen",
+    "systemability": [
+        {
+            "name": 4808,
+            "libpath": "libdistributed_screen_sink.z.so",
+            "run-on-create": false,
+            "distributed": true,
+            "dump_level": 1
+        }
+    ]
+}
\ No newline at end of file
diff --git a/sa_profile/4808.xml b/sa_profile/4808.xml
deleted file mode 100644
index 6b164795..00000000
--- a/sa_profile/4808.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * 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.
- -->
-<info>
-    <process>dscreen</process>
-    <systemability> <!-- Declare a sytem ability and its profile -->
-        <name>4808</name> <!-- Declare the name of system ability -->
-        <libpath>libdistributed_screen_sink.z.so</libpath> <!-- Declare the path of .so file which includes the system ability; Note: 1 .so file can have 1 to N system abilities. -->
-        <!--<depend></depend> --> <!-- Declare the name of system abilities which the system ability depends on, using ";" as separator among names. If there are dependencies, it needs to check if all those dependencies are avliable in service manager before starting the system ability. -->
-        <!--<depend-time-out></depend-time-out> --> <!-- Check all dependencies are avaliable before the timeout period ended. The MAX_DEPENDENCY_TIMEOUT is 60s. -->
-        <run-on-create>false</run-on-create> <!-- "true" means the system ability would start imediately, "false" means the system ability would start on demand. -->
-        <distributed>true</distributed> <!-- "true" means the system ability supports distributed scheduling while "false" is not. -->
-        <dump-level>1</dump-level> <!-- Declare the dump level. 1-high; 2-media; 3-low -->
-    </systemability>
-</info>
diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn
index 8d64abb9..3429c093 100644
--- a/sa_profile/BUILD.gn
+++ b/sa_profile/BUILD.gn
@@ -15,8 +15,8 @@ import("//build/ohos.gni")
 
 ohos_sa_profile("dscreen_sa_profile") {
   sources = [
-    "4807.xml",
-    "4808.xml",
+    "4807.json",
+    "4808.json",
   ]
 
   part_name = "distributed_screen"
diff --git a/sa_profile/dscreen.cfg b/sa_profile/dscreen.cfg
index c579659f..7403fad3 100644
--- a/sa_profile/dscreen.cfg
+++ b/sa_profile/dscreen.cfg
@@ -1,7 +1,7 @@
 {
     "services" : [{
         "name" : "dscreen",
-        "path" : ["/system/bin/sa_main", "/system/profile/dscreen.xml"],
+        "path" : ["/system/bin/sa_main", "/system/profile/dscreen.json"],
         "uid" : "dscreen",
         "gid" : ["dscreen"],
         "ondemand" : true,
-- 
Gitee