From: luozheng <1732036298@qq.com> Date: Fri, 16 May 2025 06:50:06 +0000 (+0800) Subject: 支付宝代码合并 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~304 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d2a9efb6803302e2dfd1f6757e230e7ce6f0d1ff;p=mirrors%2FFD230.git 支付宝代码合并 --- diff --git a/code/sdk/application/wearable/fd230/nativeabilityfwk/include/Ability.h b/code/sdk/application/wearable/fd230/nativeabilityfwk/include/Ability.h index 7231902fb..cfa5dd9b1 100644 --- a/code/sdk/application/wearable/fd230/nativeabilityfwk/include/Ability.h +++ b/code/sdk/application/wearable/fd230/nativeabilityfwk/include/Ability.h @@ -80,13 +80,13 @@ public: /// @param transitionId 切换的动画类型 /// @param priority 切换优先级 void EnterSlice(uint16_t sliceId,const TransitionType transitionId = TransitionType::TRANSITION_INVALID, - const uint16_t priority = gSliceDefaultPriority) { + const uint16_t priority = gSliceDefaultPriority,bool enableSlideBack = false) { // 获取当前SliceID uint16_t curSliceId = GetCurSliceId(); if (curSliceId != defaultSliceId_) { // 假定defaultSliceId_是“主页”或启动Slice的ID backStack_.push(curSliceId); } - ChangeSlice(sliceId,transitionId,priority); // 切换到新的Slice + ChangeSlice(sliceId,transitionId,priority,enableSlideBack); // 切换到新的Slice } uint16_t GettopSliceId(void) { @@ -103,19 +103,19 @@ public: /// @param transitionId 切换的动画类型 /// @param priority 切换优先级 bool Back(const TransitionType transitionId = TransitionType::TRANSITION_INVALID, - const uint16_t priority = gSliceDefaultPriority) { + const uint16_t priority = gSliceDefaultPriority,bool enableSlideBack = false) { if (!backStack_.empty()) { uint16_t preSlice = backStack_.top(); backStack_.pop(); - ChangeSlice(preSlice,transitionId,priority); + ChangeSlice(preSlice,transitionId,priority,enableSlideBack); return true; } else { backStack_.push(defaultSliceId_); // 将默认主界面的 ID 推入栈中 // 退回到defaultSliceId_ - ChangeSlice(defaultSliceId_, transitionId, priority); + ChangeSlice(defaultSliceId_, transitionId, priority,enableSlideBack); return false; // 返回false表示无前一个slice,退回到默认slice } } diff --git a/code/sdk/application/wearable/fd230/nativeabilityfwk/src/Ability.cpp b/code/sdk/application/wearable/fd230/nativeabilityfwk/src/Ability.cpp index 96368d19d..ff8ce558c 100644 --- a/code/sdk/application/wearable/fd230/nativeabilityfwk/src/Ability.cpp +++ b/code/sdk/application/wearable/fd230/nativeabilityfwk/src/Ability.cpp @@ -123,6 +123,8 @@ void Ability::ChangeSlice(const uint16_t targetSliceId, TransitionType type, } FreeElement(elementName); #endif + #ifdef FD230 + // showsStackSliceId(); if (targetSliceId == VIEW_MAIN) { ClearSliceIdStack(); /*凡是回到主界面都要清空栈*/ @@ -139,6 +141,7 @@ void Ability::ChangeSlice(const uint16_t targetSliceId, TransitionType type, if(id!=VIEW_INCOMING_CALL && id!=VIEW_BLUETOOTH_EARPHONE) make_phone_push(id); } + #endif TransitionTarget target; target.sliceInfo = targetSliceId | (priority << 16); bool runImmed = PageTransitionMgr::GetInstance().BeginTransition(TransitionCaller::CHANGE_SLICE, target, diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBindAni.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBindAni.h index ea2cc5820..d8c0cf65a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBindAni.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBindAni.h @@ -30,6 +30,7 @@ private: UILabel *alipayLabel { nullptr }; UIImageAnimatorView *alipayImageAni { nullptr }; ImageAnimatorInfo searchImageInfo[ALIPAY_BIND_SEARCH_IMAGE_NUM]; + UIImageView *alipaylogImage { nullptr }; }; } #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayC.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayC.h new file mode 100644 index 000000000..1d0cb6be7 --- /dev/null +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayC.h @@ -0,0 +1,19 @@ +#ifndef ALIPAY_C_H +#define ALIPAY_C_H + +#ifdef __cplusplus +#if __cplusplus +extern "C" +{ +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +bool is_Alipay_bind(void); + +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayExitBind.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayExitBind.h index 4b9321a60..95ae61c7e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayExitBind.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayExitBind.h @@ -27,6 +27,7 @@ private: AlipayPresenter *presenter_; UILabel *alipayLabel[ALIPAY_SET_TWO] { nullptr }; UILabelButton *alipayButton[ALIPAY_SET_TWO] { nullptr }; + UIImageView *AttentionImage { nullptr }; }; } #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListItem.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListItem.h index aef570a44..4782ae033 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListItem.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListItem.h @@ -15,10 +15,13 @@ namespace OHOS { /* * alipayList id. */ +#define SUPPORT_ALIPAY_TRANS 1 typedef enum : uint16_t { // alipayList item index ALIPAY_LIST_ITEM_PAY, +#if SUPPORT_ALIPAY_TRANS ALIPAY_LIST_ITEM_TRANS, +#endif ALIPAY_LIST_ITEM_SETTING, ALIPAY_LIST_ITEM_HELP, ALIPAY_LIST_ITEM_MAX diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListItemView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListItemView.h index 74262222f..f7d4a9cf0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListItemView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListItemView.h @@ -28,6 +28,7 @@ private: UIImageView sIcon; UILabel sLabel; UIImageView sNextImage; + UIImageView back; AlipayListItem sItemInfo; }; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h index ef9dd02bf..60442a8e2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h @@ -37,7 +37,7 @@ private: AlipayPresenter *presenter_; AlipayListAdapter *listAdapter { nullptr }; UIList *contentList { nullptr }; - AlipayListItem alipayLists[ALIPAY_LIST_ITEM_MAX]; + AlipayListItem alipayLists[ALIPAY_LIST_ITEM_MAX + 1] = {ALIPAY_LIST_ITEM_MAX,nullptr,nullptr,nullptr,false}; //加1是为了给标题一个位置(UI优化) }; } #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayMainView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayMainView.h index 325c47047..a5ffbd85c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayMainView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayMainView.h @@ -44,6 +44,7 @@ public: static AlipayMainView *GetInstance(void); void OnStart() override; void DropView(UIView &view); + void DropView(uint8_t type); void SwitchView(UIView &view); void ChangeView(int16 hideView, int16 showView); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayModel.h index 9cbbaf25a..99e22e427 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayModel.h @@ -23,6 +23,7 @@ void AlipaySwitchTimerCallBackProc(void *argument); void AlipayMsgCallBack(uint32_t msgId, uint32_t actionRes); #define ALIPAY_BIND_STATUS_TIMER_LENGTH 2000 +#define ALIPAY_BIND_STATUS_DISCONNECT 3000 #define ALIPAY_GET_BIND_STR_MAX_LENGTH 256 #define ALIPAY_GET_PAY_STR_MAX_LENGTH 20 #define ALIPAY_GET_AID_STR_MAX_LENGTH 256 @@ -57,6 +58,8 @@ public: int32_t AlipayGetIdName(uint8_t *idStr); int32_t AlipayGetAidCode(int8_t *aidStr); void AlipayUnbind(void); + bool ble_disconnect_AlipayStartBind(void); + void AlipayStopdisconnecTimer(void); bool AlipayStartBind(void); bool AlipayFinishBind(void); bool AlipayStartSwitchTimer(uint16_t time); @@ -89,8 +92,13 @@ public: uint8_t* AlipayGetTransCode(void); uint32_t AlipayGetTransCodeLen(void); char* AlipayGetCardTitle(void); + + void AlipayScreenControl(bool turnOnFlag); + void delete_all_files_in_folder(const char *folder_path); private: osTimerId_t bindTimerId = nullptr; + osTimerId_t ble_disconnect_bindTimerId = nullptr; + osTimerId_t switchTimerId = nullptr; osTimerId_t transTimerId = nullptr; int16 alipayInterLis; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayPresenter.h index 092ee45eb..1c038b948 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayPresenter.h @@ -14,6 +14,9 @@ #include "color.h" #include "AlipayModel.h" +#include "KeyInputListener.h" +#include "common/key_code.h" + namespace OHOS { constexpr char *ALIPAY_LIST_PAY_BUTTON = (char *)"alipaylistpay"; constexpr char *ALIPAY_LIST_TRANS_BUTTON = (char *)"alipaylisttrans"; @@ -61,30 +64,30 @@ typedef enum { ALIPAY_PAY_VIEW, ALIPAY_PAY_BARCODE_VIEW, - ALIPAY_TRANS_VIEW, + ALIPAY_TRANS_VIEW, //具体的乘车码支付页面 ALIPAY_SETTING_VIEW, ALIPAY_HELP_VIEW, ALIPAY_SETTING_UNBIND_VIEW, ALIPAY_SETTING_FINISH_VIEW, ALIPAY_GET_BIND_FAILURE_VIEW, - ALIPAY_TRANS_LIST_VIEW, + ALIPAY_TRANS_LIST_VIEW, //交通卡列表视图 ALIPAY_TRANS_ENABLE_VIEW, ALIPAY_TRANS_TIPS_VIEW, - ALIPAY_TRANS_RES_VIEW, - ALIPAY_GET_TRANS_LIST_VIEW, - ALIPAY_TRANS_ANI_VIEW, + ALIPAY_TRANS_RES_VIEW, //提示网络异常视图 + ALIPAY_GET_TRANS_LIST_VIEW, //获取乘车码列表视图 + ALIPAY_TRANS_ANI_VIEW, //获取乘车码列表动画视图:加载动画 ALIPAY_INTERFACES_MAX } alipayInterfacesId; typedef enum { - ALIPAY_TRANS_TIPS_UNKNOW = 0, - ALIPAY_TRANS_TIPS_TO_MUCH, - ALIPAY_TRANS_TIPS_SECURE, - ALIPAY_TRANS_TIPS_LIST_UNKNOW, - ALIPAY_TRANS_TIPS_NOT_SUPPORT, + ALIPAY_TRANS_TIPS_UNKNOW = 0, //未知错误_具体错误码,请联系设备厂商解决 + ALIPAY_TRANS_TIPS_TO_MUCH, //开通的乘车码数量太多,清在手机支付宝-出行-管理中,管理后再用 + ALIPAY_TRANS_TIPS_SECURE, //存在安全风险,12小时内不可用,请切换到手机侧使用 + ALIPAY_TRANS_TIPS_LIST_UNKNOW, //未知错误_具体错误码,请联系设备厂商解决 + ALIPAY_TRANS_TIPS_NOT_SUPPORT, //暂不支持,请切换到手机侧使用 } alipayTransTipsId; typedef enum { @@ -93,13 +96,13 @@ typedef enum { } alipayTransResId; typedef enum { - ALIPAY_TRANS_GET_LIST_FIRST = 0, + ALIPAY_TRANS_GET_LIST_FIRST = 0, //首次获取交通卡交易列表索引 ALIPAY_TRANS_GET_LIST_CLICK_DETAIL, ALIPAY_TRANS_GET_LIST_CODE_DETAIL, } alipayTransGetListId; class AlipayMainView; -class AlipayPresenter : public Presenter, +class AlipayPresenter : public Presenter,public RootView::OnKeyActListener, public UIView::OnClickListener, public UIView::OnDragListener { public: @@ -140,6 +143,7 @@ public: ColorType CyanColor(void); bool OnClick(UIView &view, const ClickEvent &event) override; bool OnDrag(UIView &view, const DragEvent &event) override; + bool OnKeyAct(UIView &view, const KeyEvent &event) override; bool ClickFuncId(UIView &view); int32_t AlipayGetPayCode(uint8_t *payStr); int32_t AlipayGetNickName(uint8_t *nickName); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipaySetting.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipaySetting.h index deb5a2da5..0f9d31445 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipaySetting.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipaySetting.h @@ -25,10 +25,10 @@ private: bool AlipayInitButton(); bool AlipayInitLabel(void); AlipayPresenter *presenter_; - UILabel *labelTitle { nullptr }; - UILabel *labelName { nullptr }; - UILabel *labelId { nullptr }; - UILabelButton *buttonSetting { nullptr }; + UILabel *labelTitle { nullptr }; // 标题:设置 + UILabel *labelName { nullptr }; // 用户名称 + UILabel *labelId { nullptr }; + UILabelButton *buttonSetting { nullptr }; // 解除绑定按钮 }; } #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h index 6a12a6a42..ca6886b97 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h @@ -28,6 +28,7 @@ public: private: UILabel sLabel; UIImageView sNextImage; + UIView back; AlipayTransListItem sItemInfo; }; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayUnbind.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayUnbind.h index 183b8066e..8118d59da 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayUnbind.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayUnbind.h @@ -27,6 +27,7 @@ private: AlipayPresenter *presenter_; UILabel *alipayLabel[ALIPAY_SET_TWO] { nullptr }; UILabelButton *alipayButton[ALIPAY_SET_TWO] { nullptr }; + UIImageView *AttentionImage { nullptr }; }; } #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindAni.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindAni.cpp index 4574cb9f5..b5da85e05 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindAni.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindAni.cpp @@ -14,35 +14,46 @@ #include "graphic_service.h" namespace OHOS { -static const int16 ANILABEL_X_FIRST = 151; -static const int16 ANILABEL_Y_FIRST = 257; -static const int16 ANILABEL_WIDTH_FIRST = 151; -static const int16 ANILABEL_HEIGHT_FIRST = 48; +static const int16 ANILABEL_X_FIRST = 133; +static const int16 ANILABEL_Y_FIRST = 328; +static const int16 ANILABEL_WIDTH_FIRST = 200; +static const int16 ANILABEL_HEIGHT_FIRST = 60; static const char *ANILABEL_TEXT_FIRST = (char *)"正在绑定"; -static const int16 ANILABEL_FONT_FIRST = 38; +static const int16 ANILABEL_FONT_FIRST = 30; + +static constexpr const char *PNG_1_PATH = "user/res/alipay/1.bin"; +static constexpr const char *PNG_2_PATH = "user/res/alipay/2.bin"; +static constexpr const char *PNG_3_PATH = "user/res/alipay/3.bin"; +static constexpr const char *PNG_4_PATH = "user/res/alipay/4.bin"; +static constexpr const char *PNG_5_PATH = "user/res/alipay/5.bin"; +static constexpr const char *PNG_6_PATH = "user/res/alipay/6.bin"; +static constexpr const char *PNG_7_PATH = "user/res/alipay/7.bin"; +static constexpr const char *PNG_8_PATH = "user/res/alipay/8.bin"; + +static constexpr const char *PNG_LOG_PATH = "user/res/alipay/alipaylog.bin"; const char *searchImagePath[ALIPAY_BIND_SEARCH_IMAGE_NUM] = { - PNG_A019_080_IMAGE_PATH, - PNG_A019_081_IMAGE_PATH, - PNG_A019_082_IMAGE_PATH, - PNG_A019_083_IMAGE_PATH, - PNG_A019_084_IMAGE_PATH, - PNG_A019_085_IMAGE_PATH, - PNG_A019_086_IMAGE_PATH, - PNG_A019_087_IMAGE_PATH, + PNG_1_PATH, + PNG_2_PATH, + PNG_3_PATH, + PNG_4_PATH, + PNG_5_PATH, + PNG_6_PATH, + PNG_7_PATH, + PNG_8_PATH, }; -static const int16 ALIPAY_BIND_IMAGE_X = 162; -static const int16 ALIPAY_BIND_IMAGE_Y = 112; -static const int16 ALIPAY_BIND_IMAGE_WIDTH = 128; -static const int16 ALIPAY_BIND_IMAGE_HEIGHT = 128; +static const int16 ALIPAY_BIND_IMAGE_X = 149; +static const int16 ALIPAY_BIND_IMAGE_Y = 358; +static const int16 ALIPAY_BIND_IMAGE_WIDTH = 168; +static const int16 ALIPAY_BIND_IMAGE_HEIGHT = 40; -static const int16 ALIPAY_BIND_IMAGE_DELAY = 200; +static const int16 ALIPAY_BIND_IMAGE_DELAY = 100; -static const int16 RES_IMAGE_X = 162; -static const int16 RES_IMAGE_Y = 112; -static const int16 RES_IMAGE_WIDTH = 128; -static const int16 RES_IMAGE_HEIGHT = 128; +static const int16 RES_IMAGE_X = 149; +static const int16 RES_IMAGE_Y = 358; +static const int16 RES_IMAGE_WIDTH = 168; +static const int16 RES_IMAGE_HEIGHT = 40; AlipayBindAni::AlipayBindAni(AlipayPresenter *presenter) { @@ -63,6 +74,12 @@ AlipayBindAni::~AlipayBindAni() delete alipayImageAni; alipayImageAni = nullptr; } + if (alipaylogImage != nullptr) { + delete alipaylogImage; + alipaylogImage = nullptr; + } + + } bool AlipayBindAni::AlipayInitLabel(void) @@ -77,7 +94,7 @@ bool AlipayBindAni::AlipayInitLabel(void) alipayLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, ANILABEL_FONT_FIRST); alipayLabel->SetStyle(STYLE_TEXT_FONT, ANILABEL_FONT_FIRST); alipayLabel->SetAlign(TEXT_ALIGNMENT_CENTER); - alipayLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + alipayLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); Add(alipayLabel); return true; } @@ -98,14 +115,23 @@ bool AlipayBindAni::AlipayInitImageAni(void) searchImageInfo[i].height = ALIPAY_BIND_IMAGE_HEIGHT; } - alipayImageAni->SetPosition(RES_IMAGE_X, RES_IMAGE_Y, RES_IMAGE_WIDTH, RES_IMAGE_HEIGHT); + alipayImageAni->SetPosition(ALIPAY_BIND_IMAGE_X, ALIPAY_BIND_IMAGE_Y, ALIPAY_BIND_IMAGE_WIDTH, ALIPAY_BIND_IMAGE_HEIGHT); alipayImageAni->SetImageAnimatorSrc(searchImageInfo, ALIPAY_BIND_SEARCH_IMAGE_NUM, ALIPAY_BIND_IMAGE_DELAY); alipayImageAni->SetRepeat(true); alipayImageAni->SetAutoEnable(false); - alipayImageAni->SetResizeMode(UIImageView::FILL); + //alipayImageAni->SetResizeMode(UIImageView::FILL); Add(alipayImageAni); - alipayImageAni->Start(); + + alipaylogImage = new UIImageView(); + if (alipaylogImage == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindRes::AlipayInitImage new alipayImage fail"); + return false; + } + alipaylogImage->SetPosition(143, 130, 180, 180); + alipaylogImage->SetSrc(PNG_LOG_PATH); + Add(alipaylogImage); + return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindRes.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindRes.cpp index 0a331982b..acde3eb94 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindRes.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindRes.cpp @@ -14,19 +14,20 @@ #include "AlipayModel.h" namespace OHOS { -static const int16 EXIT_LABEL_X_FIRST = 151; -static const int16 EXIT_LABEL_Y_FIRST = 257; -static const int16 EXIT_LABEL_WIDTH_FIRST = 151; -static const int16 EXIT_LABEL_HEIGHT_FIRST = 48; +static const int16 EXIT_LABEL_X_FIRST = 83; +static const int16 EXIT_LABEL_Y_FIRST = 350; + +static const int16 EXIT_LABEL_WIDTH_FIRST = 300; +static const int16 EXIT_LABEL_HEIGHT_FIRST = 50; static const char *EXIT_LABEL_TEXT_FIRST = (char *)"绑定失败"; -static const int16 EXIT_LABEL_FONT_FIRST = 38; +static const int16 EXIT_LABEL_FONT_FIRST = 35; static const char *EXIT_LABEL_TEXT_SEC = (char *)"绑定成功"; -static const int16 RES_IMAGE_X = 161; -static const int16 RES_IMAGE_Y = 110; -static const int16 RES_IMAGE_WIDTH = 135; -static const int16 RES_IMAGE_HEIGHT = 135; +static const int16 RES_IMAGE_X = 153; +static const int16 RES_IMAGE_Y = 140; +static const int16 RES_IMAGE_WIDTH = 160; +static const int16 RES_IMAGE_HEIGHT = 160; AlipayBindRes::AlipayBindRes(AlipayPresenter *presenter) { @@ -61,10 +62,10 @@ void AlipayBindRes::AlipayRefreshBindRes(void) // alipayLabel->Set if (presenter_->AlipayGetBindFlag()) { alipayLabel->SetText(EXIT_LABEL_TEXT_SEC); - alipayImage->SetSrc(PNG_ALIPAY_BIND_SUCCESS); + alipayImage->SetSrc(PNG_ALIPAY_YSE_ICON); } else { alipayLabel->SetText(EXIT_LABEL_TEXT_FIRST); - alipayImage->SetSrc(PNG_ALIPAY_BIND_FAILURE); + alipayImage->SetSrc(PNG_ALIPAY_NO_ICON); } alipayLabel->Invalidate(); alipayImage->Invalidate(); @@ -82,9 +83,9 @@ bool AlipayBindRes::AlipayInitLabel(const char *resStr) alipayLabel->SetPosition(EXIT_LABEL_X_FIRST, EXIT_LABEL_Y_FIRST, EXIT_LABEL_WIDTH_FIRST, EXIT_LABEL_HEIGHT_FIRST); alipayLabel->SetText(resStr); alipayLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_LABEL_FONT_FIRST); - alipayLabel->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_FIRST); - alipayLabel->SetAlign(TEXT_ALIGNMENT_CENTER); - alipayLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + //alipayLabel->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_FIRST); + alipayLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + alipayLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); Add(alipayLabel); @@ -103,7 +104,7 @@ bool AlipayBindRes::AlipayInitImage(const char *imageSrc) // Set additional property alipayImage->SetAutoEnable(false); - alipayImage->SetResizeMode(UIImageView::FILL); + //alipayImage->SetResizeMode(UIImageView::FILL); Add(alipayImage); return true; @@ -122,7 +123,7 @@ bool AlipayBindRes::InitView() WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindRes::InitView AlipayInitLabel() false"); return false; } - if (!AlipayInitImage(PNG_ALIPAY_BIND_SUCCESS)) { + if (!AlipayInitImage(PNG_ALIPAY_YSE_ICON)) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindRes::InitView AlipayInitImage() false"); return false; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayExitBind.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayExitBind.cpp index edf88e323..c24d18441 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayExitBind.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayExitBind.cpp @@ -12,33 +12,37 @@ #include "AlipayExitBind.h" namespace OHOS { -static const int16 EXIT_LABEL_X_FIRST = 132; -static const int16 EXIT_LABEL_X_SEC = 0; -static const int16 EXIT_LABEL_WIDTH_FIRST = 189; -static const int16 EXIT_LABEL_HEIGHT_FIRST = 48; - -static const int16 EXIT_LABEL_Y_FIRST = 57; -static const int16 EXIT_LABEL_Y_SECOND = 154; -static const int16 EXIT_LABEL_WIDTH_SEC = 454; -static const int16 EXIT_LABEL_HEIGHT_SEC = 83; -static const int16 EXIT_LABEL_FONT_FIRST = 38; + +static const int16 EXIT_LABEL_WIDTH_FIRST = 300; +static const int16 EXIT_LABEL_WIDTH_SEC = 360; + +static const int16 EXIT_LABEL_HEIGHT_FIRST = 35; +static const int16 EXIT_LABEL_HEIGHT_SEC = 70; + +static const int16 EXIT_LABEL_X_FIRST = (HORIZONTAL_RESOLUTION - EXIT_LABEL_WIDTH_FIRST) / 2; +static const int16 EXIT_LABEL_X_SEC = (HORIZONTAL_RESOLUTION - EXIT_LABEL_WIDTH_SEC) / 2; + +static const int16 EXIT_LABEL_Y_FIRST = 50; +static const int16 EXIT_LABEL_Y_SECOND = 222; + +static const int16 EXIT_LABEL_FONT_FIRST = 30; static const int16 EXIT_LABEL_FONT_SEC = 30; static const char *EXIT_LABEL_TEXT_FIRST = (char *)"未完成绑定"; -static const char *EXIT_LABEL_TEXT_SECOND = (char *)"当前未完成绑定,退出在进来\n需要重新扫码绑定"; +static const char *EXIT_LABEL_TEXT_SECOND = (char *)"当前未完成绑定,退出在进来需要重新扫码绑定"; -static const int16 EXIT_BUTTON_EXIT_X = 50; -static const int16 EXIT_BUTTON_EXIT_Y = 312; +static const int16 EXIT_BUTTON_EXIT_X = 58; +static const int16 EXIT_BUTTON_EXIT_Y = 320; -static const int16 EXIT_BUTTON_BIND_X = 233; -static const int16 EXIT_BUTTON_BIND_Y = 312; +static const int16 EXIT_BUTTON_BIND_X = 238; +static const int16 EXIT_BUTTON_BIND_Y = 320; static const char *EXIT_BUTTON_TEXT_FIRST = (char *)"退出"; static const char *EXIT_BUTTON_TEXT_SECOND = (char *)"去绑定"; -static const int16 EXIT_BUTTON_WIDTH = 169; -static const int16 EXIT_BUTTON_HEIGHT = 73; -static const int16 EXIT_BUTTON_FONT = 38; +static const int16 EXIT_BUTTON_WIDTH = 170; +static const int16 EXIT_BUTTON_HEIGHT = 90; +static const int16 EXIT_BUTTON_FONT = 26; AlipayExitBind::AlipayExitBind(AlipayPresenter *presenter) { @@ -62,6 +66,11 @@ AlipayExitBind::~AlipayExitBind() alipayButton[buttonNum] = nullptr; } } + if(AttentionImage) + { + delete AttentionImage; + AttentionImage =nullptr; + } } bool AlipayExitBind::AlipayInitLabel() @@ -78,7 +87,7 @@ bool AlipayExitBind::AlipayInitLabel() alipayLabel[ALIPAY_SET_ZERO]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_LABEL_FONT_FIRST); alipayLabel[ALIPAY_SET_ZERO]->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_FIRST); alipayLabel[ALIPAY_SET_ZERO]->SetAlign(TEXT_ALIGNMENT_CENTER); - alipayLabel[ALIPAY_SET_ZERO]->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + alipayLabel[ALIPAY_SET_ZERO]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); Add(alipayLabel[ALIPAY_SET_ZERO]); @@ -91,12 +100,23 @@ bool AlipayExitBind::AlipayInitLabel() EXIT_LABEL_HEIGHT_SEC); alipayLabel[ALIPAY_SET_ONE]->SetText(EXIT_LABEL_TEXT_SECOND); alipayLabel[ALIPAY_SET_ONE]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_LABEL_FONT_SEC); - alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_LINE_SPACE, 6); - alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_SEC); + //alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_LINE_SPACE, 12); + //alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_SEC); + alipayLabel[ALIPAY_SET_ONE]->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xFF)); alipayLabel[ALIPAY_SET_ONE]->SetAlign(TEXT_ALIGNMENT_CENTER); - alipayLabel[ALIPAY_SET_ONE]->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); + alipayLabel[ALIPAY_SET_ONE]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); Add(alipayLabel[ALIPAY_SET_ONE]); + AttentionImage=new UIImageView(); + if (AttentionImage == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::new FactoryResetImage fail!"); + return false; + } + AttentionImage->SetPosition(193, 110); + AttentionImage->SetSrc(PNG_ATTENTION_IMAGE); + Add(AttentionImage); + return true; } @@ -111,11 +131,12 @@ bool AlipayExitBind::InitSimilarButton(int16 num, int16 alipayX, int16 alipayY, int64_t backColor = 0; if (num == 0) { - backColor = 0xff4a83bf; - alipayButton[num]->SetTextColor(Color::GetColorFromRGBA(0x00, 0x00, 0x00, 0xff)); - alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + backColor = 0xff191919; + //alipayButton[num]->SetTextColor(Color::GetColorFromRGBA(0x19, 0x19, 0x19, 0x19)); + alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); } else if (num == 1) { - backColor = 0xff0b1928; + backColor = 0xff0176ff; + alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff0176ff); } alipayButton[num]->SetPosition(alipayX, alipayY, EXIT_BUTTON_WIDTH, EXIT_BUTTON_HEIGHT); alipayButton[num]->SetText(buttonStr); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListItemView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListItemView.cpp index 4cd238d8a..c7722640d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListItemView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListItemView.cpp @@ -9,16 +9,24 @@ #include "AlipayListItemView.h" namespace OHOS { -static constexpr int16 ALIPAY_LIST_ICON_X = 20; -static constexpr int16 NUM_22 = 22; -static constexpr int16_t ALIPAY_LIST_ICON_WIDTH = 64; -static constexpr int16_t ALIPAY_LIST_ICON_HEIGHT = 64; -static constexpr int16_t ALIPAY_LIST_ITEM_BUTTON_HEIGHT = 100; -static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_WIDTH = 122; -static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_HEIGHT = 100; -static constexpr int16_t ALIPAY_LIST_ITEM_FONT_SIZE = 40; -static constexpr int16_t ALIPAY_LISTS_RESIZE_SIZE = 100; -static constexpr int16_t ALIPAY_LIST_SICON_Y = 15; +static constexpr int16_t ALIPAY_LIST_ITEM_BUTTON_HEIGHT = 120; + +static constexpr int16 ALIPAY_LIST_BACK_X = 43; +static constexpr int16 ALIPAY_LIST_BACK_Y = 0; +static constexpr int16_t ALIPAY_LIST_BACK_WIDTH = 380; +static constexpr int16_t ALIPAY_LIST_BACK_HEIGHT = 100; + +static constexpr int16 ALIPAY_LIST_ICON_X = 19 + ALIPAY_LIST_BACK_X; +static constexpr int16 ALIPAY_LIST_ICON_Y = 19; +static constexpr int16_t ALIPAY_LIST_ICON_WIDTH = 62; +static constexpr int16_t ALIPAY_LIST_ICON_HEIGHT = 62; + +static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_X = 115 + ALIPAY_LIST_BACK_X; +static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_Y = 33; +static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_WIDTH = 180; +static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_HEIGHT = 35; +static constexpr int16_t ALIPAY_LIST_ITEM_FONT_SIZE = 30; + static constexpr int16 NUMS_2 = 2; static constexpr int16 NUMS_50 = 50; @@ -31,6 +39,7 @@ AlipayListItemView::AlipayListItemView() SetTouchable(true); SetUpChild(); + Add(&back); Add(&sIcon); Add(&sLabel); Add(&sNextImage); @@ -38,6 +47,7 @@ AlipayListItemView::AlipayListItemView() AlipayListItemView::~AlipayListItemView() { + Remove(&back); Remove(&sIcon); Remove(&sLabel); Remove(&sNextImage); @@ -50,30 +60,60 @@ void AlipayListItemView::SetItemInfo(const AlipayListItem &itemInfo) sIcon.SetSrc(itemInfo.icon); sLabel.SetText(itemInfo.label); sNextImage.SetVisible(itemInfo.hasSecondMenu); + if(!sItemInfo.hasSecondMenu) + { + back.SetVisible(false); + sIcon.SetVisible(false); + sNextImage.SetVisible(false); + sLabel.SetPosition((HORIZONTAL_RESOLUTION - ALIPAY_LIST_ITEM_LABEL_WIDTH) / NUMS_2, ALIPAY_LIST_ITEM_LABEL_Y + 17); + sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + SetHeight(120); + } + else + { + back.SetVisible(true); + sIcon.SetVisible(true); + sNextImage.SetVisible(true); + sLabel.SetPosition(ALIPAY_LIST_ITEM_LABEL_X, ALIPAY_LIST_ITEM_LABEL_Y); + sLabel.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); + if(sItemInfo.index == ALIPAY_LIST_ITEM_HELP) + { + SetHeight(180); + } + else + { + SetHeight(120); + } + } } void AlipayListItemView::SetUpChild() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayListItemView::SetUpChild()"); - sIcon.SetPosition(ALIPAY_LIST_ICON_X, ALIPAY_LIST_SICON_Y); + sIcon.SetPosition(ALIPAY_LIST_ICON_X, ALIPAY_LIST_ICON_Y); sIcon.Resize(ALIPAY_LIST_ICON_WIDTH, ALIPAY_LIST_ICON_HEIGHT); - sIcon.SetAutoEnable(false); - sIcon.SetResizeMode(UIImageView::FILL); + sIcon.SetResizeMode(UIImageView::CENTER); sIcon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE); - sLabel.SetPosition(ALIPAY_LIST_ITEM_LABEL_WIDTH, 0); + sLabel.SetPosition(ALIPAY_LIST_ITEM_LABEL_X, ALIPAY_LIST_ITEM_LABEL_Y); sLabel.Resize(ALIPAY_LIST_ITEM_LABEL_WIDTH, ALIPAY_LIST_ITEM_LABEL_HEIGHT); sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, ALIPAY_LIST_ITEM_FONT_SIZE); - sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - sLabel.SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE); - sLabel.SetStyle(STYLE_TEXT_COLOR, Color::White().full); - sLabel.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); - sLabel.SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); + sLabel.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); + sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + // sLabel.SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE); + // sLabel.SetStyle(STYLE_TEXT_COLOR, Color::White().full); + // sLabel.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); + // sLabel.SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); sNextImage.SetSrc(PNG_SETTING_NEXT_IMAGE); sNextImage.SetPosition(LA_HORIZONTAL_RESOLUTION - NUMS_50, (SETTING_ITEM_HEIGHT - sNextImage.GetHeight()) / NUMS_2); sNextImage.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE); + + back.SetPosition(ALIPAY_LIST_BACK_X, ALIPAY_LIST_BACK_Y, ALIPAY_LIST_BACK_WIDTH, ALIPAY_LIST_BACK_HEIGHT); + back.SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); + back.SetStyle(STYLE_BACKGROUND_OPA, 0xff); + back.SetStyle(STYLE_BORDER_RADIUS, 100); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListView.cpp index e96e47030..91be991f2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListView.cpp @@ -6,8 +6,10 @@ */ #include -#include "AlipayListView.h" -#include "AlipayListItem.h" +// #include "AlipayListView.h" +// #include "AlipayListItem.h" +#include "alipay/include/AlipayList/AlipayListView.h" +#include "alipay/include/AlipayList/AlipayListItem.h" #include "cmsis_os2.h" namespace OHOS { @@ -53,9 +55,11 @@ bool AlipayList::AlipayInitList() WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayList::OnStart::contentList is nullptr"); return false; } - contentList->SetPosition(ALIPAY_LIST_POSITION_X, ALIPAY_LIST_POSITION_Y); - contentList->Resize(HORIZONTAL_RESOLUTION - ALIPAY_LIST_POSITION_X, VERTICAL_RESOLUTION - ALIPAY_LIST_POSITION_Y); - contentList->SetScrollBlankSize(ALIPAY_LIST_SCROLLBLANKSIZE); + // contentList->SetPosition(ALIPAY_LIST_POSITION_X, ALIPAY_LIST_POSITION_Y); + // contentList->Resize(HORIZONTAL_RESOLUTION - ALIPAY_LIST_POSITION_X, VERTICAL_RESOLUTION - ALIPAY_LIST_POSITION_Y); + contentList->SetPosition(0, 0); + contentList->Resize(HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); + // contentList->SetScrollBlankSize(ALIPAY_LIST_SCROLLBLANKSIZE); contentList->SetSelectPosition(ALIPAY_LIST_POSITION_Y); contentList->SetDraggable(true); contentList->SetThrowDrag(false); @@ -70,11 +74,33 @@ bool AlipayList::AlipayInitList() void AlipayList::InitAlipayListItem() { +#if 0 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayListModel::InitAlipayListItem()"); alipayLists[0] = {ALIPAY_LIST_ITEM_PAY, ALIPAY_LIST_PAY_BUTTON, PNG_ALIPAY_LIST_PAY, "付款码", true}; +#if SUPPORT_ALIPAY_TRANS alipayLists[1] = {ALIPAY_LIST_ITEM_TRANS, ALIPAY_LIST_TRANS_BUTTON, PNG_ALIPAY_LIST_TRANS, "乘车码", true}; alipayLists[2] = {ALIPAY_LIST_ITEM_SETTING, ALIPAY_LIST_SETTING_BUTTON, PNG_ALIPAY_LIST_SETTING, "设置", true}; alipayLists[3] = {ALIPAY_LIST_ITEM_HELP, ALIPAY_LIST_HELP_BUTTON, PNG_ALIPAY_LIST_HELP, "帮助", true}; +#else + alipayLists[1] = {ALIPAY_LIST_ITEM_SETTING, ALIPAY_LIST_SETTING_BUTTON, PNG_ALIPAY_LIST_SETTING, "设置", true}; + alipayLists[2] = {ALIPAY_LIST_ITEM_HELP, ALIPAY_LIST_HELP_BUTTON, PNG_ALIPAY_LIST_HELP, "帮助", true}; +#endif +#else + /* -------------------------------------------------------------------------- */ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayListModel::InitAlipayListItem()"); + alipayLists[0] = {ALIPAY_LIST_ITEM_MAX, nullptr, nullptr, "支付宝", false}; + alipayLists[1] = {ALIPAY_LIST_ITEM_PAY, ALIPAY_LIST_PAY_BUTTON, PNG_ALIPAY_LIST_PAY, "付款码", true}; + #if SUPPORT_ALIPAY_TRANS + alipayLists[2] = {ALIPAY_LIST_ITEM_TRANS, ALIPAY_LIST_TRANS_BUTTON, PNG_ALIPAY_LIST_TRANS, "乘车码", true}; + alipayLists[3] = {ALIPAY_LIST_ITEM_SETTING, ALIPAY_LIST_SETTING_BUTTON, PNG_ALIPAY_LIST_SETTING, "设置", true}; + alipayLists[4] = {ALIPAY_LIST_ITEM_HELP, ALIPAY_LIST_HELP_BUTTON, PNG_ALIPAY_LIST_HELP, "帮助", true}; + #else + alipayLists[2] = {ALIPAY_LIST_ITEM_SETTING, ALIPAY_LIST_SETTING_BUTTON, PNG_ALIPAY_LIST_SETTING, "设置", true}; + alipayLists[3] = {ALIPAY_LIST_ITEM_HELP, ALIPAY_LIST_HELP_BUTTON, PNG_ALIPAY_LIST_HELP, "帮助", true}; + #endif + /* -------------------------------------------------------------------------- */ + +#endif } bool AlipayList::InitListView() @@ -97,7 +123,7 @@ bool AlipayList::InitListView() void AlipayList::AddAlipayListItemToList(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayList::AddAlipayListItemToList"); - for (uint8_t i = 0; i < ALIPAY_LIST_ITEM_MAX; i++) { + for (uint8_t i = 0; i < ALIPAY_LIST_ITEM_MAX + 1; i++) { listAdapter->AddListItem(alipayLists[i]); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayMainView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayMainView.cpp index 76c9385ff..8757eb61b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayMainView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayMainView.cpp @@ -8,6 +8,25 @@ #include "AlipayMainView.h" #include "UiConfig.h" #include "alipay_feature.h" +#include "custom_utils.h" +#include "AlipayC.h" + +bool is_Alipay_bind(void) +{ + if( OHOS:: AlipayMainView::GetInstance()) + { + int16 theView = OHOS::AlipayMainView::GetInstance()->GetWhichInter(); + if(theView==OHOS::ALIPAY_BIND_VIEW) + { + return true; + } + else + { + return false; + } + } + return false; +} namespace OHOS { #define ALIPAY_BIND_SUCCESS_RES_TIMER_LENGTH 3000 @@ -49,6 +68,12 @@ AlipayMainView *AlipayMainView::GetInstance(void) void AlipayMainView::OnStart() { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::OnStart"); + if(Alipay_is_init()==false) + return; + // 增加按键监听 + RootView::GetInstance()->SetOnKeyActListener(presenter_); + alipayInterfacesId startView; bool bindFlag = AlipayModel::GetInstance()->AlipayGetBindstate(); if (!bindFlag) { @@ -60,6 +85,8 @@ void AlipayMainView::OnStart() alipayBind->InitView(); startView = ALIPAY_BIND_VIEW; container[startView] = alipayBind; + //如果是绑定界面则打开广播 + start_alipay_ble_service(); AlipayModel::GetInstance()->AlipayStartBind(); } else { alipayList = new AlipayList(presenter_); @@ -175,7 +202,22 @@ int16 AlipayMainView::GetListenInter(void) { return interListen; } +//当前定义为给按键专用 +void AlipayMainView::DropView(uint8_t type) +{ + if(alipayWhichInter==ALIPAY_BIND_ANI_VIEW) + { + ChangeView(ALIPAY_BIND_ANI_VIEW, ALIPAY_BIND_EXIT_VIEW); + } + else + { + AlipayModel::GetInstance()->AlipayStopSwitchTimer(); + AlipayModel::GetInstance()->AlipayStopBindTimer(); + AlipayModel::GetInstance()->AlipayStopdisconnecTimer(); + NativeAbility::GetInstance().Back(); + } +} void AlipayMainView::DropView(UIView &view) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayMainView::DropView"); @@ -200,8 +242,9 @@ void AlipayMainView::DropView(UIView &view) AlipayModel::GetInstance()->AlipayFinishBind(); } AlipayModel::GetInstance()->AlipayStopSwitchTimer(); - NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); - + AlipayModel::GetInstance()->AlipayStopBindTimer(); + AlipayModel::GetInstance()->AlipayStopdisconnecTimer(); + NativeAbility::GetInstance().Back(); } else if (&view == container[ALIPAY_TRANS_LIST_VIEW]) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayMainView::DropView::container[ALIPAY_TRANS_LIST_VIEW]"); ChangeView(ALIPAY_TRANS_LIST_VIEW, ALIPAY_LIST_VIEW); @@ -433,6 +476,11 @@ bool AlipayMainView::ChangeBindView(int16 thisView) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeBindView"); AlipayModel::GetInstance()->AlipayStartBind(); + + /**启动alipay蓝牙服务*/ + //需要重新打开广播 + start_alipay_ble_service(); + if (container[thisView] == nullptr) { alipayBind = new AlipayBind(presenter_); if (alipayBind == nullptr) { @@ -730,6 +778,12 @@ void AlipayMainView::DestroyTempView(int16 hideView) } } if (hideView == ALIPAY_TRANS_TIPS_VIEW) { + + if(AlipayModel::GetInstance()->AlipayGetSwitchIndex() == ALIPAY_TRANS_TIPS_LIST_UNKNOW) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::DestroyTempView ALIPAY_TRANS_TIPS_UNKNOW"); + AlipayModel::GetInstance()->delete_all_files_in_folder("/user/alipay/"); + } delete alipayTransTips; alipayTransTips = nullptr; } else if (hideView == ALIPAY_TRANS_RES_VIEW) { @@ -772,6 +826,11 @@ void AlipayMainView::ChangeView(int16 hideView, int16 showView) container[hideView]->SetVisible(false); container[showView]->SetVisible(true); + if(hideView==ALIPAY_BIND_VIEW) + { + stop_alipay_ble_service(); + } + AlipayModel::GetInstance()->SetAlipayInterLis(showView); Draw(); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayModel.cpp index 0414fd48b..5142312e5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayModel.cpp @@ -11,6 +11,10 @@ #include "AlipayMainView.h" #include "graphic_service.h" +#include "power_display_service.h" +#include "custom_utils.h" +#include "bleService.h" +#include "ConfigModel.h" namespace OHOS { AlipayModel::AlipayModel() : alipayApi(alipay_svr_get_api()) { @@ -37,6 +41,7 @@ int16 AlipayModel::GetAlipayInterLis(void) { return alipayInterLis; } +static uint8_t disconnectfalg=0; void AlipayBindCallBackProc(void *argument) { @@ -61,6 +66,7 @@ void AlipayBindCallBackProc(void *argument) } else if (ALIPAY_INTER_STATUS_BINDING_OK == status && reFlag == 1) { AlipayModel::GetInstance()->AlipaySetRefreshFlag(0); AlipayModel::GetInstance()->AlipayFinishBind(); + AlipayModel::GetInstance()->AlipayStopBindTimer(); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayBindCallBackProc ALIPAY_INTER_STATUS_BINDING_OK"); AlipayModel::GetInstance()->AlipaySetBindFlag(true); AlipayMainView::GetInstance()->ChangeView(currentView, ALIPAY_BIND_RES_VIEW); @@ -71,13 +77,95 @@ void AlipayBindCallBackProc(void *argument) AlipayModel::GetInstance()->AlipaySetRefreshFlag(0); AlipayMainView::GetInstance()->ChangeView(currentView, ALIPAY_BIND_RES_VIEW); } + else if (ALIPAY_INTER_STATUS_START_BINDING == status && reFlag == 1) { + if(get_Alipay_ble_connect()==false) + { + disconnectfalg++; + if(disconnectfalg>=2) + { + + AlipayModel::GetInstance()->AlipaySetBindFlag(false); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayBindCallBackProc ALIPAY_INTER_STATUS_BINDING_FAIL"); + AlipayModel::GetInstance()->AlipaySetRefreshFlag(0); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "ble 断开连接 "); + AlipayModel::GetInstance()->AlipayStopBindTimer(); + AlipayMainView::GetInstance()->ChangeView(currentView, ALIPAY_BIND_RES_VIEW); + } + + //AlipayModel::GetInstance()->ble_disconnect_AlipayStartBind(); + } + + } } +void AlipayBindCallBackProcdisconnect(void *argument) +{ + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindCallBackProcdisconnect in."); + const alipay_svr_api_t *alipay_api = alipay_svr_get_api(); + int32_t status = 0; + int32_t ret = alipay_api->get_bind_status(&status); + if (AlipayMainView::GetInstance() == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::GetInstance is null, do nothing."); + return; + } + + int16_t currentView = AlipayModel::GetInstance()->GetAlipayInterLis(); + uint32_t reFlag = AlipayModel::GetInstance()->AlipayGetRefreshFlag(); + + if (ALIPAY_INTER_STATUS_START_BINDING == status && reFlag == 1 ) { + if(get_Alipay_ble_connect()==false) + { + AlipayModel::GetInstance()->AlipayStopBindTimer(); + AlipayModel::GetInstance()->AlipaySetBindFlag(false); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindCallBackProc ALIPAY_INTER_STATUS_BINDING_FAIL"); + AlipayModel::GetInstance()->AlipaySetRefreshFlag(0); + AlipayMainView::GetInstance()->ChangeView(currentView, ALIPAY_BIND_RES_VIEW); + } + + } +} void AlipayBindTimerCallBack(void *argument) { GraphicService::GetInstance()->PostGraphicEvent(std::bind(&AlipayBindCallBackProc, argument)); } + +void AlipayBindTimerCallBackbledisconnect(void *argument) +{ + GraphicService::GetInstance()->PostGraphicEvent(std::bind(&AlipayBindCallBackProcdisconnect, argument)); +} + +bool AlipayModel::ble_disconnect_AlipayStartBind(void) +{ + // if (ble_disconnect_bindTimerId == nullptr) { + + // ble_disconnect_bindTimerId = osTimerNew(AlipayBindTimerCallBackbledisconnect, osTimerOnce, (void *)0, nullptr); + // if (ble_disconnect_bindTimerId == nullptr) { + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayStartBind Create timer fail."); + // return false; + // } + + // int32_t retcode = osTimerStart(ble_disconnect_bindTimerId, ALIPAY_BIND_STATUS_DISCONNECT); + // if (retcode != 0) { + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayStartBind Start timer fail"); + // return false; + // } + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayModel::ble_disconnect_AlipayStartBind"); + // } + + return true; +} +void AlipayModel::AlipayStopdisconnecTimer(void) +{ + // if (ble_disconnect_bindTimerId == nullptr) { + // return; + // } + // int32_t ret = osTimerStop(ble_disconnect_bindTimerId); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayStopBindTimer in,%u.", ret); + // ble_disconnect_bindTimerId=nullptr; + return; +} bool AlipayModel::AlipayStartBind(void) { if (bindTimerId == nullptr) { @@ -87,6 +175,7 @@ bool AlipayModel::AlipayStartBind(void) return false; } } + disconnectfalg=0; int32_t retcode = osTimerStart(bindTimerId, ALIPAY_BIND_STATUS_TIMER_LENGTH); if (retcode != 0) { @@ -94,7 +183,7 @@ bool AlipayModel::AlipayStartBind(void) return false; } - alipayApi->bind_start(); + alipayApi->bind_start(); //调用支付宝API开始绑定流程 uint8_t str[ALIPAY_GET_BIND_STR_MAX_LENGTH] = { 0 }; AlipayGetBindCode(str); return true; @@ -178,12 +267,14 @@ void AlipayModel::AlipayStopSwitchTimer() return; } +//通过 alipay_get_bind_status 获取绑定状态,判断是否需要跳转绑定页面 bool AlipayModel::AlipayGetBindstate(void) { bool state = alipayApi->get_bind_state(); return state; } +//通过 alipay_get_bind_str 获取绑定码串生成二维码 int32_t AlipayModel::AlipayGetBindCode(uint8_t *bindStr) { int32_t bindStrLen = ALIPAY_GET_BIND_STR_MAX_LENGTH; @@ -192,6 +283,7 @@ int32_t AlipayModel::AlipayGetBindCode(uint8_t *bindStr) return ret; } +//通过 alipay_get_pay_str 获取支付码串生成二维码 int32_t AlipayModel::AlipayGetPayCode(uint8_t *payStr) { uint32_t payStrLen = ALIPAY_GET_PAY_STR_MAX_LENGTH; @@ -200,6 +292,7 @@ int32_t AlipayModel::AlipayGetPayCode(uint8_t *payStr) return ret; } +//通过 alipay_get_nickname 获取用户昵称 int32_t AlipayModel::AlipayGetNickName(uint8_t *nickName) { uint32_t nickNameLen = ALIPAY_GET_NICKNAME_MAX_LENGTH; @@ -208,6 +301,7 @@ int32_t AlipayModel::AlipayGetNickName(uint8_t *nickName) return ret; } +//通过 alipay_get_logon_id 获取用户登录账号 int32_t AlipayModel::AlipayGetIdName(uint8_t *idStr) { uint32_t idStrLen = ALIPAY_GET_ID_STR_MAX_LENGTH; @@ -216,6 +310,7 @@ int32_t AlipayModel::AlipayGetIdName(uint8_t *idStr) return ret; } +//通过 alipay_get_aid_code 获取帮助码串生成二维码 int32_t AlipayModel::AlipayGetAidCode(int8_t *aidStr) { uint32_t aidStrLen = ALIPAY_GET_AID_STR_MAX_LENGTH; @@ -224,6 +319,7 @@ int32_t AlipayModel::AlipayGetAidCode(int8_t *aidStr) return ret; } +//通过 alipay_remove_bind 解除绑定关系 void AlipayModel::AlipayUnbind(void) { int32_t ret = alipayApi->remove_bind(); @@ -233,6 +329,8 @@ void AlipayModel::AlipayUnbind(void) void AlipayModel::AlipayStopBindTimer(void) { + disconnectfalg=0; + if (bindTimerId == nullptr) { return; } @@ -253,6 +351,7 @@ void AlipayModel::AlipayExitLpm(void) return; } +/*从支付宝获取最后一次交易的交易码和交易卡标题,并将结果存储在相应的数组中*/ int32_t AlipayModel::AlipayGetLastTranscode() { memset_s(transCode_, ALIPAY_TRANS_CODE_MAX_LEN, 0, ALIPAY_TRANS_CODE_MAX_LEN); @@ -260,10 +359,11 @@ int32_t AlipayModel::AlipayGetLastTranscode() uint32_t len = ALIPAY_TRANS_CODE_MAX_LEN; int32_t ret = alipayApi->get_last_transcode(cardTitle_, transCode_, &len); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayGetLastTranscode in:ret:%u,len:%u.", ret, len); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayGetLastTranscode in:ret:%u,len:%u.", ret, len); return ret; } +/*获取本地交易列表*/ int32_t AlipayModel::AlipayGetLocalTranslist() { cardInfo_ = AlipayTransGetCardList(); @@ -271,7 +371,7 @@ int32_t AlipayModel::AlipayGetLocalTranslist() sizeof(mc_alipay_trans_card_info_t) * ALIPAY_TRANS_CARD_MAX_LENGTH); uint32_t localListSize = sizeof(mc_alipay_trans_card_info_t) * ALIPAY_TRANS_CARD_MAX_LENGTH; int32_t ret = alipayApi->get_local_translist(cardInfo_, &localListSize, &cardSum_); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayGetLastTranscode in:%u.", ret); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "获取本地交易列表 in:%u.", ret); return ret; } @@ -291,7 +391,7 @@ int32_t AlipayModel::AlipayGetOnlineTranslist() uint32_t onListSize = sizeof(mc_alipay_trans_card_info_t) * ALIPAY_TRANS_CARD_MAX_LENGTH; uint32_t onLineNum = 0; int32_t ret = alipayApi->get_online_translist(onLineList, &onListSize, &onLineNum); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayGetOnlineTranslist in,ret:%u,num:%u.", ret, onLineNum); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayGetOnlineTranslist in,ret:%u,num:%u.", ret, onLineNum); if (ret == 0) { memset_s(cardInfo_, sizeof(mc_alipay_trans_card_info_t) * ALIPAY_TRANS_CARD_MAX_LENGTH, 0, @@ -311,25 +411,29 @@ int32_t AlipayModel::AlipayUpdateTransCard(uint32_t index) return ret; } +// 检查指定索引的交易卡状态 int32_t AlipayModel::AlipayCheckTransCard(uint32_t index) { mc_alipay_tans_card_status_t cardStatus = { 0 }; + //检查指定索引的交易卡状态 int32_t ret = alipayApi->check_trans_cartstatus(&cardInfo_[index], &cardStatus); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayCheckTransCard in:%u.", ret); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayCheckTransCard in:%u.", ret); + // 如果交易卡存在且剩余使用次数大于等于最小有效次数,返回成功 if (cardStatus.card_exits && cardStatus.remain_use_count >= ALIPAY_TRANS_CARD_MIN_VALID_NUM) { return 0; } return -1; } +// 获取指定索引的交易码 int32_t AlipayModel::AlipayGetTransCode(uint32_t index) { - cardInfo_ = AlipayTransGetCardList(); + cardInfo_ = AlipayTransGetCardList(); //获取交易卡列表 memset_s(transCode_, ALIPAY_TRANS_CODE_MAX_LEN, 0, ALIPAY_TRANS_CODE_MAX_LEN); memset_s(cardTitle_, ALIPAY_TRANS_CARD_MEMBER_LEN, 0, ALIPAY_TRANS_CARD_MEMBER_LEN); transCodeLen_ = ALIPAY_TRANS_CODE_MAX_LEN; - int32_t ret = alipayApi->get_transcode(&cardInfo_[index], transCode_, &transCodeLen_); - if (ret == 0) { + int32_t ret = alipayApi->get_transcode(&cardInfo_[index], transCode_, &transCodeLen_); //获取指定索引的交易码 + if (ret == 0) { //如果获取成功,复制卡标题 memcpy_s(cardTitle_, ALIPAY_TRANS_CARD_MEMBER_LEN, cardInfo_[index].title, ALIPAY_TRANS_CARD_MEMBER_LEN); } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayCheckTransCard in:%u.", ret); @@ -581,4 +685,62 @@ char* AlipayModel::AlipayGetCardTitle(void) return cardTitle_; } +/// @brief 支付宝屏幕控制 +/// @param turnOnFlag +void AlipayModel::AlipayScreenControl(bool turnOnFlag) +{ + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayScreenControl %d",turnOnFlag); + const power_display_svr_api_t *display_api = power_display_svr_get_api(); + if(turnOnFlag) + { + ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); + uapi_setScreenBrightness(MAX_BRIGHTNESS); //最高亮度 + } + else + { + ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); + uapi_setScreenBrightness(ConfigModel::GetInstance()->GetBrightness());//退出APP将亮度恢复到ConfigModel中设置的亮度值 + } +} + +#include +#include +#include +#include + +// 删除指定文件夹下的所有文件 +void AlipayModel::delete_all_files_in_folder(const char *folder_path) { + DIR *dir; + struct dirent *entry; + struct stat statbuf; + char path[1024]; + + if ((dir = opendir(folder_path)) == NULL) { + printf("无法打开文件夹"); + return; + } + + while ((entry = readdir(dir)) != NULL) { + if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) { + continue; + } + + snprintf(path, sizeof(path), "%s/%s", folder_path, entry->d_name); + + if (stat(path, &statbuf) == -1) { + printf("无法获取文件状态"); + continue; + } + + if (S_ISREG(statbuf.st_mode)) { + if (unlink(path) == -1) { + printf("无法删除文件"); + } + } + } + + closedir(dir); + printf("文件夹 %s 下的所有文件已成功删除。\n", folder_path); +} + } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPayCode.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPayCode.cpp index 79e738f0f..80f52fa27 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPayCode.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPayCode.cpp @@ -204,7 +204,7 @@ bool AlipayPayCode::InitView() SetOnDragListener(presenter_); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); SetStyle(STYLE_BACKGROUND_COLOR, 0xff1677ff); - SetStyle(STYLE_BACKGROUND_OPA, 0xff); + //SetStyle(STYLE_BACKGROUND_OPA, 0xff); if (!AlipayInitLabel()) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPayCode::InitView AlipayInitLabel() false"); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp index a58470e2d..eb1bff420 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp @@ -19,7 +19,10 @@ #include "AlipayTransListItemView.h" #include "AlipayTransListView.h" #include "NativeRegisterManager.h" - +#include "custom_utils.h" +#include "common/key_code.h" +#include "gfx_utils/mem_check.h" +#include "AlipayC.h" namespace OHOS { REGIST_MENU(VIEW_MAIN_ALIPAY, AlipayMainView, AlipayPresenter, PNG_APPLIST_ALIPAY_IMAGE, PNG_APPLIST_DEFAULT_IMG, "支付宝"); @@ -51,10 +54,18 @@ AlipayPresenter *AlipayPresenter::GetInstance() void AlipayPresenter::OnStart() { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPresenter OnStart"); + if(Alipay_is_init()==false) + return; + /* -------------------------------- 设置支付宝界面常亮 ------------------------------- */ + alipayMode_->AlipayScreenControl(true); + /* -------------------------------------------------------------------------- */ alipayMode_->AlipayExitLpm(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " alipayMode_->AlipayExitLpm()"); + if (!alipayMode_->AlipayInitModel()) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::OnStart AlipayInitModel fail."); - NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + NativeAbility::GetInstance().Back(); return; } } @@ -67,9 +78,15 @@ void AlipayPresenter::OnResume(void) void AlipayPresenter::OnStop(void) { + + /**关闭alipay蓝牙服务*/ + stop_alipay_ble_service(); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayPresenter OnStop"); svr_alipay_destroy_task(); alipayMode_->AlipayDeinitModel(); alipayMode_->AlipayEnterLpm(); + /* -------------------------------- 恢复屏幕保持亮屏的时间 ------------------------------- */ + alipayMode_->AlipayScreenControl(false); } bool AlipayPresenter::OnDrag(UIView &view, const DragEvent &event) @@ -88,8 +105,7 @@ void AlipayPresenter::ClickExitAlipay(UIView &view) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::ClickExitAlipay start"); AlipayModel::GetInstance()->AlipayFinishBind(); - uint16 preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(preSlice); + NativeAbility::GetInstance().Back(); return; } @@ -100,15 +116,25 @@ void AlipayPresenter::ClickJumpPay(UIView &view) return; } +/** + * @brief 点击跳转到交通卡相关视图的处理函数 + * + * 当用户点击跳转到交通卡相关视图的按钮时,此函数会被调用。 + * 它会尝试获取本地交通卡交易列表,根据获取结果决定跳转到不同的视图。 + * + * @param view 被点击的视图对象 + */ void AlipayPresenter::ClickJumpTrans(UIView &view) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::ClickJumpTrans start"); - int32_t ret = alipayMode_->AlipayGetLocalTranslist(); - if (ret != 0) { - AlipaySetSwitchIndex(ALIPAY_TRANS_GET_LIST_FIRST); - view_->ChangeView(ALIPAY_LIST_VIEW, ALIPAY_GET_TRANS_LIST_VIEW); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "点击跳转到交通卡相关视图的操作开始"); + int32_t ret = alipayMode_->AlipayGetLocalTranslist(); //获取本地交通卡交易列表 + if (ret != 0) { //获取本地交通卡交易列表失败 + AlipaySetSwitchIndex(ALIPAY_TRANS_GET_LIST_FIRST); //设置切换索引为首次获取交通卡交易列表 + view_->ChangeView(ALIPAY_LIST_VIEW, ALIPAY_GET_TRANS_LIST_VIEW); //将当前视图从列表视图切换到获取交通卡交易列表视图 } else if (ret == 0) { - int32_t get_res = alipayMode_->AlipayGetLastTranscode(); + int32_t get_res = alipayMode_->AlipayGetLastTranscode(); //从支付宝获取最后一次交易的交易码 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::ClickJumpTrans get_res:%d", get_res); if (get_res == 0) { view_->ChangeView(ALIPAY_LIST_VIEW, ALIPAY_TRANS_VIEW); } else { @@ -120,6 +146,7 @@ void AlipayPresenter::ClickJumpTrans(UIView &view) void AlipayPresenter::ClickRefreshList(UIView &view) { + //刷新交通卡列表 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::ClickRefreshList start"); alipayMode_->AlipaySendMsg(ALIPAY_MSG_UPDATA_TRANS_LIST); view_->ChangeView(ALIPAY_TRANS_LIST_VIEW, ALIPAY_TRANS_ANI_VIEW); @@ -128,6 +155,7 @@ void AlipayPresenter::ClickRefreshList(UIView &view) void AlipayPresenter::ClickBackList(UIView &view) { + //获取乘车码列表视图退回到列表视图 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::ClickBackList start"); view_->ChangeView(ALIPAY_GET_TRANS_LIST_VIEW, ALIPAY_LIST_VIEW); return; @@ -135,8 +163,11 @@ void AlipayPresenter::ClickBackList(UIView &view) void AlipayPresenter::ClickUpdateList(UIView &view) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::ClickUpdateList start"); + //获取交通卡列表 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::ClickUpdateList start"); + // 发送更新交通卡列表的消息 alipayMode_->AlipaySendMsg(ALIPAY_MSG_UPDATA_TRANS_LIST); + // 从获取交通卡列表视图切换到交通卡动画视图 view_->ChangeView(ALIPAY_GET_TRANS_LIST_VIEW, ALIPAY_TRANS_ANI_VIEW); return; } @@ -164,6 +195,7 @@ void AlipayPresenter::ClickTransToTransList(UIView &view) return; } +//点击刷新按钮 void AlipayPresenter::ClickTransToTransCode(UIView &view) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::ClickTransToTransCode start"); @@ -200,25 +232,27 @@ void AlipayPresenter::ClickTransToTransCode(UIView &view) return; } +/// @brief 处理用户点击重试获取支付宝交易码 +/// @param view void AlipayPresenter::ClickRetryTransCode(UIView &view) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::ClickRetryTransCode start"); - uint32_t index = AlipayGetCardNum(); - int32_t ret = alipayMode_->AlipayGetTransCode(index); + uint32_t index = AlipayGetCardNum(); //获取当前选中的交通卡索引 + int32_t ret = alipayMode_->AlipayGetTransCode(index); //尝试重新获取交易码 if (ret == 0) { - view_->ChangeView(ALIPAY_GET_TRANS_LIST_VIEW, ALIPAY_TRANS_VIEW); + view_->ChangeView(ALIPAY_GET_TRANS_LIST_VIEW, ALIPAY_TRANS_VIEW); //成功获取交易码,跳转到交易码视图 } else if (ret == ALIPAY_TRANS_CODE_NET_ERROR) { AlipaySetSwitchIndex(ALIPAY_TRANS_RES_CODE); - view_->ChangeView(ALIPAY_GET_TRANS_LIST_VIEW, ALIPAY_TRANS_RES_VIEW); + view_->ChangeView(ALIPAY_GET_TRANS_LIST_VIEW, ALIPAY_TRANS_RES_VIEW); //网络错误,跳转到交易码获取失败视图 } else { if (ret == ALIPAY_TRANS_CODE_DATA_LIMIT) { - AlipaySetSwitchIndex(ALIPAY_TRANS_TIPS_SECURE); + AlipaySetSwitchIndex(ALIPAY_TRANS_TIPS_SECURE); //数据限制错误:设置安全提示 } else if (ret == ALIPAY_TRANS_CODE_NOT_SUPPORT) { - AlipaySetSwitchIndex(ALIPAY_TRANS_TIPS_NOT_SUPPORT); + AlipaySetSwitchIndex(ALIPAY_TRANS_TIPS_NOT_SUPPORT); //不支持的错误:设置不支持提示 } else { - AlipaySetSwitchIndex(ALIPAY_TRANS_TIPS_LIST_UNKNOW); + AlipaySetSwitchIndex(ALIPAY_TRANS_TIPS_LIST_UNKNOW); //未知错误:设置未知错误提示 } - view_->ChangeView(ALIPAY_GET_TRANS_LIST_VIEW, ALIPAY_TRANS_TIPS_VIEW); + view_->ChangeView(ALIPAY_GET_TRANS_LIST_VIEW, ALIPAY_TRANS_TIPS_VIEW); //切换到相应的错误提示视图 } return; } @@ -412,6 +446,21 @@ bool AlipayPresenter::OnClick(UIView &view, const ClickEvent &event) return true; } +bool AlipayPresenter::OnKeyAct(UIView &view, const KeyEvent &event) +{ + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::OnKeyAct"); + uint16 keyID = event.GetKeyId(); + uint16_t keyState = event.GetState(); + // 如果是power键就返回上一级 + if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) + { + view_->DropView(0); + + } + return true; + +} + int32_t AlipayPresenter::AlipayGetPayCode(uint8_t *payStr) { return alipayMode_->AlipayGetPayCode(payStr); @@ -432,6 +481,7 @@ int32_t AlipayPresenter::AlipayGetIdName(uint8_t *idStr) return alipayMode_->AlipayGetIdName(idStr); } +//通过获取帮助码串生成二维码 int32_t AlipayPresenter::AlipayGetAidCode(int8_t *aidStr) { return alipayMode_->AlipayGetAidCode(aidStr); @@ -456,6 +506,7 @@ void AlipayPresenter::AlipaySetSwitchIndex(uint32_t switchIndex) alipayMode_->AlipaySetSwitchIndex(switchIndex); } +//获取 uint32_t AlipayPresenter::AlipayGetCardNum(void) { return alipayMode_->AlipayGetCardNum(); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipaySetting.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipaySetting.cpp index c889eff58..1431015d9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipaySetting.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipaySetting.cpp @@ -8,36 +8,39 @@ #include "UiConfig.h" #include #include "cmsis_os.h" -#include "AlipaySetting.h" -#include "AlipayModel.h" +// #include "AlipaySetting.h" +// #include "AlipayModel.h" +#include "alipay/include/AlipaySetting.h" +#include "alipay/include/AlipayModel.h" +#include "uicomponents/UIComponents.h" namespace OHOS { -static const char *SETTING_TITLE = (char *)"设置"; -static const char *SETTING_BUTTON = (char *)"解除绑定"; +static const char *SETTING_TITLE = (char *)"设置"; +static const char *SETTING_BUTTON = (char *)"解除绑定"; -static const int16 SETTING_TITLE_FONT = 38; -static const int16 SETTING_TITLE_X = 0; -static const int16 SETTING_TITLE_Y = 35; -static const int16 SETTING_TITLE_WIDTH = 454; -static const int16 SETTING_TITLE_HEIGHT = 53; +static const int16 SETTING_TITLE_FONT = 30; +static const int16 SETTING_TITLE_X = (HORIZONTAL_RESOLUTION - 300) / 2; +static const int16 SETTING_TITLE_Y = 50; +static const int16 SETTING_TITLE_WIDTH = 300; +static const int16 SETTING_TITLE_HEIGHT = 35; -static const int16 SETTING_NAME_FONT = 38; -static const int16 SETTING_NAME_X = 0; -static const int16 SETTING_NAME_Y = 142; -static const int16 SETTING_NAME_WIDTH = 454; -static const int16 SETTING_NAME_HEIGHT = 53; +static const int16 SETTING_NAME_FONT = 30; +static const int16 SETTING_NAME_X = (HORIZONTAL_RESOLUTION - 360) / 2; +static const int16 SETTING_NAME_Y = 155; +static const int16 SETTING_NAME_WIDTH = 360; +static const int16 SETTING_NAME_HEIGHT = 35; static const int16 SETTING_ID_FONT = 30; -static const int16 SETTING_ID_X = 0; -static const int16 SETTING_ID_Y = 198; -static const int16 SETTING_ID_WIDTH = 454; -static const int16 SETTING_ID_HEIGHT = 109; +static const int16 SETTING_ID_X = (HORIZONTAL_RESOLUTION - 360) / 2; +static const int16 SETTING_ID_Y = 210; +static const int16 SETTING_ID_WIDTH = 360; +static const int16 SETTING_ID_HEIGHT = 35; -static const int16 SETTING_BUTTON_X = 121; -static const int16 SETTING_BUTTON_Y = 320; -static const int16 SETTING_BUTTON_WIDTH = 212; -static const int16 SETTING_BUTTON_HEIGHT = 73; -static const int16 SETTING_BUTTON_FONT = 38; +static const int16 SETTING_BUTTON_X = (HORIZONTAL_RESOLUTION - 280) / 2; +static const int16 SETTING_BUTTON_Y = 315; +static const int16 SETTING_BUTTON_WIDTH = 280; +static const int16 SETTING_BUTTON_HEIGHT = 90; +static const int16 SETTING_BUTTON_FONT = 30; AlipaySetting::AlipaySetting(AlipayPresenter *presenter) { @@ -111,13 +114,16 @@ bool AlipaySetting::AlipayInitLabel(void) } uint8_t str[ALIPAY_GET_NICKNAME_MAX_LENGTH] = {0}; presenter_->AlipayGetNickName(str); - labelName->SetText((const char *)str); - labelName->SetFont(DEFAULT_VECTOR_FONT_FILENAME, SETTING_NAME_FONT); + uint8_t str_[ALIPAY_GET_NICKNAME_MAX_LENGTH] = {0}; + updata_char((char *)str_,(char *)str,ALIPAY_GET_NICKNAME_MAX_LENGTH); + labelName->SetText((const char *)str_); + labelName->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, SETTING_NAME_FONT); + labelName->SetPosition(SETTING_NAME_X, SETTING_NAME_Y, SETTING_NAME_WIDTH, SETTING_NAME_HEIGHT); - labelName->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + labelName->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); labelName->SetStyle(STYLE_TEXT_FONT, SETTING_NAME_FONT); labelName->SetAlign(TEXT_ALIGNMENT_CENTER); - labelName->SetRollSpeed(30); + labelName->SetRollSpeed(23); labelName->SetRollStartPos(SETTING_NAME_X); Add(labelName); @@ -132,11 +138,11 @@ bool AlipaySetting::AlipayInitLabel(void) labelId->SetText((const char *)strID); labelId->SetFont(DEFAULT_VECTOR_FONT_FILENAME, SETTING_ID_FONT); labelId->SetPosition(SETTING_ID_X, SETTING_ID_Y, SETTING_ID_WIDTH, SETTING_ID_HEIGHT); - labelId->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + labelId->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); labelId->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); labelId->SetStyle(STYLE_TEXT_FONT, SETTING_ID_FONT); labelId->SetAlign(TEXT_ALIGNMENT_CENTER); - labelId->SetRollSpeed(30); + labelId->SetRollSpeed(23); labelId->SetRollStartPos(SETTING_ID_X); Add(labelId); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp index 2f0459546..b32347cde 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp @@ -85,7 +85,7 @@ bool AlipayTransCode::AlipayInitLabel(void) labelPayCode->SetPosition(TRANSCODE_TITLE_X, TRANSCODE_TITLE_Y, TRANSCODE_TITLE_WIDTH, TRANSCODE_TITLE_HEIGHT); labelPayCode->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); labelPayCode->SetAlign(TEXT_ALIGNMENT_CENTER); - labelPayCode->SetRollSpeed(30); + labelPayCode->SetRollSpeed(23); labelPayCode->SetRollStartPos(TRANSCODE_TITLE_X); Add(labelPayCode); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListItemView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListItemView.cpp index aa4b0f0c7..96fe00d11 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListItemView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListItemView.cpp @@ -6,16 +6,25 @@ */ #include "wearable_log.h" -#include "AlipayTransListItemView.h" +// #include "AlipayTransListItemView.h" +#include "alipay/include/AlipayTrans/AlipayTransListItemView.h" namespace OHOS { -static constexpr int16_t ALIPAY_TRANS_LIST_ITEM_BUTTON_HEIGHT = 95; -static constexpr int16_t ALIPAY_TRANS_LIST_ITEM_LABEL_X = 53; +static constexpr int16_t ALIPAY_TRANS_LIST_ITEM_BUTTON_HEIGHT = 120; -static constexpr int16_t ALIPAY_TRANS_LIST_ITEM_LABEL_WIDTH = 347; -static constexpr int16_t ALIPAY_TRANS_LIST_ITEM_LABEL_HEIGHT = 90; +static constexpr int16 ALIPAY_LIST_BACK_X = 0; +static constexpr int16 ALIPAY_LIST_BACK_Y = 0; +static constexpr int16_t ALIPAY_LIST_BACK_WIDTH = 380; +static constexpr int16_t ALIPAY_LIST_BACK_HEIGHT = 100; -static constexpr int16_t ALIPAY_TRANS_LIST_ITEM_FONT_SIZE = 35; +static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_X = 47 + ALIPAY_LIST_BACK_X; +static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_Y = 32; +static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_WIDTH = 250; +static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_HEIGHT = 35; +static constexpr int16_t ALIPAY_LIST_ITEM_FONT_SIZE = 30; + +static constexpr int16 NUMS_2 = 2; +static constexpr int16 NUMS_50 = 50; AlipayTransListItemView::AlipayTransListItemView() { @@ -26,12 +35,16 @@ AlipayTransListItemView::AlipayTransListItemView() SetTouchable(true); SetUpChild(); + Add(&back); Add(&sLabel); + Add(&sNextImage); } AlipayTransListItemView::~AlipayTransListItemView() { + Remove(&back); Remove(&sLabel); + Remove(&sNextImage); } void AlipayTransListItemView::SetItemInfo(const AlipayTransListItem &itemInfo) @@ -45,14 +58,24 @@ void AlipayTransListItemView::SetUpChild() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayTransListItemView::SetUpChild()"); - sLabel.SetPosition(ALIPAY_TRANS_LIST_ITEM_LABEL_X, 0); - sLabel.Resize(ALIPAY_TRANS_LIST_ITEM_LABEL_WIDTH, ALIPAY_TRANS_LIST_ITEM_LABEL_HEIGHT); - sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, ALIPAY_TRANS_LIST_ITEM_FONT_SIZE); + sLabel.SetPosition(ALIPAY_LIST_ITEM_LABEL_X, ALIPAY_LIST_ITEM_LABEL_Y); + sLabel.Resize(ALIPAY_LIST_ITEM_LABEL_WIDTH, ALIPAY_LIST_ITEM_LABEL_HEIGHT); + sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, ALIPAY_LIST_ITEM_FONT_SIZE); sLabel.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); - sLabel.SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE); - sLabel.SetStyle(STYLE_TEXT_COLOR, Color::White().full); - sLabel.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); - sLabel.SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); + sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + // sLabel.SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE); + // sLabel.SetStyle(STYLE_TEXT_COLOR, Color::White().full); + // sLabel.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); + // sLabel.SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); + + + sNextImage.SetSrc(PNG_SETTING_NEXT_IMAGE); + sNextImage.SetPosition(ALIPAY_LIST_BACK_X + 326, 37); + + back.SetPosition(ALIPAY_LIST_BACK_X, ALIPAY_LIST_BACK_Y, ALIPAY_LIST_BACK_WIDTH, ALIPAY_LIST_BACK_HEIGHT); + back.SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); + back.SetStyle(STYLE_BACKGROUND_OPA, 0xff); + back.SetStyle(STYLE_BORDER_RADIUS, 100); } uint8_t AlipayTransListItemView::GetAlipayTransListIndex() diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListView.cpp index b77752179..b5307c5b7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListView.cpp @@ -13,18 +13,18 @@ #include "common_def.h" namespace OHOS { -static constexpr int16_t ALIPAY_TRANS_LIST_POSITION_X = 33; -static constexpr int16_t ALIPAY_TRANS_LIST_POSITION_Y = 59; +static constexpr int16_t ALIPAY_TRANS_LIST_POSITION_X = 43; +static constexpr int16_t ALIPAY_TRANS_LIST_POSITION_Y = 90; static constexpr int16_t ALIPAY_TRANS_LIST_SCROLLBLANKSIZE = 50; static constexpr int16 MAX_SCR_DIS = 900; static constexpr int16 LIST_POS = 20; static constexpr int16 SNUM_2 = 2; static const int16 REFRESH_BUTTON_FONT = 38; -static const int16 REFRESH_BUTTON_X = 189; +static const int16 REFRESH_BUTTON_X = 133; static const int16 REFRESH_BUTTON_Y = 400; -static const int16 REFRESH_BUTTON_WIDTH = 76; -static const int16 REFRESH_BUTTON_HEIGHT = 53; +static const int16 REFRESH_BUTTON_WIDTH = 200; +static const int16 REFRESH_BUTTON_HEIGHT = 60; static const char *REFRESH_BUTTON = (char *)"刷新"; AlipayTransList::AlipayTransList(AlipayPresenter *presenter) @@ -67,14 +67,15 @@ bool AlipayTransList::AlipayInitList() return false; } contentList->SetPosition(ALIPAY_TRANS_LIST_POSITION_X, ALIPAY_TRANS_LIST_POSITION_Y); - contentList->Resize(HORIZONTAL_RESOLUTION - ALIPAY_TRANS_LIST_POSITION_X, VERTICAL_RESOLUTION - 115); - contentList->SetScrollBlankSize(ALIPAY_TRANS_LIST_SCROLLBLANKSIZE); + contentList->Resize(380, 300); + // contentList->SetScrollBlankSize(ALIPAY_TRANS_LIST_SCROLLBLANKSIZE); + contentList->SetReboundSize(15); contentList->SetSelectPosition(HORIZONTAL_RESOLUTION / SNUM_2); // middle position contentList->SetDraggable(true); contentList->SetThrowDrag(false); contentList->EnableAutoAlign(true); contentList->SetMaxScrollDistance(MAX_SCR_DIS); - contentList->SetYScrollBarVisible(true); + contentList->SetYScrollBarVisible(false); AddAlipayTransListItemToList(); Add(contentList); contentList->SetAdapter(listAdapter); @@ -108,7 +109,9 @@ bool AlipayTransList::AlipayInitButton() buttonRefresh->SetTextColor(Color::Blue()); buttonRefresh->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); + buttonRefresh->SetStyle(STYLE_BACKGROUND_OPA, 0xff); buttonRefresh->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); + buttonRefresh->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); buttonRefresh->SetOnClickListener(presenter_); Add(buttonRefresh); @@ -136,6 +139,19 @@ bool AlipayTransList::InitListView() return false; } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cardCount = %d", listLen); + if(listLen > 3) + { + contentList->SetHeight(300); + int16_t y = contentList->GetY() + contentList->GetHeight() + 10; + buttonRefresh->SetY(y); + } + else + { + contentList->SetHeight(listLen * 100); + buttonRefresh->SetY(REFRESH_BUTTON_Y); + } + return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp index 11706660a..79ffdd814 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp @@ -10,14 +10,16 @@ #include "font/ui_font.h" #include #include "cmsis_os.h" -#include "AlipayTransTips.h" -#include "AlipayModel.h" +// #include "AlipayTransTips.h" +// #include "AlipayModel.h" +#include "alipay/include/AlipayTrans/AlipayTransTips.h" +#include "alipay/include/AlipayModel.h" namespace OHOS { -static const int16 TIPS_LABEL_X_FIRST = 38; -static const int16 TIPS_LABEL_Y_FIRST = 179; -static const int16 TIPS_LABEL_WIDTH_FIRST = 378; -static const int16 TIPS_LABEL_HEIGHT_FIRST = 84; +static const int16 TIPS_LABEL_X_FIRST = (HORIZONTAL_RESOLUTION - 360) / 2; +static const int16 TIPS_LABEL_Y_FIRST = 180; +static const int16 TIPS_LABEL_WIDTH_FIRST = 360; +static const int16 TIPS_LABEL_HEIGHT_FIRST = 70; static const int16 TIPS_LABEL_FONT_FIRST = 30; static const char *TIPS_LABEL_TEXT_1 = (char *)"未知错误_具体错误码,请联系设备厂商解决"; @@ -26,17 +28,17 @@ static const char *TIPS_LABEL_TEXT_3 = (char *)"存在安全风险,12小时内 static const char *TIPS_LABEL_TEXT_4 = (char *)"未知错误_具体错误码,请联系设备厂商解决"; static const char *TIPS_LABEL_TEXT_5 = (char *)"暂不支持,请切换到手机侧使用"; -static const int16 RES_IMAGE_X = 170; -static const int16 RES_IMAGE_Y = 55; +static const int16 RES_IMAGE_X = (HORIZONTAL_RESOLUTION - 112) / 2; +static const int16 RES_IMAGE_Y = 50; static const int16 RES_IMAGE_WIDTH = 112; static const int16 RES_IMAGE_HEIGHT = 112; static const char *RECOGNIZE_BUTTON = (char *)"确定"; -static const int16 RECOGNIZE_BUTTON_FONT = 38; -static const int16 RECOGNIZE_BUTTON_X = 120; -static const int16 RECOGNIZE_BUTTON_Y = 320; -static const int16 RECOGNIZE_BUTTON_WIDTH = 212; -static const int16 RECOGNIZE_BUTTON_HEIGHT = 73; +static const int16 RECOGNIZE_BUTTON_FONT = 30; +static const int16 RECOGNIZE_BUTTON_X = (HORIZONTAL_RESOLUTION - 280) / 2; +static const int16 RECOGNIZE_BUTTON_Y = 315; +static const int16 RECOGNIZE_BUTTON_WIDTH = 280; +static const int16 RECOGNIZE_BUTTON_HEIGHT = 90; typedef struct AlipayTransTipsInfo { const char *str; @@ -120,7 +122,7 @@ bool AlipayTransTips::AlipayInitImage(const char *imageSrc) // Set additional property alipayImage->SetAutoEnable(false); - alipayImage->SetResizeMode(UIImageView::FILL); + alipayImage->SetResizeMode(UIImageView::CENTER); Add(alipayImage); return true; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbind.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbind.cpp index 2c081cae3..0107e26cf 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbind.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbind.cpp @@ -10,37 +10,39 @@ #include "font/ui_font.h" #include #include "cmsis_os.h" -#include "AlipayUnbind.h" +// #include "AlipayUnbind.h" +#include "alipay/include/AlipayUnbind.h" namespace OHOS { -static const int16 EXIT_LABEL_X_FIRST = 132; -static const int16 EXIT_LABEL_Y_FIRST = 57; -static const int16 EXIT_LABEL_WIDTH_FIRST = 189; -static const int16 EXIT_LABEL_HEIGHT_FIRST = 48; +static const int16 EXIT_LABEL_X_FIRST = 83; +static const int16 EXIT_LABEL_Y_FIRST = 50; +static const int16 EXIT_LABEL_WIDTH_FIRST = 300; +static const int16 EXIT_LABEL_HEIGHT_FIRST = 35; -static const int16 EXIT_LABEL_X_SEC = 44; -static const int16 EXIT_LABEL_Y_SECOND = 126; -static const int16 EXIT_LABEL_WIDTH_SEC = 365; -static const int16 EXIT_LABEL_HEIGHT_SEC = 128; +static const int16 EXIT_LABEL_X_SEC = 53; +static const int16 EXIT_LABEL_Y_SECOND = 222; -static const int16 EXIT_LABEL_FONT_FIRST = 38; +static const int16 EXIT_LABEL_WIDTH_SEC = 360; +static const int16 EXIT_LABEL_HEIGHT_SEC = 70; + +static const int16 EXIT_LABEL_FONT_FIRST = 30; static const int16 EXIT_LABEL_FONT_SEC = 30; static const char *UNBIND_LABEL_TEXT_FIRST = (char *)"解除绑定"; -static const char *UNBIND_LABEL_TEXT_SECOND = (char *)"解绑后将无法使用支付宝各项解锁功能,确认解绑?"; +static const char *UNBIND_LABEL_TEXT_SECOND = (char *)"解绑后将无法使用支付宝各项功能,确认解绑?"; -static const int16 EXIT_BUTTON_EXIT_X = 50; -static const int16 EXIT_BUTTON_EXIT_Y = 312; +static const int16 EXIT_BUTTON_EXIT_X = 58; +static const int16 EXIT_BUTTON_EXIT_Y = 320; -static const int16 EXIT_BUTTON_BIND_X = 233; -static const int16 EXIT_BUTTON_BIND_Y = 312; +static const int16 EXIT_BUTTON_BIND_X = 238; +static const int16 EXIT_BUTTON_BIND_Y = 320; static const char *UNBIND_BUTTON_TEXT_FIRST = (char *)"确认"; static const char *UNBIND_BUTTON_TEXT_SECOND = (char *)"取消"; -static const int16 EXIT_BUTTON_WIDTH = 169; -static const int16 EXIT_BUTTON_HEIGHT = 73; -static const int16 EXIT_BUTTON_FONT = 38; +static const int16 EXIT_BUTTON_WIDTH = 170; +static const int16 EXIT_BUTTON_HEIGHT = 90; +static const int16 EXIT_BUTTON_FONT = 26; AlipayUnbind::AlipayUnbind(AlipayPresenter *presenter) { @@ -64,6 +66,11 @@ AlipayUnbind::~AlipayUnbind() alipayButton[buttonNum] = nullptr; } } + if(AttentionImage) + { + delete AttentionImage; + AttentionImage =nullptr; + } } bool AlipayUnbind::AlipayInitLabel() @@ -80,7 +87,7 @@ bool AlipayUnbind::AlipayInitLabel() alipayLabel[ALIPAY_SET_ZERO]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_LABEL_FONT_FIRST); alipayLabel[ALIPAY_SET_ZERO]->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_FIRST); alipayLabel[ALIPAY_SET_ZERO]->SetAlign(TEXT_ALIGNMENT_CENTER); - alipayLabel[ALIPAY_SET_ZERO]->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + alipayLabel[ALIPAY_SET_ZERO]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); Add(alipayLabel[ALIPAY_SET_ZERO]); @@ -93,11 +100,25 @@ bool AlipayUnbind::AlipayInitLabel() EXIT_LABEL_HEIGHT_SEC); alipayLabel[ALIPAY_SET_ONE]->SetText(UNBIND_LABEL_TEXT_SECOND); alipayLabel[ALIPAY_SET_ONE]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_LABEL_FONT_SEC); - alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_LINE_SPACE, 12); - alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_SEC); + //alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_LINE_SPACE, 12); + //alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_SEC); + alipayLabel[ALIPAY_SET_ONE]->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xFF)); + alipayLabel[ALIPAY_SET_ONE]->SetAlign(TEXT_ALIGNMENT_CENTER); alipayLabel[ALIPAY_SET_ONE]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); Add(alipayLabel[ALIPAY_SET_ONE]); + AttentionImage=new UIImageView(); + if (AttentionImage == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::new FactoryResetImage fail!"); + return false; + } + AttentionImage->SetPosition(193, 110); + AttentionImage->SetSrc(PNG_ATTENTION_IMAGE); + Add(AttentionImage); + + + return true; } @@ -110,11 +131,12 @@ bool AlipayUnbind::InitSimilarButton(int16 num, int16 alipayX, int16 alipayY, co } int64_t backColor = 0; if (num == 0) { - backColor = 0xff4a83bf; - alipayButton[num]->SetTextColor(Color::GetColorFromRGBA(0x00, 0x00, 0x00, 0xff)); - alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + backColor = 0xff191919; + //alipayButton[num]->SetTextColor(Color::GetColorFromRGBA(0x19, 0x19, 0x19, 0x19)); + alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); } else if (num == 1) { - backColor = 0xff0b1928; + backColor = 0xff0176ff; + alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff0176ff); } alipayButton[num]->SetPosition(alipayX, alipayY, EXIT_BUTTON_WIDTH, EXIT_BUTTON_HEIGHT); alipayButton[num]->SetText(buttonStr); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbindFinish.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbindFinish.cpp index 817d90bf3..9a3c629c4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbindFinish.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbindFinish.cpp @@ -8,8 +8,8 @@ #include "UiConfig.h" #include #include "cmsis_os.h" -#include "AlipayUnbindFinish.h" - +// #include "AlipayUnbindFinish.h" +#include "alipay/include/AlipayUnbindFinish.h" namespace OHOS { static AlipayUnbindFinish *g_alipayUnbindFinish = nullptr; @@ -19,23 +19,23 @@ static const char *UNBIND_FINISH_TEXT = static const char *UNBIND_FINISH_BUTTON = (char *)"确认"; -static const int16 UNBIND_FINISH_TITLE_FONT = 38; -static const int16 UNBIND_FINISH_TITLE_X = 0; -static const int16 UNBIND_FINISH_TITLE_Y = 35; -static const int16 UNBIND_FINISH_TITLE_WIDTH = 454; -static const int16 UNBIND_FINISH_TITLE_HEIGHT = 53; +static const int16 UNBIND_FINISH_TITLE_FONT = 30; +static const int16 UNBIND_FINISH_TITLE_X = (HORIZONTAL_RESOLUTION - 300) / 2; +static const int16 UNBIND_FINISH_TITLE_Y = 50; +static const int16 UNBIND_FINISH_TITLE_WIDTH = 300; +static const int16 UNBIND_FINISH_TITLE_HEIGHT = 35; static const int16 UNBIND_FINISH_TEXT_FONT = 30; -static const int16 UNBIND_FINISH_TEXT_X = 38; -static const int16 UNBIND_FINISH_TEXT_Y = 126; -static const int16 UNBIND_FINISH_TEXT_WIDTH = 380; -static const int16 UNBIND_FINISH_TEXT_HEIGHT = 166; +static const int16 UNBIND_FINISH_TEXT_X = (HORIZONTAL_RESOLUTION - 360) / 2 ; +static const int16 UNBIND_FINISH_TEXT_Y = 130; +static const int16 UNBIND_FINISH_TEXT_WIDTH = 360; +static const int16 UNBIND_FINISH_TEXT_HEIGHT = 140; -static const int16 UNBIND_FINISH_BUTTON_FONT = 38; -static const int16 UNBIND_FINISH_BUTTON_X = 120; -static const int16 UNBIND_FINISH_BUTTON_Y = 320; -static const int16 UNBIND_FINISH_BUTTON_WIDTH = 212; -static const int16 UNBIND_FINISH_BUTTON_HEIGHT = 73; +static const int16 UNBIND_FINISH_BUTTON_FONT = 30; +static const int16 UNBIND_FINISH_BUTTON_X = (HORIZONTAL_RESOLUTION - 280) / 2; +static const int16 UNBIND_FINISH_BUTTON_Y = 315; +static const int16 UNBIND_FINISH_BUTTON_WIDTH = 280; +static const int16 UNBIND_FINISH_BUTTON_HEIGHT = 90; AlipayUnbindFinish::AlipayUnbindFinish(AlipayPresenter *presenter) { @@ -79,20 +79,21 @@ bool AlipayUnbindFinish::AlipayInitLabel(void) Add(titleUnbind); - titleUnbind = new UILabel(); - if (titleUnbind == nullptr) { + textUnbind = new UILabel(); + if (textUnbind == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayUnbindFinish::AlipayInitLabel new label fail"); return false; } - titleUnbind->SetText(UNBIND_FINISH_TEXT); - titleUnbind->SetFont(DEFAULT_VECTOR_FONT_FILENAME, UNBIND_FINISH_TEXT_FONT); - titleUnbind->SetPosition(UNBIND_FINISH_TEXT_X, UNBIND_FINISH_TEXT_Y, UNBIND_FINISH_TEXT_WIDTH, + textUnbind->SetText(UNBIND_FINISH_TEXT); + textUnbind->SetFont(DEFAULT_VECTOR_FONT_FILENAME, UNBIND_FINISH_TEXT_FONT); + textUnbind->SetPosition(UNBIND_FINISH_TEXT_X, UNBIND_FINISH_TEXT_Y, UNBIND_FINISH_TEXT_WIDTH, UNBIND_FINISH_TEXT_HEIGHT); - titleUnbind->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); - titleUnbind->SetStyle(STYLE_TEXT_FONT, UNBIND_FINISH_TEXT_FONT); - titleUnbind->SetStyle(STYLE_LINE_SPACE, 6); - - Add(titleUnbind); + textUnbind->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); + textUnbind->SetStyle(STYLE_TEXT_FONT, UNBIND_FINISH_TEXT_FONT); + // textUnbind->SetStyle(STYLE_LINE_SPACE, 6); + textUnbind->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xFF)); + textUnbind->SetAlign(TEXT_ALIGNMENT_CENTER); + Add(textUnbind); return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistPresenter.cpp index a6c141f17..2d450a201 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistPresenter.cpp @@ -119,14 +119,10 @@ REGIST_SLICE(VIEW_APPLIST, ApplistView, ApplistPresenter); } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ApplistPresenter::OnClick viewid = %d", viewId); if (viewId < VIEW_MAX_INTER_APP) { -#ifdef FD230_650 if (viewId == VIEW_SETTING && style == AppListStyle::APPLIST_STYLE) { - //TODO EnterSlice 需要适配新函数 需要增加新特效 是否增加? - NativeAbility::GetInstance().ChangeSlice(viewId, type, gSliceDefaultPriority, true); - } else - #endif - { - NativeAbility::GetInstance().EnterSlice(viewId, type); + NativeAbility::GetInstance().EnterSlice(viewId, type, gSliceDefaultPriority, true); + } else { + NativeAbility::GetInstance().EnterSlice(viewId, type, gSliceDefaultPriority, true); } return true; } else if (viewId == VIEW_EXTERN_APP) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp index ccf14147d..e39d1e2d6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp @@ -55,7 +55,7 @@ //#include "hfp_hf_service.h" #include "uiservice/include/ui_service.h" #include "PhoneService.h" -#ifdef SUPPORT_AT_OHOSFWK +#ifdef SUPPORT_OHOSFWK #include "BluetoothWrapper.h" #endif #include "Bluetooyhpabpserver.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/key/src/KeyInputListener.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/key/src/KeyInputListener.cpp index cef7b173d..5c0a1ea20 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/key/src/KeyInputListener.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/key/src/KeyInputListener.cpp @@ -35,6 +35,7 @@ void KeyInputListener::OnKeyPress(const KeyEvent &event) { pressFlag = 1; // 短按标志 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnKeyPress: pressFlag = %d", pressFlag); + #if 0 uint16_t currentViewId = NativeAbility::GetInstance().GetCurSliceId(); uint16 keyID = event.GetKeyId(); if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER)) @@ -44,6 +45,7 @@ void KeyInputListener::OnKeyPress(const KeyEvent &event) HandlePowerKeyPress(currentViewId); } } + #endif return; } @@ -61,6 +63,13 @@ void KeyInputListener::OnKeyRelease(const KeyEvent& event) uint16 keyID = event.GetKeyId(); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnKeyRelease: keyID = %d, currentViewId = %d, longPressFlag = %d, pressFlag = %d", keyID, currentViewId, longPressFlag, pressFlag); + if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER)) + { + if (longPressFlag == 0 && pressFlag == 1) + { + HandlePowerKeyPress(currentViewId); + } + } // 重置标志 pressFlag = 0; longPressFlag = 0; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingPresenter.cpp index 90913ce37..2b41e696c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingPresenter.cpp @@ -124,7 +124,7 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingPresenter::OnDragEnd"); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && X_DRAG_FLAG) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); X_DRAG_FLAG = false; } return true; @@ -133,12 +133,12 @@ namespace OHOS // 增加按键事件 bool SettingPresenter::OnKeyAct(UIView &view, const KeyEvent &event) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingPresenter::OnKeyAct"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SettingPresenter::OnKeyAct"); uint16 keyID = event.GetKeyId(); uint16 keyState = event.GetState(); if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingView.cpp index e8fe9f7d2..f67b80df0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingView.cpp @@ -204,7 +204,7 @@ namespace OHOS void SettingView:: RefreshSettingList(const SettingItem *item){ for (uint8_t i = 0; i < SettingModel::GetInstance().GetSettingListNum(); i++) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SettingPresenter::OnStart itemInfo[i].itemName:%d", i); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingPresenter::OnStart itemInfo[i].itemName:%d", i); AddSettingItemToList(item[i]); } contentList->SetAdapter(listAdapter); diff --git a/code/sdk/vendor/alipay_sdk/alipay_sec_sdk_v3.0.0/lib/rv70_llvm/fwk/device_certificate/lib/libfwk_device_certificate_rv70_llvm.a b/code/sdk/vendor/alipay_sdk/alipay_sec_sdk_v3.0.0/lib/rv70_llvm/fwk/device_certificate/lib/libfwk_device_certificate_rv70_llvm.a index f22a6bbd9..3db4102b8 100644 Binary files a/code/sdk/vendor/alipay_sdk/alipay_sec_sdk_v3.0.0/lib/rv70_llvm/fwk/device_certificate/lib/libfwk_device_certificate_rv70_llvm.a and b/code/sdk/vendor/alipay_sdk/alipay_sec_sdk_v3.0.0/lib/rv70_llvm/fwk/device_certificate/lib/libfwk_device_certificate_rv70_llvm.a differ diff --git a/code/sdk/vendor/alipay_sdk/alipay_sec_sdk_v3.0.0/soc/se/hsec/hsc32i1/hs_private.c b/code/sdk/vendor/alipay_sdk/alipay_sec_sdk_v3.0.0/soc/se/hsec/hsc32i1/hs_private.c index 19ac74f31..357aee406 100644 --- a/code/sdk/vendor/alipay_sdk/alipay_sec_sdk_v3.0.0/soc/se/hsec/hsc32i1/hs_private.c +++ b/code/sdk/vendor/alipay_sdk/alipay_sec_sdk_v3.0.0/soc/se/hsec/hsc32i1/hs_private.c @@ -1,222 +1,222 @@ -#include "IIC_Master_Driver.h" -#include "hs_private.h" - -unsigned char *g_HSI2CBuf; -unsigned char gHSEncTransSign; //ͨÐÅÊÇ·ñ¼ÓÃÜ£¬0 = Ã÷ÎÄͨÐÅ£¬1 = ¼ÓÃÜͨÐÅ -unsigned char g_DefTransKey[16] = {0x54,0x8E,0x8D,0x7A,0x26,0x35,0x85,0x11,0x25,0x2E,0xF8,0xD6,0xB7,0x17,0xA4,0xE4}; -unsigned char g_TransTmpKey[16]; - -//extern unsigned char * IIC_Master_Init(void); - -//extern void IIC_Master_Send(unsigned char byAddr, unsigned char *pData, unsigned short wLen); - -//extern void IIC_Master_Receive(unsigned char byAddr, unsigned char *pData, unsigned short wLen); - - - - -//CRCµ¥×Ö½Ú¼ÆË㡪¡ªÑ­»·×óÒÆ£¬ÏÈÒÆ×î¸ßbit -unsigned short LeftShift_CRC(unsigned char byValue, unsigned short *lpwCrc) -{ - byValue ^= (unsigned char)(*lpwCrc>>8); - byValue ^= (byValue>>4); - - *lpwCrc = (*lpwCrc<<8) ^ (unsigned short)(byValue); - *lpwCrc ^= (unsigned short)byValue<<12; - *lpwCrc ^= (unsigned short)byValue<<5; - - return (*lpwCrc); -} - -void ComputeCRC(unsigned char *Data, unsigned short Length, unsigned char *pbyOut) -{ - unsigned char chBlock; - unsigned short wCrc; - - wCrc = 0x0000; // ITU-V.41 - - while(Length--) - { - chBlock = *Data++; - LeftShift_CRC(chBlock, &wCrc); - } - - pbyOut[0] = (unsigned char) ((wCrc >> 8) & 0xFF); - pbyOut[1] = (unsigned char) (wCrc & 0xFF); - - return; -} - -void lmemset(unsigned char *pBuf, unsigned char byVal, unsigned short wLen) -{ - unsigned short i; - - for(i=0; i 0x1000) - { - return 4; - } - IIC_Master_Receive(0xC9, g_HSI2CBuf, 1); - } - - IIC_Master_Receive(0xC9, g_HSI2CBuf, wLen+6); - - wRspLen = g_HSI2CBuf[0]; - wRspLen <<= 8; - wRspLen |= g_HSI2CBuf[1]; - if(wRspLen != wLen+2) - { - return 2; - } - - ComputeCRC(g_HSI2CBuf+2, wLen+2, crc); - if((g_HSI2CBuf[wLen+4] != crc[0]) || (g_HSI2CBuf[wLen+5] != crc[1])) - { - return 1; - } - - if(gHSEncTransSign == 0x01) - { - for(i=0; i>8); + byValue ^= (byValue>>4); + + *lpwCrc = (*lpwCrc<<8) ^ (unsigned short)(byValue); + *lpwCrc ^= (unsigned short)byValue<<12; + *lpwCrc ^= (unsigned short)byValue<<5; + + return (*lpwCrc); +} + +void ComputeCRC(unsigned char *Data, unsigned short Length, unsigned char *pbyOut) +{ + unsigned char chBlock; + unsigned short wCrc; + + wCrc = 0x0000; // ITU-V.41 + + while(Length--) + { + chBlock = *Data++; + LeftShift_CRC(chBlock, &wCrc); + } + + pbyOut[0] = (unsigned char) ((wCrc >> 8) & 0xFF); + pbyOut[1] = (unsigned char) (wCrc & 0xFF); + + return; +} + +void lmemset(unsigned char *pBuf, unsigned char byVal, unsigned short wLen) +{ + unsigned short i; + + for(i=0; i 0x1000) + { + return 4; + } + IIC_Master_Receive(0xC9, g_HSI2CBuf, 1); + } + + IIC_Master_Receive(0xC9, g_HSI2CBuf, wLen+6); + + wRspLen = g_HSI2CBuf[0]; + wRspLen <<= 8; + wRspLen |= g_HSI2CBuf[1]; + if(wRspLen != wLen+2) + { + return 2; + } + + ComputeCRC(g_HSI2CBuf+2, wLen+2, crc); + if((g_HSI2CBuf[wLen+4] != crc[0]) || (g_HSI2CBuf[wLen+5] != crc[1])) + { + return 1; + } + + if(gHSEncTransSign == 0x01) + { + for(i=0; i 4096) - { - return CSI_ERROR; - } - if(data == 0) - { - return CSI_ERROR; - } - - //Ïȸù¾ÝfdÑ¡ÔñÎļþ - g_HSI2CBuf[0] = 0x00; - g_HSI2CBuf[1] = 0x07; - g_HSI2CBuf[2] = 0x00; - g_HSI2CBuf[3] = 0xA4; - g_HSI2CBuf[4] = 0x00; - g_HSI2CBuf[5] = 0x00; - g_HSI2CBuf[6] = 0x02; - g_HSI2CBuf[7] = (unsigned char)((unsigned int)fd / 256); - g_HSI2CBuf[8] = (unsigned int)fd % 256; - - if(gHSEncTransSign == 0x01) - { - for(i=0; i<7; ++i) - { - g_HSI2CBuf[2+i] ^= g_TransTmpKey[i]; - } - } - - ComputeCRC(g_HSI2CBuf, 9, g_HSI2CBuf+9); - HS_IIC_Send_Cmd(g_HSI2CBuf, 11); - if(0 != HS_IIC_Recv_Resp(abyBuf, 2)) - { - return CSI_ERROR; - } - - if(data_len == 0) - { - return CSI_OK; - } - - dwBufOff = 0; - while(data_len > 1024) - { - g_HSI2CBuf[0] = 0x04; - g_HSI2CBuf[1] = 0x07; - g_HSI2CBuf[2] = 0x00; - g_HSI2CBuf[3] = 0xd6; - g_HSI2CBuf[4] = (unsigned char)(offset / 256); - g_HSI2CBuf[5] = (unsigned char)(offset % 256); - g_HSI2CBuf[6] = 0x00; - g_HSI2CBuf[7] = 0x04; - g_HSI2CBuf[8] = 0x00; - lmemcpy(g_HSI2CBuf+9, (unsigned char *)data + dwBufOff, 1024); - - if(gHSEncTransSign == 0x01) - { - for(i=0; i<1031; ++i) - { - g_HSI2CBuf[2+i] ^= g_TransTmpKey[i % 16]; - } - } - - ComputeCRC(g_HSI2CBuf, 1033, g_HSI2CBuf+1033); - HS_IIC_Send_Cmd(g_HSI2CBuf, 1035); - if(0 != HS_IIC_Recv_Resp(abyBuf, 0)) - { - return CSI_ERROR; - } - offset += 1024; - data_len -= 1024; - dwBufOff += 1024; - } - - g_HSI2CBuf[0] = (unsigned char)((data_len+7) / 256); - g_HSI2CBuf[1] = (unsigned char)((data_len+7) % 256); - g_HSI2CBuf[2] = 0x80; - g_HSI2CBuf[3] = 0xd6; - g_HSI2CBuf[4] = (unsigned char)(offset / 256); - g_HSI2CBuf[5] = (unsigned char)(offset % 256); - g_HSI2CBuf[6] = 0x00; - g_HSI2CBuf[7] = (unsigned char)(data_len / 256); - g_HSI2CBuf[8] = (unsigned char)(data_len % 256); - lmemcpy(g_HSI2CBuf+9, (unsigned char *)data + dwBufOff, data_len); - - if(gHSEncTransSign == 0x01) - { - for(i=0; i= wFileLen) - { - return CSI_ERROR; - } - - if(offset + *data_len > wFileLen) - { - *data_len = wFileLen - offset; - } - - dwOff = 0; - dwTmpLen = *data_len; - while(dwTmpLen > 1024) - { - g_HSI2CBuf[0] = 0x00; - g_HSI2CBuf[1] = 0x07; - g_HSI2CBuf[2] = 0x00; - g_HSI2CBuf[3] = 0xB0; - g_HSI2CBuf[4] = (unsigned char)(offset / 256); - g_HSI2CBuf[5] = (unsigned char)(offset % 256); - g_HSI2CBuf[6] = 0x00; - g_HSI2CBuf[7] = 0x04; - g_HSI2CBuf[8] = 0x00; - if(gHSEncTransSign == 0x01) - { - for(i=0; i<7; ++i) - { - g_HSI2CBuf[2+i] ^= g_TransTmpKey[i]; - } - } - - ComputeCRC(g_HSI2CBuf, 9, g_HSI2CBuf+9); - HS_IIC_Send_Cmd(g_HSI2CBuf, 11); - if(0 == HS_IIC_Recv_Resp((unsigned char *)buffer + dwOff, 1024)) - { - offset += 1024; - dwOff += 1024; - dwTmpLen -= 1024; - } - else - { - return CSI_ERROR; - } - } - - g_HSI2CBuf[0] = 0x00; - g_HSI2CBuf[1] = 0x07; - g_HSI2CBuf[2] = 0x00; - g_HSI2CBuf[3] = 0xB0; - g_HSI2CBuf[4] = (unsigned char)(offset / 256); - g_HSI2CBuf[5] = (unsigned char)(offset % 256); - g_HSI2CBuf[6] = 0x00; - g_HSI2CBuf[7] = (unsigned char)(dwTmpLen / 256); - g_HSI2CBuf[8] = (unsigned char)(dwTmpLen % 256); - if(gHSEncTransSign == 0x01) - { - for(i=0; i<7; ++i) - { - g_HSI2CBuf[2+i] ^= g_TransTmpKey[i]; - } - } - ComputeCRC(g_HSI2CBuf, 9, g_HSI2CBuf+9); - HS_IIC_Send_Cmd(g_HSI2CBuf, 11); - if(0 != HS_IIC_Recv_Resp((unsigned char *)buffer + dwOff, dwTmpLen)) - { - return CSI_ERROR; - } - - return CSI_OK; -} - -/*¡ð ¹¦ÄÜÃèÊö - ¡ö ¹Ø±ÕÖ¸¶¨µÄ×ʲú¾ä±ú - ¡ð ½Ó¿Ú²ÎÊý - ¡ö fd - ´æ·Å×ʲú¾ä±ú - ¡ð ·µ»ØÖµ - ¡ö 0±íʾ³É¹¦£¬·Ç0±íʾʧ°Ü*/ -csi_error_t csi_close_asset(void* fd) -{ - unsigned char abySW[2]; - unsigned char i; - - - g_HSI2CBuf[0] = 0x00; - g_HSI2CBuf[1] = 0x07; - g_HSI2CBuf[2] = 0x80; - g_HSI2CBuf[3] = 0xA6; - g_HSI2CBuf[4] = 0x00; - g_HSI2CBuf[5] = 0x00; - g_HSI2CBuf[6] = 0x02; - g_HSI2CBuf[7] = (unsigned char)((unsigned int)fd / 256); - g_HSI2CBuf[8] = (unsigned int)fd % 256; - if(gHSEncTransSign == 0x01) - { - for(i=0; i<7; ++i) - { - g_HSI2CBuf[2+i] ^= g_TransTmpKey[i]; - } - } - - ComputeCRC(g_HSI2CBuf, 9, g_HSI2CBuf+9); - HS_IIC_Send_Cmd(g_HSI2CBuf, 11); - if(0 != HS_IIC_Recv_Resp(abySW, 0)) - { - return CSI_ERROR; - } - - return CSI_OK; -} - -/*¡ð ¹¦ÄÜÃèÊö - ¡ö È·ÈÏÖ¸¶¨µÄ×ʲúÊÇ·ñ¿É·ÃÎÊ - ¡ð ½Ó¿Ú²ÎÊý - ¡ö access-flag - ×ʲú·ÃÎʽá¹û±êʶ: ×ʲú´æÔÚÉèÖÃΪ1£¬×ʲú²»´æÔÚÉèÖÃΪ0 - ¡ö asset_name - ×ʲúÃû×Ö - ¡ð ·µ»ØÖµ - ¡ö 0±íʾ³É¹¦£¬·Ç0±íʾʧ°Ü*/ -csi_error_t csi_access_asset(uint32_t *access_flag, char asset_name[36]) -{ - unsigned char i; - unsigned char abyBuf[10]; - unsigned short j; - - for(i=0; i<36; ++i) - { - if(asset_name[i] == 0) - { - break; - } - } - if(i == 0) - { - return CSI_ERROR; - } - - g_HSI2CBuf[0] = 0x00; - g_HSI2CBuf[1] = i+5; - g_HSI2CBuf[2] = 0x80; - g_HSI2CBuf[3] = 0xA4; - g_HSI2CBuf[4] = 0x04; - g_HSI2CBuf[5] = 0x00; - g_HSI2CBuf[6] = i; - lmemcpy(g_HSI2CBuf+7, (unsigned char *)asset_name, i); - if(gHSEncTransSign == 0x01) - { - for(j=0; j 1024) - { - return CSI_ERROR; - } - - g_HSI2CBuf[0] = (unsigned char)((req_len+5) / 256); - g_HSI2CBuf[1] = (unsigned char)((req_len+5) % 256); - g_HSI2CBuf[2] = 0x80; - g_HSI2CBuf[3] = 0xC2; - g_HSI2CBuf[4] = 0x00; - g_HSI2CBuf[5] = (unsigned char)(req_len / 256); - g_HSI2CBuf[6] = (unsigned char)(req_len % 256); - lmemcpy(g_HSI2CBuf+7, (unsigned char *)req, req_len); - if(gHSEncTransSign == 0x01) - { - for(i=0; i 0x1000) - { - return CSI_ERROR; - } - IIC_Master_Receive(0xC9, g_HSI2CBuf, 1); - } - - IIC_Master_Receive(0xC9, g_HSI2CBuf, 256); - wRspLen = g_HSI2CBuf[0]; - wRspLen <<= 8; - wRspLen |= g_HSI2CBuf[1]; - - ComputeCRC(g_HSI2CBuf+2, wRspLen, crc); - if((g_HSI2CBuf[wRspLen+2] != crc[0]) || (g_HSI2CBuf[wRspLen+3] != crc[1])) - { - return CSI_ERROR; - } - - if(gHSEncTransSign == 0x01) - { - for(i=0; i 4096) + { + return CSI_ERROR; + } + if(data == 0) + { + return CSI_ERROR; + } + + //先根据fd选择文件 + g_HSI2CBuf[0] = 0x00; + g_HSI2CBuf[1] = 0x07; + g_HSI2CBuf[2] = 0x00; + g_HSI2CBuf[3] = 0xA4; + g_HSI2CBuf[4] = 0x00; + g_HSI2CBuf[5] = 0x00; + g_HSI2CBuf[6] = 0x02; + g_HSI2CBuf[7] = (unsigned char)((unsigned int)fd / 256); + g_HSI2CBuf[8] = (unsigned int)fd % 256; + + if(gHSEncTransSign == 0x01) + { + for(i=0; i<7; ++i) + { + g_HSI2CBuf[2+i] ^= g_TransTmpKey[i]; + } + } + + ComputeCRC(g_HSI2CBuf, 9, g_HSI2CBuf+9); + HS_IIC_Send_Cmd(g_HSI2CBuf, 11); + if(0 != HS_IIC_Recv_Resp(abyBuf, 2)) + { + return CSI_ERROR; + } + + if(data_len == 0) + { + return CSI_OK; + } + + dwBufOff = 0; + while(data_len > 1024) + { + g_HSI2CBuf[0] = 0x04; + g_HSI2CBuf[1] = 0x07; + g_HSI2CBuf[2] = 0x00; + g_HSI2CBuf[3] = 0xd6; + g_HSI2CBuf[4] = (unsigned char)(offset / 256); + g_HSI2CBuf[5] = (unsigned char)(offset % 256); + g_HSI2CBuf[6] = 0x00; + g_HSI2CBuf[7] = 0x04; + g_HSI2CBuf[8] = 0x00; + lmemcpy(g_HSI2CBuf+9, (unsigned char *)data + dwBufOff, 1024); + + if(gHSEncTransSign == 0x01) + { + for(i=0; i<1031; ++i) + { + g_HSI2CBuf[2+i] ^= g_TransTmpKey[i % 16]; + } + } + + ComputeCRC(g_HSI2CBuf, 1033, g_HSI2CBuf+1033); + HS_IIC_Send_Cmd(g_HSI2CBuf, 1035); + if(0 != HS_IIC_Recv_Resp(abyBuf, 0)) + { + return CSI_ERROR; + } + offset += 1024; + data_len -= 1024; + dwBufOff += 1024; + } + + g_HSI2CBuf[0] = (unsigned char)((data_len+7) / 256); + g_HSI2CBuf[1] = (unsigned char)((data_len+7) % 256); + g_HSI2CBuf[2] = 0x80; + g_HSI2CBuf[3] = 0xd6; + g_HSI2CBuf[4] = (unsigned char)(offset / 256); + g_HSI2CBuf[5] = (unsigned char)(offset % 256); + g_HSI2CBuf[6] = 0x00; + g_HSI2CBuf[7] = (unsigned char)(data_len / 256); + g_HSI2CBuf[8] = (unsigned char)(data_len % 256); + lmemcpy(g_HSI2CBuf+9, (unsigned char *)data + dwBufOff, data_len); + + if(gHSEncTransSign == 0x01) + { + for(i=0; i= wFileLen) + { + return CSI_ERROR; + } + + if(offset + *data_len > wFileLen) + { + *data_len = wFileLen - offset; + } + + dwOff = 0; + dwTmpLen = *data_len; + while(dwTmpLen > 1024) + { + g_HSI2CBuf[0] = 0x00; + g_HSI2CBuf[1] = 0x07; + g_HSI2CBuf[2] = 0x00; + g_HSI2CBuf[3] = 0xB0; + g_HSI2CBuf[4] = (unsigned char)(offset / 256); + g_HSI2CBuf[5] = (unsigned char)(offset % 256); + g_HSI2CBuf[6] = 0x00; + g_HSI2CBuf[7] = 0x04; + g_HSI2CBuf[8] = 0x00; + if(gHSEncTransSign == 0x01) + { + for(i=0; i<7; ++i) + { + g_HSI2CBuf[2+i] ^= g_TransTmpKey[i]; + } + } + + ComputeCRC(g_HSI2CBuf, 9, g_HSI2CBuf+9); + HS_IIC_Send_Cmd(g_HSI2CBuf, 11); + if(0 == HS_IIC_Recv_Resp((unsigned char *)buffer + dwOff, 1024)) + { + offset += 1024; + dwOff += 1024; + dwTmpLen -= 1024; + } + else + { + return CSI_ERROR; + } + } + + g_HSI2CBuf[0] = 0x00; + g_HSI2CBuf[1] = 0x07; + g_HSI2CBuf[2] = 0x00; + g_HSI2CBuf[3] = 0xB0; + g_HSI2CBuf[4] = (unsigned char)(offset / 256); + g_HSI2CBuf[5] = (unsigned char)(offset % 256); + g_HSI2CBuf[6] = 0x00; + g_HSI2CBuf[7] = (unsigned char)(dwTmpLen / 256); + g_HSI2CBuf[8] = (unsigned char)(dwTmpLen % 256); + if(gHSEncTransSign == 0x01) + { + for(i=0; i<7; ++i) + { + g_HSI2CBuf[2+i] ^= g_TransTmpKey[i]; + } + } + ComputeCRC(g_HSI2CBuf, 9, g_HSI2CBuf+9); + HS_IIC_Send_Cmd(g_HSI2CBuf, 11); + if(0 != HS_IIC_Recv_Resp((unsigned char *)buffer + dwOff, dwTmpLen)) + { + return CSI_ERROR; + } + + return CSI_OK; +} + +/*○ 功能描述 + ■ 关闭指定的资产句柄 + ○ 接口参数 + ■ fd - 存放资产句柄 + ○ 返回值 + ■ 0表示成功,非0表示失败*/ +csi_error_t csi_close_asset(void* fd) +{ + unsigned char abySW[2]; + unsigned char i; + + + g_HSI2CBuf[0] = 0x00; + g_HSI2CBuf[1] = 0x07; + g_HSI2CBuf[2] = 0x80; + g_HSI2CBuf[3] = 0xA6; + g_HSI2CBuf[4] = 0x00; + g_HSI2CBuf[5] = 0x00; + g_HSI2CBuf[6] = 0x02; + g_HSI2CBuf[7] = (unsigned char)((unsigned int)fd / 256); + g_HSI2CBuf[8] = (unsigned int)fd % 256; + if(gHSEncTransSign == 0x01) + { + for(i=0; i<7; ++i) + { + g_HSI2CBuf[2+i] ^= g_TransTmpKey[i]; + } + } + + ComputeCRC(g_HSI2CBuf, 9, g_HSI2CBuf+9); + HS_IIC_Send_Cmd(g_HSI2CBuf, 11); + if(0 != HS_IIC_Recv_Resp(abySW, 0)) + { + return CSI_ERROR; + } + + return CSI_OK; +} + +/*○ 功能描述 + ■ 确认指定的资产是否可访问 + ○ 接口参数 + ■ access-flag - 资产访问结果标识: 资产存在设置为1,资产不存在设置为0 + ■ asset_name - 资产名字 + ○ 返回值 + ■ 0表示成功,非0表示失败*/ +csi_error_t csi_access_asset(uint32_t *access_flag, char asset_name[36]) +{ + unsigned char i; + unsigned char abyBuf[10]; + unsigned short j; + + for(i=0; i<36; ++i) + { + if(asset_name[i] == 0) + { + break; + } + } + if(i == 0) + { + return CSI_ERROR; + } + + g_HSI2CBuf[0] = 0x00; + g_HSI2CBuf[1] = i+5; + g_HSI2CBuf[2] = 0x80; + g_HSI2CBuf[3] = 0xA4; + g_HSI2CBuf[4] = 0x04; + g_HSI2CBuf[5] = 0x00; + g_HSI2CBuf[6] = i; + lmemcpy(g_HSI2CBuf+7, (unsigned char *)asset_name, i); + if(gHSEncTransSign == 0x01) + { + for(j=0; j 1024) + { + return CSI_ERROR; + } + + g_HSI2CBuf[0] = (unsigned char)((req_len+5) / 256); + g_HSI2CBuf[1] = (unsigned char)((req_len+5) % 256); + g_HSI2CBuf[2] = 0x80; + g_HSI2CBuf[3] = 0xC2; + g_HSI2CBuf[4] = 0x00; + g_HSI2CBuf[5] = (unsigned char)(req_len / 256); + g_HSI2CBuf[6] = (unsigned char)(req_len % 256); + lmemcpy(g_HSI2CBuf+7, (unsigned char *)req, req_len); + if(gHSEncTransSign == 0x01) + { + for(i=0; i 0x1000) + { + return CSI_ERROR; + } + IIC_Master_Receive(0xC9, g_HSI2CBuf, 1); + } + + IIC_Master_Receive(0xC9, g_HSI2CBuf, 256); + wRspLen = g_HSI2CBuf[0]; + wRspLen <<= 8; + wRspLen |= g_HSI2CBuf[1]; + + ComputeCRC(g_HSI2CBuf+2, wRspLen, crc); + if((g_HSI2CBuf[wRspLen+2] != crc[0]) || (g_HSI2CBuf[wRspLen+3] != crc[1])) + { + return CSI_ERROR; + } + + if(gHSEncTransSign == 0x01) + { + for(i=0; i