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

!89 修改流水线搭建存在的问题

Browse Source 
Merge pull request !89 from wlxtt/master
This commit is contained in:
openharmony_ci 2022-09-07 03:57:59 +00:00 committed by Gitee
commit d772320553
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@
* limitations under the License.
*/
import deviceInfo from '@ohos.deviceInfo';
import Ability from '@ohos.application.Ability'
import wantConstant from '@ohos.ability.wantConstant'
import { Logger } from '../common/utils/Logger'
@ -32,7 +33,7 @@ const appLogger: Logger = new Logger('app');
let isFromCard = false;
let isFromCamera = false;
let appBroadCast = BroadCastManager.getInstance().getBroadCast();
const pagePath: string = 'product/pad/view/index';
var pagePath: string = deviceInfo.deviceType == ('phone' || 'default') ? 'product/phone/view/index' : 'product/pad/view/index';
export default class MainAbility extends Ability {
private static readonly RETRY_MAX_TIMES = 100;

5
entry/src/main/ets/common/model/common/ScreenManager.ts
View File

@ -14,6 +14,7 @@ import window from '@ohos.window';
* limitations under the License.
*/
import deviceInfo from '@ohos.deviceInfo';
import { Logger } from '../../utils/Logger'
import { Constants } from './Constants'
import { UiUtil } from '../../utils/UiUtil'
@ -57,10 +58,10 @@ export class ScreenManager {
private columns: number = ColumnSize.COLUMN_FOUR;
// Default orientation
private horizontal = true;
private horizontal = deviceInfo.deviceType == ('phone' || 'default') ? false : true;
// Default sidebar
private sidebar = true;
private sidebar = deviceInfo.deviceType == ('phone' || 'default') ? false : true;
private windowMode = WindowMode.UNDEFINED;
private constructor() {