projects
/
mirrors
/
FD230.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8a10b24
a24d1ff
)
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
author
luozheng
<1732036298@qq.com>
Thu, 3 Oct 2024 03:53:59 +0000
(11:53 +0800)
committer
luozheng
<1732036298@qq.com>
Thu, 3 Oct 2024 03:53:59 +0000
(11:53 +0800)
1
2
code/sdk/application/wearable/service/broadcast/include/broadcast_feature.h
patch
|
diff1
|
diff2
|
blob
|
history
code/sdk/application/wearable/service/broadcast/src/broadcast_implement.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
code/sdk/application/wearable/service/broadcast/include/broadcast_feature.h
index
e2e5e3d
,
09e6ed1
..
8390f52
---
1
/
code/sdk/application/wearable/service/broadcast/include/broadcast_feature.h
---
2
/
code/sdk/application/wearable/service/broadcast/include/broadcast_feature.h
+++ b/
code/sdk/application/wearable/service/broadcast/include/broadcast_feature.h
@@@
-94,7
-94,7
+94,8
@@@
typedef enum
TOPIC_EVENT_MESSAGENOTE, //消息通知
TOPIC_EVENT_MESSAGE_UPDATA, //消息更新通知
TOPIC_EVENT_SLEEPNOTE, //睡眠通知
+ TOPIC_EVENT_DEBUGOUTPUT,//开发调试专用窗口
+ TOPIC_EVENT_ASSISTANT_NOTE,//语音助手结束
TOPIC_END_NUM = 20000,
} TopicNum;
diff --cc
code/sdk/application/wearable/service/broadcast/src/broadcast_implement.c
Simple merge