openharmony/applications_photos
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_photos synced 2024-11-23 15:10:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!366 Fix linter error: "export default" is not supported

Browse Source 
Merge pull request !366 from Evgeniy Nikeytsev/fix_export_default
This commit is contained in:
openharmony_ci 2023-06-08 03:37:19 +00:00 committed by Gitee
commit f811c0e38b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
95 changed files with 153 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/base/src/main/ets/data/AlbumDataItem.ts
View File

@ -13,9 +13,9 @@
* limitations under the License.
*/
import MediaLib from '@ohos.multimedia.mediaLibrary';
import mediaModel from '../model/MediaModel';
import { mediaModel } from '../model/MediaModel';
import selectManager from '../manager/SelectManager';
import { selectManager } from '../manager/SelectManager';
import { Log } from '../utils/Log';
import { MediaConstants } from '../constants/MediaConstants';
import { getFetchOptions } from '../helper/MediaDataHelper';

2
common/base/src/main/ets/data/FavorMediaDataItem.ts
View File

@ -14,7 +14,7 @@
*/
import MediaLib from '@ohos.multimedia.mediaLibrary';
import mediaModel from '../model/MediaModel';
import { mediaModel } from '../model/MediaModel';
import { MediaConstants } from '../constants/MediaConstants';
import { MediaDataItem } from './MediaDataItem';

4
common/base/src/main/ets/data/MediaDataItem.ts
View File

@ -15,10 +15,10 @@
import { Log } from '../utils/Log';
import MediaLib from '@ohos.multimedia.mediaLibrary';
import { ViewType } from '../data/ViewType';
import mediaModel from '../model/MediaModel';
import { mediaModel } from '../model/MediaModel';
import { MediaConstants } from '../constants/MediaConstants';
import { setOrientation } from '../helper/MediaDataHelper';
import selectManager from '../manager/SelectManager';
import { selectManager } from '../manager/SelectManager';
import { ItemDataSource } from '../vm/ItemDataSource'
const TAG = "MediaDataItem"

4
common/base/src/main/ets/data/MediaDataItemCache.ts
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
import { MediaDataItem } from './MediaDataItem';
import stashOrGetObject from '../utils/SingleInstanceUtils';
import { stashOrGetObject } from '../utils/SingleInstanceUtils';
const TAG = "MediaDataItemCache"
@ -43,4 +43,4 @@ class MediaDataItemCache {
let mediaDataItemCache: MediaDataItemCache = stashOrGetObject(new MediaDataItemCache(), TAG);
export default mediaDataItemCache as MediaDataItemCache;
export { mediaDataItemCache };

2
common/base/src/main/ets/data/PeerDataItem.ts
View File

@ -14,7 +14,7 @@
*/
import MediaLib from '@ohos.multimedia.mediaLibrary';
import { Log } from '../utils/Log';
import selectManager from '../manager/SelectManager';
import { selectManager } from '../manager/SelectManager';
const TAG = "PeerDataItem"

4
common/base/src/main/ets/data/TrashMediaDataItem.ts
View File

@ -13,8 +13,8 @@
* limitations under the License.
*/
import MediaLib from '@ohos.multimedia.mediaLibrary';
import selectManager from '../manager/SelectManager';
import mediaModel from '../model/MediaModel';
import { selectManager } from '../manager/SelectManager';
import { mediaModel } from '../model/MediaModel';
import { Log } from '../utils/Log';
import { MediaConstants } from '../constants/MediaConstants';
import { MediaDataItem } from './MediaDataItem';

4
common/base/src/main/ets/data/TrashMediaDataItemCache.ts
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
import { TrashMediaDataItem } from './TrashMediaDataItem';
import stashOrGetObject from '../utils/SingleInstanceUtils';
import { stashOrGetObject } from '../utils/SingleInstanceUtils';
const TAG = "TrashMediaDataItemCache"
@ -43,4 +43,4 @@ class TrashMediaDataItemCache {
let trashMediaDataItemCache: TrashMediaDataItemCache = stashOrGetObject(new TrashMediaDataItemCache(), TAG);
export default trashMediaDataItemCache as TrashMediaDataItemCache;
export { trashMediaDataItemCache };

2
common/base/src/main/ets/helper/MediaDataHelper.ts
View File

@ -14,7 +14,7 @@
*/
import image from '@ohos.multimedia.image';
import MediaLib from '@ohos.multimedia.mediaLibrary';
import mediaModel from '../model/MediaModel';
import { mediaModel } from '../model/MediaModel';
import { Log } from '../utils/Log';
import { MediaConstants } from '../constants/MediaConstants';
import { getResourceString } from '../utils/ResourceUtils';

4
common/base/src/main/ets/manager/BroadcastManager.ts
View File

@ -15,7 +15,7 @@
import { Log } from '../utils/Log';
import { Broadcast } from '../utils/Broadcast';
import stashOrGetObject from '../utils/SingleInstanceUtils';
import { stashOrGetObject } from '../utils/SingleInstanceUtils';
const TAG = "BroadcastManager"
@ -35,4 +35,4 @@ export class BroadcastManager {
let broadcastManager: BroadcastManager = stashOrGetObject(new BroadcastManager(), TAG);
export default broadcastManager as BroadcastManager;
export { broadcastManager };

2
common/base/src/main/ets/manager/MultimodalInputManager.ts
View File

@ -76,4 +76,4 @@ export class MultimodalInputManager {
let mMultimodalInputManager = new MultimodalInputManager();
export default mMultimodalInputManager as MultimodalInputManager;
export { mMultimodalInputManager };

4
common/base/src/main/ets/manager/ScreenManager.ts
View File

@ -14,7 +14,7 @@
*/
import deviceInfo from '@ohos.deviceInfo';
import window from '@ohos.window';
import stashOrGetObject from '../utils/SingleInstanceUtils';
import { stashOrGetObject } from '../utils/SingleInstanceUtils';
import { Log } from '../utils/Log';
import { BroadcastConstants } from '../constants/BroadcastConstants';
import { WindowConstants } from '../constants/WindowConstants';
@ -439,4 +439,4 @@ class ScreenManager {
let screenManager: ScreenManager = stashOrGetObject(new ScreenManager(), TAG);
export default screenManager as ScreenManager;
export { screenManager };

4
common/base/src/main/ets/manager/SelectManager.ts
View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import stashOrGetObject from '../utils/SingleInstanceUtils';
import { stashOrGetObject } from '../utils/SingleInstanceUtils';
const TAG = ""
@ -38,4 +38,4 @@ class SelectManager {
let selectManager: SelectManager = stashOrGetObject(new SelectManager(), TAG);
export default selectManager as SelectManager;
export { selectManager };

2
common/base/src/main/ets/model/AlbumDataImpl.ts
View File

@ -16,7 +16,7 @@ import MediaLib from '@ohos.multimedia.mediaLibrary';
import { Log } from '../utils/Log';
import { AlbumDataItem } from '../data/AlbumDataItem';
import { MediaConstants } from '../constants/MediaConstants';
import mediaModel from '../model/MediaModel';
import { mediaModel } from '../model/MediaModel';
import { getAlbumDisplayName, getFetchOptions } from '../helper/MediaDataHelper';
import { QueryConstants } from '../constants/QueryConstants';

2
common/base/src/main/ets/model/DistributedDataImpl.ts
View File

@ -15,7 +15,7 @@
import MediaLib from '@ohos.multimedia.mediaLibrary';
import { Log } from '../utils/Log';
import mediaModel from '../model/MediaModel';
import { mediaModel } from '../model/MediaModel';
import { PeerDataItem } from '../data/PeerDataItem';
const TAG = "DistributedDataImpl"

8
common/base/src/main/ets/model/GroupDataImpl.ts
View File

@ -15,15 +15,15 @@
import MediaLib from '@ohos.multimedia.mediaLibrary';
import { Log } from '../utils/Log';
import { WindowConstants } from '../constants/WindowConstants';
import mediaModel from '../model/MediaModel';
import screenManager from '../manager/ScreenManager';
import { mediaModel } from '../model/MediaModel';
import { screenManager } from '../manager/ScreenManager';
import { MediaConstants } from '../constants/MediaConstants';
import { getFetchOptions } from '../helper/MediaDataHelper';
import { MediaDataItem } from '../data/MediaDataItem';
import { FavorMediaDataItem } from '../data/FavorMediaDataItem';
import { TrashMediaDataItem } from '../data/TrashMediaDataItem';
import mediaDataItemCache from '../data/MediaDataItemCache';
import trashMediaDataItemCache from '../data/TrashMediaDataItemCache';
import { mediaDataItemCache } from '../data/MediaDataItemCache';
import { trashMediaDataItemCache } from '../data/TrashMediaDataItemCache';
const TAG = "GroupDataImpl"

4
common/base/src/main/ets/model/MediaModel.ts
View File

@ -16,7 +16,7 @@
import fileIO from '@ohos.fileio';
import MediaLib from '@ohos.multimedia.mediaLibrary';
import { MediaConstants } from '../constants/MediaConstants';
import stashOrGetObject from '../utils/SingleInstanceUtils';
import { stashOrGetObject } from '../utils/SingleInstanceUtils';
import { Log } from '../utils/Log';
import { startTrace, finishTrace } from '../utils/TraceControllerUtils';
import { hiSysEventDataQueryTimedOut } from '../utils/hisysEventUtil';
@ -426,4 +426,4 @@ class MediaModel {
let mediaModel: MediaModel = stashOrGetObject(new MediaModel(), TAG);
export default mediaModel as MediaModel;
export { mediaModel };

6
common/base/src/main/ets/observer/MediaObserver.ts
View File

@ -13,10 +13,10 @@
* limitations under the License.
*/
import stashOrGetObject from '../utils/SingleInstanceUtils';
import { stashOrGetObject } from '../utils/SingleInstanceUtils';
import { Log } from '../utils/Log';
import { MediaConstants } from '../constants/MediaConstants';
import mediaModel from '../model/MediaModel';
import { mediaModel } from '../model/MediaModel';
import { MediaObserverCallback } from '../interface/MediaObserverCallback';
const TAG = "MediaObserver"
@ -90,4 +90,4 @@ class MediaObserver {
let mediaObserver: MediaObserver = stashOrGetObject(new MediaObserver(), TAG);
export default mediaObserver as MediaObserver;
export { mediaObserver };

2
common/base/src/main/ets/operation/AlbumSetNewMenuOperation.ts
View File

@ -25,7 +25,7 @@ import { JumpSourceToMain } from '../data/JumpSourceToMain';
import { SimpleAlbumDataItem } from '../data/SimpleAlbumDataItem';
import { getFetchOptionsByAlbumItem } from '../helper/MediaDataHelper';
import { showToast } from '../utils/UiUtil';
import mediaModel from '../model/MediaModel';
import { mediaModel } from '../model/MediaModel';
import { AlbumDataItem } from '../data/AlbumDataItem';
import { LazyItem } from '../vm/ItemDataSource';
import { MediaConstants } from '../constants/MediaConstants';

2
common/base/src/main/ets/operation/CopyMenuOperation.ts
View File

@ -19,7 +19,7 @@ import { Log } from '../utils/Log';
import { MenuContext } from './MenuContext';
import { ProcessMenuOperation, FindSameOperation, Assets } from './ProcessMenuOperation';
import { BroadcastConstants } from '../constants/BroadcastConstants';
import mediaModel from '../model/MediaModel';
import { mediaModel } from '../model/MediaModel';
import { MediaOperationType } from '../data/MediaOperationType';
import { startTraceWithTaskId, finishTraceWithTaskId } from '../utils/TraceControllerUtils';
import { ItemDataSource } from '../vm/ItemDataSource';

2
common/base/src/main/ets/operation/MoveMenuOperation.ets
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
import MediaLib from '@ohos.multimedia.mediaLibrary';
import mediaModel from '../model/MediaModel';
import { mediaModel } from '../model/MediaModel';
import { Log } from '../utils/Log';
import { MenuContext } from './MenuContext';
import { ProcessMenuOperation, FindSameOperation } from './ProcessMenuOperation';

2
common/base/src/main/ets/operation/ProcessMenuOperation.ts
View File

@ -22,7 +22,7 @@ import { BroadcastConstants } from '../constants/BroadcastConstants';
import { startTraceWithTaskId, finishTraceWithTaskId } from '../utils/TraceControllerUtils';
import { getFetchOptionsByItem } from '../helper/MediaDataHelper';
import { SimpleAlbumDataItem } from '../data/SimpleAlbumDataItem';
import mediaModel from '../model/MediaModel';
import { mediaModel } from '../model/MediaModel';
export enum FindSameOperation {
NONE,

4
common/base/src/main/ets/utils/DataStoreUtil.ts
View File

@ -15,7 +15,7 @@
import preferences from '@ohos.data.preferences';
import common from '@ohos.app.ability.common';
import { Log } from '../utils/Log';
import stashOrGetObject from './SingleInstanceUtils';
import { stashOrGetObject } from './SingleInstanceUtils';
import { GlobalContext } from '../utils/GlobalContext';
const TAG = "DataStoreUtil"
@ -139,5 +139,5 @@ class DataStoreUtil {
let dataStore: DataStoreUtil = stashOrGetObject(new DataStoreUtil(), TAG);
export default dataStore as DataStoreUtil;
export { dataStore };

2
common/base/src/main/ets/utils/SingleInstanceUtils.ts
View File

@ -19,7 +19,7 @@ import { GlobalContext } from '../utils/GlobalContext';
const TAG = "SingleInstanceHelper";
let globalThis = GlobalContext.getContext();
export default function stashOrGetObjectObject<T>(objectClass: object, storageKey: string): T {
export function stashOrGetObject<T>(objectClass: object, storageKey: string): T {
if (!Boolean(globalThis.getObject(storageKey)).valueOf()) {
globalThis.setObject(storageKey, objectClass);
Log.debug(TAG, "Create key of " + storageKey);

2
common/base/src/main/ets/utils/UiUtil.ts
View File

@ -14,7 +14,7 @@
*/
import prompt from '@system.prompt';
import { Log } from '../utils/Log';
import screenManager from '../manager/ScreenManager';
import { screenManager } from '../manager/ScreenManager';
const TAG = "UiUtil"
const TOAST_DURATION = 3000;

2
entry/src/main/ets/Application/AbilityStage.ts
View File

@ -16,7 +16,7 @@
import AbilityStage from "@ohos.app.ability.AbilityStage"
import { GlobalContext } from '@ohos/base/src/main/ets/utils/GlobalContext';
export default class PhotosAbilityStage extends AbilityStage {
export class PhotosAbilityStage extends AbilityStage {
onCreate(): void {
GlobalContext.getContext().setObject("applicationContext", this.context);
}

10
entry/src/main/ets/FormAbility/FormAbility.ts
View File

@ -19,12 +19,12 @@ import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { FormControllerManager } from './controller/FormControllerManager';
import { FormController } from './controller/FormController';
import { Constants } from './common/Constants';
import mediaModel from '@ohos/base/src/main/ets/model/MediaModel';
import DataStoreUtil from '@ohos/base/src/main/ets/utils/DataStoreUtil';
import { mediaModel } from '@ohos/base/src/main/ets/model/MediaModel';
import { dataStore } from '@ohos/base/src/main/ets/utils/DataStoreUtil';
import Want from '@ohos.app.ability.Want';
import { GlobalContext } from '@ohos/base/src/main/ets/utils/GlobalContext';
export default class FormAbility extends FormExtension {
export class FormAbility extends FormExtension {
private TAG: string = 'FormAbility';
onAddForm(want: Want): formBindingData.FormBindingData | null {
Log.info(this.TAG, "form onAddForm. want " + JSON.stringify(want));
@ -71,8 +71,8 @@ export default class FormAbility extends FormExtension {
private async clearCache(newStatus: Map<string, number>): Promise<void> {
try {
let dataStore = DataStoreUtil.getInstance();
await dataStore.removeCache();
let dataStoreInst = dataStore.getInstance();
await dataStoreInst.removeCache();
let formControllerManager: FormControllerManager = FormControllerManager.getInstance();
newStatus.forEach((value: number, key: string):void => {
Log.info(this.TAG, "onVisibilityChange, key:" + key + " value " + value);

2
entry/src/main/ets/FormAbility/controller/FormControllerManager.ts
View File

@ -15,7 +15,7 @@
import { Constants } from '../common/Constants';
import { FormController } from './FormController';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import dataStore from '@ohos/base/src/main/ets/utils/DataStoreUtil';
import { dataStore } from '@ohos/base/src/main/ets/utils/DataStoreUtil';
export class FormControllerManager {
private TAG: string = 'FormControllerManager';

4
entry/src/main/ets/FormAbility/data/MediaDataManager.ts
View File

@ -17,8 +17,8 @@ import { FormController } from '../controller/FormController';
import { Constants } from '../common/Constants';
import MediaLib from '@ohos.multimedia.mediaLibrary';
import { MediaConstants } from '@ohos/base/src/main/ets/constants/MediaConstants';
import dataStore from '@ohos/base/src/main/ets/utils/DataStoreUtil';
import mediaModel from '@ohos/base/src/main/ets/model/MediaModel';
import { dataStore } from '@ohos/base/src/main/ets/utils/DataStoreUtil';
import { mediaModel } from '@ohos/base/src/main/ets/model/MediaModel';
import { getResourceString } from '@ohos/base/src/main/ets/utils/ResourceUtils';
import { getAlbumDisplayName, getFetchOptions } from '@ohos/base/src/main/ets/helper/MediaDataHelper';
import { Log } from '@ohos/base/src/main/ets/utils/Log';

8
entry/src/main/ets/MainAbility/MainAbility.ts
View File

@ -18,12 +18,12 @@ import window from '@ohos.window';
import Ability from '@ohos.app.ability.UIAbility';
import wantConstant from '@ohos.ability.wantConstant';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../common/model/common/Constants';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { startTrace, finishTrace } from '@ohos/base/src/main/ets/utils/TraceControllerUtils';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import mediaModel from '@ohos/base/src/main/ets/model/MediaModel';
import { mediaModel } from '@ohos/base/src/main/ets/model/MediaModel';
import router from '@system.router';
import { GroupItemDataSource } from '@ohos/base/src/main/ets/vm/GroupItemDataSource';
import atManager from '@ohos.abilityAccessCtrl';
@ -40,7 +40,7 @@ let mFilterMediaType: number = MediaConstants.SELECT_TYPE_ALL;
let appBroadcast = broadcastManager.getBroadcast();
let pagePath: string = deviceInfo.deviceType == 'phone' || deviceInfo.deviceType == 'default' ? 'product/phone/view/index' : 'product/pad/view/index';
export default class MainAbility extends Ability {
export class MainAbility extends Ability {
private TAG: string = 'MainAbility';
private static readonly RETRY_MAX_TIMES = 100;
private static readonly ACTION_URI_SINGLE_SELECT = 'singleselect';

8
entry/src/main/ets/ServiceExt/ServiceExtAbility.ts
View File

@ -24,14 +24,14 @@ import deviceInfo from '@ohos.deviceInfo';
import bundleManager from '@ohos.bundle.bundleManager';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { Constants } from '../common/model/common/Constants';
import mediaModel from '@ohos/base/src/main/ets/model/MediaModel';
import { mediaModel } from '@ohos/base/src/main/ets/model/MediaModel';
import uri from '@ohos.uri';
import ScreenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { GlobalContext } from '@ohos/base/src/main/ets/utils/GlobalContext';
const TAG: string = 'ServiceExtAbility';
export default class ServiceExtAbility extends Extension {
export class ServiceExtAbility extends Extension {
private globalThis = GlobalContext.getContext();
onCreate(want): void {
@ -95,7 +95,7 @@ export default class ServiceExtAbility extends Extension {
let promise = display.getDefaultDisplay();
promise.then((data: display.Display): void => {
Log.error(TAG, "Succeeded in loading the content, width : " + data.width + ", height : " + data.height);
ScreenManager.setWinWidth(data.width)
screenManager.setWinWidth(data.width)
windowClass.resetSize(data.width, data.height);
windowClass.setBackgroundColor('#00000000');
windowClass.show();

2
entry/src/main/ets/common/view/NoPhotoComponent.ets
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../model/common/Constants';
import { Log } from '@ohos/base/src/main/ets/utils/Log';

2
entry/src/main/ets/common/view/NoPhotoIndexComponent.ets
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../model/common/Constants';
import { Log } from '@ohos/base/src/main/ets/utils/Log';

4
entry/src/main/ets/common/view/TabBar.ets
View File

@ -15,11 +15,11 @@
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { TabItem, TabItemWithText } from '../model/common/TabItem';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import { Constants } from '../model/common/Constants';
import screenManager, { ColumnSize } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager, ColumnSize } from '@ohos/base/src/main/ets/manager/ScreenManager';
export enum DEVICE_TYPE {
DEVICE_PHONE,

2
entry/src/main/ets/common/view/actionbar/ActionBarButton.ets
View File

@ -16,7 +16,7 @@
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { Action } from '../browserOperation/Action'
import { ActionBarColorMode } from '../browserOperation/ActionBarMode'
import screenManager, { ColumnSize } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager, ColumnSize } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
export interface EventVisibility {

2
entry/src/main/ets/common/view/actionbar/ToolBar.ets
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
import screenManager, { ColumnSize } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager, ColumnSize } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { ToolBarButton } from './ToolBarButton';
import { EventVisibility } from './ActionBarButton';
import { Constants } from '../../model/common/Constants';

2
entry/src/main/ets/common/view/browserOperation/MediaOperationActionBar.ets
View File

@ -17,7 +17,7 @@ import { Action } from './Action';
import { ActionBar } from '../../../common/view/actionbar/ActionBar';
import { ActionBarProp } from './ActionBarProp';
import { ActionBarMode } from './ActionBarMode';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { MediaOperationType } from '@ohos/base/src/main/ets/data/MediaOperationType';
@Component

4
entry/src/main/ets/common/view/browserOperation/MediaOperationPage.ets
View File

@ -24,8 +24,8 @@ import { MenuContext } from '@ohos/base/src/main/ets/operation/MenuContext';
import { Action } from './Action';
import { JumpSourceToMain } from '@ohos/base/src/main/ets/data/JumpSourceToMain';
import { CustomDialogView } from '../dialog/CustomDialogView';
import screenManager, { ColumnSize } from '@ohos/base/src/main/ets/manager/ScreenManager';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { screenManager, ColumnSize } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { AlbumsDataSource } from '@ohos/base/src/main/ets/vm/AlbumsDataSource'
import { AlbumDataItem } from '@ohos/base/src/main/ets/data/AlbumDataItem';
import { MediaConstants } from '@ohos/base/src/main/ets/constants/MediaConstants';

2
entry/src/main/ets/common/view/dialog/AddNotesDialog.ets
View File

@ -14,7 +14,7 @@
*/
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { DialogCallback } from '../../model/common/DialogUtil';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
import { showToast } from '@ohos/base/src/main/ets/utils/UiUtil';
import { getResourceString } from '@ohos/base/src/main/ets/utils/ResourceUtils';

2
entry/src/main/ets/common/view/dialog/CancelOperationDialog.ets
View File

@ -15,7 +15,7 @@
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
@Observed

2
entry/src/main/ets/common/view/dialog/CopyOrMoveDialog.ets
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
@Observed

2
entry/src/main/ets/common/view/dialog/CustomDialogView.ets
View File

@ -35,7 +35,7 @@ import { EditExitDialog, EditExitDialogCallback } from './EditExitDialog';
import { NewAlbumDialog } from './NewAlbumDialog';
import { CopyOrMoveDialog, OperateParam } from './CopyOrMoveDialog';
import { FindSameNameDialog, FindSameNameParam } from './FindSameNameDialog';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { SaveImageDialog } from './SaveImageDialog';
const TAG: string = 'CustomDialogView'

2
entry/src/main/ets/common/view/dialog/DeleteDialog.ets
View File

@ -14,7 +14,7 @@
*/
import { DialogCallback } from '../../model/common/DialogUtil';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
@CustomDialog

2
entry/src/main/ets/common/view/dialog/DeleteProgressDialog.ets
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
@Observed

2
entry/src/main/ets/common/view/dialog/DetailsDialog.ets
View File

@ -15,7 +15,7 @@
import MediaLib from '@ohos.multimedia.mediaLibrary';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { DateUtil } from '@ohos/base/src/main/ets/utils/DateUtil';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
@Observed

2
entry/src/main/ets/common/view/dialog/DownloadCancelOperationDialog.ets
View File

@ -15,7 +15,7 @@
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
@Observed

2
entry/src/main/ets/common/view/dialog/EditExitDialog.ets
View File

@ -14,7 +14,7 @@
*/
import router from '@system.router'
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager'
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager'
import { Constants } from '../../model/common/Constants'
@Observed

2
entry/src/main/ets/common/view/dialog/FindSameNameDialog.ets
View File

@ -17,7 +17,7 @@ import { DialogCallback } from '../../model/common/DialogUtil';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { DateUtil } from '@ohos/base/src/main/ets/utils/DateUtil';
import { FindSameOperation } from '@ohos/base/src/main/ets/operation/ProcessMenuOperation';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
@Observed

2
entry/src/main/ets/common/view/dialog/MultiSelectDialog.ets
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
@Observed

2
entry/src/main/ets/common/view/dialog/NewAlbumDialog.ets
View File

@ -14,7 +14,7 @@
*/
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { DialogCallback } from '../../model/common/DialogUtil';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
import { showToast } from '@ohos/base/src/main/ets/utils/UiUtil';
import { getResourceString } from '@ohos/base/src/main/ets/utils/ResourceUtils';

2
entry/src/main/ets/common/view/dialog/ProgressDialog.ets
View File

@ -14,7 +14,7 @@
*/
import { MediaOperationType } from '@ohos/base/src/main/ets/data/MediaOperationType'
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
@Observed

2
entry/src/main/ets/common/view/dialog/RenameDialog.ets
View File

@ -15,7 +15,7 @@
*/
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { DialogCallback } from '../../model/common/DialogUtil';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
import { showToast } from '@ohos/base/src/main/ets/utils/UiUtil';
import { getResourceString } from '@ohos/base/src/main/ets/utils/ResourceUtils';

2
entry/src/main/ets/common/view/dialog/SaveDialog.ets
View File

@ -14,7 +14,7 @@
*/
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast'
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager'
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager'
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants'
import { Constants } from '../../model/common/Constants';
import { DateUtil } from '@ohos/base/src/main/ets/utils/DateUtil';

2
entry/src/main/ets/common/view/dialog/SaveImageDialog.ets
View File

@ -15,7 +15,7 @@
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants'
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast'
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager'
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager'
import { Constants } from '../../model/common/Constants';
@CustomDialog

2
entry/src/main/ets/common/view/dialog/ThirdDeleteDialog.ets
View File

@ -14,7 +14,7 @@
*/
import { DialogCallback } from '../../model/common/DialogUtil';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Constants } from '../../model/common/Constants';
@CustomDialog

2
entry/src/main/ets/feature/album/model/AlbumBarModel.ts
View File

@ -16,7 +16,7 @@
import { Action } from '../../../common/view/browserOperation/Action'
import { ActionBarProp } from '../../../common/view/browserOperation/ActionBarProp'
import { ActionBarMode, ActionBarSelectionMode } from '../../../common/view/browserOperation/ActionBarMode'
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager'
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager'
export class AlbumBarModel {
createActionBar(isAlbumSetSelectedMode: boolean, selectedAlbumsCount: number,

6
entry/src/main/ets/feature/album/view/AlbumSetPage.ets
View File

@ -17,11 +17,11 @@ import { CopyMenuOperation } from '@ohos/base/src/main/ets/operation/CopyMenuOpe
import { MoveMenuOperation } from '@ohos/base/src/main/ets/operation/MoveMenuOperation';
import { SimpleAlbumDataItem } from '@ohos/base/src/main/ets/data/SimpleAlbumDataItem';
import { Constants } from '../../../common/model/common/Constants';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { NoPhotoIndexComponent } from '../../../common/view/NoPhotoIndexComponent';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { startTrace, finishTrace } from '@ohos/base/src/main/ets/utils/TraceControllerUtils';
import { TabBarForAlbumSet } from '../../../common/view/TabBar';
import { TabItemWithText } from '../../../common/model/common/TabItem';
@ -34,7 +34,7 @@ import { ActionBar } from '../../../common/view/actionbar/ActionBar';
import { ActionBarProp } from '../../../common/view/browserOperation/ActionBarProp';
import { MediaLibDataChangeCallback } from '@ohos/base/src/main/ets/interface/MediaLibDataChangeCallback';
import { CommonObserverCallback } from '@ohos/base/src/main/ets/observer/CommonObserverCallback';
import mediaObserver from '@ohos/base/src/main/ets/observer/MediaObserver';
import { mediaObserver } from '@ohos/base/src/main/ets/observer/MediaObserver';
import { getResourceString } from '@ohos/base/src/main/ets/utils/ResourceUtils';
import { showToast } from '@ohos/base/src/main/ets/utils/UiUtil';
import { MediaConstants } from '@ohos/base/src/main/ets/constants/MediaConstants';

2
entry/src/main/ets/feature/albumSelect/utils/UiUtil.ts
View File

@ -14,7 +14,7 @@
*/
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager'
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager'
import { Constants } from '../../../common/model/common/Constants'
const TAG = "UiUtil"

4
entry/src/main/ets/feature/albumSelect/view/AlbumSelect.ets
View File

@ -20,7 +20,7 @@ import {
AlbumSelectGridItemNewStyle
} from '@ohos/selectAlbums/src/main/ets/components/AlbumSelectGridItemNewStyle';
import { Constants } from '../../../common/model/common/Constants';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { NoPhotoComponent } from '../../../common/view/NoPhotoComponent';
import { startTrace, finishTrace } from '@ohos/base/src/main/ets/utils/TraceControllerUtils';
@ -28,7 +28,7 @@ import { Action } from '../../../common/view/browserOperation/Action';
import { ActionBar } from '../../../common/view/actionbar/ActionBar';
import { ActionBarProp } from '../../../common/view/browserOperation/ActionBarProp';
import { UiUtil } from '../utils/UiUtil';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import { AlbumSelectBarModel } from '../model/AlbumSelectBarModel';
import { AlbumScrollBar } from '@ohos/base/src/main/ets/components/scrollBar/AlbumScrollBar';

10
entry/src/main/ets/feature/browser/view/PhotoBrowser.ets
View File

@ -34,21 +34,21 @@ import { CustomDialogView } from '../../../common/view/dialog/CustomDialogView';
import { Constants } from '../../../common/model/common/Constants';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { Constants as PhotoConstants } from '@ohos/browser/src/main/ets/constants/Constants';
import { PhotoBrowserBg } from '@ohos/browser/src/main/ets/components/PhotoBrowserBg';
import { PhotoBrowserActionBar } from './PhotoBrowserActionBar';
import { ToolBar } from '../../../common/view/actionbar/ToolBar';
import { PhotoSwiper } from '@ohos/browser/src/main/ets/components/PhotoSwiper';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { JumpSourceToMain } from '@ohos/base/src/main/ets/data/JumpSourceToMain';
import { RenameMenuOperation } from '@ohos/browser/src/main/ets/operation/RenameMenuOperation';
import { MediaOperationType } from '@ohos/base/src/main/ets/data/MediaOperationType';
import { showToast } from '@ohos/base/src/main/ets/utils/UiUtil';
import { getResourceString } from '@ohos/base/src/main/ets/utils/ResourceUtils';
import { CommonObserverCallback } from '@ohos/base/src/main/ets/observer/CommonObserverCallback';
import mediaObserver from '@ohos/base/src/main/ets/observer/MediaObserver';
import mMultimodalInputManager from '@ohos/base/src/main/ets/manager/MultimodalInputManager';
import { mediaObserver } from '@ohos/base/src/main/ets/observer/MediaObserver';
import { mMultimodalInputManager } from '@ohos/base/src/main/ets/manager/MultimodalInputManager';
import { startTrace, finishTrace } from '@ohos/base/src/main/ets/utils/TraceControllerUtils';
import { GroupItemDataSource } from '@ohos/base/src/main/ets/vm/GroupItemDataSource';
import { MediaDataItem } from '@ohos/base/src/main/ets/data/MediaDataItem';
@ -56,7 +56,7 @@ import { InnerMediaDataItem } from '@ohos/browser/src/main/ets/data/InnerMediaDa
import { SimpleAlbumDataItem } from '@ohos/base/src/main/ets/data/SimpleAlbumDataItem';
import { getAlbumDisplayName } from '@ohos/base/src/main/ets/helper/MediaDataHelper';
import { startAbility, terminateSelf } from '@ohos/base/src/main/ets/utils/AbilityUtils';
import mediaDataItemCache from '@ohos/base/src/main/ets/data/MediaDataItemCache';
import { mediaDataItemCache } from '@ohos/base/src/main/ets/data/MediaDataItemCache';
import { PhotoEditorManager } from '../../editor/PhotoEditorManager';
import { GlobalContext } from '@ohos/base/src/main/ets/utils/GlobalContext';
// page of large photo

6
entry/src/main/ets/feature/browser/view/SelectPhotoBrowser.ets
View File

@ -23,10 +23,10 @@ import { PhotoBrowserBg } from '@ohos/browser/src/main/ets/components/PhotoBrows
import { Constants as PhotoConstants } from '@ohos/browser/src/main/ets/constants/Constants';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { PhotoSwiper } from '@ohos/browser/src/main/ets/components/PhotoSwiper';
import mMultimodalInputManager from '@ohos/base/src/main/ets/manager/MultimodalInputManager';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { mMultimodalInputManager } from '@ohos/base/src/main/ets/manager/MultimodalInputManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { SimpleAlbumDataItem } from '@ohos/base/src/main/ets/data/SimpleAlbumDataItem';
import { GroupItemDataSource } from '@ohos/base/src/main/ets/vm/GroupItemDataSource';
import { MediaDataItem } from '@ohos/base/src/main/ets/data/MediaDataItem';

4
entry/src/main/ets/feature/browser/view/VideoBrowser.ets
View File

@ -19,8 +19,8 @@ import { Action } from '../../../common/view/browserOperation/Action'
import { MenuOperation } from '@ohos/base/src/main/ets/operation/MenuOperation';
import { PhotoBrowserActionBar } from './PhotoBrowserActionBar';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import { startTrace, finishTrace } from '@ohos/base/src/main/ets/utils/TraceControllerUtils';

6
entry/src/main/ets/feature/distributedAlbum/view/DistributedAlbumSetPage.ets
View File

@ -22,15 +22,15 @@ import {
AlbumGridItemTraditionalStyle
} from '@ohos/distributed/src/main/ets/components/AlbumGridItemTraditionalStyle';
import { Constants } from '../../../common/model/common/Constants';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { NoPhotoIndexComponent } from '../../../common/view/NoPhotoIndexComponent';
import { JumpSourceToMain } from '@ohos/base/src/main/ets/data/JumpSourceToMain';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import { MediaLibDataChangeCallback } from '@ohos/base/src/main/ets/interface/MediaLibDataChangeCallback';
import { CommonObserverCallback } from '@ohos/base/src/main/ets/observer/CommonObserverCallback';
import mediaObserver from '@ohos/base/src/main/ets/observer/MediaObserver';
import { mediaObserver } from '@ohos/base/src/main/ets/observer/MediaObserver';
import { DistributedAlbumBarModel } from '../model/DistributedAlbumBarModel';
import { AlbumsDataSource } from '@ohos/base/src/main/ets/vm/AlbumsDataSource';
import { AlbumDataItem } from '@ohos/base/src/main/ets/data/AlbumDataItem';

2
entry/src/main/ets/feature/editor/Loader.ts
View File

@ -20,7 +20,7 @@ import { PixelMapWrapper } from './base/PixelMapWrapper';
import { MathUtils } from './crop/MathUtils';
import { CropAngle } from './crop/CropType';
import { computeSampleSize } from '@ohos/base/src/main/ets/utils/ImageUtil';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
const TAG = "Loader"

2
entry/src/main/ets/feature/editor/Save.ts
View File

@ -16,7 +16,7 @@
import image from '@ohos.multimedia.image';
import fileIO from '@ohos.fileio';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import mediaModel from '@ohos/base/src/main/ets/model/MediaModel';
import { mediaModel } from '@ohos/base/src/main/ets/model/MediaModel';
import MediaLib from '@ohos.multimedia.mediaLibrary';
import { MediaDataItem } from '@ohos/base/src/main/ets/data/MediaDataItem';
import { ImageFilterStack } from './ImageFilterStack';

2
entry/src/main/ets/feature/editor/crop/CropShow.ts
View File

@ -20,7 +20,7 @@ import { Ratio } from '../base/Ratio';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { CropRatioType, CropAngle } from './CropType';
import { MathUtils } from './MathUtils';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
export class CropShow {
private TAG: string = 'CropShow';

2
entry/src/main/ets/feature/editor/view/CropImageShow.ets
View File

@ -16,7 +16,7 @@ import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { Constants } from '../../../common/model/common/Constants';
import { PhotoEditCrop } from '../crop/PhotoEditCrop';
import { CropResetBar } from './CropResetBar';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
@Component

4
entry/src/main/ets/feature/editor/view/EditMain.ets
View File

@ -19,12 +19,12 @@ import { TitleBar } from './TitleBar';
import { MainMenuBar } from './MainMenuBar';
import { PhotoEditMode } from '../base/PhotoEditType';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { ToolBar } from './ToolBar';
import { CropImageShow } from './CropImageShow';
import { CustomDialogView } from '../../../common/view/dialog/CustomDialogView';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { PhotoEditorManager } from '../PhotoEditorManager';
import { PhotoEditCrop } from '../crop/PhotoEditCrop';
import { MediaDataItem } from '@ohos/base/src/main/ets/data/MediaDataItem';

2
entry/src/main/ets/feature/editor/view/TitleBar.ets
View File

@ -17,7 +17,7 @@ import { PhotoEditMode } from '../base/PhotoEditType';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { Constants } from '../../../common/model/common/Constants';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { PhotoEditorManager } from '../PhotoEditorManager';
import { PhotoEditCrop } from '../crop/PhotoEditCrop';
import { Log } from '@ohos/base/src/main/ets/utils/Log';

8
entry/src/main/ets/feature/formEditor/view/FormEditorPage.ets
View File

@ -21,11 +21,11 @@ import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { Constants } from '@ohos/formEditor/src/main/ets/constants/Constants';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { getResourceString } from '@ohos/base/src/main/ets/utils/ResourceUtils';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import dataStore from '@ohos/base/src/main/ets/utils/DataStoreUtil';
import mediaModel from '@ohos/base/src/main/ets/model/MediaModel';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { dataStore } from '@ohos/base/src/main/ets/utils/DataStoreUtil';
import { mediaModel } from '@ohos/base/src/main/ets/model/MediaModel';
import { terminateSelf } from '@ohos/base/src/main/ets/utils/AbilityUtils';
import { MediaConstants } from '@ohos/base/src/main/ets/constants/MediaConstants';
import { getFetchOptions } from '@ohos/base/src/main/ets/helper/MediaDataHelper';

4
entry/src/main/ets/feature/newAlbum/view/NewAlbumPage.ets
View File

@ -24,9 +24,9 @@ import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import { Constants } from '../../../common/model/common/Constants';
import { NoPhotoComponent } from '../../../common/view/NoPhotoComponent';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { startTrace, finishTrace } from '@ohos/base/src/main/ets/utils/TraceControllerUtils';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { MenuContext } from '@ohos/base/src/main/ets/operation/MenuContext';
import { CopyMenuOperation } from '@ohos/base/src/main/ets/operation/CopyMenuOperation';
import { JumpSourceToMain } from '@ohos/base/src/main/ets/data/JumpSourceToMain';

2
entry/src/main/ets/feature/photoGrid/model/PhotoGridBarModel.ts
View File

@ -16,7 +16,7 @@
import { Action } from '../../../common/view/browserOperation/Action';
import { ActionBarProp } from '../../../common/view/browserOperation/ActionBarProp';
import { ActionBarMode, ActionBarSelectionMode } from '../../../common/view/browserOperation/ActionBarMode';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { MediaConstants } from '@ohos/base/src/main/ets/constants/MediaConstants';
export class PhotoGridBarModel {

6
entry/src/main/ets/feature/photoGrid/view/PhotoGridPage.ets
View File

@ -28,10 +28,10 @@ import { Constants } from '../../../common/model/common/Constants';
import { MenuOperation } from '@ohos/base/src/main/ets/operation/MenuOperation';
import { MenuContext } from '@ohos/base/src/main/ets/operation/MenuContext';
import { BatchDeleteMenuOperation } from '@ohos/base/src/main/ets/operation/BatchDeleteMenuOperation';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { startTrace, finishTrace } from '@ohos/base/src/main/ets/utils/TraceControllerUtils';
import { ShareMenuOperation } from '@ohos/base/src/main/ets/operation/ShareMenuOperation';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { JumpSourceToMain } from '@ohos/base/src/main/ets/data/JumpSourceToMain';
import { getResourceString } from '@ohos/base/src/main/ets/utils/ResourceUtils';
import { MediaOperationType } from '@ohos/base/src/main/ets/data/MediaOperationType';
@ -41,7 +41,7 @@ import { GridScrollBar } from '@ohos/base/src/main/ets/components/scrollBar/Grid
import { BatchRecoverMenuOperation } from '@ohos/base/src/main/ets/operation/BatchRecoverMenuOperation';
import { ClearRecycleMenuOperation } from '@ohos/base/src/main/ets/operation/ClearRecycleMenuOperation';
import { SimpleAlbumDataItem } from '@ohos/base/src/main/ets/data/SimpleAlbumDataItem';
import mediaObserver from '@ohos/base/src/main/ets/observer/MediaObserver';
import { mediaObserver } from '@ohos/base/src/main/ets/observer/MediaObserver';
import { MediaLibDataChangeCallback } from '@ohos/base/src/main/ets/interface/MediaLibDataChangeCallback';
import { CommonObserverCallback } from '@ohos/base/src/main/ets/observer/CommonObserverCallback';
import { NoPhotoComponent } from '../../../common/view/NoPhotoComponent';

4
entry/src/main/ets/feature/thirdSelect/view/ThirdSelectAlbumSetPage.ets
View File

@ -23,9 +23,9 @@ import { Constants } from '../../../common/model/common/Constants';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { NoPhotoComponent } from '../../../common/view/NoPhotoComponent';
import { NoPhotoIndexComponent } from '../../../common/view/NoPhotoIndexComponent';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { ThirdSelectBarModel } from '../model/ThirdSelectBarModel';
import { AlbumScrollBar } from '@ohos/base/src/main/ets/components/scrollBar/AlbumScrollBar';
import { AlbumsDataSource } from '@ohos/base/src/main/ets/vm/AlbumsDataSource';

6
entry/src/main/ets/feature/thirdSelect/view/ThirdSelectPhotoBrowser.ets
View File

@ -22,11 +22,11 @@ import { ThirdSelectPhotoBrowserActionBar } from '../../../common/view/ThirdSele
import { PhotoBrowserBg } from '@ohos/browser/src/main/ets/components/PhotoBrowserBg';
import { Constants as PhotoConstants } from '@ohos/browser/src/main/ets/constants/Constants';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import { PhotoSwiper } from '@ohos/browser/src/main/ets/components/PhotoSwiper';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import mMultimodalInputManager from '@ohos/base/src/main/ets/manager/MultimodalInputManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { mMultimodalInputManager } from '@ohos/base/src/main/ets/manager/MultimodalInputManager';
import { GroupItemDataSource } from '@ohos/base/src/main/ets/vm/GroupItemDataSource';
import { MediaDataItem } from '@ohos/base/src/main/ets/data/MediaDataItem';
import { MediaConstants } from '@ohos/base/src/main/ets/constants/MediaConstants';

4
entry/src/main/ets/feature/thirdSelect/view/ThirdSelectPhotoGridPage.ets
View File

@ -24,9 +24,9 @@ import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import { Constants } from '../../../common/model/common/Constants';
import { NoPhotoComponent } from '../../../common/view/NoPhotoComponent';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { GridScrollBar } from '@ohos/base/src/main/ets/components/scrollBar/GridScrollBar';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { ThirdSelectBarModel } from '../model/ThirdSelectBarModel';
import { GroupItemDataSource } from '@ohos/base/src/main/ets/vm/GroupItemDataSource';
import { MediaDataItem } from '@ohos/base/src/main/ets/data/MediaDataItem';

2
entry/src/main/ets/feature/timeline/model/TimelinePageBarModel.ts
View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { Action } from '../../../common/view/browserOperation/Action';
import { ActionBarMode, ActionBarSelectionMode } from '../../../common/view/browserOperation/ActionBarMode';
import { ActionBarProp } from '../../../common/view/browserOperation/ActionBarProp';

6
entry/src/main/ets/feature/timeline/view/TimelinePage.ets
View File

@ -28,15 +28,15 @@ import { ViewType } from '@ohos/base/src/main/ets/data/ViewType';
import { Action } from '../../../common/view/browserOperation/Action';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { NoPhotoIndexComponent } from '../../../common/view/NoPhotoIndexComponent';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import router from '@system.router';
import { startTrace, finishTrace } from '@ohos/base/src/main/ets/utils/TraceControllerUtils';
import { ShareMenuOperation } from '@ohos/base/src/main/ets/operation/ShareMenuOperation';
import { MediaLibDataChangeCallback } from '@ohos/base/src/main/ets/interface/MediaLibDataChangeCallback';
import { CommonObserverCallback } from '@ohos/base/src/main/ets/observer/CommonObserverCallback';
import mediaObserver from '@ohos/base/src/main/ets/observer/MediaObserver';
import { mediaObserver } from '@ohos/base/src/main/ets/observer/MediaObserver';
import { getResourceString } from '@ohos/base/src/main/ets/utils/ResourceUtils';
import { showToast } from '@ohos/base/src/main/ets/utils/UiUtil';
import { MediaOperationType } from '@ohos/base/src/main/ets/data/MediaOperationType';

4
entry/src/main/ets/product/pad/view/index.ets
View File

@ -20,9 +20,9 @@ import { TabBar, DEVICE_TYPE } from '../../../common/view/TabBar';
import { JumpSourceToMain } from '@ohos/base/src/main/ets/data/JumpSourceToMain';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { Constants } from '../../../common/model/common/Constants';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { startTrace, finishTrace } from '@ohos/base/src/main/ets/utils/TraceControllerUtils';
import router, { ParamsInterface } from '@system.router';
import app from '@system.app';

2
entry/src/main/ets/product/phone/view/index.ets
View File

@ -20,7 +20,7 @@ import { TabBar } from '../../../common/view/TabBar';
import { JumpSourceToMain } from '@ohos/base/src/main/ets/data/JumpSourceToMain';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { Constants } from '../../../common/model/common/Constants';
import { startTrace, finishTrace } from '@ohos/base/src/main/ets/utils/TraceControllerUtils';
import router, { ParamsInterface } from '@system.router';

4
features/album/src/main/ets/components/AlbumGridItemNewStyle.ets
View File

@ -15,10 +15,10 @@
import { EmptyAlbumComponent } from '@ohos/base/src/main/ets/components/EmptyAlbumComponent';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import router from '@system.router';
import { WindowConstants } from '@ohos/base/src/main/ets/constants/WindowConstants';
import { MediaConstants } from '@ohos/base/src/main/ets/constants/MediaConstants';

2
features/album/src/main/ets/components/DistributedAlbumGriItem.ets
View File

@ -15,7 +15,7 @@
import router from '@system.router';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { EmptyAlbumComponent } from '@ohos/base/src/main/ets/components/EmptyAlbumComponent';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { WindowConstants } from '@ohos/base/src/main/ets/constants/WindowConstants';
import { PeerDataItem } from '@ohos/base/src/main/ets/data/PeerDataItem';

2
features/album/src/main/ets/operation/AlbumSetRenameMenuOperation.ts
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
import MediaLib from '@ohos.multimedia.mediaLibrary';
import mediaModel from '@ohos/base/src/main/ets/model/MediaModel';
import { mediaModel } from '@ohos/base/src/main/ets/model/MediaModel';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { ItemDataSource } from '@ohos/base/src/main/ets/vm/ItemDataSource';
import { AlbumDataItem } from '@ohos/base/src/main/ets/data/AlbumDataItem';

2
features/browser/src/main/ets/components/PhotoItem.ets
View File

@ -21,7 +21,7 @@ import { EventPipeline, AnimationOption, Matrix4TransitWithMatrix4x4 } from '../
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { Constants } from '../constants/Constants';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { RouterConstants } from '@ohos/base/src/main/ets/constants/RouterConstants';
import { startTrace, finishTrace } from '@ohos/base/src/main/ets/utils/TraceControllerUtils';
import { LoadingPanel } from './LoadingPanel';

2
features/browser/src/main/ets/data/InnerMediaDataItem.ts
View File

@ -15,7 +15,7 @@
import MediaLib from '@ohos.multimedia.mediaLibrary';
import { MediaConstants } from '@ohos/base/src/main/ets/constants/MediaConstants';
import { MediaDataItem } from '@ohos/base/src/main/ets/data/MediaDataItem';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
export class InnerMediaDataItem extends MediaDataItem {
constructor(uri: string, index: number) {

2
features/browser/src/main/ets/model/ThumbnailModel.ts
View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { computeSampleSize } from '@ohos/base/src/main/ets/utils/ImageUtil';
import { MediaDataItem } from '@ohos/base/src/main/ets/data/MediaDataItem';
import { MediaConstants } from '@ohos/base/src/main/ets/constants/MediaConstants';

2
features/browser/src/main/ets/operation/GotoPhotosMenuOperation.ts
View File

@ -17,7 +17,7 @@ import router from '@system.router';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { MenuOperation } from '@ohos/base/src/main/ets/operation/MenuOperation';
import { MenuContext } from '@ohos/base/src/main/ets/operation/MenuContext';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { JumpSourceToMain } from '@ohos/base/src/main/ets/data/JumpSourceToMain';
import { RouterConstants } from '@ohos/base/src/main/ets/constants/RouterConstants';

2
features/browser/src/main/ets/operation/RenameMenuOperation.ts
View File

@ -17,7 +17,7 @@ import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastC
import { MenuOperationCallback } from '@ohos/base/src/main/ets/operation/MenuOperationCallback';
import { MenuOperation } from '@ohos/base/src/main/ets/operation/MenuOperation';
import { MenuContext } from '@ohos/base/src/main/ets/operation/MenuContext';
import mediaModel from '@ohos/base/src/main/ets/model/MediaModel';
import { mediaModel } from '@ohos/base/src/main/ets/model/MediaModel';
import { getFetchOptionsByItem } from '@ohos/base/src/main/ets/helper/MediaDataHelper';
import { SimpleAlbumDataItem } from '@ohos/base/src/main/ets/data/SimpleAlbumDataItem';
import { Constants } from '../constants/Constants';

2
features/browser/src/main/ets/utils/EventPipeline.ts
View File

@ -19,7 +19,7 @@ import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { clamp } from '@ohos/base/src/main/ets/utils/MathUtil';
import { Constants } from '../constants/Constants';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { MediaConstants } from '@ohos/base/src/main/ets/constants/MediaConstants';
const TAG = "EventPipeline"

2
features/distributed/src/main/ets/components/AlbumGridItemTraditionalStyle.ets
View File

@ -20,7 +20,7 @@ import { MediaConstants } from '@ohos/base/src/main/ets/constants/MediaConstants
import { AlbumDataItem } from '@ohos/base/src/main/ets/data/AlbumDataItem';
import { SimpleAlbumDataItem } from '@ohos/base/src/main/ets/data/SimpleAlbumDataItem';
import { EmptyAlbumComponent } from '@ohos/base/src/main/ets/components/EmptyAlbumComponent';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
const TAG = "AlbumGridItemTraditionalStyle"

4
features/formEditor/src/main/ets/components/SettingDialog.ets
View File

@ -15,8 +15,8 @@
import { Constants } from '../constants/Constants';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
interface SettingsType {
title: Resource;

2
features/selectAlbum/src/main/ets/components/AlbumSelectGridItemNewStyle.ets
View File

@ -19,7 +19,7 @@ import { EmptyAlbumComponent } from '@ohos/base/src/main/ets/components/EmptyAlb
import { MediaConstants } from '@ohos/base/src/main/ets/constants/MediaConstants';
import { WindowConstants } from '@ohos/base/src/main/ets/constants/WindowConstants';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
const TAG = "AlbumSelectGridItemNewStyle"
// The item of album grid, and it's new style.

4
features/third/src/main/ets/components/ThirdAlbumGridItem.ets
View File

@ -14,12 +14,12 @@
*/
import router from '@system.router';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager'
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager'
import { WindowConstants } from '@ohos/base/src/main/ets/constants/WindowConstants';
import { MediaConstants } from '@ohos/base/src/main/ets/constants/MediaConstants';
import { Broadcast } from '@ohos/base/src/main/ets/utils/Broadcast';
import { BroadcastConstants } from '@ohos/base/src/main/ets/constants/BroadcastConstants';
import broadcastManager from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { broadcastManager } from '@ohos/base/src/main/ets/manager/BroadcastManager';
import { EmptyAlbumComponent } from '@ohos/base/src/main/ets/components/EmptyAlbumComponent';
import { AlbumDataItem } from '@ohos/base/src/main/ets/data/AlbumDataItem';
// The item of album grid, and it's new style.

2
features/timeline/src/main/ets/components/TimelineScrollBar.ets
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
import { WindowConstants } from '@ohos/base/src/main/ets/constants/WindowConstants';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { DateUtil } from '@ohos/base/src/main/ets/utils/DateUtil';
import { TimelineDataItem } from '../data/TimelineDataItem';
import { Log } from '@ohos/base/src/main/ets/utils/Log';

2
features/timeline/src/main/ets/data/TimelineDataItem.ts
View File

@ -17,7 +17,7 @@ import MediaLib from '@ohos.multimedia.mediaLibrary';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { ViewType } from '@ohos/base/src/main/ets/data/ViewType';
import { MediaDataItem, DateAdded } from '@ohos/base/src/main/ets/data/MediaDataItem';
import mediaDataItemCache from '@ohos/base/src/main/ets/data/MediaDataItemCache';
import { mediaDataItemCache } from '@ohos/base/src/main/ets/data/MediaDataItemCache';
import { ItemDataSource } from '@ohos/base/src/main/ets/vm/ItemDataSource';
const TAG = "TimelineDataItem"

4
features/timeline/src/main/ets/model/TimelineDataImpl.ts
View File

@ -15,8 +15,8 @@
import MediaLib from '@ohos.multimedia.mediaLibrary';
import { Log } from '@ohos/base/src/main/ets/utils/Log';
import { WindowConstants } from '@ohos/base/src/main/ets/constants/WindowConstants';
import mediaModel from '@ohos/base/src/main/ets/model/MediaModel';
import screenManager from '@ohos/base/src/main/ets/manager/ScreenManager';
import { mediaModel } from '@ohos/base/src/main/ets/model/MediaModel';
import { screenManager } from '@ohos/base/src/main/ets/manager/ScreenManager';
import { TimelineDataItem } from '../data/TimelineDataItem';
import { MediaDataItem } from '@ohos/base/src/main/ets/data/MediaDataItem';