Snicker Git - mirrors/FD230.git/commit

author	dxy <1731678236@qq.com>
	Fri, 29 Mar 2024 08:22:16 +0000 (16:22 +0800)
committer	dxy <1731678236@qq.com>
	Fri, 29 Mar 2024 08:22:16 +0000 (16:22 +0800)
commit	1879cf02b120f0254fbd5a06f12a3a9619611d98
tree	4941f6249961f410522c198ef06bb3b66fbdb059	tree \| snapshot
parent	10f3c38e439e0494e8220d8004d9ec1909766eb8	commit \| diff

合并代码冲突

174 files changed:

code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassPresenter.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdatePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt	[new file with mode: 0644]	blob
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt	[new file with mode: 0644]	blob
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml	[new file with mode: 0644]	blob
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml	[new file with mode: 0644]	blob
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/languagetool.py	[new file with mode: 0644]	blob
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/多国语言工具脚本.md	[new file with mode: 0644]	blob
code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang	[new file with mode: 0644]	blob
code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h	[new file with mode: 0644]	blob
code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang	[new file with mode: 0644]	blob
code/sdk/application/wearable/fd230app/nativeui/language/language_config/config.json	[deleted file]	blob \| history
code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/en.lang	[deleted file]	blob \| history
code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/ui_resource_string.h	[deleted file]	blob \| history
code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/zh.lang	[deleted file]	blob \| history
code/sdk/application/wearable/fd230app/nativeui/language/language_en.xml	[deleted file]	blob \| history
code/sdk/application/wearable/fd230app/nativeui/language/language_zh.xml	[deleted file]	blob \| history
code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallingPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallupPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/phone/src/PhonePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneRingPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/record/include/RecordDeleteView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPlayerView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/rotate/src/RotatePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingAttentionPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/MediaVolumePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLanguageView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLanguageView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2Presenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnotePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceAdapter.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceModel.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceModel.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleModel.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherReportView.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/nativeabilityfwk/include/ChangeSliceListener.h		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativelauncher/src/slices/main/MainView.cpp		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativeui/applist/include/ApplistModel.h		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativeui/callerlog/include/CallerLogModel.h		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativeui/compass/include/CompassPresenter.h		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativeui/compass/include/MainCompassPresenter.h		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativeui/key/src/KeyInputListener.cpp		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistModel.cpp		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativeui/settings/include/SettingModel.h		diff \| blob \| history
code/sdk/application/wearable/nativeapp/nativeui/uisample/include/UISampleModel.h		diff \| blob \| history
code/sdk/application/wearable/service/broadcast/include/broadcast_feature.h		diff \| blob \| history
code/sdk/application/wearable/service/broadcast/src/broadcast_implement.c		diff \| blob \| history
code/sdk/application/wearable/service/factorytest_service/CMakeLists.txt		diff \| blob \| history
code/sdk/application/wearable/service/factorytest_service/factorytestService.c		diff \| blob \| history
code/sdk/application/wearable/service/factorytest_service/factorytestService.h		diff \| blob \| history
code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c	[new file with mode: 0644]	blob
code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.h	[new file with mode: 0644]	blob
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp		diff \| blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang	[new file with mode: 0644]	blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h	[new file with mode: 0644]	blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang	[new file with mode: 0644]	blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/config.json	[deleted file]	blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/en.lang	[deleted file]	blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/ui_resource_string.h	[deleted file]	blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/zh.lang	[deleted file]	blob \| history
code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h		diff \| blob \| history
code/sdk/drivers/peripheral/cywee/src/main_dml.c		diff \| blob \| history
code/sdk/drivers/peripheral/utils/custom_utils.c		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom