Merge #1144 into sdk602patch0626 from refs/changes/1144/head

Code review from 罗正

* refs/changes/1144/head: (20 commits squashed)

  - 绑定弹窗增加按键监听，解决开机动画已经开始，被按键打断问题

  - 1.修改查找手表定时器定时器未关闭bug
    2.#915，解决，省电模式下，使用查找手表后，手表亮度会默认恢复，亮度不再是最低bug

  - 解决#966呼吸训练有改动，多了设置分钟，以及开始按钮，有问题。bug

  - 关闭ChangeSlice中showsStackSliceId打印

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 1.解决呼吸训练过程中出现消息弹窗而取消常亮屏，通过添加runtime解决
    2.将呼吸训练常亮屏操作只在开始训练时开启，而不是进入就设置常亮屏

  - 解决计时器和秒表图片是相反的问题

  - #673,解决蓝牙设备搜索显示框没有自适应显示，导致需要下拉才知道有多个设备bug

  - 解决，#674蓝牙搜索界面，优化重新搜索字样显示位置bug，(绑定成功界面)

  - #928,解决，手电筒设置为闪烁，上滑的时候，背景亮度会根据手电筒亮度变bug

  - 优化蓝牙耳机显示列表

  - #523，解决，录音列表，在只有几条不用滑动查看录音的时候，固定界面不允许滑动bug

  - #686,解决Al语音思考界面，动画有白色线圈bug(重新修改动画资源文件解决)

  - 修改蓝牙耳机界面，适配多国语言

  - 通过添加最高和最低亮度宏，减少硬编码

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - #929,解决，手电筒选择彩色，点击上按键退出后再次进入，显示不是彩色bug

  - 关于手表页面添加显示APN protocol

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 解决主界面天气卡片内存泄漏问题

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1144

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index 9e5c260..e47fae3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -73,6 +73,9 @@ namespace OHOS
 #define APP_LIST_PATH "/user/res/applist_icon"
 #define APP_HEARET_ICON_PATH "/user/res/heart_chart/hearticon"//心率动画
 
+#define MIN_BRIGHTNESS 51   /*最低亮度*/
+#define MAX_BRIGHTNESS 255  /*最高亮度*/
+
     static constexpr const char *CARD_CONFIG_PATH = "/user/cardconfig.bin";
 
     /* --------------------------------- 自定义表盘配置 -------------------------------- */

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothDeviceListView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothDeviceListView.h
index 71eb905..03ebbe1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothDeviceListView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothDeviceListView.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-08-05 15:20:01\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-08-16 17:33:49\r
+ * @LastEditTime: 2024-10-10 10:05:27\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothDeviceListView.h\r
  */\r
 #ifndef BLUETOOTH_DEVICE_LIST_VIEW_H\r
@@ -35,7 +35,7 @@ private:
     UILabelExt *titleLabel{nullptr}; /*标题：蓝牙耳机*/\r
     UILabelExt *emptyLabel{nullptr}; /*暂无已配对设备*/\r
     BluetoothDeviceCaseListAdapter *adapterText{nullptr};\r
-    UILabelButtonExt *newEquipmentButton{nullptr};\r
+    UILabelExt *newEquipmentButton{nullptr};\r
 };\r
 } // namespace OHOS\r
 #endif // BLUETOOTH_DEVICE_LIST_VIEW_H
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothEarListView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothEarListView.h
index 06d6111..8106fc8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothEarListView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothEarListView.h
@@ -40,7 +40,7 @@ private:
     UIList *list{nullptr};\r
     UILabelExt *titleLabel{nullptr};\r
     BluetoothCaseListAdapter *adapterText{nullptr};\r
-    UILabelButtonExt *rescanButton{nullptr};\r
+    UILabelExt *rescanButton{nullptr};\r
     UILabelButtonExt *cancelConnedRequestButton{nullptr};\r
 };\r
 } // namespace OHOS\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothOptionsView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothOptionsView.h
index 3d42f8d..ae1157b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothOptionsView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothOptionsView.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-08-05 15:20:01\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-09-04 18:20:24\r
+ * @LastEditTime: 2024-10-09 19:52:58\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothOptionsView.h\r
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE\r
  */\r
@@ -48,6 +48,7 @@ namespace OHOS
         UILabelExt *EarPhoneDeviceName{nullptr};  // 蓝牙耳机设备名\r
         UILabelExt *pairState{nullptr};           // 已配对或者未配对\r
         UILabelButtonExt *unpairButton{nullptr};     // 取消配对按钮\r
+        UILabelExt *unpairLabel{nullptr};          // 取消配对标签\r
         bd_addr_t currentAddr;\r
 \r
         /*下面两个组件暂时设为不可见待到需要时使用*/\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h
index 000cc6b..fe11194 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-08-05 15:20:01\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-08-14 17:36:25\r
+ * @LastEditTime: 2024-10-10 10:19:05\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h\r
  */\r
 \r
@@ -36,7 +36,7 @@ namespace OHOS
         UILabelExt *titleLabel{nullptr};             /*标题：蓝牙耳机 */\r
         UIImageView *btIconImage{nullptr};           /*灰色的蓝牙图标*/\r
         UILabelExt *btHeadsetNotFoundLabel{nullptr}; /*当前搜索不到耳机蓝牙设备*/\r
-        UILabelButtonExt *rescanButton{nullptr};     /*重新搜索按钮*/\r
+        UILabelExt *rescanButton{nullptr};     /*重新搜索按钮*/\r
     };\r
 } // namespace OHOS\r
 #endif // TIPS_FAIL_MESSAGE_VIEW_H
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceListView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceListView.cpp
index e72f778..22489b0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceListView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceListView.cpp
@@ -89,7 +89,7 @@ namespace OHOS
             list->SetStyle(STYLE_BORDER_RADIUS, 50);\r
             list->SetDragACCLevel(5);\r
             list->SetSwipeACCLevel(800);\r
-            // list->SetReboundSize(30);\r
+            list->SetReboundSize(30);\r
             // list->SetScrollBlankSize(30);\r
             list->SetAdapter(adapterText);\r
         }\r
@@ -131,22 +131,25 @@ namespace OHOS
     {\r
         if (newEquipmentButton == nullptr)\r
         {\r
-            newEquipmentButton = new UILabelButtonExt();\r
+            newEquipmentButton = new UILabelExt();\r
             if (newEquipmentButton == nullptr)\r
             {\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BluetoothDeviceListView newEquipmentButton new fail");\r
                 return;\r
             }\r
         }\r
-        newEquipmentButton->SetPosition(173, 390, 120, 40);\r
+        newEquipmentButton->SetPosition(133, 390, 200, 40);\r
         newEquipmentButton->SetTextId(STR_BT_HEADSET_RESCAN); // 重新搜索\r
         newEquipmentButton->SetViewId(BLUETOOTH_NEWEQUIPMENT_BUTTON);\r
         newEquipmentButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
         newEquipmentButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
         // newEquipmentButton->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE);\r
         newEquipmentButton->SetTextColor(Color::GetColorFromRGBA(0x35, 0x49, 0xff, 0xff));\r
-        newEquipmentButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
+        // newEquipmentButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
+        newEquipmentButton->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         newEquipmentButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        newEquipmentButton->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
+        newEquipmentButton->SetTouchable(true);\r
         UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::PlayersPresenter::GetInstance();\r
         UIView::OnClickListener *clickListener2 = (UIView::OnClickListener *)OHOS::BluetoothPresenter::GetInstance();\r
         if ((clickListener == nullptr) && (clickListener2 == nullptr))\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarListView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarListView.cpp
index ef37e1b..77199db 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarListView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarListView.cpp
@@ -176,21 +176,24 @@ namespace OHOS
     {\r
         if (rescanButton == nullptr)\r
         {\r
-            rescanButton = new UILabelButtonExt();\r
+            rescanButton = new UILabelExt();\r
             if (rescanButton == nullptr)\r
             {\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BluetoothDeviceListView rescanButton new fail");\r
                 return;\r
             }\r
         }\r
-        rescanButton->SetPosition(173, 390, 120, 40);\r
+        rescanButton->SetPosition(133, 390, 200, 40);\r
         rescanButton->SetTextId(STR_BT_HEADSET_RESCAN); // 重新搜索\r
         rescanButton->SetViewId(BLUETOOTH_RESCAN_BUTTON);\r
         rescanButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
         rescanButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
         rescanButton->SetTextColor(Color::GetColorFromRGBA(0x35, 0x49, 0xff, 0xff));\r
-        rescanButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
+        // rescanButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
         rescanButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        rescanButton->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+        rescanButton->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
+        rescanButton->SetTouchable(true);\r
         group->Add(rescanButton);\r
         UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::PlayersPresenter::GetInstance();\r
         UIView::OnClickListener *clickListener2 = (UIView::OnClickListener *)OHOS::BluetoothPresenter::GetInstance();\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp
index 77ed596..a33b9fb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp
@@ -54,6 +54,11 @@ namespace OHOS
                 delete unpairButton;\r
                 unpairButton = nullptr;\r
             }\r
+            if (unpairLabel)\r
+            {\r
+                delete unpairLabel;\r
+                unpairLabel = nullptr;\r
+            }\r
             if (connectStateLabel)\r
             {\r
                 delete connectStateLabel;\r
@@ -201,7 +206,7 @@ namespace OHOS
             }\r
         }\r
         unpairButton->SetPosition(0, 366, 466, 100);\r
-        unpairButton->SetTextId(STR_UNPAIR); // 取消配对\r
+        // unpairButton->SetTextId(STR_UNPAIR); // 取消配对\r
         unpairButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         unpairButton->SetViewId(BLUETOOTH_UNPAIR_BUTTON);\r
         unpairButton->SetImageSrc(PNG_BUTTON_466x100_IMAGE, PNG_BUTTON_466x100_IMAGE);\r
@@ -215,6 +220,26 @@ namespace OHOS
         {\r
             unpairButton->SetOnClickListener(clickListener2);\r
         }\r
+        /* -------------------------------------------------------------------------- */\r
+        if (unpairLabel == nullptr)\r
+        {\r
+            unpairLabel = new UILabelExt();\r
+            if (unpairLabel == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "unpairLabel new fail");\r
+                return false;\r
+            }\r
+        }\r
+        unpairLabel->SetPosition(173, unpairButton->GetY() + 33, 120, 35);\r
+        unpairLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
+        unpairLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
+        unpairLabel->SetTextId(STR_UNPAIR); // 取消配对\r
+        unpairLabel->SetTextColor(Color::GetColorFromRGBA(0xff, 0x5a, 0x36, 0xff));\r
+        unpairLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
+        unpairLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+        unpairLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        // unpairLabel->SetRollSpeed(70);\r
+        /* -------------------------------------------------------------------------- */\r
         return true;\r
     }\r
 \r
@@ -307,6 +332,7 @@ namespace OHOS
         group->Add(EarPhoneDeviceName);\r
         group->Add(pairState);\r
         group->Add(unpairButton);\r
+        group->Add(unpairLabel);\r
         group->Add(optionsOneButton);\r
         group->Add(connectStateLabel);\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp
index 5fdfd13..d44de8c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp
@@ -183,7 +183,7 @@ namespace OHOS
                 bluetoothNameLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
                 bluetoothNameLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
                 bluetoothNameLabel->SetRollSpeed(70);\r
-                bluetoothNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+                bluetoothNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);\r
                 bluetoothNameLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
             }\r
             /* ----------------------------- conn_fail_Label ---------------------------- */\r
@@ -201,7 +201,7 @@ namespace OHOS
                 conn_fail_Label->SetStyle(STYLE_LINE_HEIGHT, 35);\r
                 conn_fail_Label->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
                 conn_fail_Label->SetRollSpeed(70);\r
-                conn_fail_Label->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);\r
+                conn_fail_Label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
                 conn_fail_Label->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
                 conn_fail_Label->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f));\r
             }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsFailMessageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsFailMessageView.cpp
index 49982ff..c8bd189 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsFailMessageView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsFailMessageView.cpp
@@ -131,7 +131,7 @@ namespace OHOS
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView::CreateTipsFailMessageLabelButton");\r
         if (rescanButton == nullptr)\r
         {\r
-            rescanButton = new UILabelButtonExt();\r
+            rescanButton = new UILabelExt();\r
             if (rescanButton == nullptr)\r
             {\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView rescanButton new fail");\r
@@ -151,7 +151,10 @@ namespace OHOS
             rescanButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             rescanButton->SetViewId(BLUETOOTH_FAIL_BACK_BUTTON);\r
             rescanButton->SetTextColor(Color::GetColorFromRGBA(0x35, 0x49, 0xff, 0xff));\r
-            rescanButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
+            // rescanButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
+            rescanButton->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+            rescanButton->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
+            rescanButton->SetTouchable(true);\r
             if (BluetoothModel::GetInstance()->GetBluetoothCalleridStatus() == CALLERPLAYERS)\r
             {\r
                 rescanButton->SetOnClickListener(clickListener);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/flashlight/include/FlashlightPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/flashlight/include/FlashlightPresenter.h
index 9927f85..e19b0b6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/flashlight/include/FlashlightPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/flashlight/include/FlashlightPresenter.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-04-10 17:32:31
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-06-07 17:52:25
+ * @LastEditTime: 2024-10-10 11:40:08
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/flashligh/include/FlashlightPresenter.h
  */
 
@@ -47,7 +47,7 @@ namespace OHOS
     constexpr int64_t ColorValue_ColorSettingItem_[COLOR_SETTING_ITEM_COUNT] = 
                                                     {
                                                         0xffffffff, 0xffff5a36, 0xff4fc34c,
-                                                        0xff3549ff, 0xffff8a36, 0xffffffff
+                                                        0xff3549ff, 0xffff8a36, 0xff8120e2
                                                     };
 
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/flashlight/include/FlashlightView.h b/code/sdk/application/wearable/fd230app/nativeui/flashlight/include/FlashlightView.h
index a4aa0ff..efc1a0e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/flashlight/include/FlashlightView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/flashlight/include/FlashlightView.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-04-10 17:32:02
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-09-13 18:55:12
+ * @LastEditTime: 2024-10-10 11:42:10
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/flashligh/include/FlashlightView.h
  */
 
@@ -135,7 +135,8 @@ namespace OHOS
                                                         "/user/res/flashlight/color_2.bin", 
                                                         "/user/res/flashlight/color_3.bin", 
                                                         "/user/res/flashlight/color_4.bin", 
-                                                        "/user/res/flashlight/color_5.bin",
+                                                        // "/user/res/flashlight/color_5.bin", //自定义颜色
+                                                        "/user/res/flashlight/color_6.bin",   //紫色
                                                     };
 
         #define COLOR_CUSTOM_BACKGROUND_IMAGE "/user/res/flashlight/color_custom_bg.bin"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightPresenter.cpp
index 8cbb454..9a8c5c3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightPresenter.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-04-10 17:32:38
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-10-09 17:19:01
+ * @LastEditTime: 2024-10-10 11:31:51
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/flashligh/src/FlashlightPresenter.cpp
  */
 
@@ -19,6 +19,8 @@
 namespace OHOS
 {
 
+#define IS_SUPPORT_CUSTOM_COLOR 0 //是否支持自定义颜色
+
     // 当前Presenter属性实例化的内存指针
     static FlashlightPresenter *g_pFlashlightPresenter = nullptr;
 
@@ -138,13 +140,14 @@ namespace OHOS
 
         for(i = 0; i < COLOR_SETTING_ITEM_COUNT; i++)
         {
+#if IS_SUPPORT_CUSTOM_COLOR
             if(0 == strcmp(Flashlight_ViewId_ImageColorSettingItem_[COLOR_SETTING_ITEM_COUNT - 1], view.GetViewId()))
             {
                 FlashlightModel::GetInstance().SetColorIndex(COLOR_SETTING_ITEM_COUNT - 1);
                 view_->DisplayColorCustomScreen();
                 return true;
             }
-
+#endif
             if(0 == strcmp(Flashlight_ViewId_ImageColorSettingItem_[i], view.GetViewId()))
             {
                 FlashlightModel::GetInstance().SetColorIndex(i);
@@ -154,6 +157,7 @@ namespace OHOS
             }
         }
 
+#if IS_SUPPORT_CUSTOM_COLOR
         if(0 == strcmp(Flashlight_ViewId_ImageColorCustomBackground_, view.GetViewId()))
         {
             Point point = event.GetCurrentPos();
@@ -167,7 +171,7 @@ namespace OHOS
             view_->DisplayViewMainScreen();
             return true;
         }
-
+#endif
         return true;
     }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
index 9ad7c3d..dabb123 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@ -162,6 +162,11 @@ namespace OHOS
             delete traingView;
             traingView = nullptr;
         }
+        if (weatherControlView != nullptr)
+        {
+            delete weatherControlView;
+            weatherControlView = nullptr;
+        }
         if (GoalControlView != nullptr)
         {
             GoalControlView->RemoveAll();
@@ -182,8 +187,8 @@ namespace OHOS
         {
             delete callback;
             callback = nullptr;
-            g_pMainView = nullptr;
         }
+        g_pMainView = nullptr;
     }
     MainViewSample *MainViewSample::GetInstance(void)
     {
@@ -522,7 +527,7 @@ namespace OHOS
         weatherControlView = new WeatherControlView();
         if (weatherControlView == nullptr)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "mainweatherView new fail");
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "weatherControlView new fail");
             return nullptr;
         }
         return weatherControlView;
@@ -531,11 +536,11 @@ namespace OHOS
     // 主界面每日目标卡片
     UICardPage *MainViewSample::InitGoalPage(void)
     {
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitWeatherPage");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitGoalPage");
         GoalControlView = new goalControlView();
         if (GoalControlView == nullptr)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "mainweatherView new fail");
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GoalControlView new fail");
             return nullptr;
         }
         return GoalControlView;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp
index 0142b4b..3f820ad 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp
@@ -1,7 +1,7 @@
 /*
  * @Date: 2024-06-21 09:56:18
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-10-09 14:53:41
+ * @LastEditTime: 2024-10-10 11:50:09
  * @FilePath:
  * /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp
  */

diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModeModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModeModel.cpp
index cc330ff..672dacd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModeModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModeModel.cpp
@@ -44,7 +44,7 @@ namespace OHOS
 
         // turn down brightness
         const power_display_svr_api_t *display_api = power_display_svr_get_api();
-        display_api->set_brightness(51);
+        display_api->set_brightness(MIN_BRIGHTNESS);
     }
 
     void SleepModeModel::SetSleepModeDisabled(void)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
index 8916e25..f15f0d4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
@@ -1,8 +1,8 @@
 /*\r
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-03-30 09:14:38\r
- * @LastEditors: penglei 1624952103@qq.com\r
- * @LastEditTime: 2024-08-31 18:57:13\r
+ * @LastEditors: luozheng 1732036298@qq.com\r
+ * @LastEditTime: 2024-10-10 14:48:08\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h\r
  */\r
 #ifndef SYSTEM_ABOUT_VIEW_H\r
@@ -66,6 +66,8 @@ namespace OHOS
         UILabel *HWVER = nullptr;\r
         UILabel *CyweeVersionTitle = nullptr;\r
         UILabel *CyweeVersion = nullptr;\r
+        UILabel *APNprotocolTitle = nullptr;     //APN协议\r
+        UILabel * APNprotocol = nullptr;\r
         bool initViewStatus{false};\r
     };\r
 }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
index f627103..7dc7d45 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
@@ -3,6 +3,7 @@
 #include "wearable_log.h"\r
 #include "custom_utils.h"\r
 #include "ConfigModel.h"\r
+#include "ui_resource_string.h"\r
 \r
 #define WATCH_ABOUT_TITLE_HEIGHT 50\r
 #define WATCH_ABOUT_VALUE_HEIGHT 80\r
@@ -20,7 +21,9 @@
 #define WATCH_MODEM_VERSION_VALUE_TOP (WATCH_MODEM_VERSION_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
 #define WATCH_MODEM_APP_VERSION_TOP (WATCH_MODEM_VERSION_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
 #define WATCH_MODEM_APP_VERSION_VALUE_TOP (WATCH_MODEM_APP_VERSION_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
-#define WATCH_IMEI_TOP (WATCH_MODEM_APP_VERSION_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
+#define WATCH_APN_PROTOCOL_TOP (WATCH_MODEM_APP_VERSION_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
+#define WATCH_APN_PROTOCOL_VALUE_TOP (WATCH_APN_PROTOCOL_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
+#define WATCH_IMEI_TOP (WATCH_APN_PROTOCOL_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
 #define WATCH_IMEI_VALUE_TOP (WATCH_IMEI_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
 #define WATCH_FONT_TOP (WATCH_IMEI_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
 #define WATCH_FONT_VALUE_TOP (WATCH_FONT_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
@@ -127,6 +130,11 @@ namespace OHOS
             delete CyweeVersion;\r
             CyweeVersion = nullptr;\r
 \r
+            delete APNprotocolTitle;\r
+            APNprotocolTitle = nullptr;\r
+            delete APNprotocol;\r
+            APNprotocol = nullptr;\r
+\r
             FocusManager::GetInstance()->ClearFocus();\r
             delete SystemAboutTheWatchScrollView;\r
             SystemAboutTheWatchScrollView = nullptr;\r
@@ -480,6 +488,43 @@ namespace OHOS
         PyVer->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
         SystemAboutTheWatchScrollView->Add(PyVer);\r
         /* -------------------------------------------------------------------------- */\r
+        Config = {\r
+            .left = TITLE_LABEL_X,\r
+            .top = WATCH_APN_PROTOCOL_TOP,\r
+            .width = TITLE_LABEL_W,\r
+            .height = TITLE_LABEL_H,\r
+            .fontSize = TITLE_LABEL_FONTSIZE,\r
+            .lineHeigh = TITLE_LABEL_LINEHEIGHT,\r
+            .text = "APN protocol",\r
+            .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION,\r
+        };\r
+        APNprotocolTitle = InitLabel(Config);\r
+        if (APNprotocolTitle == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::APNprotocolTitle new fail!");\r
+            return nullptr;\r
+        }\r
+        SystemAboutTheWatchScrollView->Add(APNprotocolTitle);\r
+        /* -------------------------------------------------------------------------- */\r
+        Config = {\r
+            .left = LABEL_X,\r
+            .top = WATCH_APN_PROTOCOL_VALUE_TOP,\r
+            .width = LABEL_W,\r
+            .height = LABEL_H,\r
+            .fontSize = LABEL_FONTSIZE,\r
+            .lineHeigh = TITLE_LABEL_LINEHEIGHT,\r
+            .text = "IPV4/IPV6",\r
+            .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
+        };\r
+        APNprotocol = InitLabel(Config);\r
+        if (APNprotocol == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::APNprotocol new fail!");\r
+            return nullptr;\r
+        }\r
+        APNprotocol->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
+        SystemAboutTheWatchScrollView->Add(APNprotocol);\r
+        /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = TITLE_LABEL_X,\r
             .top = WATCH_IMEI_TOP,\r

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
index dcf393d..f040736 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-03-25 17:33:47
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-10-09 11:21:37
+ * @LastEditTime: 2024-10-10 11:50:28
  * @FilePath: /FD230/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
  * @details:实现查找手表的功能一般需要手表和智能手机之间的配合，通常是通过手机上的应用（App）或其他设备发送指令给手表，触发手表的查找功能。
  * 以下是基本的实现步骤：
@@ -157,7 +157,7 @@ namespace OHOS
         if (display_api)
         {
             /*100%亮度*/
-            int max_brightness_value = 255;
+            int max_brightness_value = MAX_BRIGHTNESS;
             if (display_api->set_brightness(max_brightness_value) != ERRCODE_SUCC)
             {
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[FindWatchViewEventListener] set_brightness fail!!");
@@ -175,7 +175,7 @@ namespace OHOS
             int brightnessValue;
             if(uapi_dev_runtime_get_saveele_status()) //如果是省电模式状态下退出要把亮度设置为最低
             {
-                brightnessValue = 51;
+                brightnessValue = MIN_BRIGHTNESS;//恢复到最低亮度
             }
             else
             {

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/1.bin
index 52d54f5..3a9afb3 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/1.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/1.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5448288921ab4edf3de9f8100dbd82332e1007a04f55365417a48eab46e47733
+oid sha256:56d4e1f23e340a3fa95bd4cbb020c85e746a3d49832a3ca0da0048bac5879920
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/10.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/10.bin
index 8c5cc8f..7312d76 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/10.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/10.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a45556b9903a97c7125298a3df55db8030b0fd62a813ea5354b44a6707de5a12
+oid sha256:485f2e8172863771a08a36efc6dd8154a4d7ff9de939cee0fc7eca98533e878b
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/11.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/11.bin
index 06d23cd..10ca675 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/11.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/11.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca55147a2db48d585b7636907c2b41556a1c241ad508731b02727e9ce3a081dc
+oid sha256:67a49fc85a4023c3fd590af4a30504b8b4ceba6bd8fe7e05b465a87037ee5a91
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/12.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/12.bin
index 7bcd404..d22c93d 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/12.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/12.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a53b3868245a90008005acbff053016a1c472ab6f98d7de15dd543df10f315e
+oid sha256:731fba23e6786e844389b0e217193c837386194816d026d655c7829b5bd9ee8f
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/13.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/13.bin
index dbbd599..ce976a4 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/13.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/13.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f50b9d88d2d4ae5969aaa175db57a022f3985594f916d3c8cdcb46116373eb43
+oid sha256:a961db1c721fa5b1c84d74364f27b0c4ffd58122f97ddea111f132792d6c76ea
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/14.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/14.bin
index 7c4ad51..3738e10 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/14.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/14.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0107360157e035c99123050bc276918d481c8e263b07ac6240599201ace18b5a
+oid sha256:d30ea0941638e0386fc5eacc52cf3ed39abd02988a46e87830be036483d9e4b9
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/15.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/15.bin
index 3b4817a..abc823f 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/15.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/15.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ec7003c65c306b77ed8fec5e6eb968590f3615aa04a2b532540b020fa208089
+oid sha256:624cff42389ce81fff5b39f43fd1aada7117eabb0a25dbb83171520c6f6bfb57
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/16.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/16.bin
index 80c0951..6890393 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/16.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/16.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:725967dcfe5e96b6978209ba4f4c492bccea8e75780ceef6c67faebb14537207
+oid sha256:c1b016b450a5146d76d980389a4b6e8a5fdac21dd7492cef845ab30ea493ed3d
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/17.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/17.bin
index e3eff05..d77d803 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/17.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/17.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73a9f0344a3d99fefbfef7a19030cd29b9b0da6d43b98fcfd23693f2cfcaa77f
+oid sha256:0447131faaed84b01cdd8f75a64eba95f91dbb0c87f6a5ef322b746994b90daf
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/18.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/18.bin
index 4fb5b4d..9acda18 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/18.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/18.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd033039f01253ea570b49027346263aeab3996ba8115ad80c11e865296afd05
+oid sha256:c9f9dd1d11174db7df6f0c9450becfdefc8b9b99975a6c3bbe562f7b6c70b16a
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/19.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/19.bin
index 5aba309..278a454 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/19.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/19.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c025338d6df979f20f1f99052e34ac89d5dc3d5dd5e955de51fa62c6e315bcc4
+oid sha256:dda139b5a864ef7d62be2b5f780ba4556d1f670e0cdb428240c5c50b3a6801d1
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/2.bin
index b495689..acd465e 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/2.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/2.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:995f40d3f1a32b555df0d5ded675e8c12087aea6d24e83226cc59fe98248976a
+oid sha256:1afe2b81bbf69882640a91f0fa1b3ae968b4a1cd18ffa6955045f99957cae866
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/21.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/21.bin
index e5cc03f..9adc5a4 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/21.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/21.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db3c16521c806f57619bb6cf6bb47061f08e19467b6845ebaca2169a347d83e8
+oid sha256:6b6c6ba89bb12076bbcf6bdd73c6789421303307e44535c7c67b9f967c60cc68
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/22.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/22.bin
index 1f6d621..65c41c9 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/22.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/22.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af7ba053570d40e88d15af4a3ea199d7016ad2030a780e460d4b689a3fbce6cc
+oid sha256:b0a08d0e1c8ba46b14f464240d5f73d9930207af8bd8b12a472a888116f898c3
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/23.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/23.bin
index 9c53c3e..3339552 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/23.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/23.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ca471f0bc9bbd0f469cda00c808bd1e654d4260f142eb43b46ba8deb5cce82a
+oid sha256:889c7da070f5e5dfa63b364a6d4b6b1b40e2a943d1818a32c2c6b16aaa3e2afb
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/24.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/24.bin
index 8eed21f..1d523d6 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/24.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/24.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89843bf05ac8f283c057bd87b39ca51d77466b3b42dde4bdba37aa44e19ce65d
+oid sha256:584d75c7563cbe91763d002f4419d48c3632c6f0d29f18af891b79f3cceefce2
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/25.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/25.bin
index e346379..1e48b6d 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/25.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/25.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce5302e89a6d6e43f3bb22aa1f5a93c9fcd5cce37ee0f6a34feca8e0e6cff097
+oid sha256:a644245c7f54022cc9969a59a5fdcefb6e696eeac73f33bf71b22534f7d67652
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/26.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/26.bin
index dffb9da..44edd14 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/26.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/26.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e3755288fb83635e4665946e17d8b37444cc13e0baa32c4a19ad0356018bcfb
+oid sha256:eebcc62ce17a2dd6966f97c105a68545b1b9e681a1c66d493300e3797eb7a7e4
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/27.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/27.bin
index 6bf8645..6695e10 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/27.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/27.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eaa8a73c0fb7941d3f5c53c4f6182b9e94fc7090c02549b51ec37ece043258b0
+oid sha256:b239c205e8130fbc46474c1a7cbb5c10b8803c77747d20cd13b5f6c1fd88b2b8
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/28.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/28.bin
index 954ce17..afaeb4b 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/28.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/28.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:639e9c9f719fdb52bdae1e7cb30101e8a7e5358867b5105e0d7c1d649a816fe0
+oid sha256:ff657a0c9e13c7a7d5f23189eab12e7894cb11359d8dfc2eb918a608358185de
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/29.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/29.bin
index ee6b021..f44d0f1 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/29.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/29.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9fb8422347a1b582d28010be68902d666ac45588f50c2182e2fb38afe755bd0f
+oid sha256:504ae8a8ff50aec397068273633715bebba88f90e2086468e4fbe24ac15b5813
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/3.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/3.bin
index 2fa12da..eadd479 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/3.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/3.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39bbac23be33291a65fcc866892a73658e3324a38da0e8c1f978e2793ac5ff37
+oid sha256:8c8ef5e2f4f7012f766c8cb61c50d4cbcc0fa98737a12c933ebfda8368c47dbc
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/30.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/30.bin
index 1730973..099fe2f 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/30.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/30.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e00c644360ae8ca81907c88e4984849660d6cd0eb6eef5cd5908bed6cffb2c2e
+oid sha256:c6700420e5da2bf83fd6a59d6beec43688bc09e3206b1cfc6ad0e21a9245a670
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/31.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/31.bin
index bdcbdcd..ccb986e 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/31.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/31.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:680e471fb3f08dd18319fd4305a5bb3be60a8b4158824bd28b8d11198c98e5a9
+oid sha256:934f6cc4627bc7688ac00d39dad9983500b5538b9e5549a8bb20bebc83557096
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/32.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/32.bin
index f587fa6..3731ca9 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/32.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/32.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3c9144c97fe6c05b55f6b700be6413ad93ec582b63826b8f04780ab87d4eaea
+oid sha256:b645505ce1ad981ac8e09f4222ab9bf22022aaea2a68ead0791c0c1440e02531
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/33.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/33.bin
index a8ee6a6..3ce918a 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/33.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/33.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8636d7847451e17f5bcaf1926db80bf8d05fb1bb238e3618de41b1bd0748069f
+oid sha256:c7df10b82df26a8534200dc5f0ae91b7e4284cb6dce89dd3cd461b43682ebc65
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/34.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/34.bin
index 6f9570f..e1f1aa4 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/34.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/34.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9cd413b381782dc079136e4ad68bcdb3f25266cea90134151c10cf59e22461db
+oid sha256:c32e3297b8cbd651d9eb22f94b699367834467d84d9ca7b6370aaa1f3a3c1e45
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/35.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/35.bin
index 0fbf62b..4922e5f 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/35.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/35.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ba2b361d09f47f48033ccd4da0b627e05087563c69f9b9d58c512f7368801ed
+oid sha256:346830aa95710aab65f684ac46bc47c7db27a93cc97239be33cb734a9b5224a5
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/36.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/36.bin
index 5dc43ee..1fb470d 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/36.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/36.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91822e3f6b3ff34cfe428e8fb3d1c981de481c7cdf0669c3b2f12cc986ad6468
+oid sha256:6630a64720bcd70e1e64451dec64d906043b050ff27df5b9026f5df6752125e1
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/37.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/37.bin
index bb236b4..49af643 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/37.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/37.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdff44bd31d20c61d0e5042772a8a9065f2168540c395d43b5e6423962ecc34d
+oid sha256:3ef6f559a8922508574e938503e648f983346783b2255e96723569f91b3a2086
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/38.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/38.bin
index 719ebd6..36e101b 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/38.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/38.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:003771224ca63b9283990ee0c1a556cecc1833ea930e84de231b3b5bfa9c1fa6
+oid sha256:f8c4cbb2e3d0910d52c12cef5339a2171f93c6eb615d54aa7dd67e68ce8bf762
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/39.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/39.bin
index ebc3db5..cd02a82 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/39.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/39.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9e3170259fe1f9649d9bfed2b667d3477d12c2e4f7c6f97433335b1a8e2d5cc
+oid sha256:589cef71001a7a4a538355d039de4fe3c5c52f66fdf846a0829bd7fb42dfd244
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/4.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/4.bin
index 1f92e21..d48e011 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/4.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/4.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7752f788f373de30345a7e73bba190894f766f320f53222437e00460dc6bab2a
+oid sha256:bda130f0f9e3b5986c014bf8cb43634ec8ca681c99a79912148c970fcc7190dc
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/40.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/40.bin
index dceb5cb..059f184 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/40.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/40.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67e1595945e7339b17a03b16be2e0b484203c709b88c4a124435243369ca7899
+oid sha256:4690d6f02e5f5b98b1226d295a423f55cb63f91de8ed0ad3daaf9bfe206a6a70
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/5.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/5.bin
index 532cffa..ae580ae 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/5.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/5.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25a90c4d990993eecae817e2022e6479124bba9fd7b7847a2557e822f2fe43f9
+oid sha256:03a87a69880333c957b5af07a42345c97221a27247262cb951a078809ab77972
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/6.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/6.bin
index 8a24068..7d5d5dd 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/6.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/6.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7d5e23c9c560d387ae8f4f22d10a257248fa845e1b89a72514b5482eb5b117c
+oid sha256:43a4d787f95fd946d47398bbd77cdeafcfa64b42cc3a3cf1731c35ab57a4f616
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/7.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/7.bin
index 90bda9e..6643746 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/7.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/7.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4256f4ef3e3197f1108cb6089ee6ea6be5391c6ec4c67d9a5762def1a97b87e0
+oid sha256:428c3911eb6d89402771cf23e4fb7086a10db6bf1f81898d10264ae3ce332ae4
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/8.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/8.bin
index c2ec6a3..15209b3 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/8.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/8.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98b09efad27e93a8fb2ecdf66e0b9d6f1ff943b6c4bd2c689ec5533448ebf0fc
+oid sha256:2b9529765d29d52ff9ff11c1362b9d4b1e0a18c5d5cbc564d7db1dba4060c24d
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/9.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/9.bin
index e4ae0c9..4540ea6 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/9.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/9.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9acf287e37fd33b7eab6ab7588d8190e2dc0d636eaa2015d88072a416be6799e
+oid sha256:547fca815bfbfedf7c3bff35c9b3de8f5bf234425d6ae21b4e6e67e13d47c85c
 size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/flashlight/color_6.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/flashlight/color_6.bin
new file mode 100644 (file)
index 0000000..5d9fd6d
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/flashlight/color_6.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db64294ada1a7af09d5867cb260b37777eb5f43220b1ce13060330d23641d72d
+size 4504