openharmony/applications_screenlock
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_screenlock synced 2025-02-17 04:59:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!32 修复import的编译问题

Browse Source 
Merge pull request !32 from 吕晓强/fix_import
This commit is contained in:
openharmony_ci 2022-05-25 12:18:10 +00:00 committed by Gitee
commit 59a7003766
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
27 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/ets/default/ReadConfigUtil.ts
View File

@ -44,7 +44,7 @@ export class ReadConfigUtil {
} finally{
stream.closeSync();
}
return JSON.stringify(content);
return JSON.parse(content);
}
}

2
common/src/main/ets/default/ScreenLockCommon.ts
View File

@ -49,5 +49,5 @@ export function ReadConfigFile(fileName) {
} finally {
stream.closeSync();
}
return JSON.stringify(content);
return JSON.parse(content);
}

4
features/batterycomponent/src/main/ets/default/pages/batteryIcon.ets
View File

@ -20,8 +20,8 @@ import Constants from '../common/constants'
import Log from '../../../../../../../common/src/main/ets/default/Log'
import StyleConfigurationCommon from '../../../../../../../common/src/main/ets/default/StyleConfiguration'
import StyleConfiguration from '../common/StyleConfiguration'
import { StatusBarGroupComponentData
} from '../../../../../../screenlock/src/main/ets/com/ohos/common/Constants'
import {StatusBarGroupComponentData
} from '../../../../../../screenlock/src/main/ets/com/ohos/common/constants'
import StatusBarVM from '../../../../../../screenlock/src/main/ets/com/ohos/vm/StatusBarVM'
const TAG = 'BatteryComponent-batteryIcon'

2
features/clockcomponent/src/main/ets/default/pages/clockIcon.ets
View File

@ -16,7 +16,7 @@
import Log from '../../../../../../../common/src/main/ets/default/Log'
import StyleConfiguration from '../common/StyleConfiguration'
import StyleConfigurationCommon from '../../../../../../../common/src/main/ets/default/StyleConfiguration'
import { StatusBarGroupComponentData } from '../../../../../../screenlock/src/main/ets/com/ohos/common/Constants'
import { StatusBarGroupComponentData } from '../../../../../../screenlock/src/main/ets/com/ohos/common/constants'
import StatusBarVM from '../../../../../../screenlock/src/main/ets/com/ohos/vm/StatusBarVM'
import TimeManager, {
TimeEventArgs,

0
features/screenlock/src/main/ets/com/ohos/common/Constants.ts → features/screenlock/src/main/ets/com/ohos/common/constants.ts
View File

2
features/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts
View File

@ -15,7 +15,7 @@
import Log from '../../../../../../../../common/src/main/ets/default/Log'
import ScreenLockMar from '@ohos.screenlock';
import windowManager from '@ohos.window'
import Constants from '../common/Constants'
import Constants from '../common/constants'
import { Callback } from 'basic';
const TAG = 'ScreenLock-ScreenLockModel';

10
features/screenlock/src/main/ets/com/ohos/model/screenlockStyle.ts
View File

@ -42,12 +42,12 @@ class ScreenlockStyle {
readMode(deviceType: string): number{
Log.showInfo(TAG, `readMode deviceType:${deviceType}`);
try {
let modeJson = ReadConfigFile(FILE_URI.replace('{0}', deviceType))
Log.showDebug(TAG, `ReadConfigFile content:` + JSON.stringify(modeJson));
this.screenMode = modeJson.mode
let modeJson = ReadConfigFile(FILE_URI.replace('{0}', deviceType));
Log.showInfo(TAG, `ReadConfigFile content:` + JSON.stringify(modeJson));
this.screenMode = modeJson.mode;
} catch(error) {
Log.showError(TAG, `ReadConfigFile content error: ${error}`);
this.screenMode = 1
Log.showInfo(TAG, `ReadConfigFile content error: ${error}`);
this.screenMode = 1;
}
return this.screenMode
}

2
features/screenlock/src/main/ets/com/ohos/view/component/accounts.ets
View File

@ -15,7 +15,7 @@
import Log from '../../../../../../../../../common/src/main/ets/default/Log'
import ViewModel from '../../vm/accountsViewModel'
import Constants from '../../common/Constants'
import Constants from '../../common/constants'
import {UserData} from '../../data/userData'
const TAG = 'ScreenLock-Accounts'

2
features/screenlock/src/main/ets/com/ohos/view/component/batterySoc.ets
View File

@ -14,7 +14,7 @@
*/
import Log from '../../../../../../../../../common/src/main/ets/default/Log'
import Constants from '../../common/Constants'
import Constants from '../../common/constants'
const TAG = 'ScreenLock-BatterySoc'

2
features/screenlock/src/main/ets/com/ohos/view/component/customPSD.ets
View File

@ -14,7 +14,7 @@
*/
import Log from '../../../../../../../../../common/src/main/ets/default/Log'
import Constants from '../../common/Constants'
import Constants from '../../common/constants'
import NumkeyBoard from './numkeyBoard'
import ViewModel from '../../vm/customPSDViewModel'
import deviceInfo from '@ohos.deviceInfo';

2
features/screenlock/src/main/ets/com/ohos/view/component/digitalPSD.ets
View File

@ -14,7 +14,7 @@
*/
import Log from '../../../../../../../../../common/src/main/ets/default/Log'
import Constants from '../../common/Constants'
import Constants from '../../common/constants'
import NumkeyBoard from './numkeyBoard'
import ViewModel from '../../vm/digitalPSDViewModel'

2
features/screenlock/src/main/ets/com/ohos/view/component/lockIcon.ets
View File

@ -16,7 +16,7 @@
import Log from '../../../../../../../../../common/src/main/ets/default/Log'
import {ScreenLockStatus} from '../../../../../../../../../common/src/main/ets/default/ScreenLockCommon'
import ViewModel from '../../vm/lockIconViewModel'
import Constants from '../../common/Constants'
import Constants from '../../common/constants'
const TAG = 'ScreenLock-LockIcon'

2
features/screenlock/src/main/ets/com/ohos/view/component/mixedPSD.ets
View File

@ -14,7 +14,7 @@
*/
import Log from '../../../../../../../../../common/src/main/ets/default/Log'
import Constants from '../../common/Constants'
import Constants from '../../common/constants'
import ViewModel from '../../vm/mixedPSDViewModel'
const TAG = 'ScreenLock-MixedPSD'

2
features/screenlock/src/main/ets/com/ohos/view/component/numkeyBoard.ets
View File

@ -14,7 +14,7 @@
*/
import Log from '../../../../../../../../../common/src/main/ets/default/Log'
import Constants from '../../common/Constants'
import Constants from '../../common/constants'
import BaseViewModel from '../../vm/baseViewModel'
import deviceInfo from '@ohos.deviceInfo';

2
features/screenlock/src/main/ets/com/ohos/view/component/statusBar.ets
View File

@ -15,7 +15,7 @@
import Log from '../../../../../../../../../common/src/main/ets/default/Log'
import ViewModel from '../../vm/StatusBarVM'
import Constants from '../../common/Constants'
import Constants from '../../common/constants'
import BatteryIcon from '../../../../../../../../../features/batterycomponent/src/main/ets/default/pages/batteryIcon.ets'
import ClockIcon from '../../../../../../../../../features/clockcomponent/src/main/ets/default/pages/clockIcon.ets'
import WifiIcon from '../../../../../../../../../features/wificomponent/src/main/ets/default/pages/wifiIcon.ets'

2
features/screenlock/src/main/ets/com/ohos/vm/StatusBarVM.ts
View File

@ -15,7 +15,7 @@
import Log from '../../../../../../../../common/src/main/ets/default/Log';
import WindowManager, { WindowType } from '../../../../../../../../common/src/main/ets/default/WindowManager';
import Constants, {StatusBarGroupComponentData} from '../common/Constants';
import Constants, {StatusBarGroupComponentData} from '../common/constants';
const TAG = 'StatusBarVM';

2
features/screenlock/src/main/ets/com/ohos/vm/baseViewModel.ts
View File

@ -14,7 +14,7 @@
*/
import Log from '../../../../../../../../common/src/main/ets/default/Log'
import Constants from '../common/Constants'
import Constants from '../common/constants'
import service, {UnlockResult, AuthType, AuthSubType} from '../model/screenLockService'
import {Callback} from 'basic';

2
features/screenlock/src/main/ets/com/ohos/vm/customPSDViewModel.ts
View File

@ -14,7 +14,7 @@
*/
import Log from '../../../../../../../../common/src/main/ets/default/Log'
import Constants from '../common/Constants'
import Constants from '../common/constants'
import BaseViewModel, {service, AuthType, AuthSubType} from './baseViewModel'
import {Callback} from 'basic';

2
features/screenlock/src/main/ets/com/ohos/vm/digitalPSDViewModel.ts
View File

@ -14,7 +14,7 @@
*/
import Log from '../../../../../../../../common/src/main/ets/default/Log'
import Constants from '../common/Constants'
import Constants from '../common/constants'
import BaseViewModel, {service, AuthType, AuthSubType} from './baseViewModel'
import {Callback} from 'basic';

2
features/signalcomponent/src/main/ets/default/common/StyleConfiguration.ts
View File

@ -14,7 +14,7 @@
*/
import StyleManager from '../../../../../../../common/src/main/ets/default/StyleManager';
import Constants from './Constants'
import Constants from './constants'
const TAG = 'signal-StyleConfiguration';

8
features/signalcomponent/src/main/ets/default/pages/signalIcon.ets
View File

@ -14,12 +14,12 @@
*/
import Constants from '../common/constants';
import mSignalModel from '../SignalModel';
import mSignalModel from '../signalModel';
import Log from '../../../../../../../common/src/main/ets/default/Log'
import StyleConfigurationCommon from '../../../../../../../common/src/main/ets/default/StyleConfiguration'
import StyleConfiguration from '../common/StyleConfiguration'
import { StatusBarGroupComponentData
} from '../../../../../../screenlock/src/main/ets/com/ohos/common/Constants'
} from '../../../../../../screenlock/src/main/ets/com/ohos/common/constants'
import StatusBarVM from '../../../../../../screenlock/src/main/ets/com/ohos/vm/StatusBarVM'
const TAG = 'SignalComponent-SignalIcon'
@ -36,7 +36,7 @@ export default struct SignalIcon {
@State style: any = StyleConfiguration.getSignalComponentStyle()
aboutToAppear() {
Log.signalIcon(TAG, 'aboutToAppear');
Log.showInfo(TAG, 'aboutToAppear');
this.mStatusBarGroupComponentData = StatusBarVM.getStatusBarGroupComponentData(this.mGroupId)
if (!this.signalObserved) {
mSignalModel.initSignalModel();
@ -45,7 +45,7 @@ export default struct SignalIcon {
}
aboutToDisappear() {
Log.signalIcon(TAG, 'aboutToDisappear');
Log.showInfo(TAG, 'aboutToDisappear');
}
build() {

2
features/wificomponent/src/main/ets/default/common/StyleConfiguration.ts
View File

@ -14,7 +14,7 @@
*/
import StyleManager from '../../../../../../../common/src/main/ets/default/StyleManager'
import Constants from './Constants'
import Constants from './constants'
const TAG = 'wifi-StyleConfiguration';

8
features/wificomponent/src/main/ets/default/pages/wifiIcon.ets
View File

@ -14,13 +14,13 @@
*/
import Constants from '../common/constants'
import mWifiModel from '../WifiModel'
import mWifiModel from '../wifiModel'
import Log from '../../../../../../../common/src/main/ets/default/Log'
import StyleConfigurationCommon from '../../../../../../../common/src/main/ets/default/StyleConfiguration'
import StyleConfiguration from '../common/StyleConfiguration'
import { StatusBarGroupComponentData
} from '../../../../../../screenlock/src/main/ets/com/ohos/common/Constants'
import StatusBarVM from '../../../../../../screenlock/src/main/ets/com/ohos/vM/StatusBarVM'
import {StatusBarGroupComponentData
} from '../../../../../../screenlock/src/main/ets/com/ohos/common/constants'
import StatusBarVM from '../../../../../../screenlock/src/main/ets/com/ohos/vm/StatusBarVM'
const TAG = 'WifiComponent-WifiIcon'

2
product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts
View File

@ -18,7 +18,7 @@ import windowManager from '@ohos.window'
import WindowManagers, { WindowType } from "../../../../../../common/src/main/ets/default/WindowManager";
import display from '@ohos.display'
import Log from '../../../../../../common/src/main/ets/default/Log'
import Constants from '../../../../../../features/screenlock/src/main/ets/com/ohos/common/Constants'
import Constants from '../../../../../../features/screenlock/src/main/ets/com/ohos/common/constants'
import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'
import sTimeManager from '../../../../../../common/src/main/ets/default/TimeManager'

2
product/pc/src/main/ets/pages/mixedPassword.ets
View File

@ -17,7 +17,7 @@ import Log from '../../../../../../common/src/main/ets/default/Log'
import CommonStyleManager from '../../../../../../common/src/main/ets/default/StyleManager'
import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'
import StatusBar from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar'
import MixedPSD from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/MixedPSD'
import MixedPSD from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/mixedPSD'
import Constants from '../common/constants'
import StyleManager from '../common/StyleManager'

2
product/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts
View File

@ -17,7 +17,7 @@ import ServiceExtension from '@ohos.application.ServiceExtensionAbility'
import windowManager from '@ohos.window'
import display from '@ohos.display'
import Log from '../../../../../../common/src/main/ets/default/Log'
import Constants from '../../../../../../features/screenlock/src/main/ets/com/ohos/common/Constants'
import Constants from '../../../../../../features/screenlock/src/main/ets/com/ohos/common/constants'
import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'
import sTimeManager from '../../../../../../common/src/main/ets/default/TimeManager'

2
product/phone/src/main/ets/pages/mixedPassword.ets
View File

@ -17,7 +17,7 @@ import Log from '../../../../../../common/src/main/ets/default/Log'
import CommonStyleManager from '../../../../../../common/src/main/ets/default/StyleManager'
import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'
import StatusBar from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar'
import MixedPSD from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/MixedPSD'
import MixedPSD from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/mixedPSD'
import Constants from '../common/constants'
import StyleManager from '../common/StyleManager'