!330 循环依赖

Merge pull request !330 from fanchenxuan/master+

permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetDialog.ets

@@ -19,7 +19,7 @@ import audio from '@ohos.multimedia.audio';
 import camera from '@ohos.multimedia.camera';
 import { CustomContentDialog } from '@ohos.arkui.advanced.Dialog';
 import { Log, PermissionDialogException, PermissionDialogReturn } from '../common/utils/utils';
-import { GroupInfo, WantInfo } from '../common/utils/typedef';
+import { GroupInfo, WantInfo } from '../common/model/typedef';
 import { GlobalContext } from '../common/utils/globalContext';
 import Constants from '../common/utils/constant';
 import { globalGroup, groups } from '../common/model/permissionGroup';

permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetDialog.ets

@@ -25,7 +25,7 @@ import {
 import { AppInfo, CallerBundleInfo,
   CheckboxInfo,
   MediaDocObj,
-  WantInfo } from '../common/utils/typedef';
+  WantInfo } from '../common/model/typedef';
 import { GlobalContext } from '../common/utils/globalContext';
 import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl';
 import { groups, showSubPermissionsGroup } from '../common/model/permissionGroup';

permissionmanager/src/main/ets/common/components/alphabeticalIndex.ets

@@ -16,7 +16,7 @@
 import Constants from '../utils/constant';
 import { indexValue, sortByName } from '../utils/utils';
 import { GlobalContext } from '../utils/globalContext';
-import { AppInfo, ApplicationObj } from '../utils/typedef';
+import { AppInfo, ApplicationObj } from '../model/typedef';
 
 @Component
 export struct alphabetIndexerComponent {

permissionmanager/src/main/ets/common/components/search.ets

@@ -14,7 +14,7 @@
  */
 
 import Constants from '../utils/constant';
-import { AppInfo, ApplicationObj } from '../utils/typedef';
+import { AppInfo, ApplicationObj } from '../model/typedef';
 
 @Component
 export struct textInput {

permissionmanager/src/main/ets/common/model/permissionGroup.ets

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { PermissionInfo, GroupInfo } from '../utils/typedef';
+import { PermissionInfo, GroupInfo } from './typedef';
 
 export const permissionGroups: PermissionInfo[] = [
     new PermissionInfo('ohos.permission.LOCATION_IN_BACKGROUND', 'LOCATION', $r('sys.string.ohos_lab_location_in_background'), 0),

permissionmanager/src/main/ets/common/utils/utils.ets

@@ -20,7 +20,7 @@ import { permissionGroups, groups } from '../model/permissionGroup';
 import Constants from '../utils/constant';
 import { BundleInfoUtils } from './bundleInfoUtils';
 import { CommonUtils } from './commonUtils';
-import { GroupInfo, AppInfo, ApplicationObj, PermissionInfo } from './typedef';
+import { GroupInfo, AppInfo, ApplicationObj, PermissionInfo } from '../model/typedef';
 import systemParameterEnhance from '@ohos.systemParameterEnhance';
 import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession';
 import uiExtensionHost from '@ohos.uiExtensionHost';

permissionmanager/src/main/ets/pages/application-secondary.ets

@@ -22,7 +22,7 @@ import { BusinessError } from '@ohos.base';
 import { groups, userGrantPermissions } from '../common/model/permissionGroup';
 import Constants from '../common/utils/constant';
 import { Log, verifyAccessToken, getGroupIdByPermission } from '../common/utils/utils';
-import { PermissionObj, AppInfo } from '../common/utils/typedef';
+import { PermissionObj, AppInfo } from '../common/model/typedef';
 import { GlobalContext } from '../common/utils/globalContext';
 
 const FUZZY_LOCATION_PERMISSION = 'ohos.permission.APPROXIMATELY_LOCATION';

permissionmanager/src/main/ets/pages/application-tertiary.ets

@@ -22,7 +22,7 @@ import { BusinessError } from '@ohos.base';
 import { showSubPermissionsGroup } from '../common/model/permissionGroup';
 import { Log, getPermissionLabel } from '../common/utils/utils';
 import Constants from '../common/utils/constant';
-import { MediaDocObj, RouterParams3, AppInfo, CheckboxInfo } from '../common/utils/typedef';
+import { MediaDocObj, RouterParams3, AppInfo, CheckboxInfo } from '../common/model/typedef';
 import { GlobalContext } from '../common/utils/globalContext';
 
 const FUZZY_LOCATION_PERMISSION = 'ohos.permission.APPROXIMATELY_LOCATION';

permissionmanager/src/main/ets/pages/authority-management.ets

@@ -24,7 +24,7 @@ import display from '@ohos.display';
 import common from '@ohos.app.ability.common';
 import { groups, userGrantPermissions, globalGroup, permissionGroups, showSubPermissionsGroup } from '../common/model/permissionGroup';
 import { Log, indexValue, getPermissionGroupByName, getGroupIdByPermission, addLocalTag, sortByName } from '../common/utils/utils';
-import { AppInfo, PermissionApplications, GroupPermission, GroupInfo } from '../common/utils/typedef';
+import { AppInfo, PermissionApplications, GroupPermission, GroupInfo } from '../common/model/typedef';
 import { GlobalContext } from '../common/utils/globalContext';
 import Constants from '../common/utils/constant';
 import bundleManager from '@ohos.bundle.bundleManager';

permissionmanager/src/main/ets/pages/authority-secondary.ets

@@ -17,7 +17,7 @@ import { backBar } from '../common/components/backBar';
 import { permissionGroups, groups } from '../common/model/permissionGroup';
 import router from '@ohos.router';
 import Constants from '../common/utils/constant';
-import { CalendarObj, RouterParams1, PermissionApplications } from '../common/utils/typedef';
+import { CalendarObj, RouterParams1, PermissionApplications } from '../common/model/typedef';
 
 @Entry
 @Component

permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets

@@ -24,7 +24,7 @@ import audio from '@ohos.multimedia.audio'
 import camera from '@ohos.multimedia.camera'
 import { CustomContentDialog } from '@ohos.arkui.advanced.Dialog';
 import { Log, verifyAccessToken, indexValue, sortByName } from '../common/utils/utils';
-import { ApplicationObj, GroupInfo, RouterParams1, PermissionApplications, AppInfo } from '../common/utils/typedef';
+import { ApplicationObj, GroupInfo, RouterParams1, PermissionApplications, AppInfo } from '../common/model/typedef';
 import { GlobalContext } from '../common/utils/globalContext';
 import Constants from '../common/utils/constant';
 import { polymorphismGroup, globalGroup, groups } from '../common/model/permissionGroup';

permissionmanager/src/main/ets/pages/authority-tertiary.ets

@@ -20,7 +20,13 @@ import router from '@ohos.router';
 import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl';
 import { BusinessError } from '@ohos.base';
 import { Log, verifyAccessToken, indexValue, sortByName } from '../common/utils/utils';
-import { ApplicationObj, PermissionInfo, RouterParams2, PermissionApplications, AppInfo } from '../common/utils/typedef';
+import {
+  ApplicationObj,
+  PermissionInfo,
+  RouterParams2,
+  PermissionApplications,
+  AppInfo
+} from '../common/model/typedef';
 import { GlobalContext } from '../common/utils/globalContext';
 import Constants from '../common/utils/constant';
 import { permissionGroups } from '../common/model/permissionGroup';

permissionmanager/src/main/ets/pages/dialogPlus.ets

@@ -29,7 +29,7 @@ import {
   getFontSizeScale,
   getLimitFontSize
 } from '../common/utils/utils';
-import { GroupInfo, WantInfo } from '../common/utils/typedef';
+import { GroupInfo, WantInfo } from '../common/model/typedef';
 import { GlobalContext } from '../common/utils/globalContext';
 import Constants from '../common/utils/constant';
 import { showSubPermissionsGroup, userGrantPermissions } from '../common/model/permissionGroup';

permissionmanager/src/main/ets/pages/other-permissions.ets

@@ -18,7 +18,7 @@ import router from '@ohos.router';
 import Constants from '../common/utils/constant';
 import { permissionGroups } from '../common/model/permissionGroup';
 import { verifyAccessToken } from '../common/utils/utils';
-import { OtherPermission, RouterParams3 } from '../common/utils/typedef';
+import { OtherPermission, RouterParams3 } from '../common/model/typedef';
 import { Permissions } from '@ohos.abilityAccessCtrl';
 
 let status: number = (router.getParams() as RouterParams3).status; // Status: Allowed, Forbidden

permissionmanager/src/main/ets/pages/permission-access-record.ets

@@ -22,7 +22,14 @@ import { backBar } from '../common/components/backBar';
 import Constants from '../common/utils/constant';
 import { userGrantPermissions } from '../common/model/permissionGroup';
 import { Log, getPermissionGroup, getGroupIdByPermission } from '../common/utils/utils';
-import { StringObj, AppInfoSimple, AppRecordInfo, AppInfo, GroupRecordInfo, AppGroupRecordInfo } from '../common/utils/typedef';
+import {
+  StringObj,
+  AppInfoSimple,
+  AppRecordInfo,
+  AppInfo,
+  GroupRecordInfo,
+  AppGroupRecordInfo
+} from '../common/model/typedef';
 import { GlobalContext } from '../common/utils/globalContext';
 
 @Extend(Image)function customizeImage(width: number, height: number) {

permissionmanager/src/main/ets/pages/securityDialog.ets

@@ -24,7 +24,7 @@ import {
   getFontSizeScale,
   getLimitFontSize
 } from '../common/utils/utils';
-import { Param, WantInfo } from '../common/utils/typedef';
+import { Param, WantInfo } from '../common/model/typedef';
 import { GlobalContext } from '../common/utils/globalContext';
 
 let storage = LocalStorage.getShared();