Add tls On Off

Signed-off-by: NYangys <yangyousheng@huawei.com>
Change-Id: I85ca8155dad1fc7e4c88145d9d3d7a63002c247f

zh-cn/application-dev/connectivity/http-request.md

@@ -158,7 +158,6 @@ httpRequest.request2(
     httpRequest.destroy();
   }
 );
-
 ```
 
 ## 相关实例

zh-cn/application-dev/connectivity/net-connection-manager.md

@@ -81,7 +81,7 @@
 6. 当不使用该网络时，可以调用该对象的unregister()方法，取消订阅。
 
 ```js
-   // 引入包名
+// 引入包名
 import connection from '@ohos.net.connection'
 
 let netCap = {
@@ -128,7 +128,7 @@ conn.unregister((err, data) => {
 2. 调用getAllNets方法，获取所有处于连接状态的网络列表。
 
 ```js
-   // 引入包名
+// 引入包名
 import connection from '@ohos.net.connection'
 
 // 获取所有处于连接状态的网络列表
@@ -154,7 +154,7 @@ connection.getAllNets((err, data) => {
 4. 调用getConnectionProperties方法，获取NetHandle对应网络的连接信息。
 
 ```js
-   // 引入包名
+// 引入包名
 import connection from '@ohos.net.connection'
 
 // 调用getDefaultNet方法，获取默认的数据网络(NetHandle)

zh-cn/application-dev/connectivity/net-ethernet.md

@@ -44,7 +44,7 @@
 5. 用户态通过getIfaceConfig方法，来获取指定网口“eth0”的网络属性，未设置过的以太网络默认为DHCP模式，获取自动分配的网络属性。
 
 ```js
-   // 从@ohos.net.ethernet中导入ethernet命名空间
+// 从@ohos.net.ethernet中导入ethernet命名空间
 import ethernet from '@ohos.net.ethernet'
 
 // getAllActiveIfaces获取所有活动的网络设备名称
@@ -96,7 +96,7 @@ ethernet.getIfaceConfig("eth0", (error, data) => {
 6. 用户态通过getIfaceConfig方法，来获取指定网口“eth0”的静态网络属性。
 
 ```js
-   // 从@ohos.net.ethernet中导入ethernet命名空间
+// 从@ohos.net.ethernet中导入ethernet命名空间
 import ethernet from '@ohos.net.ethernet'
 
 // getAllActiveIfaces获取所有活动的网络设备名称
@@ -158,7 +158,7 @@ ethernet.getIfaceConfig("eth0", (error, data) => {
 4. 调用该对象的off()方法，取消订阅interfaceStateChange事件。
 
 ```js
-   // 从@ohos.net.ethernet中导入ethernet命名空间
+// 从@ohos.net.ethernet中导入ethernet命名空间
 import ethernet from '@ohos.net.ethernet'
 
 // 订阅interfaceStateChange事件

zh-cn/application-dev/connectivity/net-sharing.md

@@ -60,7 +60,7 @@
 4. 接收到共享状态开启的回调，开启共享成功。
 
 ```js
-   // 从@ohos.net.sharing中导入sharing命名空间
+// 从@ohos.net.sharing中导入sharing命名空间
 import sharing from '@ohos.net.sharing'
 
 // 注册监听共享状态的改变
@@ -85,7 +85,7 @@ sharing.startSharing(sharing.SharingIfaceType.SHARING_WIFI, (error) => {
 4. 接收到共享状态关闭的回调，停止共享成功。
 
 ```js
-   // 从@ohos.net.sharing中导入sharing命名空间
+// 从@ohos.net.sharing中导入sharing命名空间
 import sharing from '@ohos.net.sharing'
 
 // 注册监听共享状态的改变
@@ -110,7 +110,7 @@ sharing.stopSharing(sharing.SharingIfaceType.SHARING_WIFI, (error) => {
 4. 调用stopSharing方法，来停止指定类型共享，共享网络数据量清零。
 
 ```js
-   // 从@ohos.net.sharing中导入sharing命名空间
+// 从@ohos.net.sharing中导入sharing命名空间
 import sharing from '@ohos.net.sharing'
 
 // 调用startSharing方法，来开启指定类型共享

zh-cn/application-dev/connectivity/socket-connection.md

@@ -87,37 +87,37 @@ UDP与TCP流程大体类似，下面以TCP为例：
 
 7. Socket连接使用完毕后，主动关闭。
 
-   ```js
-   import socket from '@ohos.net.socket'
+```js
+import socket from '@ohos.net.socket'
 
-   // 创建一个TCPSocket连接，返回一个TCPSocket对象。
-   let tcp = socket.constructTCPSocketInstance();
+// 创建一个TCPSocket连接，返回一个TCPSocket对象。
+let tcp = socket.constructTCPSocketInstance();
 
-   // 订阅TCPSocket相关的订阅事件
-   tcp.on('message', value => {
+// 订阅TCPSocket相关的订阅事件
+tcp.on('message', value => {
   console.log("on message")
   let buffer = value.message
   let dataView = new DataView(buffer)
   let str = ""
-       for (let i = 0;i < dataView.byteLength; ++i) {
+  for (let i = 0; i < dataView.byteLength; ++i) {
     str += String.fromCharCode(dataView.getUint8(i))
   }
   console.log("on connect received:" + str)
-   });
-   tcp.on('connect', () => {
+});
+tcp.on('connect', () => {
   console.log("on connect")
-   });
-   tcp.on('close', () => {
+});
+tcp.on('close', () => {
   console.log("on close")
-   });
+});
 
-   // 绑定本地IP地址和端口。
-   let bindAddress = {
+// 绑定本地IP地址和端口。
+let bindAddress = {
   address: '192.168.xx.xx',
   port: 1234, // 绑定端口，如1234
   family: 1
-   };
-   tcp.bind(bindAddress, err => {
+};
+tcp.bind(bindAddress, err => {
   if (err) {
     console.log('bind fail');
     return;
@@ -150,18 +150,18 @@ UDP与TCP流程大体类似，下面以TCP为例：
       console.log('send success');
     })
   });
-   });
+});
 
-   // 连接使用完毕后，主动关闭。取消相关事件的订阅。
-   setTimeout(() => {
+// 连接使用完毕后，主动关闭。取消相关事件的订阅。
+setTimeout(() => {
   tcp.close((err) => {
     console.log('close socket.')
   });
   tcp.off('message');
   tcp.off('connect');
   tcp.off('close');
-   }, 30 * 1000);
-   ```
+}, 30 * 1000);
+```
 
 ## 应用通过TLS Socket进行加密数据传输
 
@@ -184,7 +184,7 @@ UDP与TCP流程大体类似，下面以TCP为例：
 7. TLSSocket连接使用完毕后，主动关闭。
 
 ```js
-   import socket from '@ohos.net.socket'
+import socket from '@ohos.net.socket'
 
 // 创建一个（双向认证）TLS Socket连接，返回一个TLS Socket对象。
 let tlsTwoWay = socket.constructTLSSocketInstance();
@@ -208,7 +208,7 @@ tlsTwoWay.on('close', () => {
 });
 
 // 绑定本地IP地址和端口。
-tlsTwoWay.bind({address: '192.168.xxx.xxx', port: xxxx, family: 1}, err => {
+tlsTwoWay.bind({ address: '192.168.xxx.xxx', port: xxxx, family: 1 }, err => {
   if (err) {
     console.log('bind fail');
     return;
@@ -280,7 +280,7 @@ tlsTwoWay.on('close', () => {
 });
 
 // 绑定本地IP地址和端口。
-tlsOneWay.bind({address: '192.168.xxx.xxx', port: xxxx, family: 1}, err => {
+tlsOneWay.bind({ address: '192.168.xxx.xxx', port: xxxx, family: 1 }, err => {
   if (err) {
     console.log('bind fail');
     return;

zh-cn/application-dev/connectivity/websocket-connection.md

@@ -37,12 +37,12 @@ WebSocket连接功能主要由webSocket模块提供。使用该功能需要申
 
 5. 使用完WebSocket连接之后，主动断开连接。
 
-   ```js
-   import webSocket from '@ohos.net.webSocket';
+```js
+import webSocket from '@ohos.net.webSocket';
 
-   var defaultIpAddress = "ws://";
-   let ws = webSocket.createWebSocket();
-   ws.on('open', (err, value) => {
+var defaultIpAddress = "ws://";
+let ws = webSocket.createWebSocket();
+ws.on('open', (err, value) => {
   console.log("on open, status:" + JSON.stringify(value));
   // 当收到on('open')事件时，可以通过send()方法与服务器进行通信
   ws.send("Hello, server!", (err, value) => {
@@ -52,8 +52,8 @@ WebSocket连接功能主要由webSocket模块提供。使用该功能需要申
       console.log("Failed to send the message. Err:" + JSON.stringify(err));
     }
   });
-   });
-   ws.on('message', (err, value) => {
+});
+ws.on('message', (err, value) => {
   console.log("on message, message:" + value);
   // 当收到服务器的`bye`消息时（此消息字段仅为示意，具体字段需要与服务器协商），主动断开连接
   if (value === 'bye') {
@@ -65,21 +65,21 @@ WebSocket连接功能主要由webSocket模块提供。使用该功能需要申
       }
     });
   }
-   });
-   ws.on('close', (err, value) => {
+});
+ws.on('close', (err, value) => {
   console.log("on close, code is " + value.code + ", reason is " + value.reason);
-   });
-   ws.on('error', (err) => {
+});
+ws.on('error', (err) => {
   console.log("on error, error:" + JSON.stringify(err));
-   });
-   ws.connect(defaultIpAddress, (err, value) => {
+});
+ws.connect(defaultIpAddress, (err, value) => {
   if (!err) {
     console.log("Connected successfully");
   } else {
     console.log("Connection failed. Err:" + JSON.stringify(err));
   }
-   });
-   ```
+});
+```
 
 ## 相关实例
 

zh-cn/application-dev/reference/apis/js-apis-net-ethernet.md

@@ -416,7 +416,7 @@ on(type: 'interfaceStateChange', callback: Callback\<{ iface: string, active: bo
 **示例：**
 
 ```js
- ethernet.on('interfaceStateChange', (data) => {
+ethernet.on('interfaceStateChange', (data) => {
   console.log('on interfaceSharingStateChange：' + JSON.stringify(data));
 });
 ```

zh-cn/application-dev/reference/apis/js-apis-net-policy.md

@@ -12,9 +12,9 @@
 import policy from '@ohos.net.policy'
 ```
 
-## policy.setBackgroundPolicy
+## policy.setBackgroundAllowed
 
-setBackgroundPolicy(isAllowed: boolean, callback: AsyncCallback\<void>): void
+setBackgroundAllowed(isAllowed: boolean, callback: AsyncCallback\<void>): void
 
 设置后台网络策略，使用callback方式作为异步方法。
 
@@ -42,18 +42,15 @@ setBackgroundPolicy(isAllowed: boolean, callback: AsyncCallback\<void>): void
 **示例：**
 
 ```js
-policy.setBackgroundPolicy(Boolean(Number.parseInt(this.isBoolean))), (error, data) => {
-  this.callBack(error, data);
+policy.setBackgroundAllowed(Boolean(Number.parseInt(this.isBoolean)), (error) => {
   console.log(JSON.stringify(error))
-  console.log(JSON.stringify(data))
-}
-)
+})
 ;
 ```
 
-## policy.setBackgroundPolicy
+## policy.setBackgroundAllowed
 
-setBackgroundPolicy(isAllowed: boolean): Promise\<void>
+setBackgroundAllowed(isAllowed: boolean): Promise\<void>
 
 设置后台网络策略，使用Promise方式作为异步方法。
 
@@ -86,9 +83,8 @@ setBackgroundPolicy(isAllowed: boolean): Promise\<void>
 **示例：**
 
 ```js
-policy.setBackgroundPolicy(Boolean(Number.parseInt(this.isBoolean))).then(function (error, data) {
+policy.setBackgroundAllowed(Boolean(Number.parseInt(this.isBoolean))).then(function (error) {
   console.log(JSON.stringify(error))
-  console.log(JSON.stringify(data))
 })
 ```
 
@@ -157,7 +153,6 @@ policy.isBackgroundAllowed().then(function (error, data) {
   console.log(JSON.stringify(error))
   console.log(JSON.stringify(data))
 })
-
 ```
 
 ## policy.setPolicyByUid
@@ -194,8 +189,8 @@ setPolicyByUid(uid: number, policy: NetUidPolicy, callback: AsyncCallback\<void>
 let param = {
   uid: Number.parseInt(this.firstParam), policy: Number.parseInt(this.currentNetUidPolicy)
 }
-policy.setPolicyByUid(Number.parseInt(this.firstParam), Number.parseInt(this.currentNetUidPolicy), (error, data) => {
-  this.callBack(error, data);
+policy.setPolicyByUid(Number.parseInt(this.firstParam), Number.parseInt(this.currentNetUidPolicy), (error) => {
+  this.callBack(error);
 });
 ```
 
@@ -238,11 +233,9 @@ setPolicyByUid(uid: number, policy: NetUidPolicy): Promise\<void>;
 let param = {
   uid: Number.parseInt(this.firstParam), policy: Number.parseInt(this.currentNetUidPolicy)
 }
-policy.setPolicyByUid(Number.parseInt(this.firstParam), Number.parseInt(this.currentNetUidPolicy)).then(function (error, data) {
+policy.setPolicyByUid(Number.parseInt(this.firstParam), Number.parseInt(this.currentNetUidPolicy)).then(function (error) {
   console.log(JSON.stringify(error))
-  console.log(JSON.stringify(data))
 })
-
 ```
 
 ## policy.getPolicyByUid
@@ -319,7 +312,6 @@ policy.getPolicyByUid(Number.parseInt(this.firstParam)).then(function (error, da
   console.log(JSON.stringify(error))
   console.log(JSON.stringify(data))
 })
-
 ```
 
 ## policy.getUidsByPolicy
@@ -396,7 +388,6 @@ policy.getUidsByPolicy(Number.parseInt(this.firstParam)).then(function (error, d
   console.log(JSON.stringify(error))
   console.log(JSON.stringify(data))
 })
-
 ```
 
 ## policy.getNetQuotaPolicies
@@ -509,8 +500,8 @@ let param = {
 };
 this.netQuotaPolicyList.push(param);
 
-policy.setNetQuotaPolicies(this.netQuotaPolicyList, (error, data) => {
-  this.callBack(error, data);
+policy.setNetQuotaPolicies(this.netQuotaPolicyList, (error) => {
+  console.log(JSON.stringify(error))
 });
 ```
 
@@ -563,9 +554,8 @@ let param = {
 };
 this.netQuotaPolicyList.push(param);
 
-policy.setNetQuotaPolicies(this.netQuotaPolicyList).then(function (error, data) {
+policy.setNetQuotaPolicies(this.netQuotaPolicyList).then(function (error) {
   console.log(JSON.stringify(error))
-  console.log(JSON.stringify(data))
 })
 ```
 
@@ -600,8 +590,8 @@ restoreAllPolicies(iccid: string, callback: AsyncCallback\<void>): void
 
 ```js
 this.firstParam = iccid;
-policy.restoreAllPolicies(this.firstParam, (error, data) => {
-  this.callBack(error, data);
+policy.restoreAllPolicies(this.firstParam, (error) => {
+  console.log(JSON.stringify(error))
 });
 ```
 
@@ -641,11 +631,9 @@ restoreAllPolicies(iccid: string): Promise\<void>;
 
 ```js
 this.firstParam = iccid;
-policy.restoreAllPolicies(this.firstParam).then(function (error, data) {
+policy.restoreAllPolicies(this.firstParam).then(function (error) {
   console.log(JSON.stringify(error))
-  console.log(JSON.stringify(data))
 })
-
 ```
 
 ## policy.isUidNetAllowed
@@ -679,7 +667,6 @@ isUidNetAllowed(uid: number, isMetered: boolean, callback: AsyncCallback\<boolea
 **示例：**
 
 ```js
-
 let param = {
   uid: Number.parseInt(this.firstParam), isMetered: Boolean(Number.parseInt(this.isBoolean))
 }
@@ -724,7 +711,6 @@ isUidNetAllowed(uid: number, isMetered: boolean): Promise\<boolean>;
 **示例：**
 
 ```js
-
 let param = {
   uid: Number.parseInt(this.firstParam), isMetered: Boolean(Number.parseInt(this.isBoolean))
 }
@@ -732,7 +718,6 @@ policy.isUidNetAllowed(Number.parseInt(this.firstParam), Boolean(Number.parseInt
   console.log(JSON.stringify(error))
   console.log(JSON.stringify(data))
 })
-
 ```
 
 ## policy.isUidNetAllowed
@@ -766,7 +751,6 @@ isUidNetAllowed(uid: number, iface: string, callback: AsyncCallback\<boolean>):
 **示例：**
 
 ```js
-
 let param = {
   uid: Number.parseInt(this.firstParam), iface: this.secondParam
 }
@@ -818,7 +802,6 @@ policy.isUidNetAllowed(Number.parseInt(this.firstParam), this.secondParam).then(
   console.log(JSON.stringify(error))
   console.log(JSON.stringify(data))
 })
-
 ```
 
 ## policy.setDeviceIdleAllowList
@@ -855,8 +838,8 @@ setDeviceIdleAllowList(uid: number, isAllowed: boolean, callback: AsyncCallback\
 let param = {
   uid: Number.parseInt(this.firstParam), isAllowed: Boolean(Number.parseInt(this.isBoolean))
 }
-policy.setDeviceIdleAllowList(Number.parseInt(this.firstParam), Boolean(Number.parseInt(this.isBoolean)), (error, data) => {
-  this.callBack(error, data);
+policy.setDeviceIdleAllowList(Number.parseInt(this.firstParam), Boolean(Number.parseInt(this.isBoolean)), (error) => {
+  console.log(JSON.stringify(error))
 });
 ```
 
@@ -899,11 +882,9 @@ setDeviceIdleAllowList(uid: number, isAllowed: boolean): Promise\<void>;
 let param = {
   uid: Number.parseInt(this.firstParam), isAllowed: Boolean(Number.parseInt(this.isBoolean))
 }
-policy.setDeviceIdleAllowList(Number.parseInt(this.firstParam), Boolean(Number.parseInt(this.isBoolean))).then(function (error, data) {
+policy.setDeviceIdleAllowList(Number.parseInt(this.firstParam), Boolean(Number.parseInt(this.isBoolean))).then(function (error) {
   console.log(JSON.stringify(error))
-  console.log(JSON.stringify(data))
 })
-
 ```
 
 ## policy.getDeviceIdleAllowList
@@ -1080,8 +1061,8 @@ resetPolicies(iccid: string, callback: AsyncCallback\<void>): void
 
 ```js
 this.firstParam = iccid
-policy.resetPolicies(this.firstParam, (error, data) => {
-  this.callBack(error, data);
+policy.resetPolicies(this.firstParam, (error) => {
+  console.log(JSON.stringify(error))
 });
 ```
 
@@ -1124,11 +1105,9 @@ policy.getUidsByPolicy(Number.parseInt(this.firstParam)).then(function (error, d
 
 })
 this.firstParam = iccid
-policy.resetPolicies(this.firstParam).then(function (error, data) {
+policy.resetPolicies(this.firstParam).then(function (error) {
   console.log(JSON.stringify(error))
-  console.log(JSON.stringify(data))
 })
-
 ```
 
 ## policy.updateRemindPolicy
@@ -1166,8 +1145,8 @@ updateRemindPolicy(netType: NetBearType, iccid: string, remindType: RemindType,
 let param = {
   netType: Number.parseInt(this.netType), iccid: this.firstParam, remindType: this.currentRemindType
 }
-policy.updateRemindPolicy(Number.parseInt(this.netType), this.firstParam, Number.parseInt(this.currentRemindType), (error, data) => {
-  this.callBack(error, data);
+policy.updateRemindPolicy(Number.parseInt(this.netType), this.firstParam, Number.parseInt(this.currentRemindType), (error) => {
+  console.log(JSON.stringify(error))
 });
 ```
 
@@ -1211,11 +1190,9 @@ updateRemindPolicy(netType: NetBearType, iccid: string, remindType: RemindType):
 let param = {
   netType: Number.parseInt(this.netType), iccid: this.firstParam, remindType: this.currentRemindType
 }
-policy.updateRemindPolicy(Number.parseInt(this.netType), this.firstParam, Number.parseInt(this.currentRemindType)).then(function (error, data) {
+policy.updateRemindPolicy(Number.parseInt(this.netType), this.firstParam, Number.parseInt(this.currentRemindType)).then(function (error) {
   console.log(JSON.stringify(error))
-  console.log(JSON.stringify(data))
 })
-
 ```
 
 ## policy.setPowerSaveAllowList
@@ -1252,8 +1229,8 @@ setPowerSaveAllowList(uid: number, isAllowed: boolean, callback: AsyncCallback\<
 let param = {
   uid: Number.parseInt(this.firstParam), isAllowed: Boolean(Number.parseInt(this.isBoolean))
 }
-policy.setPowerSaveAllowList(Number.parseInt(this.firstParam), Boolean(Number.parseInt(this.isBoolean)), (error, data) => {
-  this.callBack(error, data);
+policy.setPowerSaveAllowList(Number.parseInt(this.firstParam), Boolean(Number.parseInt(this.isBoolean)), (error) => {
+  console.log(JSON.stringify(error))
 });
 ```
 
@@ -1296,11 +1273,9 @@ setPowerSaveAllowList(uid: number, isAllowed: boolean): Promise\<void>;
 let param = {
   uid: Number.parseInt(this.firstParam), isAllowed: Boolean(Number.parseInt(this.isBoolean))
 }
-policy.setPowerSaveAllowList(Number.parseInt(this.firstParam), Boolean(Number.parseInt(this.isBoolean))).then(function (error, data) {
+policy.setPowerSaveAllowList(Number.parseInt(this.firstParam), Boolean(Number.parseInt(this.isBoolean))).then(function (error) {
   console.log(JSON.stringify(error))
-  console.log(JSON.stringify(data))
 })
-
 ```
 
 ## policy.getPowerSaveAllowList
@@ -1393,7 +1368,7 @@ on(type: "netUidPolicyChange", callback: Callback\<{ uid: number, policy: NetUid
 
 ```js
 policy.on('netUidPolicyChange', (data) => {
-  this.log('on netUidPolicyChange：' + JSON.stringify(data));
+  this.log('on netUidPolicyChange: ' + JSON.stringify(data));
 })
 ```
 
@@ -1418,7 +1393,7 @@ on(type: "netUidRuleChange", callback: Callback\<{ uid: number, rule: NetUidRule
 
 ```js
 policy.on('netUidRuleChange', (data) => {
-  this.log('on netUidRuleChange：' + JSON.stringify(data));
+  this.log('on netUidRuleChange: ' + JSON.stringify(data));
 })
 ```
 
@@ -1443,7 +1418,7 @@ on(type: "netMeteredIfacesChange", callback: Callback\<Array\<string>>): void
 
 ```js
 policy.on('netMeteredIfacesChange', (data) => {
-  this.log('on netMeteredIfacesChange：' + JSON.stringify(data));
+  this.log('on netMeteredIfacesChange: ' + JSON.stringify(data));
 })
 ```
 
@@ -1468,7 +1443,7 @@ on(type: "netQuotaPolicyChange", callback: Callback\<Array\<NetQuotaPolicy>>): v
 
 ```js
 policy.on('netQuotaPolicyChange', (data) => {
-  this.log('on netQuotaPolicyChange：' + JSON.stringify(data));
+  this.log('on netQuotaPolicyChange: ' + JSON.stringify(data));
 })
 ```
 
@@ -1493,7 +1468,7 @@ on(type: "netBackgroundPolicyChange", callback: Callback\<boolean>): void
 
 ```js
 policy.on('netBackgroundPolicyChange', (data) => {
-  this.log('on netBackgroundPolicyChange：' + JSON.stringify(data));
+  this.log('on netBackgroundPolicyChange: ' + JSON.stringify(data));
 })
 ```