developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
a2ba980f 1 parent 1b01da8c

fix: 初始化国殇数据逻辑优化

Inline Side-by-side
Showing 4 changed files with 54 additions and 21 deletions
... ... @@ -44,6 +44,9 @@ export class SpConstants{
//启动页数据存储key
static APP_LAUNCH_PAGE_DATA_MODEL = 'app_launch_page_data_model'
//国殇模式数据存储key
static APP_MOURNS_INFO_DATA_MODEL = 'app_mourns_info_model'
//频道信息流页面左右挂角
static APP_PAGE_CORNER_ADV = 'app_page_corner_adv_'
... ...
... ... @@ -32,7 +32,7 @@ struct MainPage {
upgradeDialogController?: CustomDialogController
watchCurrentBreakpoint() {
Logger.info(TAG, `watchCurrentBreakpoint, this.currentBreakpoint: ${this.currentBreakpoint}`);
// Logger.info(TAG, `watchCurrentBreakpoint, this.currentBreakpoint: ${this.currentBreakpoint}`);
}
aboutToAppear() {
... ... @@ -41,14 +41,14 @@ struct MainPage {
this.breakpointSystem.register()
Logger.info(TAG, `aboutToAppear `);
// Logger.info(TAG, `aboutToAppear `);
EmitterUtils.receiveEvent(EmitterEventId.FORCE_USER_LOGIN_OUT, () => {
LogoutViewModel.clearLoginInfo()
})
let dataModelStr : string = SPHelper.default.getSync(SpConstants.APP_LAUNCH_PAGE_DATA_MODEL,'') as string
let dataModelStr : string = SPHelper.default.getSync(SpConstants.APP_MOURNS_INFO_DATA_MODEL,'') as string
let dataModel : LaunchDataModel = JSON.parse(dataModelStr)
console.log(dataModelStr)
// console.log(dataModelStr)
// 处理国殇模式数据
let mourns: mournsInfoModel = dataModel.mourns as mournsInfoModel
let GrayManage = new GrayManageModel()
... ... @@ -63,22 +63,22 @@ struct MainPage {
aboutToDisappear() {
this.breakpointSystem.unregister()
Logger.info(TAG, 'aboutToDisappear');
// Logger.info(TAG, 'aboutToDisappear');
}
onPageHide() {
Logger.info(TAG, 'onPageHide');
// Logger.info(TAG, 'onPageHide');
this.pageHide = Math.random()
}
onPageShow() {
Logger.info(TAG, 'onPageShow');
// Logger.info(TAG, 'onPageShow');
this.pageShow = Math.random()
// 升级检查
// this.upgradeCheck()
Logger.debug('setBarBackgroundColor','Top onPageShow ')
// Logger.debug('setBarBackgroundColor','Top onPageShow ')
}
upgradeCheck() {
... ... @@ -104,8 +104,6 @@ struct MainPage {
})
this.upgradeDialogController?.open()
}
}).catch(() => {
})
}
... ... @@ -115,13 +113,13 @@ struct MainPage {
// 拦截返回键，切到后台
const windowClass = WindowModel.shared.getWindowClass() as window.Window
windowClass.minimize().then(() => {
Logger.debug(TAG, 'Succeeded in minimizing the window.');
// Logger.debug(TAG, 'Succeeded in minimizing the window.');
}).catch((err: BusinessError) => {
Logger.error(TAG, 'Failed to minimize the window. Cause: ' + JSON.stringify(err));
// Logger.error(TAG, 'Failed to minimize the window. Cause: ' + JSON.stringify(err));
return false
});
} catch (err) {
Logger.error(TAG, 'Failed to minimize: ' + JSON.stringify(err));
// Logger.error(TAG, 'Failed to minimize: ' + JSON.stringify(err));
return false
}
return true
... ...
... ... @@ -105,16 +105,13 @@ struct LaunchPage {
let dataModelStr : string = SPHelper.default.getSync(SpConstants.APP_LAUNCH_PAGE_DATA_MODEL,'') as string
if (!dataModelStr) {
this.requestLaunchPageData()
//直接跳转首页
WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
return
}
let dataModel : LaunchDataModel = JSON.parse(dataModelStr)
console.log(dataModelStr)
//同意隐私协议后每次启动app请求启动页相关数据，并更新数据
this.requestLaunchPageData();
// console.log(dataModelStr)
if (dataModel.launchPageInfo || dataModel.launchAdInfo.length) {
//跳转广告页
... ... @@ -126,6 +123,8 @@ struct LaunchPage {
//直接跳转首页
WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
}
//同意隐私协议后每次启动app请求启动页相关数据，并更新数据
this.requestLaunchPageData();
}
});
});
... ... @@ -194,8 +193,15 @@ struct LaunchPage {
launchPageModel.getLaunchPageData()
}
requestMournsInfoData() {
//请求国殇模式数据并保存
let launchPageModel = new LaunchPageModel()
launchPageModel.getMournsInfoData()
}
aboutToAppear(): void {
this.requestAgreement()
this.requestMournsInfoData()
}
... ...
import LaunchDataModel from '../viewModel/LaunchDataModel'
import LaunchDataModel, { mournsInfoModel } from '../viewModel/LaunchDataModel'
import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
import { HttpUrlUtils, ResponseDTO } from 'wdNetwork/Index';
... ... @@ -20,15 +20,41 @@ export class LaunchPageModel {
fail(data.message)
return
}
Logger.debug("LaunchPageModel获取启动相关数据获取成功:success ", JSON.stringify(data))
// Logger.debug("LaunchPageModel获取启动相关数据获取成功:success ", JSON.stringify(data))
success(data.data);
//存储数据
let obj : string = JSON.stringify(data.data)
console.log(obj)
// console.log(obj)
SPHelper.default.saveSync(SpConstants.APP_LAUNCH_PAGE_DATA_MODEL,obj)
}, (error: Error) => {
Logger.debug("LaunchPageModel获取启动相关数据获取失败:error ", error.toString())
// Logger.debug("LaunchPageModel获取启动相关数据获取失败:error ", error.toString())
fail(error.message)
})
})
}
getMournsInfoData(): Promise<LaunchDataModel> {
return new Promise<LaunchDataModel>((success, fail) => {
HttpRequest.get<ResponseDTO<LaunchDataModel>>(HttpUrlUtils.getLaunchPageDataUrl()).then((data: ResponseDTO<LaunchDataModel>) => {
if (!data || !data.data) {
fail("数据为空")
return
}
if (data.code != 0) {
fail(data.message)
return
}
// Logger.debug("LaunchPageModel获取启动相关数据获取成功:success ", JSON.stringify(data))
// 处理国殇模式数据
success(data.data);
//存储数据
let obj : string = JSON.stringify(data.data)
// console.log(obj)
SPHelper.default.saveSync(SpConstants.APP_MOURNS_INFO_DATA_MODEL,obj)
}, (error: Error) => {
// Logger.debug("LaunchPageModel获取启动相关数据获取失败:error ", error.toString())
fail(error.message)
})
})
... ...