From: luozheng <1732036298@qq.com>
Date: Thu, 11 Jul 2024 06:48:23 +0000 (+0800)
Subject: ai大模型UI完成需适配接口
X-Git-Tag: release_V1.2.70_20241020_135402~832
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d8f3b6da98b3d69ee1910c90ee3ba2f8a6c5c8d1;p=mirrors%2FFD230.git
ai大模型UI完成需适配接口
---
diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 809aa490a..e7b0622f4 100644
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -438,7 +438,7 @@ namespace OHOS
ScreenModels::GetInstance()->PreLoadAppimages();
// NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN);
// 注åæé®äºä»¶
- RebootModel::GetInstance()->RegisterKeyEvents();
+ RebootModel::GetInstance()->RegisterAllKeyEvents();
// 弿ºæ£æµå
çµç¶æ
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "get_charge_stat is %d", get_charge_stat());
diff --git a/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsModel.h b/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsModel.h
index b39a9f084..00d64daa9 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsModel.h
@@ -2,7 +2,7 @@
* @Author: luozheng 1732036298@qq.com
* @Date: 2024-07-08 09:39:31
* @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-09 11:48:34
+ * @LastEditTime: 2024-07-10 21:20:02
* @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsModel.h
*/
@@ -18,8 +18,11 @@ namespace OHOS
{
public:
static AiModelsModel &GetInstance(void);
- int16_t GetSelectAiModel(void);
- void SetSelectAiModel(int16_t textId);
+ int GetSelectAiModel(void);
+ void SetSelectAiModel(int index);
+ bool ChangeAiModel(void);
+ int GetAiModelTextId(void);
+ void SetAiModelTextId(int textId);
private:
AiModelsModel();
@@ -27,7 +30,8 @@ namespace OHOS
AiModelsModel(const AiModelsModel &) = delete;
AiModelsModel &operator=(const AiModelsModel &) = delete;
- int16_t selectAiModel; // éæ©çai模å
+ int selectAiModel; // éæ©çai模å
+ int textId;
};
}
diff --git a/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsPresenter.h
index 08e4e4ab1..dda863529 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsPresenter.h
@@ -2,7 +2,7 @@
* @Author: luozheng 1732036298@qq.com
* @Date: 2024-07-08 09:39:10
* @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-09 11:48:26
+ * @LastEditTime: 2024-07-10 10:21:57
* @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsPresenter.h
*/
@@ -29,6 +29,9 @@ namespace OHOS
/*è·åéæ©çai模å*/
int16_t GetSelectAiModel(void);
+ /*åå»func key忢ai模å*/
+ void ChangeAiModel(void);
+ void SetAiModelTextId(int16_t id);
void OnStart() override;
void OnResume() override;
diff --git a/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsView.h b/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsView.h
index ac3ec3cd6..3643e0278 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsView.h
@@ -2,7 +2,7 @@
* @Author: luozheng 1732036298@qq.com
* @Date: 2024-07-08 09:38:50
* @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-09 11:36:40
+ * @LastEditTime: 2024-07-10 10:11:28
* @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aimodels/include/AiModelsView.h
*/
diff --git a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsModel.cpp
index 22ff39081..52c9c4997 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsModel.cpp
@@ -2,11 +2,12 @@
* @Author: luozheng 1732036298@qq.com
* @Date: 2024-07-08 09:39:58
* @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-09 11:48:54
+ * @LastEditTime: 2024-07-10 21:20:06
* @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsModel.cpp
*/
#include "aimodels/include/AiModelsModel.h"
+#include "aimodels/include/AiModelsPresenter.h"
#include "wearable_log.h"
namespace OHOS
@@ -22,15 +23,41 @@ namespace OHOS
}
/*è·åéæ©çai模å*/
- int16_t AiModelsModel::GetSelectAiModel(void)
+ int AiModelsModel::GetSelectAiModel(void)
{
return selectAiModel;
}
// è®¾ç½®éæ©çai模å
- void AiModelsModel::SetSelectAiModel(int16_t textId)
+ void AiModelsModel::SetSelectAiModel(int index)
{
- selectAiModel = textId;
+ selectAiModel = index;
}
+ /*åå»func key忢ai模å*/
+ bool AiModelsModel::ChangeAiModel(void)
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiModelsModel::ChangeAiModel");
+ AiModelsPresenter *aiModelsPresenter = AiModelsPresenter::GetInstance();
+ if (aiModelsPresenter == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsModel::ChangeAiModel - AiModelsPresenter instance is nullptr");
+ return false;
+ }
+ aiModelsPresenter->ChangeAiModel();
+ return true;
+ }
+
+ /*è·å已鿩çai模åçtextid*/
+ int AiModelsModel::GetAiModelTextId(void)
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiModelsModel::GetAiModelTextId - textId = %d", textId);
+ return textId;
+ }
+
+ void AiModelsModel::SetAiModelTextId(int id)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsModel::SetAiModelTextId - id = %d", id);
+ textId = id;
+ }
}
diff --git a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsPresenter.cpp
index cc0943fbd..545549c92 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsPresenter.cpp
@@ -2,7 +2,7 @@
* @Author: luozheng 1732036298@qq.com
* @Date: 2024-06-20 15:11:17
* @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-09 14:22:34
+ * @LastEditTime: 2024-07-10 10:22:18
* @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiModelsPresenter.cpp
*/
#include "AppViewIDs.h"
@@ -40,6 +40,23 @@ namespace OHOS
return model->GetSelectAiModel();
}
+ void AiModelsPresenter::ChangeAiModel(void)
+ {
+ int index = GetSelectAiModel() + 1;
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsPresenter::index = %d", index);
+ if (index >= AIMODES_MAX_NUM)
+ {
+ index = AIMODES_DOUBAO;
+ }
+ model->SetSelectAiModel(index);
+ view_->UpdateAiModelsSelectStateAndTitleId();
+ }
+
+ void AiModelsPresenter::SetAiModelTextId(int16_t id)
+ {
+ model->SetAiModelTextId(id);
+ }
+
// å¯å¨æ¶æ§è¡çé»è¾
void AiModelsPresenter::OnStart()
{
diff --git a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp
index 51354804f..89db66818 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp
@@ -2,7 +2,7 @@
* @Author: luozheng 1732036298@qq.com
* @Date: 2024-05-07 11:25:58
* @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-09 11:56:24
+ * @LastEditTime: 2024-07-10 10:24:57
* @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiModels/src/AiModelsView.cpp
*/
#include "aimodels/include/AiModelsPresenter.h"
@@ -38,9 +38,11 @@ namespace OHOS
void AiModelsView::UpdateAiModelsSelectStateAndTitleId()
{
int index = presenter_->GetSelectAiModel();
+ int textId = AimodelsTextId[index];
+ presenter_->SetAiModelTextId(textId);
if (AiModelsTitle != nullptr)
{
- AiModelsTitle->SetTextId(AimodelsTextId[index]);
+ AiModelsTitle->SetTextId(textId);
AiModelsTitle->ForceResetText();
}
// æ´æ°æ¨¡åéä¸ç¶æç彿°ä¸ç循ç¯ä¼å
diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
index 48722f414..724b7356c 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
@@ -2,7 +2,7 @@
* @Author: luozheng 1732036298@qq.com
* @Date: 2024-06-20 15:14:43
* @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-04 18:31:22
+ * @LastEditTime: 2024-07-11 14:35:27
* @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
*/
#ifndef AI_VOICE_MODEL_H
@@ -62,7 +62,7 @@ namespace OHOS
void StopListenAndRecordingUserQuestion(void);
// 宿¶å¨ç®¡ç
- void AIVoice_StartTimer(uint32_t interval = 1000);
+ void AIVoice_StartTimer(uint32_t interval = 2000);
void AIVoice_StopTimer(void);
private:
diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
index 92ac487b0..711ffe43b 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
@@ -2,7 +2,7 @@
* @Author: luozheng 1732036298@qq.com
* @Date: 2024-06-20 15:14:50
* @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-09 18:29:38
+ * @LastEditTime: 2024-07-11 14:36:14
* @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
*/
#include "aivoice/include/AiVoiceModel.h"
@@ -489,7 +489,7 @@ namespace OHOS
static void AIVoice_TimerCallbackProc(int data)
{
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AIVoice_TimerCallbackProc,Time = %d", Time);
- Time -= 1;
+ Time -= 2;
if (Time == 30)
{
AiVoiceModel::GetInstance().CheckFileAndSendAIIsReady();
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_ja.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_ja.xml
deleted file mode 100644
index b539e5fba..000000000
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_ja.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang
index e787e95eb..a242fedb9 100644
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang differ
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
index 8793c2a1e..ede429db9 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
@@ -1,15 +1,15 @@
-/*
-* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
-* Description: language
-* Author: Graphic develop team
-* Create: 2021-07-06
-*/
-
-#ifndef UI_RESOURCE_STRING_H
-#define UI_RESOURCE_STRING_H
-#include
-namespace OHOS {
-enum UIResourceTextId : uint16_t {
+/*
+* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
+* Description: language
+* Author: Graphic develop team
+* Create: 2021-07-06
+*/
+
+#ifndef UI_RESOURCE_STRING_H
+#define UI_RESOURCE_STRING_H
+#include
+namespace OHOS {
+enum UIResourceTextId : uint16_t {
STR_EXERCISE_OUTDOORWALKING = 0,
STR_EXERCISE_OUTDOORRUNNING = 1,
STR_EXERCISE_OUTDOORBIKING = 2,
@@ -481,10 +481,14 @@ enum UIResourceTextId : uint16_t {
STR_CONNECT_TIMEOUT = 468,
STR_PLEASE_RESTART_CHAT = 469,
STR_CONTINUE_CHAT = 470,
- STR_MAX_ID = 471,
+ STR_AIMODELS_DOUBAO = 471,
+ STR_AIMODES_WENXINYIYAN = 472,
+ STR_AIMODES_KIMI = 473,
+ STR_AIMODES_CHATGPT = 474,
+ STR_MAX_ID = 475,
}; // UIResourceTextId
-
-enum FontLanguageId : uint8_t {
+
+enum FontLanguageId : uint8_t {
LANGUAGE_ID_EN,
LANGUAGE_ID_ZH,
LANGUAGE_ID_MAX
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
index ad99cc0e6..053d7e382 100644
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang differ
diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootModel.h b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootModel.h
index 90c7ecdc6..4606d9fba 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootModel.h
@@ -2,7 +2,7 @@
* @Author: luozheng 1732036298@qq.com
* @Date: 2024-06-12 11:44:04
* @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-06-13 19:09:49
+ * @LastEditTime: 2024-07-10 21:13:23
* @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootModel.h
* @Description: è¿æ¯é»è®¤è®¾ç½®,请设置`customMade`, æå¼koroFileHeaderæ¥çé
ç½® è¿è¡è®¾ç½®: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%A
*/
@@ -28,9 +28,11 @@ public:
void SetSelectViewId(int16_t value);
bool GetExitsView(void);
void SetExitsView(bool value);
- bool RegisterLongPressEvents(void);
- bool RegisterDoubleClickEvents(void);
- void RegisterKeyEvents(void);
+ bool RegisterPowerKeyLongPressEvent(void);
+ bool RegisterPowerKeyDoubleClickEvent(void);
+ bool RegisterFuncKeyClickEvent(void);
+ bool RegisterFuncKeyDoubleClickEvent(void);
+ void RegisterAllKeyEvents(void);
private:
RebootModel();
int16_t selectView{0};
diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootModel.cpp
index b083cd02c..bc113aa6e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootModel.cpp
@@ -2,7 +2,7 @@
* @Author: luozheng 1732036298@qq.com
* @Date: 2024-03-28 11:50:42
* @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-06-14 18:42:57
+ * @LastEditTime: 2024-07-11 14:41:49
* @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootModel.cpp
*/
@@ -13,6 +13,7 @@
#include
#include
#include "power_display_service.h"
+#include "aimodels/include/AiModelsModel.h"
namespace OHOS
{
RebootModel::RebootModel() {}
@@ -55,76 +56,128 @@ namespace OHOS
}
#endif
- /*
- * @brief é¿æåç§å
³æºåè°å½æ°
- */
- static void OnKeyLongPress4s_Callback(void)
+ static void HandlePowerKeyLongPress(void)
{
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnKeyLongPress4s_Callback");
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HandlePowerKeyLongPress");
const power_display_svr_api_t *display_api = power_display_svr_get_api();
+ if (!display_api)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "power_display_svr_get_api returned nullptr");
+ return;
+ }
+
if (display_api->get_screen_state() != SCREEN_ON)
{
display_api->turn_on_screen();
}
+
// 忢å°å
³æº/éå¯å¡ç
NativeAbility::GetInstance().ChangeSlice(VIEW_SHUTDOWN_OR_REBOOT);
-
- return;
}
- /*
- * @brief 注åé¿æçå¬äºä»¶
- * @return 注åæåè¿åtrueï¼åä¹è¿åfalse
- */
- bool RebootModel::RegisterLongPressEvents(void)
+ /*注åçµæºé®çé¿æäºä»¶*/
+ bool RebootModel::RegisterPowerKeyLongPressEvent(void)
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RebootModel::RegisterLongPressEvents");
- int32_t ret = uapi_button_register_event_cb(OnKeyLongPress4s_Callback, BUTTON_PWR_LONGPRESS_3S);
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RebootModel::RegisterPowerKeyLongPressEvent");
+ int32_t ret = uapi_button_register_event_cb(HandlePowerKeyLongPress, BUTTON_PWR_LONGPRESS_3S);
if (ret != ERRCODE_SUCC)
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Register LongPress Events err,ret = %d", ret);
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Register PowerKey LongPress Event error, ret = %d", ret);
return false;
}
return true;
}
- /*
- * @brief åå»äºä»¶åè°å½æ°
- */
- static void OnKeyDoubleClick_Callback(void)
+ static void HandlePowerKeyDoubleClick(void)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandlePowerKeyDoubleClick");
+ // Handle PowerKey DoubleClick logic here
+ }
+
+ /*注åçµæºé®çåå»äºä»¶*/
+ bool RebootModel::RegisterPowerKeyDoubleClickEvent(void)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RebootModel::RegisterPowerKeyDoubleClickEvent");
+ // Register PowerKey DoubleClick event here
+ return true;
+ }
+
+ static void HandleFuncKeyOnClick(void)
{
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnKeyDoubleClick_Callback");
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HandleFuncKeyOnClick");
+
const power_display_svr_api_t *display_api = power_display_svr_get_api();
+ if (!display_api)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "power_display_svr_get_api returned nullptr");
+ return;
+ }
+
if (display_api->get_screen_state() == SCREEN_ON)
{
- // 忢å°ä¸»é¢æ ·å¼çé¢
- NativeAbility::GetInstance().EnterSlice(VIEW_THEME_STYLE);
- //NativeAbility::GetInstance().ChangeSlice(VIEW_SET_DESKTOP);
+ AiModelsModel &aiModelsModel = AiModelsModel::GetInstance();
+ if (!aiModelsModel.ChangeAiModel())
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to change AI model");
+ }
+ }
+ else
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Screen is not on, skipping AI model change");
}
+ }
+
+ /*注ååè½é®çåå»äºä»¶*/
+ bool RebootModel::RegisterFuncKeyClickEvent(void)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RebootModel::RegisterFuncKeyClickEvent");
+ int32_t ret = uapi_button_register_event_cb(HandleFuncKeyOnClick, BUTTON1_CLICKUP);
+ if (ret != ERRCODE_SUCC)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Register FuncKey Click Event error, ret = %d", ret);
+ return false;
+ }
+ return true;
+ }
- return;
+ static void HandleFuncKeyDoubleClick(void)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleFuncKeyDoubleClick");
+ const power_display_svr_api_t *display_api = power_display_svr_get_api();
+ if (!display_api)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "power_display_svr_get_api returned nullptr");
+ return;
+ }
+ if (display_api->get_screen_state() == SCREEN_ON)
+ {
+ // 忢尿¾ç¤ºæ¹å¼çé¢
+ NativeAbility::GetInstance().EnterSlice(VIEW_AI_MODELS);
+ }
+ else
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Screen is not on, skipping Slice change");
+ }
}
- /*
- * @brief 注ååå»äºä»¶
- * @return 注åæåè¿åtrueï¼åä¹è¿åfalse
- */
- bool RebootModel::RegisterDoubleClickEvents(void)
+ /*注ååè½é®åå»äºä»¶*/
+ bool RebootModel::RegisterFuncKeyDoubleClickEvent(void)
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RebootModel::RegisterDoubleClickEvents");
- int32_t ret = uapi_button_register_event_cb(OnKeyDoubleClick_Callback, BUTTON1_CLICKUP_2);
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RebootModel::RegisterFuncKeyDoubleClickEvent");
+ int32_t ret = uapi_button_register_event_cb(HandleFuncKeyDoubleClick, BUTTON1_CLICKUP_2);
if (ret != ERRCODE_SUCC)
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Register DoubleClick Events err,ret = %d", ret);
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Register FuncKey DoubleClick Event error, ret = %d", ret);
return false;
}
return true;
}
- // 注åæé®äºä»¶
- void RebootModel::RegisterKeyEvents(void)
+ void RebootModel::RegisterAllKeyEvents(void)
{
- RegisterLongPressEvents();
- RegisterDoubleClickEvents();
+ RegisterPowerKeyDoubleClickEvent();
+ RegisterPowerKeyLongPressEvent();
+ RegisterFuncKeyClickEvent();
+ RegisterFuncKeyDoubleClickEvent();
}
}
\ No newline at end of file
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/aimodels/aimodels_bg.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/aimodels/aimodels_bg.bin
index f9585fd2d..1275fbc03 100644
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/aimodels/aimodels_bg.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/aimodels/aimodels_bg.bin
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:672cf086d4e285b0f63da94d5dd448d343012999c3e8b0a9878ba9a1621fe859
-size 73064
+oid sha256:88c0f9a3719468cfab7a7396d43edaba4a1ce2b313e0e1f95833f0ef0032f52b
+size 77544
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
index 5e5e8b5a0..a242fedb9 100644
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
index 8793c2a1e..ede429db9 100644
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
@@ -1,15 +1,15 @@
-/*
-* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
-* Description: language
-* Author: Graphic develop team
-* Create: 2021-07-06
-*/
-
-#ifndef UI_RESOURCE_STRING_H
-#define UI_RESOURCE_STRING_H
-#include
-namespace OHOS {
-enum UIResourceTextId : uint16_t {
+/*
+* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
+* Description: language
+* Author: Graphic develop team
+* Create: 2021-07-06
+*/
+
+#ifndef UI_RESOURCE_STRING_H
+#define UI_RESOURCE_STRING_H
+#include
+namespace OHOS {
+enum UIResourceTextId : uint16_t {
STR_EXERCISE_OUTDOORWALKING = 0,
STR_EXERCISE_OUTDOORRUNNING = 1,
STR_EXERCISE_OUTDOORBIKING = 2,
@@ -481,10 +481,14 @@ enum UIResourceTextId : uint16_t {
STR_CONNECT_TIMEOUT = 468,
STR_PLEASE_RESTART_CHAT = 469,
STR_CONTINUE_CHAT = 470,
- STR_MAX_ID = 471,
+ STR_AIMODELS_DOUBAO = 471,
+ STR_AIMODES_WENXINYIYAN = 472,
+ STR_AIMODES_KIMI = 473,
+ STR_AIMODES_CHATGPT = 474,
+ STR_MAX_ID = 475,
}; // UIResourceTextId
-
-enum FontLanguageId : uint8_t {
+
+enum FontLanguageId : uint8_t {
LANGUAGE_ID_EN,
LANGUAGE_ID_ZH,
LANGUAGE_ID_MAX
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
index ad99cc0e6..053d7e382 100644
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ