diff --git a/OAT.xml b/OAT.xml index df03b803c468eabd3b9ce50905bd9b77104b2940..c44c80974dafbb33b72de47ebba92f130c413368 100644 --- a/OAT.xml +++ b/OAT.xml @@ -67,6 +67,21 @@ Note:If the text contains special characters, please escape them according to th + + + + + + + + + + + + + + + diff --git a/common/include/dm_constants.h b/common/include/dm_constants.h index d145695d08b1b01e608d4393444cb14c1272d6a6..da6ea708c110a529d79d2bb50b5382e9be84b4a6 100755 --- a/common/include/dm_constants.h +++ b/common/include/dm_constants.h @@ -152,6 +152,7 @@ constexpr const char* DM_CAPABILITY_CASTPLUS = "castPlus"; constexpr const char* DM_CAPABILITY_VIRTUAL_LINK = "virtualLink"; constexpr const char* DM_CAPABILITY_SHARE = "share"; constexpr const char* DM_CAPABILITY_WEAR = "wear"; +constexpr const char* DM_CAPABILITY_OOP = "oop"; constexpr const char* DM_CREDENTIAL_TYPE = "CREDENTIAL_TYPE"; constexpr const char* DM_CREDENTIAL_REQJSONSTR = "CREDENTIAL_REQJSONSTR"; constexpr const char* DM_CREDENTIAL_RETURNJSONSTR = "CREDENTIAL_RETURNJSONSTR"; @@ -262,6 +263,11 @@ constexpr const char* PROCESS_NAME = "PROCESS_NAME"; constexpr const char* PARAM_CLOSE_SESSION_DELAY_SECONDS = "DM_CLOSE_SESSION_DELAY_SECONDS"; constexpr const char* DM_AUTHENTICATION_TYPE = "DM_AUTHENTICATION_TYPE"; +constexpr const char* PARAM_KEY_CONN_SESSIONTYPE = "connSessionType"; +constexpr const char* PARAM_KEY_HML_RELEASETIME = "hmlReleaseTime"; +constexpr const char* PARAM_KEY_HML_ENABLE_160M = "hmlEnable160M"; +constexpr const char* PARAM_KEY_HML_ACTIONID = "hmlActionId"; +const std::string CONN_SESSION_TYPE_HML = "HML"; // screen state constexpr int32_t DM_SCREEN_UNKNOWN = -1; constexpr int32_t DM_SCREEN_ON = 0; @@ -291,6 +297,8 @@ constexpr int32_t MAX_ICON_SIZE = 4 * 1024 * 1024; constexpr int32_t MAX_CONTAINER_SIZE = 500; // One year 365 * 24 * 60 * 60 constexpr int32_t MAX_ALWAYS_ALLOW_SECONDS = 31536000; + +const std::string PICKER_PROXY_SPLIT = "_pickerProxy_"; } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_DM_CONSTANTS_H \ No newline at end of file diff --git a/common/src/dm_anonymous.cpp b/common/src/dm_anonymous.cpp index 1ae4cd2b3d466c68f949c758166de3cdd1e36444..8241a39bf7f04123b7f0d8cca0df7712aa236b83 100644 --- a/common/src/dm_anonymous.cpp +++ b/common/src/dm_anonymous.cpp @@ -384,7 +384,7 @@ std::string GetSubStr(const std::string &rawStr, const std::string &separator, i while (end != std::string::npos) { strVec.push_back(rawStr.substr(start, end - start)); - start = end + 1; + start = end + separator.size(); end = rawStr.find(separator, start); } strVec.push_back(rawStr.substr(start)); diff --git a/common/src/ipc/standard/ipc_model_codec.cpp b/common/src/ipc/standard/ipc_model_codec.cpp index 0deff2a128b7837b838dccaafdbe8ef9fd357094..212b69c6933577ae5209034ba4a40f6c86f1bce7 100644 --- a/common/src/ipc/standard/ipc_model_codec.cpp +++ b/common/src/ipc/standard/ipc_model_codec.cpp @@ -42,6 +42,7 @@ void IpcModelCodec::DecodeDmDeviceBasicInfo(MessageParcel &parcel, DmDeviceBasic LOGE("strcpy_s networkId failed!"); return; } + devInfo.extraData = parcel.ReadString(); } bool IpcModelCodec::EncodePeerTargetId(const PeerTargetId &targetId, MessageParcel &parcel) diff --git a/display/@ohos.distributedDeviceManager.d.ts b/display/@ohos.distributedDeviceManager.d.ts index 22accf7a6a1036bb1accc4b8e1cf4126695a3c7b..0aaaafef602eb89b4dade19633e0f18a3f7ccef6 100644 --- a/display/@ohos.distributedDeviceManager.d.ts +++ b/display/@ohos.distributedDeviceManager.d.ts @@ -54,7 +54,7 @@ declare namespace distributedDeviceManager { * @syscap SystemCapability.DistributedHardware.DeviceManager * @since 10 */ - deviceType: number; + deviceType: string; /** * Device network id. @@ -62,6 +62,14 @@ declare namespace distributedDeviceManager { * @since 10 */ networkId?: string; + + /** + * Device extra data. + * @type { ?string } + * @syscap SystemCapability.DistributedHardware.DeviceManager + * @since 16 + */ + extraData?: string; } /** diff --git a/display/AppScope/app.json b/display/AppScope/app.json index d69b34263649f82eb9a775b4bb676db7a16b1b79..ab9abd1592e89274f18d20bef9f9e9dad56447ee 100644 --- a/display/AppScope/app.json +++ b/display/AppScope/app.json @@ -2,8 +2,8 @@ "app": { "bundleName": "com.ohos.devicemanagerui", "vendor": "example", - "versionCode": 1000032, - "versionName": "1.0.32", + "versionCode": 1000033, + "versionName": "1.0.33", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 10, diff --git a/display/entry/src/main/ets/UIExtAbility/picker/DeviceSelectAbility.ets b/display/entry/src/main/ets/UIExtAbility/picker/DeviceSelectAbility.ets new file mode 100644 index 0000000000000000000000000000000000000000..472482bb224854526fd065c477b1ae603f95e4d0 --- /dev/null +++ b/display/entry/src/main/ets/UIExtAbility/picker/DeviceSelectAbility.ets @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2025 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 UIExtensionAbility from '@ohos.app.ability.UIExtensionAbility' +import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession' +import Want from '@ohos.app.ability.Want'; +const TAG = '[DeviceManagerUI:DeviceSelectAbility]==>'; + +export default class DeviceSelectAbility extends UIExtensionAbility { + onSessionCreate(want: Want, session: UIExtensionContentSession) { + console.log(TAG, `UIExtAbility onSessionCreate`) + if (want.parameters != undefined) { + if (want.parameters.title) { + AppStorage.setOrCreate('title', want.parameters.title); + } + if (want.parameters.customDescription) { + AppStorage.setOrCreate('customDescription', want.parameters.customDescription); + } + if (want.parameters.operation) { + AppStorage.setOrCreate('operation', want.parameters.operation); + } + if (want.parameters.bundleName) { + AppStorage.setOrCreate('bundleName', want.parameters.bundleName); + } + if (want.parameters.moduleName) { + AppStorage.setOrCreate('moduleName', want.parameters.moduleName); + } + if (want.parameters.abilityName) { + AppStorage.setOrCreate('abilityName', want.parameters.abilityName); + } + let callerBundleName: string = want.parameters?.['ohos.aafwk.param.callerBundleName'] as string; + AppStorage.setOrCreate('callerBundleName', callerBundleName); + } + let param: Record = { + 'session': session + } + let storage: LocalStorage = new LocalStorage(param); + session.loadContent('pages/picker/DeviceSelect', storage); + session.setWindowBackgroundColor('#00000000'); + let extensionHostWindow = session.getUIExtensionHostWindowProxy(); + extensionHostWindow.hideNonSecureWindows(true); + session.setWindowPrivacyMode(true); + AppStorage.setOrCreate('deviceSelectSession', session); + } + + onSessionDestroy(session: UIExtensionContentSession) { + let extensionHostWindow = session.getUIExtensionHostWindowProxy(); + extensionHostWindow.hideNonSecureWindows(false); + console.log(TAG, `UIExtAbility onSessionDestroy`) + } +} \ No newline at end of file diff --git a/display/entry/src/main/ets/pages/ConfirmDialog.ets b/display/entry/src/main/ets/pages/ConfirmDialog.ets index 598b966e375626a7bb6e1421f854b71090cd060a..a0cbedbf8abff340f02823fdb1fcba4600e8ab7f 100644 --- a/display/entry/src/main/ets/pages/ConfirmDialog.ets +++ b/display/entry/src/main/ets/pages/ConfirmDialog.ets @@ -53,6 +53,7 @@ struct ConfirmCustomDialog { this.peerDeviceName = AppStorage.get('deviceName') as string; console.log('peerDeviceName is ' + this.peerDeviceName); } + let customDescriptionStr: string = AppStorage.get('customDescriptionStr') as string; let hostPkgLabel: string = AppStorage.get('hostPkgLabel') as string; if (hostPkgLabel === CAST_PKG_NAME) { this.title = @@ -61,6 +62,9 @@ struct ConfirmCustomDialog { this.title = context.resourceManager.getStringSync($r('app.string.dm_confirm_title_hap').id, hostPkgLabel, this.peerDeviceName); this.peerCustomDescription = context.resourceManager.getStringSync($r('app.string.dm_confirm_intention').id); + if (customDescriptionStr != undefined && customDescriptionStr != '') { + this.peerCustomDescription = this.peerDeviceName + customDescriptionStr; + } } else { let titleFirst: string = context.resourceManager.getStringSync($r('app.string.dm_connect_device').id, this.peerDeviceName); @@ -68,7 +72,6 @@ struct ConfirmCustomDialog { context.resourceManager.getStringSync($r('app.string.dm_is_trust_device').id, titleFirst); this.peerCustomDescription = context.resourceManager.getStringSync($r('app.string.dm_confirm_intention').id); } - if (AppStorage.get('deviceType') != null) { this.peerDeviceType = AppStorage.get('deviceType') as number; console.log('peerDeviceType is ' + this.peerDeviceType); diff --git a/display/entry/src/main/ets/pages/InputPinDialog.ets b/display/entry/src/main/ets/pages/InputPinDialog.ets index 266b5cf4dcd7f918fab1d23e8faf2fc062932234..809925d46eddc2e3d88b1dce85fd0bbd3ed72ebb 100644 --- a/display/entry/src/main/ets/pages/InputPinDialog.ets +++ b/display/entry/src/main/ets/pages/InputPinDialog.ets @@ -40,6 +40,7 @@ struct InputCustomDialog { @State errorTips: Resource = $r('app.plural.dm_incorrect_code', this.isTimes, this.isTimes); @State errorTipsVisible: Visibility = Visibility.None; @State heightNum: number = 600; + @State landscapeHeightNum: number = 200; @State targetDeviceName: string = ''; @State model: string = MODEL_PIN; @State isPC: boolean = false; @@ -50,7 +51,7 @@ struct InputCustomDialog { onPortrait(mediaQueryResult: mediaquery.MediaQueryResult) { if (mediaQueryResult.matches as boolean) { - this.heightNum = 300; + this.heightNum = this.landscapeHeightNum; } else { this.heightNum = 800; } @@ -69,6 +70,9 @@ struct InputCustomDialog { ims.on('imeShow', (info: Array) => { this.scroller.scrollTo({yOffset: 72, xOffset: 0}); }); + if (AppStorage.get('mediaQueryResult') != null && AppStorage.get('mediaQueryResult') as boolean) { + this.heightNum = this.landscapeHeightNum; + } if (AppStorage.get('targetDeviceName') != null) { this.targetDeviceName = AppStorage.get('targetDeviceName') as string; console.log('targetDeviceName is ' + this.targetDeviceName); @@ -380,6 +384,7 @@ struct InputCustomDialog { @Entry @Component struct dialogPlusPage { + mediaqueryListener: mediaquery.MediaQueryListener = mediaquery.matchMediaSync('(orientation: landscape)'); dialogController: CustomDialogController = new CustomDialogController({ builder: InputCustomDialog(), autoCancel: false, @@ -389,8 +394,13 @@ struct dialogPlusPage { maskColor: $r('sys.color.ohos_id_color_mask_thin') }); + onPortrait(mediaQueryResult: mediaquery.MediaQueryResult) { + AppStorage.setOrCreate('mediaQueryResult', mediaQueryResult.matches as boolean); + } + aboutToAppear() { console.log(TAG + 'aboutToAppear aboutToAppear'); + this.mediaqueryListener.on('change', this.onPortrait.bind(this)); } aboutToDisappear() { diff --git a/display/entry/src/main/ets/pages/picker/DeviceSelect.ets b/display/entry/src/main/ets/pages/picker/DeviceSelect.ets new file mode 100644 index 0000000000000000000000000000000000000000..6b014010ed9f6daf84eff9e2051f333d7433bd9f --- /dev/null +++ b/display/entry/src/main/ets/pages/picker/DeviceSelect.ets @@ -0,0 +1,590 @@ +/* + * Copyright (c) 2025 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 distributedDeviceManager from '@ohos.distributedDeviceManager'; +import { AsyncCallback, BusinessError, Callback, ErrorCallback } from '@ohos.base'; +import abilityAccessCtrl, { Context } from '@ohos.abilityAccessCtrl'; +import promptAction from '@ohos.promptAction'; +import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession'; +import mediaquery from '@ohos.mediaquery'; +import deviceInfo from '@ohos.deviceInfo'; +import Constant from '../../common/constant'; +import accessibility from '@ohos.accessibility'; +import common from '@ohos.app.ability.common'; +let anmDuration: number = 800; +let TAG = '[DeviceManagerUI:DeviceSelect]==>'; + +enum StatusType { + Unbound = 0, + TrustBinding = 1, + Binding = 2 +} + +let customData: Record = { + 'operation': '', + 'object': '', + 'qResp': 1 +}; + +let discoverParam: Record = { + 'discoverTargetType': 1, + 'CUSTOM_DATA': JSON.stringify(customData), + 'DISC_CAPABILITY': '' +}; +let filterOptions: Record = { + 'availableStatus': 0 +}; + +class Data { + public status?: StatusType = StatusType.Unbound + public device: distributedDeviceManager.DeviceBasicInfo = { + deviceId: '', + deviceName: '', + deviceType: '', + networkId: '', + extraData: '', + }; +} + +class DeviceStateData { + public action: distributedDeviceManager.DeviceStateChange = 0; + public device: distributedDeviceManager.DeviceBasicInfo = { + deviceId: '', + deviceName: '', + deviceType: '', + networkId: '', + extraData: '', + }; +} + +class Device { + public device: distributedDeviceManager.DeviceBasicInfo = { + deviceId: '', + deviceName: '', + deviceType: '', + networkId: '', + extraData: '', + } +} + +class CustomData { + public operation: string = ''; + public object: string = ''; + public displayName: string = ''; + public policyCode: number = 0; + public actionId: number = 0; +} + +class ExtraData { + public CUSTOM_DATA: string = '' +} + +class DeviceCallBack { + public deviceId: string = ''; + public deviceName: string = ''; + public bundlename: string = ''; + public moudlename: string = ''; + public ablityname: string = ''; +} + +class BindTargetData { + public deviceId: string = ''; +} + +@Entry +@Component +export struct Index { + @State showPhone: Visibility = Visibility.Visible; + @State showFlag: Visibility = Visibility.Visible; + @State deviceSelectSession : UIExtensionContentSession | undefined = undefined; + @State isAutoCancel: boolean = false; + @State deviceList: Data[] = []; + @State trustDeviceList: Data[] = []; + @State centerX: number = 0; + @State centerY: number = 0; + @State radius: number = 0; + @State deviceStateStatus: number = -1; + @State currentDevice: Data | undefined = undefined; + @State title: string | Resource = ''; + @State operation: string = ''; + @State customDescription: string | Resource = ''; + @State bundleName: string = ''; + @State moduleName: string = ''; + @State abilityName: string = ''; + @State isLandscape: boolean = true; + @State isListNum: number = 5; + @State discCapability: string = 'oop'; + @State networIdMatchLen: number = -1; + listener = mediaquery.matchMediaSync('(orientation: landscape)'); + dmInstance: distributedDeviceManager.DeviceManager | undefined = undefined; + context = getContext(this) as common.UIAbilityContext + bindParam: Record = {}; + scroller: Scroller = new Scroller() + + @Builder + CustomBuilder() { + Column() { + Stack() { + Image($r('app.media.iocn_phone_self')).width(54).draggable(false) + Image($r('app.media.phone')).width(30).draggable(false) + } + .width(54) + .height(54) + .borderRadius(54) + } + .width(68) + .height(92) + } + + cancel() { + this.dmInstance!.stopDiscovering(); + try { + console.log(TAG + 'terminateSelf'); + this.deviceSelectSession = AppStorage.get('deviceSelectSession'); + if (this.deviceSelectSession) { + this.deviceSelectSession.terminateSelf(); + } + } catch (err) { + console.log(TAG + 'dialog cancel failed: ' + JSON.stringify(err)); + } + } + + deviceStateChange() { + try { + this.dmInstance!.on('deviceStateChange', (data: DeviceStateData) => { + if (data.action == 0 || data.action == 1) { + let deviceInfoList: distributedDeviceManager.DeviceBasicInfo[] = + this.dmInstance!.getAvailableDeviceListSync(); + this.trustDeviceList = []; + deviceInfoList.forEach((item) => { + this.trustDeviceList.push({ device: item, status: StatusType.TrustBinding}) + for (let i = 0; i < this.deviceList.length; i++) { + let deviceItem = this.deviceList[i] + if (this.isDeviceBasicEqual(deviceItem, item)) { + this.deviceList[i].status = StatusType.TrustBinding + this.deviceList.push(new Data()) + this.deviceList.splice(this.deviceList.length - 1, 1) + } + } + }) + let currentItem = this.currentDevice as Data + if (currentItem && this.isDeviceEqual(currentItem, data)) { + this.sendData(data.device.deviceId, data.device.networkId, data.device.deviceName) + } + } + if (data.action == 2) { + this.deviceList = this.deviceList.filter((item) => !this.isDeviceEqual(item, data)) + } + }); + } catch (err) { + let e: BusinessError = err as BusinessError; + console.error('deviceStateChange errCode:' + e.code + ',errMessage:' + e.message); + } + } + + addProperty(data: Data) { + let extraDataStr: string = data.device.extraData == undefined ? '' : data.device.extraData + let extraData: ExtraData = JSON.parse(extraDataStr) + let customData: CustomData = JSON.parse(extraData.CUSTOM_DATA) + data.device.deviceName = customData.displayName + } + + devListInfo() { + try { + this.deviceStateChange() + let deviceInfoList: distributedDeviceManager.DeviceBasicInfo[] = + this.dmInstance!.getAvailableDeviceListSync(); + deviceInfoList.forEach((item) => { + this.trustDeviceList.push({ device: item, status: StatusType.TrustBinding }) + }) + + customData = { + 'operation': this.operation, + 'object': this.bundleName, + 'qResp': 1 + } + discoverParam = { + 'discoverTargetType': 1, + 'CUSTOM_DATA': JSON.stringify(customData), + 'DISC_CAPABILITY' : this.discCapability + } + this.dmInstance!.startDiscovering(discoverParam, filterOptions); + } catch (err) { + let e: BusinessError = err as BusinessError; + console.error('startDiscovering errCode:' + e.code + ',errMessage:' + e.message); + } + this.dmInstance!.on('discoverSuccess', (data: Data) => { + let arr: string[] = [] + let result = this.deviceList.find((item: Data) => { + return this.isDeviceDataEqual(item, data) + }) + if (!!result) { + return + } + this.deviceList.forEach((item) => { + arr.push(this.getMatchId(item.device.deviceId, item.device.networkId)) + }) + if (arr.indexOf(this.getMatchId(data.device.deviceId, data.device.networkId)) === -1) { + data.status = this.getStatusType(data) + this.deviceList.push(data) + } + }); + } + + getFullNetworkId(networkId: string | undefined): string { + let networkIdStr = networkId == undefined ? '' : networkId + let fullNetworkId = ''; + this.trustDeviceList.forEach((item) => { + if (this.getMatchId('', item.device.networkId) == this.getMatchId('', networkIdStr)) { + fullNetworkId = item.device.networkId; + } + }); + return fullNetworkId; + } + + getStatusType(data: Data): StatusType { + let isTrust = false; + this.trustDeviceList.forEach((item) => { + if (this.isDeviceDataEqual(item, data)) { + isTrust = true + } + }); + if (isTrust) { + return StatusType.TrustBinding + } + return StatusType.Unbound + } + + getMatchId(deviceId: string, networkId: string | undefined): string { + networkId = networkId == undefined ? '' : networkId; + if (this.discCapability == 'oop') { + this.networIdMatchLen = 8; + if (networkId.length > this.networIdMatchLen) { + return networkId.substring(0, this.networIdMatchLen) + } + return networkId + } + return deviceId; + } + + isDeviceEqual(device1: Data, device2: DeviceStateData): boolean { + return this.getMatchId(device1.device.deviceId, device1.device.networkId) == + this.getMatchId(device2.device.deviceId, device2.device.networkId); + } + + isDeviceBasicEqual(device1: Data, device2: distributedDeviceManager.DeviceBasicInfo): boolean { + return this.getMatchId(device1.device.deviceId, device1.device.networkId) == + this.getMatchId(device2.deviceId, device2.networkId); + } + + isDeviceDataEqual(device1: Data, device2: Data): boolean { + return this.getMatchId(device1.device.deviceId, device1.device.networkId) == + this.getMatchId(device2.device.deviceId, device2.device.networkId); + } + + initPickParms() { + if (AppStorage.get('title') != null) { + this.title = AppStorage.get('title') as string; + } + if (AppStorage.get('customDescription') != null) { + this.customDescription = AppStorage.get('customDescription') as string; + } + if (AppStorage.get('operation') != null) { + this.operation = AppStorage.get('operation') as string; + } + if (AppStorage.get('bundleName') != null) { + this.bundleName = AppStorage.get('callerBundleName') as string; + } + if (AppStorage.get('moduleName') != null) { + this.moduleName = AppStorage.get('moduleName') as string; + } + if (AppStorage.get('abilityName') != null) { + this.abilityName = AppStorage.get('abilityName') as string; + } + let bundleName = `com.ohos.devicemanagerui_pickerProxy_${this.bundleName}` + this.dmInstance = distributedDeviceManager.createDeviceManager(bundleName); + } + + calcPositionX(index: number): number { + let angle = -160 + (index * 160 / this.isListNum) + let radian = angle * Math.PI / 180 + return this.centerX + Math.cos(radian) * this.radius + } + + calcPositionY(index: number): number { + let angle = -160 + (index * 160 / this.isListNum) + let radian = angle * Math.PI / 180 + return this.centerY + Math.sin(radian) * this.radius + } + + sendData(deviceId: string, networkId: string | undefined, deviceName: string) { + this.deviceSelectSession = AppStorage.get('deviceSelectSession'); + let callBack: DeviceCallBack = { + deviceId: deviceId, + deviceName: deviceName, + bundlename: this.bundleName, + moudlename: this.moduleName, + ablityname: this.abilityName, + } + let fullNetworkId = this.getFullNetworkId(networkId) + console.info('sendData:' + JSON.stringify(callBack)); + this.deviceSelectSession.sendData({'deviceId' : deviceId, 'networkId' : fullNetworkId, 'deviceName' : deviceName}) + this.cancel() + } + + bindTarget(item: Data, index: number) { + this.currentDevice = item + if (item.status == 0) { + try { + this.bindParam = { + 'bindType': 1, + 'targetPkgName': 'xxxx', + 'appName': 'xxxx', + 'appOperation': 'xxxx', + 'customDescription': this.customDescription, + 'bundleName': this.bundleName, + 'context': this.context + }; + this.dmInstance!.bindTarget(item.device.deviceId, this.bindParam, + (err: BusinessError, data: BindTargetData) => { + if (err) { + console.error('======bindTarget errCode:' + err.code + ',errMessage:' + err.message); + return; + } + }); + } catch (err) { + let e: BusinessError = err as BusinessError; + console.error('bindTarget errCode:' + e.code + ',errMessage:' + e.message); + } + } else { + try { + this.dmInstance!.unbindTarget(item.device.deviceId); + this.deviceList[index].status = StatusType.Unbound + this.deviceList.push(new Data()) + this.deviceList.splice(this.deviceList.length - 1, 1) + } catch (err) { + let e: BusinessError = err as BusinessError; + console.error('unbindTarget errCode:' + e.code + ',errMessage:' + e.message); + } + } + } + + onPortrait(mediaQueryResult: mediaquery.MediaQueryResult) { + console.info('mediaQueryResult.matches:' + mediaQueryResult.matches) + if (mediaQueryResult.matches) { + this.isLandscape = true + this.isListNum = 8 + } else { + this.isLandscape = false + this.isListNum = 5 + } + } + + aboutToAppear(): void { + this.listener.on('change', this.onPortrait.bind(this)) + this.initPickParms() + this.deviceSelectSession = AppStorage.get('deviceSelectSession'); + this.devListInfo(); + } + + aboutToDisappear(): void { + this.listener.off('change', this.onPortrait) + } + + build() { + Column() { + Row() { + Text(this.title) + .fontSize(24) + .fontWeight(500) + .onClick(() => { + let arr: string[] = [] + this.deviceList.forEach((item) => { + arr.push(item.device.deviceId) + arr = Array.from(new Set(arr)) + }) + }) + Image($r('app.media.close')).width(40).height(40) + .onClick(() => { + this.cancel() + }) + }.justifyContent(FlexAlign.SpaceBetween) + .width('100%') + + if (this.deviceList.length <= this.isListNum) { + ForEach(this.deviceList, (item: Data, index: number) => { + Column() { + Stack() { + Image(item.status == StatusType.TrustBinding ? $r('app.media.icon_ball_online') : + $r('app.media.icon_ball')).width(54) + Image(item.device.deviceType == 'PHONE' ? $r('app.media.phone') : $r('app.media.icon_pad')).width(30) + } + .width(54) + .height(54) + .borderRadius(54) + + Text(item.device.deviceName) + .fontSize(12) + .textAlign(TextAlign.Center) + } + .width(68) + .height(92) + .position({ + x: this.calcPositionX(index) - 34, + y: this.calcPositionY(index) - 46 + }) + .onClick(() => { + if (item.status == StatusType.TrustBinding) { + this.sendData(item.device.deviceId, item.device.networkId, item.device.deviceName) + } + }) + .onDrop((event: DragEvent, extraParams?: string | undefined) => { + this.showPhone = Visibility.Visible + this.bindTarget(item, index) + console.info('======onDrop onDrop:' + JSON.stringify(event), JSON.stringify(extraParams)); + }) + }) + Column() { + Stack() { + Image($r('app.media.iocn_phone_self')).width(54).draggable(false) + Image($r('app.media.phone')).width(30).draggable(false) + } + .width(54) + .height(54) + .borderRadius(54) + + Text($r('app.string.local_machine')) + .fontSize(12) + .textAlign(TextAlign.Center) + } + .width(68) + .height(92) + .position({ + x: this.centerX - 34, + y: this.centerY - 46 + }) + .visibility(this.showPhone) + .draggable(true) + .onDragStart((event) => { + this.showPhone = Visibility.Hidden + console.info('======onDrop onDragStart:' + JSON.stringify(event)); + return this.CustomBuilder() + }) + .onDragEnter((event: DragEvent, extraParams?: string | undefined) => { + this.showPhone = Visibility.Hidden + console.info('======onDrop onDragEnter:' + JSON.stringify(event), JSON.stringify(extraParams)); + }) + .onDragMove((event: DragEvent, extraParams?: string | undefined) => { + console.info('======onDrop onDragMove:' + JSON.stringify(event), JSON.stringify(extraParams)); + }) + .onDrop((event: DragEvent, extraParams?: string | undefined) => { + console.info('======onDrop onDrop:' + JSON.stringify(event), JSON.stringify(extraParams)); + }) + .onDragEnd((event: DragEvent, extraParams?: string | undefined) => { + console.info('======onDrop onDragEnd:' + JSON.stringify(event), JSON.stringify(extraParams)); + }) + } else { + Grid(this.scroller) { + ForEach(this.deviceList, (item: Data, index: number) => { + GridItem() { + Column() { + Stack() { + Image(item.status == StatusType.TrustBinding ? $r('app.media.icon_ball_online') : + $r('app.media.icon_ball')).width(54).draggable(false) + Image(item.device.deviceType == 'PHONE' ? $r('app.media.phone') : $r('app.media.icon_pad')) + .width(30) + .draggable(false) + } + .width(54) + .height(54) + .borderRadius(54) + + Text(item.device.deviceName) + .fontSize(12) + .textAlign(TextAlign.Center) + } + .width(68) + .height(92) + .onClick(() => { + if (item.status == StatusType.TrustBinding) { + this.sendData(item.device.deviceId, item.device.networkId, item.device.deviceName) + } else { + this.bindTarget(item, index) + } + }) + } + .draggable(true) + .onDragStart((event) => { + console.info('======onDrop onDragStart:' + JSON.stringify(event)); + }) + .onDragEnter((event: DragEvent, extraParams?: string | undefined) => { + + console.info('======onDrop onDragEnter:' + JSON.stringify(event), JSON.stringify(extraParams)); + }) + .onDragMove((event: DragEvent, extraParams?: string | undefined) => { + console.info('======onDrop onDragMove:' + JSON.stringify(event), JSON.stringify(extraParams)); + }) + .onDrop((event: DragEvent, extraParams?: string | undefined) => { + console.info('======onDrop onDrop:' + JSON.stringify(event), JSON.stringify(extraParams)); + }) + .onDragEnd((event: DragEvent, extraParams?: string | undefined) => { + console.info('======onDrop onDragEnd:' + JSON.stringify(event), JSON.stringify(extraParams)); + }) + }) + } + .columnsTemplate('1fr 1fr 1fr 1fr 1fr') + .columnsGap(10) + .rowsGap(10) + .friction(0.6) + .enableScrollInteraction(true) + .supportAnimation(false) + .multiSelectable(false) + .edgeEffect(EdgeEffect.Spring) + .scrollBar(BarState.On) + .scrollBarColor(Color.Grey) + .scrollBarWidth(4) + .width('100%') + .layoutWeight(1) + } + } + .onDrop((event: DragEvent, extraParams?: string | undefined) => { + this.showPhone = Visibility.Visible + console.info('======onDrop onDrop:' + JSON.stringify(event), JSON.stringify(extraParams)); + }) + .width('100%') + .height('100%') + .backgroundColor(Color.White) + .borderRadius({ topLeft: 20, topRight: 20 }) + .padding({ bottom: 0, left: 10, right: 10 }) + .onClick(() => { + if (this.isAutoCancel) { + this.cancel(); + } + }) + .onAreaChange((oldValue, newValue) => { + this.centerX = Number(newValue.width) / 2 + if (this.isLandscape) { + this.radius = Number(newValue.height) - 90 + this.centerY = Number(newValue.height) - 20 + } else { + this.radius = Math.min(Number(newValue.width), Number(newValue.height)) * 0.4 + this.centerY = this.radius + 90 + } + }) + .visibility(this.showFlag) + .transition(TransitionEffect.OPACITY.animation({ duration: anmDuration }) + .combine(TransitionEffect.translate({ y: 100 }))) + + } +} \ No newline at end of file diff --git a/display/entry/src/main/module.json b/display/entry/src/main/module.json index 0c27af8a5bc98d008440808df91b2641ac2f3419..d30a70f1ec2f606257b07ce5b92e4dc58b4ad81b 100644 --- a/display/entry/src/main/module.json +++ b/display/entry/src/main/module.json @@ -67,6 +67,15 @@ "label": "$string:ServiceExtAbility_label", "exported": true, "type": "sysDialog/common" + }, + { + "name": "com.ohos.devicemanagerui.picker.DeviceSelectAbility", + "srcEntrance": "./ets/UIExtAbility/picker/DeviceSelectAbility.ets", + "description": "$string:ServiceExtAbility_desc", + "icon": "$media:icon", + "label": "$string:ServiceExtAbility_label", + "exported": true, + "type": "sysDialog/common" } ], "requestPermissions": [ @@ -78,6 +87,9 @@ }, { "name": "ohos.permission.PRIVACY_WINDOW" + }, + { + "name": "ohos.permission.DISTRIBUTED_DATASYNC" } ] } diff --git a/display/entry/src/main/resources/base/media/background.png b/display/entry/src/main/resources/base/media/background.png new file mode 100644 index 0000000000000000000000000000000000000000..f939c9fa8cc8914832e602198745f592a0dfa34d Binary files /dev/null and b/display/entry/src/main/resources/base/media/background.png differ diff --git a/display/entry/src/main/resources/base/media/background_picker.png b/display/entry/src/main/resources/base/media/background_picker.png new file mode 100644 index 0000000000000000000000000000000000000000..4c7a3509d2610a3749ffefab527ad247277a5c3e Binary files /dev/null and b/display/entry/src/main/resources/base/media/background_picker.png differ diff --git a/display/entry/src/main/resources/base/media/close.png b/display/entry/src/main/resources/base/media/close.png new file mode 100644 index 0000000000000000000000000000000000000000..c72a52014d43419fc7330db489e9685c7f65748d Binary files /dev/null and b/display/entry/src/main/resources/base/media/close.png differ diff --git a/display/entry/src/main/resources/base/media/foreground.png b/display/entry/src/main/resources/base/media/foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..4483ddad1f079e1089d685bd204ee1cfe1d01902 Binary files /dev/null and b/display/entry/src/main/resources/base/media/foreground.png differ diff --git a/display/entry/src/main/resources/base/media/icon_background.png b/display/entry/src/main/resources/base/media/icon_background.png new file mode 100644 index 0000000000000000000000000000000000000000..e1492162570336840dc0337f2aa0dd9eec0a74d3 Binary files /dev/null and b/display/entry/src/main/resources/base/media/icon_background.png differ diff --git a/display/entry/src/main/resources/base/media/icon_background_light.png b/display/entry/src/main/resources/base/media/icon_background_light.png new file mode 100644 index 0000000000000000000000000000000000000000..5c9344358225c1a9a30cace297ffa31fab0a5dd4 Binary files /dev/null and b/display/entry/src/main/resources/base/media/icon_background_light.png differ diff --git a/display/entry/src/main/resources/base/media/icon_ball.png b/display/entry/src/main/resources/base/media/icon_ball.png new file mode 100644 index 0000000000000000000000000000000000000000..f7eeaf1cb072513be6c9af52c8e477a20d05be81 Binary files /dev/null and b/display/entry/src/main/resources/base/media/icon_ball.png differ diff --git a/display/entry/src/main/resources/base/media/icon_ball_online.png b/display/entry/src/main/resources/base/media/icon_ball_online.png new file mode 100644 index 0000000000000000000000000000000000000000..5a5562cff051b78e51a55768556f528cadf57fdf Binary files /dev/null and b/display/entry/src/main/resources/base/media/icon_ball_online.png differ diff --git a/display/entry/src/main/resources/base/media/icon_pad.png b/display/entry/src/main/resources/base/media/icon_pad.png new file mode 100644 index 0000000000000000000000000000000000000000..29b9a0607f76551203c2e6d325004f201390914d Binary files /dev/null and b/display/entry/src/main/resources/base/media/icon_pad.png differ diff --git a/display/entry/src/main/resources/base/media/img.png b/display/entry/src/main/resources/base/media/img.png new file mode 100644 index 0000000000000000000000000000000000000000..fb7633cf7c637d0631d04d2bfdb48947944298d0 Binary files /dev/null and b/display/entry/src/main/resources/base/media/img.png differ diff --git a/display/entry/src/main/resources/base/media/img_select.png b/display/entry/src/main/resources/base/media/img_select.png new file mode 100644 index 0000000000000000000000000000000000000000..35a077a9929d611dd91af9fcf2609de28954501f Binary files /dev/null and b/display/entry/src/main/resources/base/media/img_select.png differ diff --git a/display/entry/src/main/resources/base/media/iocn_phone_self.png b/display/entry/src/main/resources/base/media/iocn_phone_self.png new file mode 100644 index 0000000000000000000000000000000000000000..bf74b558b43a41bcb977ede8f93be8430fbcaa6f Binary files /dev/null and b/display/entry/src/main/resources/base/media/iocn_phone_self.png differ diff --git a/display/entry/src/main/resources/base/media/layered_image.json b/display/entry/src/main/resources/base/media/layered_image.json new file mode 100644 index 0000000000000000000000000000000000000000..fb49920440fb4d246c82f9ada275e26123a2136a --- /dev/null +++ b/display/entry/src/main/resources/base/media/layered_image.json @@ -0,0 +1,7 @@ +{ + "layered-image": + { + "background" : "$media:background", + "foreground" : "$media:foreground" + } +} \ No newline at end of file diff --git a/display/entry/src/main/resources/base/media/phone.png b/display/entry/src/main/resources/base/media/phone.png new file mode 100644 index 0000000000000000000000000000000000000000..7f0e68f30a71c577223e3c3fd114afae5b399221 Binary files /dev/null and b/display/entry/src/main/resources/base/media/phone.png differ diff --git a/display/entry/src/main/resources/base/media/startIcon.png b/display/entry/src/main/resources/base/media/startIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..205ad8b5a8a42e8762fbe4899b8e5e31ce822b8b Binary files /dev/null and b/display/entry/src/main/resources/base/media/startIcon.png differ diff --git a/display/entry/src/main/resources/base/media/status.png b/display/entry/src/main/resources/base/media/status.png new file mode 100644 index 0000000000000000000000000000000000000000..fff3a2d0045dafea80ffd0b85027edcea0ac3383 Binary files /dev/null and b/display/entry/src/main/resources/base/media/status.png differ diff --git a/display/entry/src/main/resources/base/profile/main_pages.json b/display/entry/src/main/resources/base/profile/main_pages.json index cfe70b3426b3acfab0140015e264a91c172778cb..4b73c7b4f94e56a3193e1646baf4e69dca53b019 100644 --- a/display/entry/src/main/resources/base/profile/main_pages.json +++ b/display/entry/src/main/resources/base/profile/main_pages.json @@ -6,6 +6,7 @@ "pages/BluetoothDialog", "pages/ConfirmDialogWearable", "pages/PinDialogWearable", - "pages/InputPinDialogWearable" + "pages/InputPinDialogWearable", + "pages/picker/DeviceSelect" ] } diff --git a/display/entry/src/main/resources/es_US/element/string.json b/display/entry/src/main/resources/es_US/element/string.json index b09c22c0768d461208977003d47ae661f71b8693..15b5fab8d72c455a28e7374906a6db3997ad979d 100644 --- a/display/entry/src/main/resources/es_US/element/string.json +++ b/display/entry/src/main/resources/es_US/element/string.json @@ -48,6 +48,10 @@ "attr":{ "priority":"translate" } + }, + { + "name":"local_machine", + "value":"local machine" } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/zh_CN/element/string.json b/display/entry/src/main/resources/zh_CN/element/string.json index 90d642d9e5e3417e594b968c7f7e579f09280cbd..eee4e696c98987132ac88f216f04a1c28d4a99e4 100644 --- a/display/entry/src/main/resources/zh_CN/element/string.json +++ b/display/entry/src/main/resources/zh_CN/element/string.json @@ -104,6 +104,10 @@ { "name":"dm_password_error", "value":"密码错误，连接失败。" + }, + { + "name":"local_machine", + "value":"本机" } ] } \ No newline at end of file diff --git a/interfaces/inner_kits/native_cpp/include/dm_device_info.h b/interfaces/inner_kits/native_cpp/include/dm_device_info.h index 00d087fcbd26773ccd73e26acac0b5785ad89e6a..52ad4df81a6fa2473dc953dbe7103e089d4fac39 100644 --- a/interfaces/inner_kits/native_cpp/include/dm_device_info.h +++ b/interfaces/inner_kits/native_cpp/include/dm_device_info.h @@ -208,6 +208,11 @@ DmDeviceBasicInfo { * NetworkId of the device. */ char networkId[DM_MAX_DEVICE_ID_LEN] = {0}; + /** + * Extra data of the device. + * include json keys: "CUSTOM_DATA" + */ + std::string extraData; } DmDeviceBasicInfo; /** diff --git a/interfaces/kits/js4.0/include/dm_native_util.h b/interfaces/kits/js4.0/include/dm_native_util.h index 68d0edb9affc0b81c5c52f674ed0565d247f4736..38a4158e37f230f19566b64d797e48231d2b497b 100644 --- a/interfaces/kits/js4.0/include/dm_native_util.h +++ b/interfaces/kits/js4.0/include/dm_native_util.h @@ -87,7 +87,8 @@ void DmDeviceIconInfoToJs(const napi_env &env, const DmDeviceIconInfo &deviceIco void DmDeviceProfileInfoToJsArray(const napi_env &env, const std::vector &devInfos, napi_value &arrayResult); bool JsToDmDeviceProfileInfos(const napi_env &env, const napi_value &jsObj, std::vector &devInfos); - +void JsToDiscoveryParam(const napi_env &env, const napi_value &object, + std::map &discParam); } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_DM_NATIVE_UTIL_H diff --git a/interfaces/kits/js4.0/include/native_devicemanager_js.h b/interfaces/kits/js4.0/include/native_devicemanager_js.h index 0bd52b05dea42d6d455c389fe734c75137a6770a..02c4739777dde6605b23e170548f929d85ccfb96 100644 --- a/interfaces/kits/js4.0/include/native_devicemanager_js.h +++ b/interfaces/kits/js4.0/include/native_devicemanager_js.h @@ -334,8 +334,8 @@ public: private: static void ReleasePublishCallback(std::string &bundleName); static void ReleaseDiscoveryCallback(std::string &bundleName); - static void LockDiscoveryCallbackMutex(napi_env env, std::string &bundleName, std::string &extra, - uint32_t subscribeId); + static void LockDiscoveryCallbackMutex(napi_env env, std::string &bundleName, + std::map discParam, std::string &extra, uint32_t subscribeId); static void ClearBundleCallbacks(std::string &bundleName); static napi_value JsOffFrench(napi_env env, int32_t num, napi_value thisVar, napi_value argv[]); static napi_value JsOnFrench(napi_env env, int32_t num, napi_value thisVar, napi_value argv[]); diff --git a/interfaces/kits/js4.0/src/dm_native_util.cpp b/interfaces/kits/js4.0/src/dm_native_util.cpp index 8b08c668a1d786f0b71cc9f4ef85c5d12ca1cbbe..c2633595ed5b08b004e555c7aed50324bfe37d88 100644 --- a/interfaces/kits/js4.0/src/dm_native_util.cpp +++ b/interfaces/kits/js4.0/src/dm_native_util.cpp @@ -47,7 +47,8 @@ const int32_t MAX_OBJECT_LEN = 4096; void JsObjectToString(const napi_env &env, const napi_value &object, const std::string &fieldStr, char *dest, const int32_t destLen) { - if (dest == nullptr || destLen < 0 || destLen > MAX_OBJECT_LEN) { + if (dest == nullptr || destLen < 0 || (destLen > MAX_OBJECT_LEN && fieldStr != CUSTOM_DESCRIPTION) || + destLen > DM_NAPI_DESCRIPTION_BUF_LENGTH) { return; } bool hasProperty = false; @@ -292,6 +293,7 @@ void DmDeviceBasicToJsObject(napi_env env, const DmDeviceBasicInfo &devInfo, nap SetValueUtf8String(env, "deviceName", devInfo.deviceName, result); std::string deviceType = GetDeviceTypeById(static_cast(devInfo.deviceTypeId)); SetValueUtf8String(env, "deviceType", deviceType.c_str(), result); + SetValueUtf8String(env, "extraData", devInfo.extraData.c_str(), result); } void JsToDmPublishInfo(const napi_env &env, const napi_value &object, DmPublishInfo &info) @@ -434,6 +436,17 @@ void JsToDmDiscoveryExtra(const napi_env &env, const napi_value &object, std::st LOGI("JsToDmDiscoveryExtra, extra :%{public}s", extra.c_str()); } +void JsToDiscoveryParam(const napi_env &env, const napi_value &object, + std::map &discParam) +{ + char customData[DM_NAPI_BUF_LENGTH] = ""; + JsObjectToString(env, object, "CUSTOM_DATA", customData, sizeof(customData)); + discParam.insert(std::pair(PARAM_KEY_CUSTOM_DATA, customData)); + char capability[DM_NAPI_BUF_LENGTH] = ""; + JsObjectToString(env, object, "DISC_CAPABILITY", capability, sizeof(capability)); + discParam.insert(std::pair(PARAM_KEY_DISC_CAPABILITY, capability)); +} + void InsertMapParames(nlohmann::json &bindParamObj, std::map &bindParamMap) { LOGI("Insert map parames start"); diff --git a/interfaces/kits/js4.0/src/native_devicemanager_js.cpp b/interfaces/kits/js4.0/src/native_devicemanager_js.cpp index eae6007c07e42a542e027173cac899a66416354f..27948267636a12ccfb13958c470f749b01b96afd 100644 --- a/interfaces/kits/js4.0/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js4.0/src/native_devicemanager_js.cpp @@ -1480,8 +1480,8 @@ napi_value DeviceManagerNapi::GetDeviceType(napi_env env, napi_callback_info inf return result; } -void DeviceManagerNapi::LockDiscoveryCallbackMutex(napi_env env, std::string &bundleName, std::string &extra, - uint32_t subscribeId) +void DeviceManagerNapi::LockDiscoveryCallbackMutex(napi_env env, std::string &bundleName, + std::map discParam, std::string &extra, uint32_t subscribeId) { std::shared_ptr discoveryCallback = nullptr; { @@ -1495,7 +1495,10 @@ void DeviceManagerNapi::LockDiscoveryCallbackMutex(napi_env env, std::string &bu } } uint64_t tokenId = OHOS::IPCSkeleton::GetSelfTokenID(); - int32_t ret = DeviceManager::GetInstance().StartDeviceDiscovery(bundleName, tokenId, extra, discoveryCallback); + discParam.insert(std::pair(PARAM_KEY_SUBSCRIBE_ID, std::to_string(tokenId))); + std::map filterOps; + filterOps.insert(std::pair(PARAM_KEY_FILTER_OPTIONS, extra)); + int32_t ret = DeviceManager::GetInstance().StartDiscovering(bundleName, discParam, filterOps, discoveryCallback); if (ret != 0) { LOGE("Discovery failed, bundleName %{public}s, ret %{public}d", bundleName.c_str(), ret); CreateBusinessError(env, ret); @@ -1508,6 +1511,7 @@ napi_value DeviceManagerNapi::StartDeviceDiscover(napi_env env, napi_callback_in { LOGI("StartDeviceDiscover in"); std::string extra = ""; + std::map discParam; napi_value result = nullptr; napi_value thisVar = nullptr; size_t argcNum = 0; @@ -1524,11 +1528,13 @@ napi_value DeviceManagerNapi::StartDeviceDiscover(napi_env env, napi_callback_in if (!JsToDiscoverTargetType(env, argv[DM_NAPI_ARGS_ZERO], discoverTargetType) || discoverTargetType != 1) { return nullptr; } + JsToDiscoveryParam(env, argv[DM_NAPI_ARGS_ZERO], discParam); } else if (argcNum == DM_NAPI_ARGS_TWO) { GET_PARAMS(env, info, DM_NAPI_ARGS_TWO); if (!JsToDiscoverTargetType(env, argv[DM_NAPI_ARGS_ZERO], discoverTargetType) || discoverTargetType != 1) { return nullptr; } + JsToDiscoveryParam(env, argv[DM_NAPI_ARGS_ZERO], discParam); napi_valuetype objectType = napi_undefined; napi_typeof(env, argv[DM_NAPI_ARGS_ONE], &objectType); if (!(CheckArgsType(env, objectType == napi_object, "filterOptions", "object or undefined"))) { @@ -1536,7 +1542,7 @@ napi_value DeviceManagerNapi::StartDeviceDiscover(napi_env env, napi_callback_in } JsToDmDiscoveryExtra(env, argv[DM_NAPI_ARGS_ONE], extra); } - LockDiscoveryCallbackMutex(env, deviceManagerWrapper->bundleName_, extra, subscribeId); + LockDiscoveryCallbackMutex(env, deviceManagerWrapper->bundleName_, discParam, extra, subscribeId); napi_get_undefined(env, &result); return result; } diff --git a/sa_profile/device_manager.cfg b/sa_profile/device_manager.cfg index 4a495502fd274812e3b69b1b2725dabc1bf0279c..de736fd0aece8418c29f8bdc0a6d6f1a37725455 100644 --- a/sa_profile/device_manager.cfg +++ b/sa_profile/device_manager.cfg @@ -30,6 +30,7 @@ "ohos.permission.ACCESS_BLUETOOTH", "ohos.permission.MANAGE_BLUETOOTH", "ohos.permission.MANAGE_SETTINGS", + "ohos.permission.MANAGE_SOFTBUS_NETWORK", "ohos.permission.START_SYSTEM_DIALOG", "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS", "ohos.permission.GET_BUNDLE_RESOURCES", diff --git a/services/implementation/BUILD.gn b/services/implementation/BUILD.gn index e841ebcdc2a98bbe0079b84cd092e6eebd835f71..10ad1737beaf3d3e66aa73f275e3eb2cf8e06361 100644 --- a/services/implementation/BUILD.gn +++ b/services/implementation/BUILD.gn @@ -124,6 +124,7 @@ if (defined(ohos_lite)) { "include/dependency/multipleuser", "include/dependency/hichain", "include/dependency/softbus", + "include/i18n", "${common_path}/include", "${common_path}/include/dfx", "${common_path}/include/dfx/standard", @@ -190,6 +191,7 @@ if (defined(ohos_lite)) { "src/dependency/softbus/softbus_session.cpp", "src/device_manager_service_impl.cpp", "src/devicestate/dm_device_state_manager.cpp", + "src/i18n/dm_language_manager.cpp", ] public_configs = [ ":devicemanagerserviceimpl_config" ] diff --git a/services/implementation/include/authentication/dm_auth_manager.h b/services/implementation/include/authentication/dm_auth_manager.h index 760000cb4fc6e5f1de7aa61e1e6c6b2395a184f9..f18d723423c6a2cc020c8ba043cb72058de51b21 100644 --- a/services/implementation/include/authentication/dm_auth_manager.h +++ b/services/implementation/include/authentication/dm_auth_manager.h @@ -134,6 +134,10 @@ typedef struct DmAuthRequestContext { std::string addr; std::string hostPkgLabel; int32_t closeSessionDelaySeconds = 0; + std::string connSessionType; + int32_t hmlActionId = 0; + int32_t hmlReleaseTime = 0; + bool hmlEnable160M = false; } DmAuthRequestContext; typedef struct DmAuthResponseContext { @@ -474,9 +478,11 @@ public: int32_t RegisterAuthenticationType(int32_t authenticationType); private: + bool IsHmlSessionType(); + void JoinLnn(const std::string &deviceId); int32_t CheckAuthParamVaild(const std::string &pkgName, int32_t authType, const std::string &deviceId, const std::string &extra); - int32_t CheckAuthParamVaildExtra(const std::string &extra); + int32_t CheckAuthParamVaildExtra(const std::string &extra, const std::string &deviceId); bool CheckProcessNameInWhiteList(const std::string &processName); void ProcessSourceMsg(); void ProcessSinkMsg(); @@ -527,6 +533,7 @@ private: void GetAuthParam(const std::string &pkgName, int32_t authType, const std::string &deviceId, const std::string &extra); void ParseJsonObject(nlohmann::json jsonObject); + void ParseHmlInfoInJsonObject(nlohmann::json &jsonObject); int32_t DeleteAcl(const std::string &pkgName, const std::string &localUdid, const std::string &remoteUdid, int32_t bindLevel, const std::string &extra); void ProcessAuthRequestExt(const int32_t &sessionId); @@ -558,6 +565,7 @@ private: bool IsSinkMsgValid(); bool IsSourceMsgValid(); void ProcessReqPublicKey(); + int32_t GetTokenIdByBundleName(int32_t userId, std::string &bundleName, int64_t &tokenId); private: std::shared_ptr softbusConnector_; diff --git a/services/implementation/include/dependency/softbus/softbus_connector.h b/services/implementation/include/dependency/softbus/softbus_connector.h index 2536eeaccc594b880040c6311129e99ec569325d..30d44b6b1fd3b78f7067a86aea4d5e13266ddee9 100644 --- a/services/implementation/include/dependency/softbus/softbus_connector.h +++ b/services/implementation/include/dependency/softbus/softbus_connector.h @@ -77,6 +77,13 @@ public: * @tc.type: FUNC */ static void JoinLnn(const std::string &deviceId); + + /** + * @tc.name: SoftbusConnector::JoinLnnByHml + * @tc.desc: join lnn by session id + * @tc.type: FUNC + */ + static void JoinLnnByHml(const int32_t sessionId); public: SoftbusConnector(); ~SoftbusConnector(); diff --git a/services/implementation/include/dependency/softbus/softbus_session.h b/services/implementation/include/dependency/softbus/softbus_session.h index 99387bb7618119b0596fd902370fec8c7c563128..289a9cd60e3ad756eff66cfc0b3039ea401a09ab 100644 --- a/services/implementation/include/dependency/softbus/softbus_session.h +++ b/services/implementation/include/dependency/softbus/softbus_session.h @@ -60,6 +60,13 @@ public: */ int32_t OpenAuthSession(const std::string &deviceId); + /** + * @tc.name: SoftbusSession::OpenAuthSessionWithPara + * @tc.desc: Open HML AuthSession of the Softbus Session + * @tc.type: FUNC + */ + int32_t OpenAuthSessionWithPara(const std::string &deviceId, int32_t actionId, bool isEnable160m); + /** * @tc.name: SoftbusSession::CloseAuthSession * @tc.desc: Close AuthSession of the Softbus Session diff --git a/services/implementation/include/i18n/dm_language_manager.h b/services/implementation/include/i18n/dm_language_manager.h new file mode 100644 index 0000000000000000000000000000000000000000..9cbc36243c5eee8c7765ffd500ca583b7bd529e1 --- /dev/null +++ b/services/implementation/include/i18n/dm_language_manager.h @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2025 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. + */ + +#ifndef OHOS_DM_LANGUAGE_MANAGER_H +#define OHOS_DM_LANGUAGE_MANAGER_H + +#include +#include + +#include "cJSON.h" +#include "dm_single_instance.h" +namespace OHOS { +namespace DistributedHardware { + +class DmLanguageManager { + DM_DECLARE_SINGLE_INSTANCE_BASE(DmLanguageManager); + +public: + DmLanguageManager() {} + ~DmLanguageManager() {} + std::string GetSystemParam(const std::string &key); + void GetLocaleByLanguage(const std::string &language, std::set &localeSet); + std::string GetTextBySystemLocale(const cJSON *const textObj, const std::set &localeSet); + std::string GetTextBySystemLanguage(const std::string &text); +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DM_LANGUAGE_MANAGER_H diff --git a/services/implementation/src/authentication/dm_auth_manager.cpp b/services/implementation/src/authentication/dm_auth_manager.cpp index 1d284dab319c86f50b0c62a9c70aea1ca5dca597..04f524df63cca9f962c931ff4bf7bcd6ebfac6a5 100644 --- a/services/implementation/src/authentication/dm_auth_manager.cpp +++ b/services/implementation/src/authentication/dm_auth_manager.cpp @@ -36,6 +36,7 @@ #include "dm_constants.h" #include "dm_crypto.h" #include "dm_dialog_manager.h" +#include "dm_language_manager.h" #include "dm_log.h" #include "dm_radar_helper.h" #include "dm_random.h" @@ -62,6 +63,7 @@ const int32_t CLONE_NEGOTIATE_TIMEOUT = 10; const int32_t CLONE_ADD_TIMEOUT = 10; const int32_t CLONE_WAIT_NEGOTIATE_TIMEOUT = 10; const int32_t CLONE_WAIT_REQUEST_TIMEOUT = 10; +const int32_t HML_SESSION_TIMEOUT = 10; const int32_t CLONE_SESSION_HEARTBEAT_TIMEOUT = 20; const int32_t CANCEL_PIN_CODE_DISPLAY = 1; const int32_t DEVICE_ID_HALF = 2; @@ -127,6 +129,12 @@ DmAuthManager::~DmAuthManager() LOGI("DmAuthManager destructor"); } +bool DmAuthManager::IsHmlSessionType() +{ + CHECK_NULL_RETURN(authRequestContext_, false); + return authRequestContext_->connSessionType == CONN_SESSION_TYPE_HML; +} + int32_t DmAuthManager::CheckAuthParamVaild(const std::string &pkgName, int32_t authType, const std::string &deviceId, const std::string &extra) { @@ -158,14 +166,6 @@ int32_t DmAuthManager::CheckAuthParamVaild(const std::string &pkgName, int32_t a return ERR_DM_AUTH_BUSINESS_BUSY; } - if (!softbusConnector_->HaveDeviceInMap(deviceId)) { - LOGE("CheckAuthParamVaild failed, the discoveryDeviceInfoMap_ not have this device."); - listener_->OnAuthResult(processInfo_, peerTargetId_.deviceId, "", STATUS_DM_AUTH_DEFAULT, - ERR_DM_INPUT_PARA_INVALID); - listener_->OnBindResult(processInfo_, peerTargetId_, ERR_DM_INPUT_PARA_INVALID, STATUS_DM_AUTH_DEFAULT, ""); - return ERR_DM_INPUT_PARA_INVALID; - } - if ((authType == AUTH_TYPE_IMPORT_AUTH_CODE) && (!IsAuthCodeReady(pkgName))) { LOGE("Auth code not exist."); listener_->OnAuthResult(processInfo_, peerTargetId_.deviceId, "", STATUS_DM_AUTH_DEFAULT, @@ -176,9 +176,18 @@ int32_t DmAuthManager::CheckAuthParamVaild(const std::string &pkgName, int32_t a return DM_OK; } -int32_t DmAuthManager::CheckAuthParamVaildExtra(const std::string &extra) +int32_t DmAuthManager::CheckAuthParamVaildExtra(const std::string &extra, const std::string &deviceId) { nlohmann::json jsonObject = nlohmann::json::parse(extra, nullptr, false); + if ((jsonObject.is_discarded() || !IsString(jsonObject, PARAM_KEY_CONN_SESSIONTYPE) || + jsonObject[PARAM_KEY_CONN_SESSIONTYPE].get() != CONN_SESSION_TYPE_HML) && + !softbusConnector_->HaveDeviceInMap(deviceId)) { + LOGE("CheckAuthParamVaild failed, the discoveryDeviceInfoMap_ not have this device."); + listener_->OnAuthResult(processInfo_, peerTargetId_.deviceId, "", STATUS_DM_AUTH_DEFAULT, + ERR_DM_INPUT_PARA_INVALID); + listener_->OnBindResult(processInfo_, peerTargetId_, ERR_DM_INPUT_PARA_INVALID, STATUS_DM_AUTH_DEFAULT, ""); + return ERR_DM_INPUT_PARA_INVALID; + } if (jsonObject.is_discarded() || jsonObject.find(TAG_BIND_LEVEL) == jsonObject.end() || !IsInt32(jsonObject, TAG_BIND_LEVEL)) { return DM_OK; @@ -222,8 +231,10 @@ void DmAuthManager::GetAuthParam(const std::string &pkgName, int32_t authType, char localDeviceId[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); std::string localUdid = static_cast(localDeviceId); - authRequestContext_->hostPkgName = pkgName; - authRequestContext_->hostPkgLabel = GetBundleLable(pkgName); + std::string realPkgName = GetSubStr(pkgName, PICKER_PROXY_SPLIT, 1); + realPkgName = realPkgName.empty() ? pkgName : realPkgName; + authRequestContext_->hostPkgName = realPkgName; + authRequestContext_->hostPkgLabel = GetBundleLable(realPkgName); authRequestContext_->authType = authType; authRequestContext_->localDeviceName = softbusConnector_->GetLocalDeviceName(); authRequestContext_->localDeviceTypeId = softbusConnector_->GetLocalDeviceTypeId(); @@ -231,9 +242,12 @@ void DmAuthManager::GetAuthParam(const std::string &pkgName, int32_t authType, authRequestContext_->deviceId = deviceId; authRequestContext_->addr = deviceId; authRequestContext_->dmVersion = DM_VERSION_5_0_3; - uint32_t tokenId = 0 ; + uint32_t tokenId = 0; MultipleUserConnector::GetTokenIdAndForegroundUserId(tokenId, authRequestContext_->localUserId); authRequestContext_->tokenId = static_cast(tokenId); + if (realPkgName != pkgName) { + GetTokenIdByBundleName(authRequestContext_->localUserId, realPkgName, authRequestContext_->tokenId); + } authRequestContext_->localAccountId = MultipleUserConnector::GetOhosAccountIdByUserId(authRequestContext_->localUserId); authRequestContext_->isOnline = false; @@ -259,7 +273,8 @@ void DmAuthManager::ParseJsonObject(nlohmann::json jsonObject) authRequestContext_->appOperation = jsonObject[APP_OPERATION_KEY].get(); } if (IsString(jsonObject, CUSTOM_DESCRIPTION_KEY)) { - authRequestContext_->customDesc = jsonObject[CUSTOM_DESCRIPTION_KEY].get(); + authRequestContext_->customDesc = DmLanguageManager::GetInstance(). + GetTextBySystemLanguage(jsonObject[CUSTOM_DESCRIPTION_KEY].get()); } if (IsString(jsonObject, APP_THUMBNAIL)) { authRequestContext_->appThumbnail = jsonObject[APP_THUMBNAIL].get(); @@ -281,10 +296,46 @@ void DmAuthManager::ParseJsonObject(nlohmann::json jsonObject) } else { authRequestContext_->peerBundleName = authRequestContext_->hostPkgName; } + ParseHmlInfoInJsonObject(jsonObject); } authRequestContext_->bundleName = GetBundleName(jsonObject); } +void DmAuthManager::ParseHmlInfoInJsonObject(nlohmann::json &jsonObject) +{ + if (IsString(jsonObject, PARAM_KEY_CONN_SESSIONTYPE)) { + authRequestContext_->connSessionType = jsonObject[PARAM_KEY_CONN_SESSIONTYPE].get(); + LOGI("[nopincode] input connSessionType %{public}s", authRequestContext_->connSessionType.c_str()); + } + if (!IsHmlSessionType()) { + LOGI("[nopincode] not HML session type"); + return; + } + if (IsInt32(jsonObject, PARAM_KEY_HML_RELEASETIME)) { + authRequestContext_->hmlReleaseTime = jsonObject[PARAM_KEY_HML_RELEASETIME].get(); + if (authRequestContext_->hmlReleaseTime <= 0) { + authRequestContext_->hmlReleaseTime = 0; + } + LOGI("[nopincode] input hmlReleaseTime %{public}d", authRequestContext_->hmlReleaseTime); + } + if (IsBool(jsonObject, PARAM_KEY_HML_ENABLE_160M)) { + authRequestContext_->hmlEnable160M = jsonObject[PARAM_KEY_HML_ENABLE_160M].get(); + LOGI("[nopincode] input hmlEnable160M %{public}d", authRequestContext_->hmlEnable160M); + } + if (IsInt32(jsonObject, PARAM_KEY_HML_ACTIONID)) { + authRequestContext_->hmlActionId = jsonObject[PARAM_KEY_HML_ACTIONID].get(); + if (authRequestContext_->hmlActionId <= 0) { + authRequestContext_->hmlActionId = 0; + } + LOGI("[nopincode] input hmlActionId %{public}d", authRequestContext_->hmlActionId); + } + if (authRequestContext_->hmlReleaseTime > 0) { + authRequestContext_->closeSessionDelaySeconds = authRequestContext_->hmlReleaseTime; + } else { + authRequestContext_->closeSessionDelaySeconds = HML_SESSION_TIMEOUT; + } +} + int32_t DmAuthManager::GetCloseSessionDelaySeconds(std::string &delaySecondsStr) { if (!IsNumberString(delaySecondsStr)) { @@ -344,7 +395,7 @@ int32_t DmAuthManager::AuthenticateDevice(const std::string &pkgName, int32_t au LOGE("DmAuthManager::AuthenticateDevice failed, param is invaild."); return ret; } - ret = CheckAuthParamVaildExtra(extra); + ret = CheckAuthParamVaildExtra(extra, deviceId); if (ret != DM_OK) { LOGE("CheckAuthParamVaildExtra failed, param is invaild."); return ret; @@ -800,7 +851,14 @@ void DmAuthManager::HandleAuthenticateTimeout(std::string name) int32_t DmAuthManager::EstablishAuthChannel(const std::string &deviceId) { - int32_t sessionId = softbusConnector_->GetSoftbusSession()->OpenAuthSession(deviceId); + int32_t sessionId = 0; + if (IsHmlSessionType()) { + CHECK_NULL_RETURN(authRequestContext_, ERR_DM_FAILED); + sessionId = softbusConnector_->GetSoftbusSession()->OpenAuthSessionWithPara(deviceId, + authRequestContext_->hmlActionId, authRequestContext_->hmlEnable160M); + } else { + sessionId = softbusConnector_->GetSoftbusSession()->OpenAuthSession(deviceId); + } struct RadarInfo info = { .funcName = "EstablishAuthChannel", .stageRes = (sessionId > 0) ? @@ -1091,7 +1149,7 @@ bool DmAuthManager::IsAuthFinish() if ((authResponseContext_->isIdenticalAccount && !authResponseContext_->authed) || (authResponseContext_->authed && !authResponseContext_->isOnline)) { - softbusConnector_->JoinLnn(authRequestContext_->addr); + JoinLnn(authRequestContext_->addr); authRequestContext_->reason = DM_OK; authResponseContext_->state = AuthState::AUTH_REQUEST_FINISH; authResponseContext_->reply = DM_OK; @@ -2024,7 +2082,7 @@ void DmAuthManager::RequestCredentialDone() if (timer_ != nullptr) { timer_->DeleteTimer(std::string(AUTHENTICATE_TIMEOUT_TASK)); } - softbusConnector_->JoinLnn(authRequestContext_->addr); + JoinLnn(authRequestContext_->addr); authResponseContext_->state = AuthState::AUTH_REQUEST_FINISH; authRequestContext_->reason = DM_OK; authResponseContext_->reply = DM_OK; @@ -2118,7 +2176,7 @@ void DmAuthManager::SrcAuthDeviceFinish() return; } if (!authResponseContext_->isOnline && authResponseContext_->haveCredential) { - softbusConnector_->JoinLnn(authRequestContext_->addr); + JoinLnn(authRequestContext_->addr); timer_->DeleteTimer(std::string(AUTHENTICATE_TIMEOUT_TASK)); ConverToFinish(); return; @@ -2554,7 +2612,7 @@ int32_t DmAuthManager::CheckTrustState() } if (authResponseContext_->isIdenticalAccount) { if (IsIdenticalAccount()) { - softbusConnector_->JoinLnn(authResponseContext_->deviceId); + JoinLnn(authResponseContext_->deviceId); authResponseContext_->state = AuthState::AUTH_REQUEST_FINISH; authRequestContext_->reason = DM_OK; authResponseContext_->reply = DM_OK; @@ -2567,7 +2625,7 @@ int32_t DmAuthManager::CheckTrustState() authResponseContext_->localDeviceId)) { CompatiblePutAcl(); } - softbusConnector_->JoinLnn(authResponseContext_->deviceId); + JoinLnn(authResponseContext_->deviceId); authResponseContext_->state = AuthState::AUTH_REQUEST_FINISH; authRequestState_->TransitionTo(std::make_shared()); return ALREADY_BIND; @@ -2935,5 +2993,29 @@ void DmAuthManager::ProcessReqPublicKey() isNeedProcCachedSrcReqMsg_ = true; } } + +void DmAuthManager::JoinLnn(const std::string &deviceId) +{ + CHECK_NULL_VOID(authRequestContext_); + CHECK_NULL_VOID(softbusConnector_); + if (IsHmlSessionType()) { + softbusConnector_->JoinLnnByHml(authRequestContext_->sessionId); + return; + } + softbusConnector_->JoinLnn(authRequestContext_->addr); +} + +int32_t DmAuthManager::GetTokenIdByBundleName(int32_t userId, std::string &bundleName, int64_t &tokenId) +{ + int32_t ret = AppManager::GetInstance().GetNativeTokenIdByName(bundleName, tokenId); + if (ret == DM_OK) { + return DM_OK; + } + ret = AppManager::GetInstance().GetHapTokenIdByName(userId, bundleName, 0, tokenId); + if (ret != DM_OK) { + LOGE("get tokenId by bundleName failed %{public}s", GetAnonyString(bundleName).c_str()); + } + return ret; +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/implementation/src/dependency/softbus/softbus_connector.cpp b/services/implementation/src/dependency/softbus/softbus_connector.cpp index cf4eeb5d3ff0fe4dc802afef8bb3f3e02baeb52c..a65aab3bc4daf39a4de430bc75a5334926a9eebd 100644 --- a/services/implementation/src/dependency/softbus/softbus_connector.cpp +++ b/services/implementation/src/dependency/softbus/softbus_connector.cpp @@ -96,6 +96,18 @@ void SoftbusConnector::JoinLnn(const std::string &deviceId) return; } +void SoftbusConnector::JoinLnnByHml(const int32_t sessionId) +{ + LOGI("start, JoinLnnByHml sessionId: %{public}d.", sessionId); + ConnectionAddr addrInfo; + addrInfo.type = CONNECTION_ADDR_SESSION; + addrInfo.info.session.sessionId = sessionId; + int32_t ret = ::JoinLNN(DM_PKG_NAME, &addrInfo, OnSoftbusJoinLNNResult); + if (ret != DM_OK) { + LOGE("[SOFTBUS]JoinLNN failed, ret: %{public}d.", ret); + } +} + int32_t SoftbusConnector::GetUdidByNetworkId(const char *networkId, std::string &udid) { LOGI("start, networkId: %{public}s.", GetAnonyString(std::string(networkId)).c_str()); diff --git a/services/implementation/src/dependency/softbus/softbus_session.cpp b/services/implementation/src/dependency/softbus/softbus_session.cpp index 9e579ba80efa912f3935780bd5b7d936c79afa07..76d0081405b7fe810c91484d3ac9df52e6c6444e 100644 --- a/services/implementation/src/dependency/softbus/softbus_session.cpp +++ b/services/implementation/src/dependency/softbus/softbus_session.cpp @@ -22,6 +22,10 @@ #include "dm_log.h" #include "nlohmann/json.hpp" #include "softbus_connector.h" +#include "softbus_error_code.h" +#ifndef DEVICE_MANAGER_COMMON_FLAG +#include "session_ex.h" +#endif namespace OHOS { namespace DistributedHardware { @@ -110,6 +114,29 @@ int32_t SoftbusSession::OpenAuthSession(const std::string &deviceId) return sessionId; } +int32_t SoftbusSession::OpenAuthSessionWithPara(const std::string &deviceId, int32_t actionId, bool isEnable160m) +{ +#ifdef DEVICE_MANAGER_COMMON_FLAG + LOGE("[SOFTBUS] OpenAuthSessionWithPara no implement"); + return SOFTBUS_NOT_IMPLEMENT; +#else + DmTraceStart(std::string(DM_HITRACE_AUTH_TO_OPPEN_SESSION)); + LinkPara para; + para.type = PARA_ACTION; + para.action.actionId = actionId; + para.enable160M = isEnable160m; + para.accountInfo = false; + int32_t sessionId = ::OpenAuthSessionWithPara(DM_SESSION_NAME, ¶); + if (sessionId < 0) { + LOGE("[SOFTBUS]open session error, sessionId: %{public}d.", sessionId); + return sessionId; + } + DmTraceEnd(); + LOGI("OpenAuthSessionWithPara success. sessionId: %{public}d.", sessionId); + return sessionId; +#endif +} + int32_t SoftbusSession::CloseAuthSession(int32_t sessionId) { LOGI("CloseAuthSession."); diff --git a/services/implementation/src/i18n/dm_language_manager.cpp b/services/implementation/src/i18n/dm_language_manager.cpp new file mode 100644 index 0000000000000000000000000000000000000000..77f080ee5c412b3ddfe41d4c13262a97bb2aee2b --- /dev/null +++ b/services/implementation/src/i18n/dm_language_manager.cpp @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2025 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. + */ + +#include "dm_language_manager.h" + +#include "cJSON.h" +#include + +#include "dm_constants.h" +#include "dm_log.h" +#include "parameter.h" + +namespace OHOS { +namespace DistributedHardware { +DM_IMPLEMENT_SINGLE_INSTANCE(DmLanguageManager); +const int32_t MAX_LEN = 128; +const std::string SYSTEM_LANGUAGE_KEY = "persist.global.language"; +const std::string SYSTEM_LANGUAGE_LOCALE_KEY = "persist.global.locale"; +const std::string DEFAULT_LANGUAGE = "zh-Hans"; +const std::string LANGUAGE_EN = "en-Latn_US"; +const std::string LANGUAGE_AND_LOCALE_STR = + R"({ + "zh-Hant": [ + { + "persist.global.locale": "zh-Hant-HK" + }, + { + "persist.global.locale": "zh-Hant-TW" + } + ] +})"; + +std::string DmLanguageManager::GetSystemParam(const std::string &key) +{ + char value[MAX_LEN] = {0}; + int32_t ret = GetParameter(key.c_str(), "", value, MAX_LEN); + if (ret <= 0) { + LOGE("GetSystemParam %{public}s failed", key.c_str()); + return ""; + } + return std::string(value); +} + +void DmLanguageManager::GetLocaleByLanguage(const std::string &language, std::set &localeSet) +{ + cJSON *languageAndLocaleObj = cJSON_Parse(LANGUAGE_AND_LOCALE_STR.c_str()); + if (languageAndLocaleObj == NULL) { + LOGE("parse languageAndLocaleObj failed"); + return; + } + cJSON *languageObj = cJSON_GetObjectItem(languageAndLocaleObj, language.c_str()); + if (languageObj == NULL || !cJSON_IsArray(languageObj)) { + cJSON_Delete(languageAndLocaleObj); + return; + } + cJSON *item = NULL; + cJSON_ArrayForEach(item, languageObj) { + if (!cJSON_IsObject(item)) { + LOGE("item is not object!"); + continue; + } + cJSON* localeObj = cJSON_GetObjectItemCaseSensitive(item, SYSTEM_LANGUAGE_LOCALE_KEY.c_str()); + if (!cJSON_IsString(localeObj) || localeObj->valuestring == NULL) { + LOGE("Get localeObj fail!"); + continue; + } + localeSet.insert(localeObj->valuestring); + } + cJSON_Delete(languageAndLocaleObj); +} + +std::string DmLanguageManager::GetTextBySystemLanguage(const std::string &text) +{ + if (text.empty()) { + return ""; + } + cJSON *textObj = cJSON_Parse(text.c_str()); + if (textObj == NULL) { + LOGE("parse text failed"); + return text; + } + std::string resultText = text; + std::string language = GetSystemParam(SYSTEM_LANGUAGE_KEY); + language = language.empty() ? DEFAULT_LANGUAGE : language; + std::set localeSet; + GetLocaleByLanguage(language, localeSet); + if (localeSet.size() > 0) { + resultText = GetTextBySystemLocale(textObj, localeSet); + if (!resultText.empty()) { + cJSON_Delete(textObj); + return resultText; + } + } + cJSON *languageJson = cJSON_GetObjectItem(textObj, language.c_str()); + if (languageJson != NULL && cJSON_IsString(languageJson)) { + resultText = std::string(languageJson->valuestring); + cJSON_Delete(textObj); + return resultText; + } + cJSON *defaultJson = cJSON_GetObjectItem(textObj, DEFAULT_LANGUAGE.c_str()); + if (defaultJson != NULL && cJSON_IsString(defaultJson)) { + resultText = std::string(defaultJson->valuestring); + cJSON_Delete(textObj); + return resultText; + } + cJSON *enJson = cJSON_GetObjectItem(textObj, LANGUAGE_EN.c_str()); + if (enJson != NULL && cJSON_IsString(enJson)) { + resultText = std::string(enJson->valuestring); + cJSON_Delete(textObj); + return resultText; + } + cJSON_Delete(textObj); + return ""; +} + +std::string DmLanguageManager::GetTextBySystemLocale(const cJSON *const textObj, + const std::set &localeSet) +{ + std::string resultText = ""; + std::string languageLocale = GetSystemParam(SYSTEM_LANGUAGE_LOCALE_KEY); + cJSON *languageLocaleson = cJSON_GetObjectItem(textObj, languageLocale.c_str()); + if (languageLocaleson != NULL && cJSON_IsString(languageLocaleson)) { + resultText = std::string(languageLocaleson->valuestring); + return resultText; + } + for (std::string locale : localeSet) { + cJSON *localesonObj = cJSON_GetObjectItem(textObj, locale.c_str()); + if (localesonObj != NULL && cJSON_IsString(localesonObj)) { + resultText = std::string(localesonObj->valuestring); + return resultText; + } + } + return ""; +} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/service/include/device_manager_service.h b/services/service/include/device_manager_service.h index f57a29acb271b86a4dcbd9054e58f1c1c1190d3a..2c2fd5dc1454c5cb8908e9beb9363f48ca034ef5 100644 --- a/services/service/include/device_manager_service.h +++ b/services/service/include/device_manager_service.h @@ -266,6 +266,7 @@ private: std::vector backgroundUserIds); void ProcessCheckSumByBT(std::string networkId, std::vector foregroundUserIds, std::vector backgroundUserIds); + void AddHmlInfoToBindParam(int32_t actionId, std::string &bindParam); #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) void SubscribeAccountCommonEvent(); diff --git a/services/service/include/softbus/softbus_listener.h b/services/service/include/softbus/softbus_listener.h index b0d13359f309524e17607a5d61d0109ee5990e3a..45866ef957485af98d015e580e9a014d77a80f14 100644 --- a/services/service/include/softbus/softbus_listener.h +++ b/services/service/include/softbus/softbus_listener.h @@ -25,6 +25,7 @@ #include #include +#include "cJSON.h" #include "softbus_bus_center.h" #include "dm_device_info.h" #include "dm_publish_info.h" @@ -113,6 +114,7 @@ public: int32_t GetAllTrustedDeviceList(const std::string &pkgName, const std::string &extra, std::vector &deviceList); int32_t GetUdidFromDp(const std::string &udidHash, std::string &udid); + static void GetActionId(const std::string &deviceId, int32_t &actionId); private: static int32_t FillDeviceInfo(const DeviceInfo &device, DmDeviceInfo &dmDevice); static void ParseConnAddrInfo(const ConnectionAddr *addrInfo, nlohmann::json &jsonObj); @@ -120,6 +122,9 @@ private: #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) void ConvertAclToDeviceInfo(DistributedDeviceProfile::AccessControlProfile &profile, DmDeviceInfo &dmDevice); #endif + static int32_t GetAttrFromCustomData(const cJSON *const customDataJson, DmDeviceInfo &dmDevInfo, + int32_t &actionId); + static int32_t GetAttrFromExtraData(DmDeviceInfo &dmDevInfo, int32_t &actionId); private: static std::string hostName_; static bool isRadarSoLoad_; diff --git a/services/service/src/advertise/advertise_manager.cpp b/services/service/src/advertise/advertise_manager.cpp index 263203e85048c9e7ad3a8862b82f1aa8b483e774..9f94c5293b207a449d876a1fd9fdb73cdad87fa2 100644 --- a/services/service/src/advertise/advertise_manager.cpp +++ b/services/service/src/advertise/advertise_manager.cpp @@ -51,6 +51,9 @@ int32_t AdvertiseManager::StartAdvertising(const std::string &pkgName, if (capability == DM_CAPABILITY_APPROACH || capability == DM_CAPABILITY_TOUCH) { dmPubInfo.mode = DmDiscoverMode::DM_DISCOVER_MODE_ACTIVE; } + if (capability == DM_CAPABILITY_OOP) { + dmPubInfo.ranging = false; + } std::string customData = ""; if (advertiseParam.find(PARAM_KEY_CUSTOM_DATA) != advertiseParam.end()) { customData = advertiseParam.find(PARAM_KEY_CUSTOM_DATA)->second; diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index 7c0745e0769ac1f23b76676abb72e316a4af0538..f18951170cb03a2fcb06df934f159d91acaba858 100755 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -15,6 +15,7 @@ #include "device_manager_service.h" +#include "cJSON.h" #include #include @@ -299,11 +300,13 @@ int32_t DeviceManagerService::GetTrustedDeviceList(const std::string &pkgName, c return DM_OK; } if (!onlineDeviceList.empty() && IsDMServiceImplReady()) { + std::string queryPkgName = GetSubStr(pkgName, PICKER_PROXY_SPLIT, 1); + queryPkgName = queryPkgName.empty() ? pkgName : queryPkgName; std::unordered_map udidMap; - if (PermissionManager::GetInstance().CheckWhiteListSystemSA(pkgName)) { + if (PermissionManager::GetInstance().CheckWhiteListSystemSA(queryPkgName)) { udidMap = dmServiceImpl_->GetAppTrustDeviceIdList(std::string(ALL_PKGNAME)); } else { - udidMap = dmServiceImpl_->GetAppTrustDeviceIdList(pkgName); + udidMap = dmServiceImpl_->GetAppTrustDeviceIdList(queryPkgName); } for (auto item : onlineDeviceList) { #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) @@ -644,16 +647,24 @@ int32_t DeviceManagerService::BindDevice(const std::string &pkgName, int32_t aut } #endif PeerTargetId targetId; - ConnectionAddrType addrType; - int32_t ret = SoftbusListener::GetTargetInfoFromCache(queryDeviceId, targetId, addrType); - if (ret != DM_OK) { - LOGE("BindDevice failed, cannot get target info from cached discovered device map."); - return ERR_DM_BIND_INPUT_PARA_INVALID; - } std::map bindParamMap; + std::string bindParamStr = bindParam; + int32_t actionId = 0; + SoftbusListener::GetActionId(queryDeviceId, actionId); + if (actionId > 0) { + targetId.deviceId = queryDeviceId; + AddHmlInfoToBindParam(actionId, bindParamStr); + } else { + ConnectionAddrType addrType; + int32_t ret = SoftbusListener::GetTargetInfoFromCache(queryDeviceId, targetId, addrType); + if (ret != DM_OK) { + LOGE("BindDevice failed, cannot get target info from cached discovered device map."); + return ERR_DM_BIND_INPUT_PARA_INVALID; + } + bindParamMap.insert(std::pair(PARAM_KEY_CONN_ADDR_TYPE, std::to_string(addrType))); + } bindParamMap.insert(std::pair(PARAM_KEY_AUTH_TYPE, std::to_string(authType))); - bindParamMap.insert(std::pair(PARAM_KEY_BIND_EXTRA_DATA, bindParam)); - bindParamMap.insert(std::pair(PARAM_KEY_CONN_ADDR_TYPE, std::to_string(addrType))); + bindParamMap.insert(std::pair(PARAM_KEY_BIND_EXTRA_DATA, bindParamStr)); return dmServiceImpl_->BindTarget(pkgName, targetId, bindParamMap); } @@ -688,13 +699,15 @@ int32_t DeviceManagerService::UnBindDevice(const std::string &pkgName, const std char localUdid[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localUdid, DEVICE_UUID_LENGTH); uint64_t tokenId = 0; - int32_t bindLevel = dmServiceImpl_->GetBindLevel(pkgName, std::string(localUdid), udid, tokenId); + std::string unbindPkgName = GetSubStr(pkgName, PICKER_PROXY_SPLIT, 1); + unbindPkgName = unbindPkgName.empty() ? pkgName : unbindPkgName; + int32_t bindLevel = dmServiceImpl_->GetBindLevel(unbindPkgName, std::string(localUdid), udid, tokenId); LOGI("UnAuthenticateDevice get bindlevel %{public}d.", bindLevel); if (bindLevel == INVALIED_BIND_LEVEL) { LOGE("UnAuthenticateDevice failed, Acl not contain the bindLevel %{public}d.", bindLevel); return ERR_DM_FAILED; } - if (dmServiceImpl_->UnBindDevice(pkgName, udid, bindLevel) != DM_OK) { + if (dmServiceImpl_->UnBindDevice(unbindPkgName, udid, bindLevel) != DM_OK) { LOGE("dmServiceImpl_ UnBindDevice failed."); return ERR_DM_FAILED; } @@ -2694,5 +2707,26 @@ std::vector DeviceManagerService::GetDeviceNamePrefixs() } return dmServiceImplExtResident_->GetDeviceNamePrefixs(); } + +void DeviceManagerService::AddHmlInfoToBindParam(int32_t actionId, std::string &bindParam) +{ + cJSON *bindParamObj = cJSON_Parse(bindParam.c_str()); + if (bindParamObj == NULL) { + bindParamObj = cJSON_CreateObject(); + if (bindParamObj == NULL) { + LOGE("Create bindParamObj object failed."); + return; + } + } + cJSON_AddStringToObject(bindParamObj, PARAM_KEY_CONN_SESSIONTYPE, CONN_SESSION_TYPE_HML.c_str()); + cJSON_AddNumberToObject(bindParamObj, PARAM_KEY_HML_ACTIONID, actionId); + char *str = cJSON_PrintUnformatted(bindParamObj); + if (str == nullptr) { + cJSON_Delete(bindParamObj); + return; + } + bindParam = std::string(str); + cJSON_Delete(bindParamObj); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/services/service/src/device_manager_service_listener.cpp b/services/service/src/device_manager_service_listener.cpp index 97a788511d04a4247257bee03e6bab73c92d8308..78ba919440ca471f5d24da7d3f15d889ff1799dc 100644 --- a/services/service/src/device_manager_service_listener.cpp +++ b/services/service/src/device_manager_service_listener.cpp @@ -14,6 +14,7 @@ */ #include +#include "cJSON.h" #include "device_manager_service_listener.h" @@ -83,6 +84,33 @@ void DeviceManagerServiceListener::ConvertDeviceInfoToDeviceBasicInfo(const std: } deviceBasicInfo.deviceTypeId = info.deviceTypeId; + cJSON *extraDataJsonObj = cJSON_Parse(info.extraData.c_str()); + if (extraDataJsonObj == NULL) { + return; + } + cJSON *customDataJson = cJSON_GetObjectItem(extraDataJsonObj, PARAM_KEY_CUSTOM_DATA); + if (customDataJson == NULL || !cJSON_IsString(customDataJson)) { + cJSON_Delete(extraDataJsonObj); + return; + } + char *customData = cJSON_PrintUnformatted(customDataJson); + if (customData == nullptr) { + cJSON_Delete(extraDataJsonObj); + return; + } + cJSON_Delete(extraDataJsonObj); + cJSON *basicExtraDataJsonObj = cJSON_CreateObject(); + if (basicExtraDataJsonObj == NULL) { + return; + } + cJSON_AddStringToObject(basicExtraDataJsonObj, PARAM_KEY_CUSTOM_DATA, customData); + char *basicExtraData = cJSON_PrintUnformatted(basicExtraDataJsonObj); + if (basicExtraData == nullptr) { + cJSON_Delete(basicExtraDataJsonObj); + return; + } + deviceBasicInfo.extraData = std::string(basicExtraData); + cJSON_Delete(basicExtraDataJsonObj); } void DeviceManagerServiceListener::SetDeviceInfo(std::shared_ptr pReq, @@ -194,6 +222,12 @@ void DeviceManagerServiceListener::ProcessAppStateChange(const ProcessInfo &proc std::vector processInfoVec = GetWhiteListSAProcessInfo(DmCommonNotifyEvent::REG_DEVICE_STATE); ProcessInfo bindProcessInfo = DealBindProcessInfo(processInfo); processInfoVec.push_back(bindProcessInfo); + std::vector allProcessInfos = ipcServerListener_.GetAllProcessInfo(); + for (auto item : allProcessInfos) { + if (item.pkgName.find(PICKER_PROXY_SPLIT + processInfo.pkgName) != std::string::npos) { + processInfoVec.push_back(item); + } + } switch (static_cast(state)) { case static_cast(DmDeviceState::DEVICE_STATE_ONLINE): ProcessAppOnline(processInfoVec, processInfo, state, info, deviceBasicInfo); diff --git a/services/service/src/discovery/discovery_manager.cpp b/services/service/src/discovery/discovery_manager.cpp index a68fe4667a39fe5c0b51a3e46dd274597e8c1eb1..a70e688e0808699649292ab90388c9e99661eb26 100644 --- a/services/service/src/discovery/discovery_manager.cpp +++ b/services/service/src/discovery/discovery_manager.cpp @@ -235,8 +235,14 @@ int32_t DiscoveryManager::StartDiscovering4MineLibary(const std::string &pkgName int32_t DiscoveryManager::StartDiscoveringNoMetaType(const std::string &pkgName, DmSubscribeInfo &dmSubInfo, const std::map ¶m) { - (void)param; - if (strcpy_s(dmSubInfo.capability, DM_MAX_DEVICE_CAPABILITY_LEN, DM_CAPABILITY_OSD) != EOK) { + if (param.find(PARAM_KEY_DISC_CAPABILITY) != param.end() && + !param.find(PARAM_KEY_DISC_CAPABILITY)->second.empty()) { + if (strcpy_s(dmSubInfo.capability, DM_MAX_DEVICE_CAPABILITY_LEN, + param.find(PARAM_KEY_DISC_CAPABILITY)->second.c_str()) != EOK) { + LOGE("capability copy err."); + return ERR_DM_START_DISCOVERING_FAILED; + } + } else if (strcpy_s(dmSubInfo.capability, DM_MAX_DEVICE_CAPABILITY_LEN, DM_CAPABILITY_OSD) != EOK) { LOGE("capability copy err."); return ERR_DM_START_DISCOVERING_FAILED; } @@ -247,7 +253,11 @@ int32_t DiscoveryManager::StartDiscoveringNoMetaType(const std::string &pkgName, std::lock_guard capLock(capabilityMapLocks_); capabilityMap_[pkgName] = std::string(dmSubInfo.capability); } - int32_t ret = softbusListener_->RefreshSoftbusLNN(DM_PKG_NAME, dmSubInfo, LNN_DISC_CAPABILITY); + std::string customData = LNN_DISC_CAPABILITY; + if (param.find(PARAM_KEY_CUSTOM_DATA) != param.end() && !param.find(PARAM_KEY_CUSTOM_DATA)->second.empty()) { + customData = param.find(PARAM_KEY_CUSTOM_DATA)->second; + } + int32_t ret = softbusListener_->RefreshSoftbusLNN(DM_PKG_NAME, dmSubInfo, customData); if (ret != DM_OK) { LOGE("StartDiscoveringNoMetaType failed, softbus refresh lnn ret: %{public}d.", ret); } diff --git a/services/service/src/ipc/standard/ipc_cmd_parser.cpp b/services/service/src/ipc/standard/ipc_cmd_parser.cpp index d2abe873ac43cb3d21402a72fe58a0cea6bf476c..446890ebe163112dc0efa9906310b80d3d502a77 100644 --- a/services/service/src/ipc/standard/ipc_cmd_parser.cpp +++ b/services/service/src/ipc/standard/ipc_cmd_parser.cpp @@ -84,6 +84,7 @@ bool EncodeDmDeviceBasicInfo(const DmDeviceBasicInfo &devInfo, MessageParcel &pa bRet = (bRet && parcel.WriteUint16(devInfo.deviceTypeId)); std::string networkIdStr(devInfo.networkId); bRet = (bRet && parcel.WriteString(networkIdStr)); + bRet = (bRet && parcel.WriteString(devInfo.extraData)); return bRet; } diff --git a/services/service/src/softbus/softbus_listener.cpp b/services/service/src/softbus/softbus_listener.cpp index 3f7cf134306a84d3f6998da7ab5a33e813b648df..0749f25cb69d9c53854662c20b2a0cf233cca0bf 100644 --- a/services/service/src/softbus/softbus_listener.cpp +++ b/services/service/src/softbus/softbus_listener.cpp @@ -58,6 +58,10 @@ constexpr static uint16_t ARRAY_DOUBLE_SIZE = 2; constexpr static uint16_t BIN_HIGH_FOUR_NUM = 4; constexpr uint32_t SOFTBUS_MAX_RETRY_TIME = 10; +constexpr const char* CUSTOM_DATA_ACTIONID = "actionId"; +constexpr const char* CUSTOM_DATA_NETWORKID = "networkId"; +constexpr const char* CUSTOM_DATA_DISPLAY_NAME = "displayName"; + static std::mutex g_deviceMapMutex; static std::mutex g_lnnCbkMapMutex; static std::mutex g_radarLoadLock; @@ -73,6 +77,7 @@ static std::mutex g_credentialAuthStatus; static std::map>>> discoveredDeviceMap; static std::map> lnnOpsCbkMap; +static std::map discoveredDeviceActionIdMap; static std::set deviceIdSet; bool SoftbusListener::isRadarSoLoad_ = false; IDmRadarHelper* SoftbusListener::dmRadarHelper_ = nullptr; @@ -446,8 +451,14 @@ void SoftbusListener::OnSoftbusDeviceFound(const DeviceInfo *device) "isOnline=%{public}d, capability=%{public}u", GetAnonyString(dmDevInfo.deviceId).c_str(), GetAnonyString(dmDevInfo.deviceName).c_str(), dmDevInfo.deviceTypeId, dmDevInfo.range, device->isOnline, device->capabilityBitmap[0]); - + int32_t actionId = 0; + int32_t ret = GetAttrFromExtraData(dmDevInfo, actionId); + if (ret != DM_OK) { + LOGE("GetAttrFromExtraData failed"); + return; + } std::lock_guard lock(g_lnnCbkMapMutex); + discoveredDeviceActionIdMap[dmDevInfo.deviceId] = actionId; CacheDiscoveredDevice(device); for (auto &iter : lnnOpsCbkMap) { iter.second->OnDeviceFound(iter.first, dmDevInfo, device->isOnline); @@ -1287,5 +1298,72 @@ int32_t SoftbusListener::GetUdidFromDp(const std::string &udidHash, std::string #endif return ERR_DM_FAILED; } + +int32_t SoftbusListener::GetAttrFromExtraData(DmDeviceInfo &dmDevInfo, int32_t &actionId) +{ + cJSON *extraDataJsonObj = cJSON_Parse(dmDevInfo.extraData.c_str()); + if (extraDataJsonObj == NULL) { + return DM_OK; + } + cJSON *customData = cJSON_GetObjectItem(extraDataJsonObj, PARAM_KEY_CUSTOM_DATA); + if (customData == NULL) { + cJSON_Delete(extraDataJsonObj); + return DM_OK; + } + cJSON *customDataJson = cJSON_Parse(customData->valuestring); + if (customDataJson == NULL) { + cJSON_Delete(extraDataJsonObj); + return DM_OK; + } + int32_t ret = GetAttrFromCustomData(customDataJson, dmDevInfo, actionId); + cJSON_Delete(customDataJson); + cJSON_Delete(extraDataJsonObj); + return ret; +} + +int32_t SoftbusListener::GetAttrFromCustomData(const cJSON *const customDataJson, DmDeviceInfo &dmDevInfo, + int32_t &actionId) +{ + cJSON *actionIdJson = cJSON_GetObjectItem(customDataJson, CUSTOM_DATA_ACTIONID); + if (actionIdJson == NULL || !cJSON_IsNumber(actionIdJson)) { + return DM_OK; + } + actionId = actionIdJson->valueint; + cJSON *networkIdJson = cJSON_GetObjectItem(customDataJson, CUSTOM_DATA_NETWORKID); + if (networkIdJson == NULL || !cJSON_IsString(networkIdJson)) { + return DM_OK; + } + std::string networkId = networkIdJson->valuestring; + if (memcpy_s(dmDevInfo.deviceId, sizeof(dmDevInfo.deviceId), networkId.c_str(), + std::min(sizeof(dmDevInfo.deviceId), sizeof(networkId))) != DM_OK) { + LOGE("copy deviceId failed."); + return ERR_DM_FAILED; + } + if (memcpy_s(dmDevInfo.networkId, sizeof(dmDevInfo.networkId), networkId.c_str(), + std::min(sizeof(dmDevInfo.networkId), sizeof(networkId))) != DM_OK) { + LOGE("copy networkId failed."); + return ERR_DM_FAILED; + } + cJSON *displayNameJson = cJSON_GetObjectItem(customDataJson, CUSTOM_DATA_DISPLAY_NAME); + if (displayNameJson == NULL || !cJSON_IsString(displayNameJson)) { + return DM_OK; + } + std::string displayName = displayNameJson->valuestring; + if (memcpy_s(dmDevInfo.deviceName, sizeof(dmDevInfo.deviceName), displayName.c_str(), + std::min(sizeof(dmDevInfo.deviceName), sizeof(displayName))) != DM_OK) { + LOGE("copy deviceName failed."); + return ERR_DM_FAILED; + } + return DM_OK; +} + +void SoftbusListener::GetActionId(const std::string &deviceId, int32_t &actionId) +{ + std::lock_guard lock(g_lnnCbkMapMutex); + if (discoveredDeviceActionIdMap.find(deviceId) == discoveredDeviceActionIdMap.end()) { + return; + } + actionId = discoveredDeviceActionIdMap.find(deviceId)->second; +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/commonunittest/UTTest_dm_auth_manager_first.cpp b/test/commonunittest/UTTest_dm_auth_manager_first.cpp index b9afe71afdb323d9dfd6603d474c0ffa32aaa24a..7e84ec5dc0b59296eda682309019922ff4462344 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_first.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_first.cpp @@ -1382,21 +1382,21 @@ HWTEST_F(DmAuthManagerTest, CheckAuthParamVaildExtra_001, testing::ext::TestSize std::string extra = R"({"extra": {"bindLevel": "123"}})"; nlohmann::json jsonObject; jsonObject["bindLevel"] = 1; - int32_t ret = authManager_->CheckAuthParamVaildExtra(extra); - EXPECT_EQ(ret, DM_OK); + int32_t ret = authManager_->CheckAuthParamVaildExtra(extra, ""); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); extra = SafetyDump(jsonObject); EXPECT_CALL(*appManagerMock_, IsSystemSA()).WillOnce(Return(false)); - ret = authManager_->CheckAuthParamVaildExtra(extra); + ret = authManager_->CheckAuthParamVaildExtra(extra, ""); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); EXPECT_CALL(*appManagerMock_, IsSystemSA()).WillOnce(Return(true)); - ret = authManager_->CheckAuthParamVaildExtra(extra); - EXPECT_EQ(ret, DM_OK); + ret = authManager_->CheckAuthParamVaildExtra(extra, ""); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); jsonObject["bindLevel"] = 15; extra = SafetyDump(jsonObject); - ret = authManager_->CheckAuthParamVaildExtra(extra); + ret = authManager_->CheckAuthParamVaildExtra(extra, ""); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } diff --git a/test/commonunittest/UTTest_dm_auth_manager_second.cpp b/test/commonunittest/UTTest_dm_auth_manager_second.cpp index 2416020c8fd694867ea8e004b25fb0603b37cd4e..5e8f303f383c7f390b55a2d9209e35705466a425 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_second.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_second.cpp @@ -1263,7 +1263,7 @@ HWTEST_F(DmAuthManagerTest, CheckAuthParamVaild_0013, testing::ext::TestSize.Lev authManager_->authResponseState_ = nullptr; authManager_->softbusConnector_->discoveryDeviceInfoMap_.clear(); int32_t ret = authManager_->CheckAuthParamVaild(pkgName, authType, deviceId, extra); - ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); + ASSERT_EQ(ret, DM_OK); } HWTEST_F(DmAuthManagerTest, CheckAuthParamVaild_0014, testing::ext::TestSize.Level0) diff --git a/test/softbusfuzztest/onsoftbusdevicefound_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdevicefound_fuzzer/BUILD.gn index d2195a85ea8dfda03894389144a3ad76b4fe64b9..f960bcba3d8ec88dde0db3a0556d17a6a0a9322f 100644 --- a/test/softbusfuzztest/onsoftbusdevicefound_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdevicefound_fuzzer/BUILD.gn @@ -50,6 +50,7 @@ ohos_fuzztest("OnSoftbusDeviceFoundFuzzTest") { ] external_deps = [ + "cJSON:cjson", "c_utils:utils", "dsoftbus:softbus_client", "safwk:system_ability_fwk", diff --git a/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn index 0cb1e7b21b44b73884a1fd025c7f11c0eee448aa..420e8426cdeceea6a0055dc70d5f2e3c9c92659f 100644 --- a/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn @@ -45,6 +45,7 @@ ohos_fuzztest("OnSoftbusDeviceInfoChangedFuzzTest") { ] external_deps = [ + "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", diff --git a/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn index ecf137944035fc7508ef06813c8c038e143da126..877101702e78675b912e990a7cad92c516094e18 100644 --- a/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn @@ -46,6 +46,7 @@ ohos_fuzztest("OnSoftbusDeviceOfflineFuzzTest") { ] external_deps = [ + "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", diff --git a/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn index 049ffdb531a261a7c24f8c56fe979ab8ce2039cf..72332df3e3b5d63f38999f8b72ede5938b76cece 100644 --- a/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn @@ -46,6 +46,7 @@ ohos_fuzztest("OnSoftbusDeviceOnlineFuzzTest") { ] external_deps = [ + "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", diff --git a/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn index 6bc2757194f6a187d063771fca03e38f84b69865..5682d0b4b8ceba7e25f96e3ab5ebbf952a2787bd 100644 --- a/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn @@ -45,6 +45,7 @@ ohos_fuzztest("OnSoftbusListenerDeviceFoundFuzzTest") { ] external_deps = [ + "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", diff --git a/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn index 8a1a5e38592930c937c428165b104494745eed72..31e0254e872b435a47d7a4888cf9b97445ae4005 100644 --- a/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn @@ -46,6 +46,7 @@ ohos_fuzztest("PublishSoftbusLnnFuzzTest") { ] external_deps = [ + "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", diff --git a/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn index 731f97cc5737679abcf3e9616cd3a09d90b92c73..2c12dd74e3f151b9242da91348ff75712c8e0406 100644 --- a/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn @@ -46,6 +46,7 @@ ohos_fuzztest("RefreshSoftbusLnnFuzzTest") { ] external_deps = [ + "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", diff --git a/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn b/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn index caea4d6ffcbdb8b8b55981e34309e53a688a64d9..208f4dd31db884ce536208d31775439ecf0bf102 100644 --- a/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn @@ -49,6 +49,7 @@ ohos_fuzztest("SoftbusListenerGetLocalDeviceInfoFuzzTest") { external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", + "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", diff --git a/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn index b69e49882096650e7e1f61fa65ec25440a0f5857..23dbd11b36a229fc2cb5173627ac92d951485017 100644 --- a/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn @@ -46,6 +46,7 @@ ohos_fuzztest("StopRefreshSoftbusLnnFuzzTest") { ] external_deps = [ + "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index d47d3f153d1ddec39c957c5268e92ee68f733e52..a4a36f9005e33c35dc161e53b421407074ee355e 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -535,6 +535,7 @@ ohos_unittest("UTTest_mine_softbus_listener") { external_deps = [ "ability_base:want", "ability_runtime:ability_manager", + "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", @@ -1426,6 +1427,7 @@ ohos_unittest("UTTest_discovery_manager") { deps = [ ":device_manager_test_common" ] external_deps = [ + "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk",