openharmony/applications_dlp_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_dlp_manager synced 2024-11-23 01:49:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!345 冗余代码删除

Browse Source 
Merge pull request !345 from 毕水秀/master
This commit is contained in:
openharmony_ci 2024-11-19 09:35:34 +00:00 committed by Gitee
commit f969513182
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
entry/src/main/ets/ViewAbility/ViewAbility.ets
View File

@ -759,7 +759,7 @@ export default class ViewAbility extends ServiceExtensionAbility {
let callerAppId = want.parameters?.['ohos.aafwk.param.callerAppIdentifier'] as string;
if (callerAppId !== APPID_FOR_HOPE || paramCallerBundleName !== BUNDLE_NAME_FOR_HOPE) {
HiLog.error(TAG, `callerAppId or callerBundleNameis error.`);
await this.callAlertAbility({code: Constants.ERR_JS_NOT_AUTHORIZED_APPLICATION } as BusinessError);
await this.callAlertAbility({code: Constants.ERR_JS_NOT_AUTHORIZED_APPLICATION} as BusinessError);
return false;
}

13
entry/src/main/ets/common/GetAlertMessage.ets
View File

@ -14,19 +14,12 @@
*/
import { BusinessError } from '@ohos.base';
import display from '@ohos.display'
import StartOptions from '@ohos.app.ability.StartOptions';
import common from '@ohos.app.ability.common';
import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession';
import osAccount from '@ohos.account.osAccount';
import account_osAccount from '@ohos.account.osAccount';
import Constants from './constant';
import GlobalContext from './GlobalContext';
import deviceInfo from '@ohos.deviceInfo';
import promptAction from '@ohos.promptAction';
import { HiLog } from '../common/HiLog';
import AccountManager from '../manager/AccountManager';
import CommonUtil from './CommonUtil';
const TAG = 'AlertMessage';
@ -181,12 +174,6 @@ export class GetAlertMessage {
}
}
public static async checkAccountInfo(accountName: string): Promise<boolean> {
let domainAccount = await AccountManager.getDomainAccountByAccountName(accountName);
return !CommonUtil.isEmptyStr(domainAccount.accountName);
}
public static async requestModalUIExtension(context: common.UIAbilityContext | common.ServiceExtensionContext,
error: BusinessError) {
if (deviceInfo.deviceType !== '2in1') {

1
entry/src/main/ets/common/constant.ets
View File

@ -14,7 +14,6 @@
*/
export default class Constants {
public static FOOTER_ROW_WIDTH = '100%';
public static FOOTER_ROW_MARGIN = 8;
public static FOOTER_ROW_PAD_LEFT = 16;

4
entry/src/main/ets/common/utils.ets
View File

@ -553,12 +553,12 @@ async function sleep(milliSeconds: number): Promise<void> {
}
async function getConnectionStatus(exactly: boolean = true): Promise<boolean> {
HiLog.info(TAG, `Enter getConnectionStatus, exactly mode: ${exactly}}.`);
HiLog.info(TAG, `Enter getConnectionStatus, exactly mode: ${exactly}.`);
try {
const startTime = getCurrentTime();
let net: connection.NetHandle = await connection.getDefaultNet();
let capabilities: connection.NetCapabilities = await connection.getNetCapabilities(net);
let capabilities: connection.NetCapabilities = await connection.getNetCapabilities(net);
HiLog.info(TAG, `Succeeded to get net capabilities, ${JSON.stringify(capabilities)}.`);
let networkCap = capabilities.networkCap;