From: 罗正yun <1732036298@qq.com> Date: Mon, 27 Nov 2023 03:33:31 +0000 (+0800) Subject: 设置中子视图的视图整合,删除了子视图文件夹,将其文件放到他们的主视图下,减少文件夹数量 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1e960a0b98e6856bfaf7edf8d9d30739bcf921a3;p=mirrors%2FFD230.git 设置中子视图的视图整合,删除了子视图文件夹,将其文件放到他们的主视图下,减少文件夹数量 --- diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 1f75d5089..0224ebf6e 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -3,7 +3,8 @@ { "name": "DevEco", "includePath": [ - "${workspaceFolder}/**" + "${workspaceFolder}/**", + "${workspaceFolder}/code/sdk/application/wearable/nativeapp/nativeui" ], "browse": { "limitSymbolsToIncludedHeaders": true, diff --git a/Resource/res/ALARM_ADD_BACKGROUND.bin b/Resource/res/ALARM_ADD_BACKGROUND.bin new file mode 100644 index 000000000..6ac12e3b5 Binary files /dev/null and b/Resource/res/ALARM_ADD_BACKGROUND.bin differ diff --git a/Resource/res/dial.bin b/Resource/res/dial.bin new file mode 100644 index 000000000..bf4e8395a Binary files /dev/null and b/Resource/res/dial.bin differ diff --git a/code/sdk/application/wearable/nativeapp/CMakeLists.txt b/code/sdk/application/wearable/nativeapp/CMakeLists.txt index a8d77cd19..f403b5ef7 100644 --- a/code/sdk/application/wearable/nativeapp/CMakeLists.txt +++ b/code/sdk/application/wearable/nativeapp/CMakeLists.txt @@ -287,20 +287,20 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bluetoothofsetting/src/BlueToothOfSettingModel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bluetoothofsetting/src/BlueToothOfSettingPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bluetoothofsetting/src/BlueToothOfSettingView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp #�������𶯵�presenter� - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/soundandvibration/src/SoundAndVibrationView.cpp #�������𶯵�vie� - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/systemvolume/src/SystemVolumePresenter.cpp #ϵͳ���� - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/systemvolume/src/SystemVolumeView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/quickaccess/src/QuickAccessPresenter.cpp #���ٷ��ʵ�presenter� - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/quickaccess/src/QuickAccessView.cpp #���ٷ��ʵ�View� - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemPresenter.cpp #ϵͳpresenter� - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemView.cpp #ϵͳView� - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/systemaboutwatch/src/SystemAboutPresenter.cpp #ϵͳ�������ֱ���View� - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/systemaboutwatch/src/SystemAboutView.cpp #ϵͳ�������ֱ���presenter� - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/systemsupervise/src/SystemSupervisePresenter.cpp #ϵͳ����ܵ�View� - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/systemsupervise/src/SystemSuperviseView.cpp #ϵͳ����ܵ�presenter� - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/systemlanguage/src/SystemLanguagePresenter.cpp #ϵͳ��ϵͳ���Ե�View� - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/systemlanguage/src/SystemLanguageView.cpp #ϵͳ��ϵͳ���Ե�presenter� + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/soundandvibration/src/SoundAndVibrationView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/soundandvibration/src/SystemVolumePresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/soundandvibration/src/SystemVolumeView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/quickaccess/src/QuickAccessPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/quickaccess/src/QuickAccessView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemAboutPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemAboutView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemSupervisePresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemSuperviseView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemLanguagePresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemLanguageView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/record/src/RecordPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/record/src/RecordView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/record/src/RecordListPresenter.cpp @@ -311,12 +311,12 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/record/src/RecordDeleteView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/record/src/RecordGoingPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/record/src/RecordGoingView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/systemreboot/src/SystemRebootPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/systemreboot/src/SystemRebootView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/steamshoutdown/src/SystemShoutDownPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/steamshoutdown/src/SystemShoutDownView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/steamfactoryreset/src/SystemFactoryResetPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/steamfactoryreset/src/SystemFactoryResetView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemRebootPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemRebootView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemShoutDownPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemShoutDownView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemFactoryResetPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemFactoryResetView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/InitComponent/src/InitComponent.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/uisample/src/UISampleView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/uisample/src/UISamplePresenter.cpp diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp index b5aff218e..1326761a0 100644 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp @@ -109,24 +109,24 @@ #include "screenduration/include/ScreenDurationView.h" #include "soundandvibration/include/SoundAndVibrationPresenter.h" #include "soundandvibration/include/SoundAndVibrationView.h" -#include "systemvolume/include/SystemVolumePresenter.h" -#include "systemvolume/include/SystemVolumeView.h" +#include "soundandvibration/include/SystemVolumePresenter.h" +#include "soundandvibration/include/SystemVolumeView.h" #include "quickaccess/include/QuickAccessPresenter.h" #include "quickaccess/include/QuickAccessView.h" #include "system/include/SystemPresenter.h" #include "system/include/SystemView.h" -#include "systemaboutwatch/include/SystemAboutPresenter.h" -#include "systemaboutwatch/include/SystemAboutView.h" -#include "systemsupervise/include/SystemSupervisePresenter.h" -#include "systemsupervise/include/SystemSuperviseView.h" -#include "systemlanguage/include/SystemLanguagePresenter.h" -#include "systemlanguage/include/SystemLanguageView.h" -#include "systemreboot/include/SystemRebootPresenter.h" -#include "systemreboot/include/SystemRebootView.h" -#include "steamshoutdown/include/SystemShoutDownPresenter.h" -#include "steamshoutdown/include/SystemShoutDownView.h" -#include "steamfactoryreset/include/SystemFactoryResetPresenter.h" -#include "steamfactoryreset/include/SystemFactoryResetView.h" +#include "system/include/SystemAboutPresenter.h" +#include "system/include/SystemAboutView.h" +#include "system/include/SystemSupervisePresenter.h" +#include "system/include/SystemSuperviseView.h" +#include "system/include/SystemLanguagePresenter.h" +#include "system/include/SystemLanguageView.h" +#include "system/include/SystemRebootPresenter.h" +#include "system/include/SystemRebootView.h" +#include "system/include/SystemShoutDownPresenter.h" +#include "system/include/SystemShoutDownView.h" +#include "system/include/SystemFactoryResetPresenter.h" +#include "system/include/SystemFactoryResetView.h" #include "record/include/RecordPresenter.h" #include "record/include/RecordView.h" #include "record/include/RecordListPresenter.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/MainAlarmView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/MainAlarmView.cpp index 5a500f764..5d0545cd8 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/MainAlarmView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/MainAlarmView.cpp @@ -420,7 +420,7 @@ void MainAlarmView::RefreshAlarm(void) RefreshAlarmStatus(alarmEnable, i); dClock[i]->SetTime24Hour(refreshHour, refreshMin, 0); } - group->ScrollBy(0, ADD_BUTTON_Y - addButton->GetY()); + group->ScrollBy(0, ADD_BUTTON_Y - addButton->GetY() + 120); if (dClockNum > (i - 1)) { group->Remove(dImageViewBackGround[dClockNum]); delete dImageViewBackGround[dClockNum]; diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemvolume/include/SystemVolumePresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/soundandvibration/include/SystemVolumePresenter.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/systemvolume/include/SystemVolumePresenter.h rename to code/sdk/application/wearable/nativeapp/nativeui/soundandvibration/include/SystemVolumePresenter.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemvolume/include/SystemVolumeView.h b/code/sdk/application/wearable/nativeapp/nativeui/soundandvibration/include/SystemVolumeView.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/systemvolume/include/SystemVolumeView.h rename to code/sdk/application/wearable/nativeapp/nativeui/soundandvibration/include/SystemVolumeView.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemvolume/src/SystemVolumePresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/soundandvibration/src/SystemVolumePresenter.cpp similarity index 96% rename from code/sdk/application/wearable/nativeapp/nativeui/systemvolume/src/SystemVolumePresenter.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/soundandvibration/src/SystemVolumePresenter.cpp index e06058d29..f63f0846c 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/systemvolume/src/SystemVolumePresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/soundandvibration/src/SystemVolumePresenter.cpp @@ -2,8 +2,8 @@ #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" -#include "systemvolume/include/SystemVolumePresenter.h" - +#include "soundandvibration/include/SystemVolumePresenter.h" +//系统音量 namespace OHOS{ //当前Presenter属性实例化的内存指针 diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemvolume/src/SystemVolumeView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/soundandvibration/src/SystemVolumeView.cpp similarity index 93% rename from code/sdk/application/wearable/nativeapp/nativeui/systemvolume/src/SystemVolumeView.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/soundandvibration/src/SystemVolumeView.cpp index bce0ce418..f046c37d5 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/systemvolume/src/SystemVolumeView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/soundandvibration/src/SystemVolumeView.cpp @@ -1,5 +1,5 @@ -#include "systemvolume/include/SystemVolumeView.h" -#include "systemvolume/include/SystemVolumePresenter.h" +#include "soundandvibration/include/SystemVolumeView.h" +#include "soundandvibration/include/SystemVolumePresenter.h" #include "UiConfig.h" namespace OHOS { @@ -62,13 +62,14 @@ namespace OHOS SystemVolumeslider->SetStyle(STYLE_BORDER_OPA, 0x19); SystemVolumeslider->SetStyle(STYLE_BORDER_RADIUS, 100); SystemVolumeslider->SetDirection(UISlider::Direction::DIR_BOTTOM_TO_TOP); - SystemVolumeslider->SetValue(20); + SystemVolumeslider->SetValue(50); SystemVolumeslider->SetSliderColor(Color::GetColorFromRGBA(0x19, 0x19, 0x19, 0xff), Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff)); SystemVolumeslider->SetKnobStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); SystemVolumeslider->SetForegroundStyle(STYLE_BACKGROUND_OPA, 0xff); SystemVolumeslider->SetBackgroundStyle(STYLE_LINE_CAP, CapType::CAP_ROUND); // 圆帽式 SystemVolumeslider->SetForegroundStyle(STYLE_LINE_CAP, CapType::CAP_ROUND); // 设置进度条的前景样式。圆帽式 - SystemVolumeslider->SetStyle(STYLE_BORDER_COLOR, 0xff000000); + SystemVolumeslider->SetStyle(STYLE_BORDER_COLOR, Color::Black().full); + SystemVolumeslider->SetStyle(STYLE_BORDER_WIDTH,2); sliderClick = static_cast(SystemVolumePresenter::GetInstance()); // 用来处理之后点击slider的点击事件 SystemVolumeslider->SetOnClickListener(sliderClick); sliderDrag = static_cast(SystemVolumePresenter::GetInstance()); // 用来处理之后拖动slider的拖动事件 diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemaboutwatch/include/SystemAboutPresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemAboutPresenter.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/systemaboutwatch/include/SystemAboutPresenter.h rename to code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemAboutPresenter.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemaboutwatch/include/SystemAboutView.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemAboutView.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/systemaboutwatch/include/SystemAboutView.h rename to code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemAboutView.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/steamfactoryreset/include/SystemFactoryResetPresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemFactoryResetPresenter.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/steamfactoryreset/include/SystemFactoryResetPresenter.h rename to code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemFactoryResetPresenter.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/steamfactoryreset/include/SystemFactoryResetView.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemFactoryResetView.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/steamfactoryreset/include/SystemFactoryResetView.h rename to code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemFactoryResetView.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemlanguage/include/SystemLanguagePresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemLanguagePresenter.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/systemlanguage/include/SystemLanguagePresenter.h rename to code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemLanguagePresenter.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemlanguage/include/SystemLanguageView.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemLanguageView.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/systemlanguage/include/SystemLanguageView.h rename to code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemLanguageView.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemreboot/include/SystemRebootPresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemRebootPresenter.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/systemreboot/include/SystemRebootPresenter.h rename to code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemRebootPresenter.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemreboot/include/SystemRebootView.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemRebootView.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/systemreboot/include/SystemRebootView.h rename to code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemRebootView.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/steamshoutdown/include/SystemShoutDownPresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemShoutDownPresenter.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/steamshoutdown/include/SystemShoutDownPresenter.h rename to code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemShoutDownPresenter.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/steamshoutdown/include/SystemShoutDownView.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemShoutDownView.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/steamshoutdown/include/SystemShoutDownView.h rename to code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemShoutDownView.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemsupervise/include/SystemSupervisePresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemSupervisePresenter.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/systemsupervise/include/SystemSupervisePresenter.h rename to code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemSupervisePresenter.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemsupervise/include/SystemSuperviseView.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemSuperviseView.h similarity index 100% rename from code/sdk/application/wearable/nativeapp/nativeui/systemsupervise/include/SystemSuperviseView.h rename to code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemSuperviseView.h diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemaboutwatch/src/SystemAboutPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemAboutPresenter.cpp similarity index 96% rename from code/sdk/application/wearable/nativeapp/nativeui/systemaboutwatch/src/SystemAboutPresenter.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemAboutPresenter.cpp index d4038f02a..d12519fdf 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/systemaboutwatch/src/SystemAboutPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemAboutPresenter.cpp @@ -2,8 +2,7 @@ #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" -#include "systemaboutwatch/include/SystemAboutPresenter.h" - +#include "system/include/SystemAboutPresenter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemaboutwatch/src/SystemAboutView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemAboutView.cpp similarity index 98% rename from code/sdk/application/wearable/nativeapp/nativeui/systemaboutwatch/src/SystemAboutView.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemAboutView.cpp index 6f4ae67b1..1b924c666 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/systemaboutwatch/src/SystemAboutView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemAboutView.cpp @@ -1,5 +1,5 @@ -#include "systemaboutwatch/include/SystemAboutView.h" -#include "systemaboutwatch/include/SystemAboutPresenter.h" +#include "system/include/SystemAboutView.h" +#include "system/include/SystemAboutPresenter.h" #include "UiConfig.h" namespace OHOS diff --git a/code/sdk/application/wearable/nativeapp/nativeui/steamfactoryreset/src/SystemFactoryResetPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemFactoryResetPresenter.cpp similarity index 96% rename from code/sdk/application/wearable/nativeapp/nativeui/steamfactoryreset/src/SystemFactoryResetPresenter.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemFactoryResetPresenter.cpp index daf1f7af7..ea8b3e227 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/steamfactoryreset/src/SystemFactoryResetPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemFactoryResetPresenter.cpp @@ -2,7 +2,7 @@ #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" -#include "steamfactoryreset/include/SystemFactoryResetPresenter.h" +#include "system/include/SystemFactoryResetPresenter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/steamfactoryreset/src/SystemFactoryResetView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemFactoryResetView.cpp similarity index 97% rename from code/sdk/application/wearable/nativeapp/nativeui/steamfactoryreset/src/SystemFactoryResetView.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemFactoryResetView.cpp index dc8da2a5e..28d5f9d62 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/steamfactoryreset/src/SystemFactoryResetView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemFactoryResetView.cpp @@ -1,5 +1,5 @@ -#include "steamfactoryreset/include/SystemFactoryResetView.h" -#include "steamfactoryreset/include/SystemFactoryResetPresenter.h" +#include "system/include/SystemFactoryResetView.h" +#include "system/include/SystemFactoryResetPresenter.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemlanguage/src/SystemLanguagePresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemLanguagePresenter.cpp similarity index 97% rename from code/sdk/application/wearable/nativeapp/nativeui/systemlanguage/src/SystemLanguagePresenter.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemLanguagePresenter.cpp index 7e9b9f7f5..cc56f2f64 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/systemlanguage/src/SystemLanguagePresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemLanguagePresenter.cpp @@ -2,7 +2,7 @@ #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" -#include "systemlanguage/include/SystemLanguagePresenter.h" +#include "system/include/SystemLanguagePresenter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemlanguage/src/SystemLanguageView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemLanguageView.cpp similarity index 98% rename from code/sdk/application/wearable/nativeapp/nativeui/systemlanguage/src/SystemLanguageView.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemLanguageView.cpp index c4086b07f..320a6352a 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/systemlanguage/src/SystemLanguageView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemLanguageView.cpp @@ -1,5 +1,5 @@ -#include "systemlanguage/include/SystemLanguageView.h" -#include "systemlanguage/include/SystemLanguagePresenter.h" +#include "system/include/SystemLanguageView.h" +#include "system/include/SystemLanguagePresenter.h" #include "string.h" #include "UiConfig.h" #include "ui_view.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemPresenter.cpp index be286181f..9dd2ab1e1 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemPresenter.cpp @@ -3,7 +3,6 @@ #include "graphic_math.h" #include "string.h" #include "system/include/SystemPresenter.h" -#include "systemaboutwatch//include/SystemAboutView.h" namespace OHOS { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemreboot/src/SystemRebootPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemRebootPresenter.cpp similarity index 96% rename from code/sdk/application/wearable/nativeapp/nativeui/systemreboot/src/SystemRebootPresenter.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemRebootPresenter.cpp index ccc461adb..19f8da16d 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/systemreboot/src/SystemRebootPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemRebootPresenter.cpp @@ -2,7 +2,7 @@ #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" -#include "systemreboot/include/SystemRebootPresenter.h" +#include "system/include/SystemRebootPresenter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemreboot/src/SystemRebootView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemRebootView.cpp similarity index 97% rename from code/sdk/application/wearable/nativeapp/nativeui/systemreboot/src/SystemRebootView.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemRebootView.cpp index 3dfffa9fb..dc8506cf4 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/systemreboot/src/SystemRebootView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemRebootView.cpp @@ -1,5 +1,5 @@ -#include "systemreboot/include/SystemRebootView.h" -#include "systemreboot/include/SystemRebootPresenter.h" +#include "system/include/SystemRebootView.h" +#include "system/include/SystemRebootPresenter.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/steamshoutdown/src/SystemShoutDownPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemShoutDownPresenter.cpp similarity index 96% rename from code/sdk/application/wearable/nativeapp/nativeui/steamshoutdown/src/SystemShoutDownPresenter.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemShoutDownPresenter.cpp index 42da34f3f..49a1031bc 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/steamshoutdown/src/SystemShoutDownPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemShoutDownPresenter.cpp @@ -2,7 +2,7 @@ #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" -#include "steamshoutdown/include/SystemShoutDownPresenter.h" +#include "system/include/SystemShoutDownPresenter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/steamshoutdown/src/SystemShoutDownView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemShoutDownView.cpp similarity index 97% rename from code/sdk/application/wearable/nativeapp/nativeui/steamshoutdown/src/SystemShoutDownView.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemShoutDownView.cpp index 23cecf1b8..a504f2182 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/steamshoutdown/src/SystemShoutDownView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemShoutDownView.cpp @@ -1,5 +1,5 @@ -#include "steamshoutdown/include/SystemShoutDownView.h" -#include "steamshoutdown/include/SystemShoutDownPresenter.h" +#include "system/include/SystemShoutDownView.h" +#include "system/include/SystemShoutDownPresenter.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemsupervise/src/SystemSupervisePresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemSupervisePresenter.cpp similarity index 96% rename from code/sdk/application/wearable/nativeapp/nativeui/systemsupervise/src/SystemSupervisePresenter.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemSupervisePresenter.cpp index 0c9c5b927..827b687cb 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/systemsupervise/src/SystemSupervisePresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemSupervisePresenter.cpp @@ -2,7 +2,7 @@ #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" -#include "systemsupervise/include/SystemSupervisePresenter.h" +#include "system/include/SystemSupervisePresenter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/systemsupervise/src/SystemSuperviseView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemSuperviseView.cpp similarity index 97% rename from code/sdk/application/wearable/nativeapp/nativeui/systemsupervise/src/SystemSuperviseView.cpp rename to code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemSuperviseView.cpp index 9a8db2117..00512d3cf 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/systemsupervise/src/SystemSuperviseView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemSuperviseView.cpp @@ -1,5 +1,5 @@ -#include "systemsupervise/include/SystemSuperviseView.h" -#include "systemsupervise/include/SystemSupervisePresenter.h" +#include "system/include/SystemSuperviseView.h" +#include "system/include/SystemSupervisePresenter.h" namespace OHOS { diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a index f7b7b4756..bb17203a5 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a index 735273d1d..6271a1b97 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a index 08f396b2b..eccaa7e90 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a index ee2825064..9a03cc4c2 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a index 71ac4cd90..b385fef2d 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a index cdfdabde5..8d6c0bd44 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a differ diff --git a/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a b/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a index eaf693b2a..c1a00dfa2 100644 Binary files a/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a and b/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a differ diff --git a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a index 3334de6aa..11e8cbc5a 100644 Binary files a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a and b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a differ diff --git a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a index 340c06d3f..4f1cd2fd3 100644 Binary files a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a and b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a differ diff --git a/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin b/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin index 4f6ab0298..e5a9f00e0 100644 Binary files a/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin and b/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin differ