未验证 提交 93c9ed6b 编写于 作者: O openharmony_ci 提交者: Gitee

!8380 改变validator回退button大小以及experience模块数据保存方式

Merge pull request !8380 from 田文哲/OpenHarmony-3.2-Release
......@@ -154,7 +154,7 @@ struct IndexPage {
Row() {
Button() {
Image($r('app.media.ic_public_back')).width('20vp').height('18vp')
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(() => {
router.back();
})
......
......@@ -82,7 +82,7 @@ struct CustomContainer1 {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:this.Url,
......
......@@ -86,7 +86,7 @@ struct audioInputRouting {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:'pages/Audio/Audio_index',
......
......@@ -86,7 +86,7 @@ struct audioInputRouting {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:'pages/Audio/Audio_index',
......
......@@ -76,7 +76,7 @@ struct audioOutputRouting {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:'pages/Audio/Audio_index',
......
......@@ -76,7 +76,7 @@ struct audioOutputRouting {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:'pages/Audio/Audio_index',
......
......@@ -76,7 +76,7 @@ struct audioOutputRouting {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:'pages/Audio/Audio_index',
......
......@@ -137,7 +137,7 @@ struct IndexPage {
Row() {
Button() {
Image($r('app.media.ic_public_back')).width('20vp').height('18vp')
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(() => {
router.back();
})
......
......@@ -78,7 +78,7 @@ struct cameraOrientation {
Row() {
Button() {
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' })
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(() => {
router.back({
url: 'pages/Camera/Camera_index',
......
......@@ -88,7 +88,7 @@ struct cameraOrientation {
onPageShow() {
Logger.info(this.tag, `cameraOrientation onPageShow`)
// @ts-ignore
// @ts-ignore
this.surfaceId = this.mXComponentController.getXComponentSurfaceId()
CameraService.initCamera(this.surfaceId, this.cameraDeviceIndex).then(() => {
Logger.info(this.tag, `onPageShow initCamera start`)
......@@ -106,7 +106,7 @@ struct cameraOrientation {
Row() {
Button() {
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' })
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(() => {
router.back({
url: 'pages/Camera/Camera_index',
......
......@@ -113,7 +113,7 @@ struct cameraOrientation {
Row() {
Button() {
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' })
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(() => {
router.back({
url: 'pages/Camera/Camera_index',
......
......@@ -118,7 +118,7 @@ struct cameraFormat {
Row() {
Button() {
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' })
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(() => {
router.back({
url: 'pages/Camera/Camera_index',
......
......@@ -104,7 +104,7 @@ struct cameraOrientation {
Row() {
Button() {
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' })
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(() => {
router.back({
url: 'pages/Camera/Camera_index',
......
......@@ -129,7 +129,7 @@ struct cameraOrientation {
Row() {
Button() {
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' })
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(() => {
router.back({
url: 'pages/Camera/Camera_index',
......
......@@ -138,7 +138,7 @@ struct IndexPage {
Row() {
Button() {
Image($r('app.media.ic_public_back')).width('20vp').height('18vp')
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(() => {
router.back();
})
......
......@@ -20,7 +20,8 @@ import context from '@ohos.app.ability.common';
let abilityContext = getContext(this) as context.UIAbilityContext;
let path = globalThis.dir;
let CameraColdPath = path + '/ColdStartCamera.log';
let path1 = path + '/ExperienceData';
let CameraColdPath = path1 + '/ColdStartCamera.log';
@Entry
@Component
struct CustomContainerUser {
......
......@@ -20,7 +20,8 @@ import context from '@ohos.app.ability.common';
let abilityContext = getContext(this) as context.UIAbilityContext;
let path = globalThis.dir;
let ContactsColdPath = path + '/ColdStartContacts.log';
let path1 = path + '/ExperienceData';
let ContactsColdPath = path1 + '/ColdStartContacts.log';
@Entry
@Component
struct CustomContainerUser {
......
......@@ -20,7 +20,8 @@ import context from '@ohos.app.ability.common';
let abilityContext = getContext(this) as context.UIAbilityContext;
let path = globalThis.dir;
let ContactsColdPath = path + '/HotStartContacts.log';
let path1 = path + '/ExperienceData';
let ContactsColdPath = path1 + '/HotStartContacts.log';
@Entry
@Component
struct CustomContainerUser {
......
......@@ -21,7 +21,8 @@ import router from '@ohos.router';
let abilityContext = getContext(this) as context.UIAbilityContext;
let path = globalThis.dir;
let Xpath = path + '/DeskFps.log'
let path1 = path + '/ExperienceData';
let Xpath = path1 + '/DeskFps.log'
@Entry
@Component
struct CustomContainerUser {
......
......@@ -24,6 +24,7 @@ import data_preferences from '@ohos.data.preferences';
const TAG = 'ParseXML';
let path = globalThis.dir;
let path1 = path + '/Experience';
let ExperienceDataPath = path + '/ExperienceData';
let VarColor = [];
let ColorBackPath = path + '/ExperienceColorBack.txt';
......@@ -150,7 +151,7 @@ struct IndexPage {
Row() {
Button() {
Image($r('app.media.ic_public_back')).width('20vp').height('18vp')
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(() => {
router.back();
})
......@@ -243,6 +244,8 @@ struct IndexPage {
ClearText(){
fileio.rmdirSync(path1);
fileio.mkdirSync(path1);
fileio.rmdirSync(ExperienceDataPath);
fileio.mkdirSync(ExperienceDataPath);
let fd = fileio.openSync(ColorBackPath, 0o102, 0o666);
for(let i = 0; i < this.TestCaseList.length; i++) {
let log = (this.TestCaseList[i].title+';'+'#ff808080'+';').toString();
......
......@@ -18,7 +18,8 @@ import FirstDialog from '../model/FirstDialog';
import router from '@ohos.router';
let path = globalThis.dir;
let Xpath = path + '/CompleteTimeKeyboard.log';
let path1 = path + '/ExperienceData';
let Xpath = path1 + '/CompleteTimeKeyboard.log';
@Entry
@Component
......
......@@ -18,7 +18,8 @@ import FirstDialog from '../model/FirstDialog';
import router from '@ohos.router';
let path = globalThis.dir;
let Xpath = path + '/ResponseTimeKeyboard.log';
let path1 = path + '/ExperienceData';
let Xpath = path1 + '/ResponseTimeKeyboard.log';
@Entry
@Component
......
......@@ -20,7 +20,8 @@ import context from '@ohos.app.ability.common';
let abilityContext = getContext(this) as context.UIAbilityContext;
let path = globalThis.dir;
let MmsColdPath = path + '/ColdStartMms.log';
let path1 = path + '/ExperienceData';
let MmsColdPath = path1 + '/ColdStartMms.log';
@Entry
@Component
struct CustomContainerUser {
......
......@@ -20,7 +20,8 @@ import context from '@ohos.app.ability.common';
let abilityContext = getContext(this) as context.UIAbilityContext;
let path = globalThis.dir;
let MmsColdPath = path + '/HotStartMms.log';
let path1 = path + '/ExperienceData';
let MmsColdPath = path1 + '/HotStartMms.log';
@Entry
@Component
struct CustomContainerUser {
......
......@@ -18,7 +18,8 @@ import {CustomContainer} from '../common/ExperienceCustomContainer';
import FirstDialog from '../model/FirstDialog';
let path = globalThis.dir;
let Xpath = path + '/PhotoFps.log';
let path1 = path + '/ExperienceData';
let Xpath = path1 + '/PhotoFps.log';
@Entry
@Component
......
......@@ -20,7 +20,8 @@ import context from '@ohos.app.ability.common';
let abilityContext = getContext(this) as context.UIAbilityContext;
let path = globalThis.dir;
let PhotosColdPath = path + '/ColdStartPhotos.log';
let path1 = path + '/ExperienceData';
let PhotosColdPath = path1 + '/ColdStartPhotos.log';
@Entry
@Component
struct CustomContainerUser {
......
......@@ -20,7 +20,8 @@ import context from '@ohos.app.ability.common';
let abilityContext = getContext(this) as context.UIAbilityContext;
let path = globalThis.dir;
let PhotosColdPath = path + '/HotStartPhotos.log';
let path1 = path + '/ExperienceData';
let PhotosColdPath = path1 + '/HotStartPhotos.log';
@Entry
@Component
struct CustomContainerUser {
......
......@@ -18,7 +18,8 @@ import {CustomContainer} from '../common/TimeExperienceCustomContainer';
import FirstDialog from '../model/FirstDialog';
let path = globalThis.dir;
let Xpath = path + '/ResponseTimePhotos.log';
let path1 = path + '/ExperienceData';
let Xpath = path1 + '/ResponseTimePhotos.log';
@Entry
@Component
......
......@@ -20,7 +20,8 @@ import context from '@ohos.app.ability.common';
let abilityContext = getContext(this) as context.UIAbilityContext;
let path = globalThis.dir;
let SettingsColdPath = path + '/ColdStartSetting.log';
let path1 = path + '/ExperienceData';
let SettingsColdPath = path1 + '/ColdStartSetting.log';
@Entry
@Component
struct CustomContainerUser {
......
......@@ -20,7 +20,8 @@ import context from '@ohos.app.ability.common';
let abilityContext = getContext(this) as context.UIAbilityContext;
let path = globalThis.dir;
let SettingsColdPath = path + '/HotStartSetting.log';
let path1 = path + '/ExperienceData';
let SettingsColdPath = path1 + '/HotStartSetting.log';
@Entry
@Component
struct CustomContainerUser {
......
......@@ -20,7 +20,8 @@ import context from '@ohos.app.ability.common';
let abilityContext = getContext(this) as context.UIAbilityContext;
let path = globalThis.dir;
let Xpath = path + '/CompleteTimeLauncher.log';
let path1 = path + '/ExperienceData';
let Xpath = path1 + '/CompleteTimeLauncher.log';
@Entry
@Component
......
......@@ -20,7 +20,8 @@ import context from '@ohos.app.ability.common';
let abilityContext = getContext(this) as context.UIAbilityContext;
let path = globalThis.dir;
let Xpath = path + '/ResponseTimeLauncher.log';
let path1 = path + '/ExperienceData';
let Xpath = path1 + '/ResponseTimeLauncher.log';
@Entry
@Component
......
......@@ -20,7 +20,8 @@ import context from '@ohos.app.ability.common';
let abilityContext = getContext(this) as context.UIAbilityContext;
let path = globalThis.dir;
let Xpath = path + '/CompleteTimeLauncher.log';
let path1 = path + '/ExperienceData';
let Xpath = path1 + '/CompleteTimeLauncher.log';
@Entry
@Component
......
......@@ -18,7 +18,8 @@ import {CustomContainer} from '../common/TimeExperienceCustomContainer';
import FirstDialog from '../model/FirstDialog';
let path = globalThis.dir;
let Xpath = path + '/ResponseTimePhotos.log';
let path1 = path + '/ExperienceData';
let Xpath = path1 + '/ResponseTimePhotos.log';
@Entry
@Component
......
......@@ -39,7 +39,7 @@ struct playAudio {
Row() {
Button() {
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' })
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(() => {
router.back({
url: 'pages/Player/PlayAudioList',
......
......@@ -40,7 +40,7 @@ struct playVideo {
Row() {
Button() {
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' })
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(() => {
router.back({
url: 'pages/Player/PlayVideoList',
......
......@@ -138,7 +138,7 @@ struct IndexPage {
Row() {
Button() {
Image($r('app.media.ic_public_back')).width('20vp').height('18vp')
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(() => {
router.back();
})
......
......@@ -82,7 +82,7 @@ export struct CustomContainer {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:this.Url,
......
......@@ -84,7 +84,7 @@ export struct CustomContainer {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:this.Url,
......
......@@ -80,7 +80,7 @@ export struct CustomContainer {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:this.Url,
......
......@@ -80,7 +80,7 @@ export struct CustomContainer {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:this.Url,
......
......@@ -81,7 +81,7 @@ export struct CustomContainer {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:this.Url,
......
......@@ -80,7 +80,7 @@ export struct CustomContainer {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:this.Url,
......
......@@ -82,7 +82,7 @@ export struct CustomContainer {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:this.Url,
......
......@@ -82,7 +82,7 @@ export struct CustomContainer {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:this.Url,
......
......@@ -87,7 +87,7 @@ export struct CustomContainer {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:this.Url,
......
......@@ -82,7 +82,7 @@ export struct CustomContainer {
Row() {
Button(){
Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'})
}.backgroundColor(Color.Black)
}.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' })
.onClick(()=>{
router.back({
url:this.Url,
......
......@@ -30,6 +30,7 @@ let path3 = path + '/Camera';
let path4 = path + '/Player';
let path5 = path + '/Experience';
let picturePath = path + '/screenshot';
let ExperienceDataPath = path + '/ExperienceData';
let ArkUIColorBackPath = path + '/ArkUIColorBack.txt';
let AudioColorBackPath = path + '/AudioColorBack.txt';
let CameraColorBackPath = path + '/CameraColorBack.txt';
......@@ -214,6 +215,8 @@ struct IndexPage {
fileio.unlinkSync(ExperienceColorBackPath);
fileio.rmdirSync(picturePath);
fileio.mkdirSync(picturePath);
fileio.rmdirSync(ExperienceDataPath);
fileio.mkdirSync(ExperienceDataPath);
fileio.openSync(TimePath, 0o100 | 0o2002, 0o664);
fileio.openSync(xmlPath, 0o100 | 0o2002, 0o664);
fileio.openSync(path11, 0o100 | 0o2002, 0o664);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册