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

蓝区master：settings适配3.2.10.6SDK

Browse Source 
Signed-off-by: liminjie10 <liminjie10@huawei.com>
This commit is contained in:
liminjie10 2023-02-01 14:59:32 +08:00
parent 09328994be
commit 95b0781edd
11 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-profile.json5
View File

@ -1,6 +1,6 @@
{
"app": {
"compileSdkVersion": 9,
"compileSdkVersion": 10,
"compatibleSdkVersion": 9,
"products": [
{

2
common/search/src/main/ets/default/page/searchHeader.ets
View File

@ -18,7 +18,7 @@ import LogUtil from '../../../../../../utils/src/main/ets/default/baseUtil/LogUt
import Log from '../../../../../../utils/src/main/ets/default/baseUtil/LogDecorator';
import ConfigData from '../../../../../../utils/src/main/ets/default/baseUtil/ConfigData';
import Router from '@system.router'
import InputMethod from '@ohos.inputmethod';
import InputMethod from '@ohos.inputMethod';
let SEARCH_INPUT_MAX_LENGTH = 100;

2
product/phone/src/main/ets/Application/AbilityStage.ts
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
import AbilityStage from "@ohos.application.AbilityStage"
import AbilityStage from "@ohos.app.ability.AbilityStage"
export default class MyAbilityStage extends AbilityStage {
onCreate() {

2
product/phone/src/main/ets/MainAbility/AppInfoAbility.ts
View File

@ -15,7 +15,7 @@
import ConfigData from '../../../../../../common/utils/src/main/ets/default/baseUtil/ConfigData';
import LogUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil';
import Ability from '@ohos.application.Ability';
import Ability from '@ohos.app.ability.UIAbility';
export default class MainAbility extends Ability {
tag: string = "ApplicationInfoSettings";

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

@ -15,7 +15,7 @@
import ConfigData from '../../../../../../common/utils/src/main/ets/default/baseUtil/ConfigData';
import LogUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil';
import Ability from '@ohos.application.Ability'
import Ability from '@ohos.app.ability.UIAbility'
export default class MainAbility extends Ability {
onCreate(want, launchParam) {

14
product/phone/src/main/ets/model/locationServicesImpl/LocationService.ts
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
import geolocation from '@ohos.geolocation';
import geolocation from '@ohos.geoLocationManager';
import LogUtil from '../../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil';
import ConfigData from '../../../../../../../common/utils/src/main/ets/default/baseUtil/ConfigData';
@ -28,7 +28,7 @@ export class LocationService {
LogUtil.info(ConfigData.TAG + 'start location service')
this.mIsStart = true;
this.getServiceState();
geolocation.on('locationServiceState', (isChanged: boolean) => {
geolocation.on('locationEnabledChange', (isChanged: boolean) => {
LogUtil.info(ConfigData.TAG + `start location service isChanged: ${JSON.stringify(isChanged)}`)
this.getServiceState();
});
@ -43,10 +43,9 @@ export class LocationService {
getServiceState() {
LogUtil.info(ConfigData.TAG + 'get location state')
geolocation.isLocationEnabled().then((data) => {
LogUtil.info(ConfigData.TAG + `get location state, data: ${JSON.stringify(data)}`)
this.mListener?.updateServiceState(data);
});
let state = geolocation.isLocationEnabled();
LogUtil.info(ConfigData.TAG + `get location state, data: ${JSON.stringify(state)}`)
this.mListener?.updateServiceState(state);
}
enableLocation() {
@ -57,8 +56,7 @@ export class LocationService {
disableLocation() {
LogUtil.info(ConfigData.TAG + 'disable location')
geolocation.disableLocation()
.then((res) => LogUtil.info(ConfigData.TAG + `disable location, result: ${JSON.stringify(res)}`));
geolocation.disableLocation();
}
}

2
product/phone/src/main/ets/model/storageImpl/StorageModel.ts
View File

@ -17,7 +17,7 @@ import BaseModel from '../../../../../../../common/utils/src/main/ets/default/mo
import {LogAll} from '../../../../../../../common/utils/src/main/ets/default/baseUtil/LogDecorator';
import { BaseData } from '../../../../../../../common/utils/src/main/ets/default/bean/BaseData';
import storage from '@ohos.statfs';
import Environment from '@ohos.environment'
import Environment from '@ohos.file.environment'
/**
* read local file

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

@ -38,7 +38,7 @@ struct AboutDevice {
SubEntryComponentWithEndText({
targetPage: "pages/deviceName",
title: $r("app.string.deviceName"),
endText: this.systemName
endText: $systemName
})
.width(ConfigData.WH_100_100)
.margin({ bottom: $r("app.float.distance_12"), top: $r("app.float.distance_8") })

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

@ -15,7 +15,7 @@
import prompt from "@ohos.prompt";
import Router from '@system.router';
import InputMethod from '@ohos.inputmethod';
import InputMethod from '@ohos.inputMethod';
import AboutDeviceModel from '../model/aboutDeviceImpl/AboutDeviceModel';
import LogUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil';
import ConfigData from '../../../../../../common/utils/src/main/ets/default/baseUtil/ConfigData';

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

@ -14,7 +14,7 @@
*/
import Router from '@system.router';
import InputMethod from '@ohos.inputmethod';
import InputMethod from '@ohos.inputMethod';
import { PinSubType } from '../model/passwordImpl/PasswordModel';
import PasswordCheckController from '../controller/password/PasswordCheckController';
import LogUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil';

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

@ -15,7 +15,7 @@
import Router from '@system.router';
import deviceInfo from '@ohos.deviceInfo';
import InputMethod from '@ohos.inputmethod';
import InputMethod from '@ohos.inputMethod';
import { PinSubType } from '../model/passwordImpl/PasswordModel';
import PasswordInputController from '../controller/password/PasswordInputController';
import LogUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil';