alipay同步到0521patch

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBarCode.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBarCode.h
index 376e265..b58689a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBarCode.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBarCode.h
@@ -18,8 +18,8 @@
 namespace OHOS {\r
 class AlipayBarCode : public UIViewGroup {\r
 public:\r
-    AlipayBarCode(AlipayPresenter *presenter);\r
-    virtual ~AlipayBarCode();\r
+    explicit AlipayBarCode(AlipayPresenter *presenter);\r
+    ~AlipayBarCode() override;\r
     static AlipayBarCode *GetInstance();\r
     bool InitView();\r
     void AlipayRefreshBarcode(const char *refreshStr);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBind.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBind.h
index ef290e6..4c97b4c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBind.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBind.h
@@ -18,8 +18,8 @@
 namespace OHOS {\r
 class AlipayBind : public UIViewGroup {\r
 public:\r
-    AlipayBind(AlipayPresenter *presenter);\r
-    virtual ~AlipayBind();\r
+    explicit AlipayBind(AlipayPresenter *presenter);\r
+    ~AlipayBind() override;\r
     bool InitView();\r
 \r
 private:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindAni.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindAni.h
index d765f13..d2f4f45 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindAni.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindAni.h
@@ -20,8 +20,8 @@
 namespace OHOS {\r
 class AlipayBindAni : public UIViewGroup {\r
 public:\r
-    AlipayBindAni(AlipayPresenter *presenter);\r
-    virtual ~AlipayBindAni();\r
+    explicit AlipayBindAni(AlipayPresenter *presenter);\r
+    ~AlipayBindAni() override;\r
     bool InitView();\r
 \r
 private:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindRes.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindRes.h
index ce57975..431d2ce 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindRes.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindRes.h
@@ -17,8 +17,8 @@
 namespace OHOS {\r
 class AlipayBindRes : public UIViewGroup {\r
 public:\r
-    AlipayBindRes(AlipayPresenter *presenter);\r
-    virtual ~AlipayBindRes();\r
+    explicit AlipayBindRes(AlipayPresenter *presenter);\r
+    ~AlipayBindRes() override;\r
     bool InitView();\r
     void AlipayRefreshBindRes(void);\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayExitBind.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayExitBind.h
index bacd680..08a8627 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayExitBind.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayExitBind.h
@@ -17,8 +17,8 @@
 namespace OHOS {\r
 class AlipayExitBind : public UIViewGroup {\r
 public:\r
-    AlipayExitBind(AlipayPresenter *presenter);\r
-    virtual ~AlipayExitBind();\r
+    explicit AlipayExitBind(AlipayPresenter *presenter);\r
+    ~AlipayExitBind() override;\r
     bool InitView();\r
 \r
 private:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayHelp.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayHelp.h
index 6b16d87..d203fc8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayHelp.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayHelp.h
@@ -18,8 +18,8 @@
 namespace OHOS {\r
 class AlipayHelp : public UIViewGroup {\r
 public:\r
-    AlipayHelp(AlipayPresenter *presenter);\r
-    virtual ~AlipayHelp();\r
+    explicit AlipayHelp(AlipayPresenter *presenter);\r
+    ~AlipayHelp() override;\r
     bool InitView();\r
 \r
 private:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListAdapter.h
index 0d26748..fb37cd5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListAdapter.h
@@ -24,7 +24,7 @@ namespace OHOS {
 class AlipayListAdapter : public AbstractAdapter {
 public:
     explicit AlipayListAdapter();
-    virtual ~AlipayListAdapter();
+    ~AlipayListAdapter() override;
 
     /* *
      * @brief Sets the UIView adapter data, which is a AlipayListItem linked list.
@@ -42,11 +42,11 @@ public:
      * @since 1.0
      * @version 1.0
      */
-    virtual uint16_t GetCount(void) override;
+    uint16_t GetCount(void) override;
 
-    virtual UIView *GetView(UIView *inView, int16_t index) override;
+    UIView *GetView(UIView *inView, int16_t index) override;
 
-    virtual void AddListItem(const AlipayListItem &item);
+    void AddListItem(const AlipayListItem &item);
 
     void SetItemClickListener(UIView::OnClickListener *itemclicklistener)
     {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItemView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItemView.h
index c1a3730..02cd06f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItemView.h
@@ -21,13 +21,11 @@ namespace OHOS {
 class AlipayListItemView : public UIViewGroup {
 public:
     explicit AlipayListItemView();
-    virtual ~AlipayListItemView();
-    virtual void SetItemInfo(const AlipayListItem &itemInfo);
-    virtual void SetUpChild();
+    ~AlipayListItemView() override;
+    void SetItemInfo(const AlipayListItem &itemInfo);
+    void SetUpChild();
 
 private:
-    AlipayListItemView(const AlipayListItemView &);
-
     UIImageView sIcon;
     UILabel sLabel;
     UIImageView sNextImage;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h
index 3bb99b3..b4a3081 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h
@@ -19,7 +19,6 @@
 #include "components/icon_adapter.h"
 #include "AlipayPresenter.h"
 #include "AppViewIDs.h"
-#include "components/ui_label_ext.h"
 #include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "AlipayListAdapter.h"
@@ -29,8 +28,8 @@ namespace OHOS {
 class AlipayListAdapter;
 class AlipayList : public UIViewGroup {
 public:
-    AlipayList(AlipayPresenter *presenter);
-    virtual ~AlipayList();
+    explicit AlipayList(AlipayPresenter *presenter);
+    ~AlipayList() override;
     bool InitListView();
 
 private:

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayMainView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayMainView.h
index 6d68a39..f88514a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayMainView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayMainView.h
@@ -41,7 +41,7 @@ class AlipayMainView;
 class AlipayMainView : public View<AlipayPresenter> {\r
 public:\r
     AlipayMainView();\r
-    virtual ~AlipayMainView();\r
+    ~AlipayMainView() override;\r
     static AlipayMainView *GetInstance(void);\r
     void OnStart() override;\r
     void OnSetUpView() override;\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayModel.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayModel.h
index 4b8103c..4cf1d02 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayModel.h
@@ -91,9 +91,9 @@ public:
 \r
     void AlipayScreenControl(bool turnOnFlag);\r
 private:\r
-    osTimerId_t bindTimerId = NULL;\r
-    osTimerId_t switchTimerId = NULL;\r
-    osTimerId_t transTimerId = NULL;\r
+    osTimerId_t bindTimerId = nullptr;\r
+    osTimerId_t switchTimerId = nullptr;\r
+    osTimerId_t transTimerId = nullptr;\r
     int16 alipayInterLis;\r
     const alipay_svr_api_t *alipayApi;\r
     bool bindFlag_;\r
@@ -101,8 +101,8 @@ private:
     uint32_t refreshFlag_ = 0;\r
     uint32_t cardNum_ = 0;\r
     uint32_t cardSum_ = 0;\r
-    mc_alipay_trans_card_info_t *cardInfo_ = NULL;\r
-    uint8_t* transCode_ = NULL;\r
+    mc_alipay_trans_card_info_t *cardInfo_ = nullptr;\r
+    uint8_t* transCode_ = nullptr;\r
     uint32_t transCodeLen_;\r
     char cardTitle_[ALIPAY_TRANS_CARD_MEMBER_LEN];\r
 };\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPayCode.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPayCode.h
index 47ff86d..e6de83c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPayCode.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPayCode.h
@@ -18,8 +18,8 @@
 namespace OHOS {\r
 class AlipayPayCode : public UIViewGroup {\r
 public:\r
-    AlipayPayCode(AlipayPresenter *presenter);\r
-    virtual ~AlipayPayCode();\r
+    explicit AlipayPayCode(AlipayPresenter *presenter);\r
+    ~AlipayPayCode() override;\r
     static AlipayPayCode *GetInstance();\r
     bool InitView();\r
     void AlipayRefreshQrcode(const char *refreshStr);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPresenter.h
index 1dcce35..9690a02 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPresenter.h
@@ -108,7 +108,7 @@ class AlipayPresenter : public Presenter<AlipayMainView>,public RootView::OnKeyA
     public UIView::OnDragListener {\r
 public:\r
     AlipayPresenter();\r
-    virtual ~AlipayPresenter();\r
+    ~AlipayPresenter() override;\r
     void OnStart() override;\r
     void OnPause() override;\r
     void OnResume() override;\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayRefreshBindCode.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayRefreshBindCode.h
index 1ed10cb..04cd671 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayRefreshBindCode.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayRefreshBindCode.h
@@ -19,7 +19,7 @@ namespace OHOS {
 class AlipayRefreshBind : public UIViewGroup {\r
 public:\r
     AlipayRefreshBind();\r
-    virtual ~AlipayRefreshBind();\r
+    ~AlipayRefreshBind() override;\r
     bool InitView();\r
 \r
 private:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipaySetting.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipaySetting.h
index 3d52bad..a734661 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipaySetting.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipaySetting.h
@@ -18,8 +18,8 @@
 namespace OHOS {\r
 class AlipaySetting : public UIViewGroup {\r
 public:\r
-    AlipaySetting(AlipayPresenter *presenter);\r
-    virtual ~AlipaySetting();\r
+    explicit AlipaySetting(AlipayPresenter *presenter);\r
+    ~AlipaySetting() override;\r
     bool InitView();\r
 \r
 private:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayGetTransList.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayGetTransList.h
index ece8ce1..3353cbf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayGetTransList.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayGetTransList.h
@@ -17,8 +17,8 @@
 namespace OHOS {\r
 class AlipayGetTransList : public UIViewGroup {\r
 public:\r
-    AlipayGetTransList(AlipayPresenter *presenter);\r
-    virtual ~AlipayGetTransList();\r
+    explicit AlipayGetTransList(AlipayPresenter *presenter);\r
+    ~AlipayGetTransList() override;\r
     bool InitGetView(uint32_t index);\r
 private:\r
     AlipayPresenter *presenter_;\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransAni.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransAni.h
index 5cf44ed..a319b49 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransAni.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransAni.h
@@ -20,8 +20,8 @@
 namespace OHOS {\r
 class AlipayTransAni : public UIViewGroup {\r
 public:\r
-    AlipayTransAni(AlipayPresenter *presenter);\r
-    virtual ~AlipayTransAni();\r
+    explicit AlipayTransAni(AlipayPresenter *presenter);\r
+    ~AlipayTransAni() override;\r
     bool InitView();\r
 \r
 private:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransCode.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransCode.h
index 9a96b3f..87aee12 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransCode.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransCode.h
@@ -18,8 +18,8 @@
 namespace OHOS {\r
 class AlipayTransCode : public UIViewGroup {\r
 public:\r
-    AlipayTransCode(AlipayPresenter *presenter);\r
-    virtual ~AlipayTransCode();\r
+    explicit AlipayTransCode(AlipayPresenter *presenter);\r
+    ~AlipayTransCode() override;\r
     bool InitView();\r
 \r
 private:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransEnable.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransEnable.h
index d3db9aa..bfdb09e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransEnable.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransEnable.h
@@ -18,8 +18,8 @@
 namespace OHOS {\r
 class AlipayTransEnable : public UIViewGroup {\r
 public:\r
-    AlipayTransEnable(AlipayPresenter *presenter);\r
-    virtual ~AlipayTransEnable();\r
+    explicit AlipayTransEnable(AlipayPresenter *presenter);\r
+    ~AlipayTransEnable() override;\r
     bool InitView();\r
 \r
 private:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListAdapter.h
index ca81b10..8c3611d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListAdapter.h
@@ -24,7 +24,7 @@ namespace OHOS {
 class AlipayTransListAdapter : public AbstractAdapter {
 public:
     explicit AlipayTransListAdapter();
-    virtual ~AlipayTransListAdapter();
+    ~AlipayTransListAdapter() override;
 
     /* *
      * @brief Sets the UIView adapter data, which is a AlipayTransListItem linked list.
@@ -42,11 +42,11 @@ public:
      * @since 1.0
      * @version 1.0
      */
-    virtual uint16_t GetCount(void) override;
+    uint16_t GetCount(void) override;
 
-    virtual UIView *GetView(UIView *inView, int16_t index) override;
+    UIView *GetView(UIView *inView, int16_t index) override;
 
-    virtual void AddListItem(const AlipayTransListItem &item);
+    void AddListItem(const AlipayTransListItem &item);
 
     void SetItemClickListener(UIView::OnClickListener *itemclicklistener)
     {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h
index 1c96396..181f48b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h
@@ -21,14 +21,12 @@ namespace OHOS {
 class AlipayTransListItemView : public UIViewGroup {
 public:
     explicit AlipayTransListItemView();
-    virtual ~AlipayTransListItemView();
-    virtual void SetItemInfo(const AlipayTransListItem &itemInfo);
-    virtual void SetUpChild();
+    ~AlipayTransListItemView() override;
+    void SetItemInfo(const AlipayTransListItem &itemInfo);
+    void SetUpChild();
     uint8_t GetAlipayTransListIndex();
 
 private:
-    AlipayTransListItemView(const AlipayTransListItemView &);
-
     UILabel sLabel;
     UIImageView sNextImage;
     AlipayTransListItem sItemInfo;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h
index b54cc8a..ff2e9e2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h
@@ -20,7 +20,6 @@
 #include "components/icon_adapter.h"
 #include "AlipayPresenter.h"
 #include "AppViewIDs.h"
-#include "components/ui_label_ext.h"
 #include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "AlipayTransListAdapter.h"
@@ -34,8 +33,8 @@ static const uint8_t ALIPAY_TRANS_LIST_ITEM_LEN = 20;
 class AlipayTransListAdapter;
 class AlipayTransList : public UIViewGroup {
 public:
-    AlipayTransList(AlipayPresenter *presenter);
-    virtual ~AlipayTransList();
+    explicit AlipayTransList(AlipayPresenter *presenter);
+    ~AlipayTransList() override;
     bool InitListView();
     void AlipayTransListUpdate();
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransRes.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransRes.h
index 7650b2a..d66184c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransRes.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransRes.h
@@ -17,8 +17,8 @@
 namespace OHOS {\r
 class AlipayTransRes : public UIViewGroup {\r
 public:\r
-    AlipayTransRes(AlipayPresenter *presenter);\r
-    virtual ~AlipayTransRes();\r
+    explicit AlipayTransRes(AlipayPresenter *presenter);\r
+    ~AlipayTransRes() override;\r
     bool InitResView(uint32_t index);\r
     void AlipayTransRefreshRes(void);\r
 private:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransTips.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransTips.h
index 85a707a..af903d2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransTips.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransTips.h
@@ -17,8 +17,8 @@
 namespace OHOS {\r
 class AlipayTransTips : public UIViewGroup {\r
 public:\r
-    AlipayTransTips(AlipayPresenter *presenter);\r
-    virtual ~AlipayTransTips();\r
+    explicit AlipayTransTips(AlipayPresenter *presenter);\r
+    ~AlipayTransTips() override;\r
     bool InitTipsView(uint32_t index);\r
     void AlipayTransRefreshTips(void);\r
 private:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbind.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbind.h
index 24bb884..8c15146 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbind.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbind.h
@@ -17,8 +17,8 @@
 namespace OHOS {\r
 class AlipayUnbind : public UIViewGroup {\r
 public:\r
-    AlipayUnbind(AlipayPresenter *presenter);\r
-    virtual ~AlipayUnbind();\r
+    explicit AlipayUnbind(AlipayPresenter *presenter);\r
+    ~AlipayUnbind() override;\r
     bool InitView();\r
 \r
 private:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbindFinish.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbindFinish.h
index d265880..488ecee 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbindFinish.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbindFinish.h
@@ -18,8 +18,8 @@
 namespace OHOS {\r
 class AlipayUnbindFinish : public UIViewGroup {\r
 public:\r
-    AlipayUnbindFinish(AlipayPresenter *presenter);\r
-    virtual ~AlipayUnbindFinish();\r
+    explicit AlipayUnbindFinish(AlipayPresenter *presenter);\r
+    ~AlipayUnbindFinish() override;\r
     bool InitView();\r
 \r
 private:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBarCode.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBarCode.cpp
index c5740ed..5e8723d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBarCode.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBarCode.cpp
@@ -231,21 +231,21 @@ bool AlipayBarCode::InitView()
     SetStyle(STYLE_BACKGROUND_COLOR, 0xff1677ff);\r
     SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
 \r
-    if (AlipayInitLabel() == false) {\r
+    if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBarCode::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
-    if (AlipayInitButton() == false) {\r
+    if (!AlipayInitButton()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBarCode::InitView AlipayInitButton() false");\r
         return false;\r
     }\r
 \r
-    if (AlipayInitBarcode() == false) {\r
+    if (!AlipayInitBarcode()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBarCode::InitView AlipayInitQrcode() false");\r
         return false;\r
     }\r
 \r
-    if (AlipayInitImage() == false) {\r
+    if (!AlipayInitImage()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBarCode::InitView AlipayInitImage() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBind.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBind.cpp
index 6b1e558..7809495 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBind.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBind.cpp
@@ -101,12 +101,12 @@ bool AlipayBind::InitView()
     SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
     SetStyle(STYLE_BACKGROUND_COLOR, Color::White().full);\r
 \r
-    if (AlipayInitLabel() == false) {\r
+    if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBind::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
 \r
-    if (AlipayInitImage() == false) {\r
+    if (!AlipayInitImage()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBind::InitView AlipayInitImage() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindAni.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindAni.cpp
index c3f7390..4574cb9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindAni.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindAni.cpp
@@ -116,11 +116,11 @@ bool AlipayBindAni::InitView()
     SetTouchable(true);\r
     SetOnDragListener(presenter_);\r
     SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    if (AlipayInitLabel() == false) {\r
+    if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindAni::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
-    if (AlipayInitImageAni() == false) {\r
+    if (!AlipayInitImageAni()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindAni::InitView AlipayInitImageAni() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindRes.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindRes.cpp
index 9a6bd4c..0a33198 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindRes.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindRes.cpp
@@ -118,11 +118,11 @@ bool AlipayBindRes::InitView()
     SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
 \r
     const char *resStr = EXIT_LABEL_TEXT_SEC;\r
-    if (AlipayInitLabel(resStr) == false) {\r
+    if (!AlipayInitLabel(resStr)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindRes::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
-    if (AlipayInitImage(PNG_ALIPAY_BIND_SUCCESS) == false) {\r
+    if (!AlipayInitImage(PNG_ALIPAY_BIND_SUCCESS)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindRes::InitView AlipayInitImage() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayExitBind.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayExitBind.cpp
index 08944b8..edf88e3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayExitBind.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayExitBind.cpp
@@ -131,14 +131,14 @@ bool AlipayExitBind::InitSimilarButton(int16 num, int16 alipayX, int16 alipayY,
 \r
 bool AlipayExitBind::AlipayInitButton()\r
 {\r
-    if (InitSimilarButton(ALIPAY_SET_ZERO, EXIT_BUTTON_EXIT_X, EXIT_BUTTON_EXIT_Y, EXIT_BUTTON_TEXT_FIRST,\r
-        ALIPAY_INTER_EXIT) == false) {\r
+    if (!InitSimilarButton(ALIPAY_SET_ZERO, EXIT_BUTTON_EXIT_X, EXIT_BUTTON_EXIT_Y, EXIT_BUTTON_TEXT_FIRST,\r
+        ALIPAY_INTER_EXIT)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
             "AlipayExitBind::AlipayInitButton new alipayButton[ALIPAY_SET_ZERO] fail");\r
         return false;\r
     }\r
-    if (InitSimilarButton(ALIPAY_SET_ONE, EXIT_BUTTON_BIND_X, EXIT_BUTTON_BIND_Y, EXIT_BUTTON_TEXT_SECOND,\r
-        ALIPAY_BIND_CONTINUE) == false) {\r
+    if (!InitSimilarButton(ALIPAY_SET_ONE, EXIT_BUTTON_BIND_X, EXIT_BUTTON_BIND_Y, EXIT_BUTTON_TEXT_SECOND,\r
+        ALIPAY_BIND_CONTINUE)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
             "AlipayExitBind::AlipayInitButton new alipayButton[ALIPAY_SET_ONE] fail");\r
         return false;\r
@@ -154,11 +154,11 @@ bool AlipayExitBind::InitView()
     SetOnDragListener(presenter_);\r
     SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
 \r
-    if (AlipayInitLabel() == false) {\r
+    if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayExitBind::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
-    if (AlipayInitButton() == false) {\r
+    if (!AlipayInitButton()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayExitBind::InitView AlipayInitButton() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayHelp.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayHelp.cpp
index aec899f..7914369 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayHelp.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayHelp.cpp
@@ -101,12 +101,12 @@ bool AlipayHelp::InitView()
     SetStyle(STYLE_BACKGROUND_COLOR, 0xff1677ff);\r
     SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
 \r
-    if (AlipayInitLabel() == false) {\r
+    if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayHelp::InitView AlipayInitImage() false");\r
         return false;\r
     }\r
     \r
-    if (AlipayInitImage() == false) {\r
+    if (!AlipayInitImage()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayHelp::InitView AlipayInitImage() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListView.cpp
index c1f508b..0a2f65f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListView.cpp
@@ -91,7 +91,7 @@ bool AlipayList::InitListView()
     SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
     SetStyle(STYLE_BACKGROUND_OPA, UN_OPACITY);
 
-    if (AlipayInitList() == false) {
+    if (!AlipayInitList()) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayList::InitView AlipayInitList() false");
         return false;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayMainView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayMainView.cpp
index 25e3d5c..0f20340 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayMainView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayMainView.cpp
@@ -83,8 +83,11 @@ void AlipayMainView::OnStart()
     group = container[startView];\r
     alipayWhichInter = startView;\r
 \r
-    RootView::GetInstance()->Add(container[startView]);\r
-\r
+    if (group == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::OnSetUpView group null error!");\r
+        return;\r
+    }\r
+    container_ = group;\r
     return;\r
 }\r
 \r
@@ -92,15 +95,6 @@ void AlipayMainView::OnSetUpView()
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayMainView::OnSetUpView");\r
     View<AlipayPresenter>::OnSetUpView();\r
-\r
-    if (group == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::OnSetUpView group null error!");\r
-        return;\r
-    }\r
-\r
-    RootView::GetInstance()->Add(group);\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RootView::GetInstance()->Add");\r
-\r
     // show timerView\r
     Draw();\r
 }\r
@@ -117,12 +111,6 @@ void AlipayMainView::OnStop()
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayMainView::OnStop");\r
     View<AlipayPresenter>::OnStop();\r
-    if (container_ != nullptr) {\r
-        container_->RemoveAll();\r
-        delete container_;\r
-        container_ = nullptr;\r
-    }\r
-    group->RemoveAll();\r
     RootView::GetInstance()->ClearOnKeyActListener();\r
     RootView::GetInstance()->RemoveAll();\r
     return;\r
@@ -283,7 +271,7 @@ bool AlipayMainView::ChangePayView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangePayView alipayPayCode null error!");\r
             return false;\r
         }\r
-        if (alipayPayCode->InitView() == false) {\r
+        if (!alipayPayCode->InitView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangePayView  InitView null error!");\r
             return false;\r
         }\r
@@ -310,7 +298,7 @@ bool AlipayMainView::ChangeSettingView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeSettingView alipayPayCode null error!");\r
             return false;\r
         }\r
-        if (alipaySetting->InitView() == false) {\r
+        if (!alipaySetting->InitView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeSettingView  InitView null error!");\r
             return false;\r
         }\r
@@ -333,7 +321,7 @@ bool AlipayMainView::ChangeHelpView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeHelpView alipayHelp null error!");\r
             return false;\r
         }\r
-        if (alipayHelp->InitView() == false) {\r
+        if (!alipayHelp->InitView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeHelpView  InitView null error!");\r
             return false;\r
         }\r
@@ -356,7 +344,7 @@ bool AlipayMainView::ChangeBindAniView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeBindAniView alipayBindAni null error!");\r
             return false;\r
         }\r
-        if (alipayBindAni->InitView() == false) {\r
+        if (!alipayBindAni->InitView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeBindAniView  InitView null error!");\r
             return false;\r
         }\r
@@ -379,7 +367,7 @@ bool AlipayMainView::ChangeBindExitView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeBindExitView alipayExitBind null error!");\r
             return false;\r
         }\r
-        if (alipayExitBind->InitView() == false) {\r
+        if (!alipayExitBind->InitView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeBindExitView  InitView null error!");\r
             return false;\r
         }\r
@@ -402,7 +390,7 @@ bool AlipayMainView::ChangeBindResView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeBindResView alipayBindRes null error!");\r
             return false;\r
         }\r
-        if (alipayBindRes->InitView() == false) {\r
+        if (!alipayBindRes->InitView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeBindResView  InitView null error!");\r
             return false;\r
         }\r
@@ -432,7 +420,7 @@ bool AlipayMainView::ChangeUnbindView(int16 thisView)
                 "AlipayMainView::ChangeUnbindView alipayExitBindSetting null error!");\r
             return false;\r
         }\r
-        if (alipayExitBindSetting->InitView() == false) {\r
+        if (!alipayExitBindSetting->InitView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeUnbindView  InitView null error!");\r
             return false;\r
         }\r
@@ -457,7 +445,7 @@ bool AlipayMainView::ChangeUnbindFinishView(int16 thisView)
                 "AlipayMainView::ChangeUnbindFinishView alipayUnbindFinish null error!");\r
             return false;\r
         }\r
-        if (alipayUnbindFinish->InitView() == false) {\r
+        if (!alipayUnbindFinish->InitView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeUnbindFinishView  InitView null error!");\r
             return false;\r
         }\r
@@ -481,7 +469,7 @@ bool AlipayMainView::ChangeBindView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeBindView alipayBind null error!");\r
             return false;\r
         }\r
-        if (alipayBind->InitView() == false) {\r
+        if (!alipayBind->InitView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeBindView  InitView null error!");\r
             return false;\r
         }\r
@@ -504,7 +492,7 @@ bool AlipayMainView::ChangeTransView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeTransView alipayTransCode null error!");\r
             return false;\r
         }\r
-        if (alipayTransCode->InitView() == false) {\r
+        if (!alipayTransCode->InitView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeTransView  InitView null error!");\r
             return false;\r
         }\r
@@ -527,7 +515,7 @@ bool AlipayMainView::ChangeTransListView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeTransListView alipayTransList null error!");\r
             return false;\r
         }\r
-        if (alipayTransList->InitListView() == false) {\r
+        if (!alipayTransList->InitListView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeTransListView  InitView null error!");\r
             return false;\r
         }\r
@@ -551,7 +539,7 @@ bool AlipayMainView::ChangeTransEnableView(int16 thisView)
                 "AlipayMainView::ChangeTransEnableView alipayTransEnable null error!");\r
             return false;\r
         }\r
-        if (alipayTransEnable->InitView() == false) {\r
+        if (!alipayTransEnable->InitView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeTransEnableView  InitView null error!");\r
             return false;\r
         }\r
@@ -574,7 +562,7 @@ bool AlipayMainView::ChangeTransTipsView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeTransTipsView alipayTransTips null error!");\r
             return false;\r
         }\r
-        if (alipayTransTips->InitTipsView(presenter_->AlipayGetSwitchIndex()) == false) {\r
+        if (!alipayTransTips->InitTipsView(presenter_->AlipayGetSwitchIndex())) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeTransTipsView  InitView null error!");\r
             return false;\r
         }\r
@@ -597,7 +585,7 @@ bool AlipayMainView::ChangeTransResView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeTransResView alipayTransRes null error!");\r
             return false;\r
         }\r
-        if (alipayTransRes->InitResView(presenter_->AlipayGetSwitchIndex()) == false) {\r
+        if (!alipayTransRes->InitResView(presenter_->AlipayGetSwitchIndex())) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeTransResView  InitView null error!");\r
             return false;\r
         }\r
@@ -621,7 +609,7 @@ bool AlipayMainView::ChangeGetTransListView(int16 thisView)
                 "AlipayMainView::ChangeGetTransListView alipayGetTransList null error!");\r
             return false;\r
         }\r
-        if (alipayGetTransList->InitGetView(presenter_->AlipayGetSwitchIndex()) == false) {\r
+        if (!alipayGetTransList->InitGetView(presenter_->AlipayGetSwitchIndex())) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeGetTransListView  InitView null error!");\r
             return false;\r
         }\r
@@ -644,7 +632,7 @@ bool AlipayMainView::ChangeTransAniView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeTransProcessView alipayTransAni null error!");\r
             return false;\r
         }\r
-        if (alipayTransAni->InitView() == false) {\r
+        if (!alipayTransAni->InitView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeTransProcessView  InitView null error!");\r
             return false;\r
         }\r
@@ -668,7 +656,7 @@ bool AlipayMainView::ChangeBarCodeView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeBarView alipayPayCode null error!");\r
             return false;\r
         }\r
-        if (alipayBarCode->InitView() == false) {\r
+        if (!alipayBarCode->InitView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeBarView  InitView null error!");\r
             return false;\r
         }\r
@@ -695,7 +683,7 @@ bool AlipayMainView::ChangeListView(int16 thisView)
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeListView alipayList null error!");\r
             return false;\r
         }\r
-        if (alipayList->InitListView() == false) {\r
+        if (!alipayList->InitListView()) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeListView  InitView null error!");\r
             return false;\r
         }\r
@@ -742,7 +730,7 @@ bool AlipayMainView::ClickFunc(int16 interface)
     for (int i = 0; i < funcSize; i++) {\r
         if (interface == ViewMapper[i].viewId) {\r
             bool jug = (this->*(ViewMapper[i].func))(interface);\r
-            if (jug == false) {\r
+            if (!jug) {\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: ChangeInterFace[%d] false", interface);\r
                 return false;\r
             }\r
@@ -758,6 +746,7 @@ static const int16 DestroyMapper[] = {
     ALIPAY_GET_TRANS_LIST_VIEW,\r
     ALIPAY_TRANS_VIEW,\r
     ALIPAY_TRANS_LIST_VIEW,\r
+    ALIPAY_SETTING_VIEW,\r
 };\r
 \r
 void AlipayMainView::DestroyTempView(int16 hideView)\r
@@ -785,6 +774,9 @@ void AlipayMainView::DestroyTempView(int16 hideView)
     } else if (hideView == ALIPAY_TRANS_LIST_VIEW) {\r
         delete alipayTransList;\r
         alipayTransList = nullptr;\r
+    } else if (hideView == ALIPAY_SETTING_VIEW) {\r
+        delete alipaySetting;\r
+        alipaySetting = nullptr;\r
     }\r
 }\r
 \r
@@ -802,7 +794,7 @@ void AlipayMainView::ChangeView(int16 hideView, int16 showView)
         return;\r
     }\r
     interListen = hideView;\r
-    if (ClickFunc(showView) == false) {\r
+    if (!ClickFunc(showView)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::ChangeView ClickFunc error");\r
         return;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp
index 3b83d60..8fac4ef 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp
@@ -82,9 +82,9 @@ void AlipayBindTimerCallBack(void *argument)
 \r
 bool AlipayModel::AlipayStartBind(void)\r
 {\r
-    if (bindTimerId == NULL) {\r
-        bindTimerId = osTimerNew(AlipayBindTimerCallBack, osTimerPeriodic, (void *)0, NULL);\r
-        if (bindTimerId == NULL) {\r
+    if (bindTimerId == nullptr) {\r
+        bindTimerId = osTimerNew(AlipayBindTimerCallBack, osTimerPeriodic, (void *)0, nullptr);\r
+        if (bindTimerId == nullptr) {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayStartBind Create timer fail.");\r
             return false;\r
         }\r
@@ -111,10 +111,10 @@ void AlipaySwitchTimerCallBackProc(void *argument)
     }\r
     int16 alipayLis = AlipayModel::GetInstance()->GetAlipayInterLis();\r
     int16 bindState = AlipayModel::GetInstance()->AlipayGetBindFlag();\r
-    if (alipayLis == ALIPAY_BIND_RES_VIEW && bindState == true) {\r
+    if (alipayLis == ALIPAY_BIND_RES_VIEW && bindState) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ALIPAY_BIND_RES_VIEW bindState true in.");\r
         AlipayMainView::GetInstance()->ChangeView(ALIPAY_BIND_RES_VIEW, ALIPAY_LIST_VIEW);\r
-    } else if (alipayLis == ALIPAY_BIND_RES_VIEW && bindState == false) {\r
+    } else if (alipayLis == ALIPAY_BIND_RES_VIEW && (!bindState)) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ALIPAY_BIND_RES_VIEW bindState false in.");\r
         AlipayMainView::GetInstance()->ChangeView(ALIPAY_BIND_RES_VIEW, ALIPAY_BIND_VIEW);\r
     } else if (alipayLis == ALIPAY_PAY_VIEW) {\r
@@ -146,9 +146,9 @@ void AlipaySwitchTimerCallBack(void *argument)
 \r
 bool AlipayModel::AlipayStartSwitchTimer(uint16_t time)\r
 {\r
-    if (switchTimerId == NULL) {\r
-        switchTimerId = osTimerNew(AlipaySwitchTimerCallBack, osTimerOnce, (void *)0, NULL);\r
-        if (switchTimerId == NULL) {\r
+    if (switchTimerId == nullptr) {\r
+        switchTimerId = osTimerNew(AlipaySwitchTimerCallBack, osTimerOnce, (void *)0, nullptr);\r
+        if (switchTimerId == nullptr) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayStartSwitchTimer Create timer fail.");\r
             return false;\r
         }\r
@@ -167,7 +167,7 @@ bool AlipayModel::AlipayStartSwitchTimer(uint16_t time)
 void AlipayModel::AlipayStopSwitchTimer()\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayStopSwitchTimer stop timer.");\r
-    if (switchTimerId != NULL) {\r
+    if (switchTimerId != nullptr) {\r
         osTimerStop(switchTimerId);\r
     }\r
     return;\r
@@ -228,7 +228,7 @@ void AlipayModel::AlipayUnbind(void)
 \r
 void AlipayModel::AlipayStopBindTimer(void)\r
 {\r
-    if (bindTimerId == NULL) {\r
+    if (bindTimerId == nullptr) {\r
         return;\r
     }\r
     int32_t ret = osTimerStop(bindTimerId);\r
@@ -273,10 +273,10 @@ int32_t AlipayModel::AlipayGetLocalTranslist()
 int32_t AlipayModel::AlipayGetOnlineTranslist()\r
 {\r
     cardInfo_ = AlipayTransGetCardList();\r
-    mc_alipay_trans_card_info_t *onLineList = NULL;\r
+    mc_alipay_trans_card_info_t *onLineList = nullptr;\r
 \r
     onLineList = (mc_alipay_trans_card_info_t *)malloc(sizeof(mc_alipay_trans_card_info_t) * ALIPAY_TRANS_CARD_MAX_LENGTH);\r
-    if (onLineList == NULL) {\r
+    if (onLineList == nullptr) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayGetOnlineTranslist alloc fail.");\r
         return -1;\r
     }\r
@@ -295,7 +295,7 @@ int32_t AlipayModel::AlipayGetOnlineTranslist()
         cardSum_ = onLineNum;\r
     }\r
     free(onLineList);\r
-    onLineList = NULL;\r
+    onLineList = nullptr;\r
     return ret;\r
 }\r
 \r
@@ -311,7 +311,7 @@ int32_t AlipayModel::AlipayCheckTransCard(uint32_t index)
     mc_alipay_tans_card_status_t cardStatus = { 0 };\r
     int32_t ret = alipayApi->check_trans_cartstatus(&cardInfo_[index], &cardStatus);\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayCheckTransCard in:%u.", ret);\r
-    if (cardStatus.card_exits == true && cardStatus.remain_use_count >= ALIPAY_TRANS_CARD_MIN_VALID_NUM) {\r
+    if (cardStatus.card_exits && cardStatus.remain_use_count >= ALIPAY_TRANS_CARD_MIN_VALID_NUM) {\r
         return 0;\r
     }\r
     return -1;\r
@@ -362,9 +362,9 @@ void AlipayTransGetListsTimerCallBack(void *argument)
 \r
 bool AlipayModel::AlipayTransStartGetListsTimer(void)\r
 {\r
-    if (transTimerId == NULL) {\r
-        transTimerId = osTimerNew(AlipayTransGetListsTimerCallBack, osTimerPeriodic, (void *)0, NULL);\r
-        if (transTimerId == NULL) {\r
+    if (transTimerId == nullptr) {\r
+        transTimerId = osTimerNew(AlipayTransGetListsTimerCallBack, osTimerPeriodic, (void *)0, nullptr);\r
+        if (transTimerId == nullptr) {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayTransStartGetLists Create timer fail.");\r
             return false;\r
         }\r
@@ -379,7 +379,7 @@ bool AlipayModel::AlipayTransStartGetListsTimer(void)
 }\r
 void AlipayModel::AlipayTransStopGetListsTimer(void)\r
 {\r
-    if (transTimerId == NULL) {\r
+    if (transTimerId == nullptr) {\r
         return;\r
     }\r
     int32_t ret = osTimerStop(transTimerId);\r
@@ -482,7 +482,7 @@ int32_t AlipayModel::AlipayTransGetCardNum(void)
 bool AlipayModel::AlipayInitModel(void)\r
 {\r
     transCode_ = (uint8_t *)malloc(ALIPAY_TRANS_CODE_MAX_LEN);\r
-    if (transCode_ == NULL) {\r
+    if (transCode_ == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayInitModel transCode_ alloc failure.");\r
         return false;\r
     }\r
@@ -499,9 +499,9 @@ bool AlipayModel::AlipayInitModel(void)
 void AlipayModel::AlipayDeinitModel(void)\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayDeinitModel in.");\r
-    if (transCode_ != NULL) {\r
+    if (transCode_ != nullptr) {\r
         free(transCode_);\r
-        transCode_ = NULL;\r
+        transCode_ = nullptr;\r
     }\r
     svr_alipay_deinit_trans_context();\r
     return;\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPayCode.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPayCode.cpp
index ad73a51..79e738f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPayCode.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPayCode.cpp
@@ -206,20 +206,20 @@ bool AlipayPayCode::InitView()
     SetStyle(STYLE_BACKGROUND_COLOR, 0xff1677ff);\r
     SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
 \r
-    if (AlipayInitLabel() == false) {\r
+    if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPayCode::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
-    if (AlipayInitImage() == false) {\r
+    if (!AlipayInitImage()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPayCode::InitView AlipayInitImage() false");\r
         return false;\r
     }\r
 \r
-    if (AlipayInitQrcode() == false) {\r
+    if (!AlipayInitQrcode()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPayCode::InitView AlipayInitQrcode() false");\r
         return false;\r
     }\r
-    if (AlipayInitButton() == false) {\r
+    if (!AlipayInitButton()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPayCode::InitView AlipayInitButton() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp
index 1f06248..e530e1c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp
@@ -57,7 +57,7 @@ void AlipayPresenter::OnStart()
     /* -------------------------------------------------------------------------- */\r
 \r
     alipayMode_->AlipayExitLpm();\r
-    if (alipayMode_->AlipayInitModel() == false) {\r
+    if (!alipayMode_->AlipayInitModel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::OnStart AlipayInitModel fail.");\r
         NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);\r
         return;\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp
index 4b2527b..c889eff 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp
@@ -154,11 +154,11 @@ bool AlipaySetting::InitView()
     SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
     SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);\r
 \r
-    if (AlipayInitLabel() == false) {\r
+    if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipaySetting::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
-    if (AlipayInitButton() == false) {\r
+    if (!AlipayInitButton()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipaySetting::InitView AlipayInitButton() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayGetTransList.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayGetTransList.cpp
index 5776b78..0bdadd0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayGetTransList.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayGetTransList.cpp
@@ -129,14 +129,14 @@ bool AlipayGetTransList::InitSimilarButton(int16 num, int16 alipayX, int16 alipa
 \r
 bool AlipayGetTransList::AlipayInitButton(uint32_t index)\r
 {\r
-    if (InitSimilarButton(ALIPAY_SET_ZERO, EXIT_BUTTON_EXIT_X, EXIT_BUTTON_EXIT_Y,\r
-        g_AlipayTransGetListMapper[index].label_left, g_AlipayTransGetListMapper[index].button_left) == false) {\r
+    if (!InitSimilarButton(ALIPAY_SET_ZERO, EXIT_BUTTON_EXIT_X, EXIT_BUTTON_EXIT_Y,\r
+        g_AlipayTransGetListMapper[index].label_left, g_AlipayTransGetListMapper[index].button_left)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
             "AlipayGetTransList::AlipayInitButton new alipayButton[ALIPAY_SET_ZERO] fail");\r
         return false;\r
     }\r
-    if (InitSimilarButton(ALIPAY_SET_ONE, EXIT_BUTTON_BIND_X, EXIT_BUTTON_BIND_Y,\r
-        g_AlipayTransGetListMapper[index].label_right, g_AlipayTransGetListMapper[index].button_right) == false) {\r
+    if (!InitSimilarButton(ALIPAY_SET_ONE, EXIT_BUTTON_BIND_X, EXIT_BUTTON_BIND_Y,\r
+        g_AlipayTransGetListMapper[index].label_right, g_AlipayTransGetListMapper[index].button_right)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
             "AlipayGetTransList::AlipayInitButton new alipayButton[ALIPAY_SET_ONE] fail");\r
         return false;\r
@@ -153,11 +153,11 @@ bool AlipayGetTransList::InitGetView(uint32_t index)
     SetOnDragListener(presenter_);\r
     SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
 \r
-    if (AlipayInitLabel(index) == false) {\r
+    if (!AlipayInitLabel(index)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayGetTransList::InitView AlipayInitLabel false");\r
         return false;\r
     }\r
-    if (AlipayInitButton(index) == false) {\r
+    if (!AlipayInitButton(index)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayGetTransList::InitView AlipayInitButton false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransAni.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransAni.cpp
index cb34a59..37adb66 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransAni.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransAni.cpp
@@ -122,11 +122,11 @@ bool AlipayTransAni::InitView()
     SetOnDragListener(presenter_);\r
     SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
 \r
-    if (AlipayInitLabel() == false) {\r
+    if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransAni::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
-    if (AlipayInitImageAni() == false) {\r
+    if (!AlipayInitImageAni()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransAni::InitView AlipayInitImageAni() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp
index 784472d..2f04595 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp
@@ -121,16 +121,16 @@ bool AlipayTransCode::InitView()
     SetStyle(STYLE_BACKGROUND_COLOR, 0xff1677ff);\r
     SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
 \r
-    if (AlipayInitLabel() == false) {\r
+    if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransCode::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
 \r
-    if (AlipayInitQrcode() == false) {\r
+    if (!AlipayInitQrcode()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransCode::InitView AlipayInitQrcode() false");\r
         return false;\r
     }\r
-    if (AlipayInitButton() == false) {\r
+    if (!AlipayInitButton()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransCode::InitView AlipayInitButton() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransEnable.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransEnable.cpp
index 967d616..8b42995 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransEnable.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransEnable.cpp
@@ -111,12 +111,12 @@ bool AlipayTransEnable::InitView()
     SetStyle(STYLE_BACKGROUND_COLOR, 0xff1677ff);\r
     SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
 \r
-    if (AlipayInitLabel() == false) {\r
+    if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransEnable::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
 \r
-    if (AlipayInitQrcode() == false) {\r
+    if (!AlipayInitQrcode()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransEnable::InitView AlipayInitQrcode() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransListView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransListView.cpp
index bab3370..b777521 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransListView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransListView.cpp
@@ -126,12 +126,12 @@ bool AlipayTransList::InitListView()
     SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
     SetStyle(STYLE_BACKGROUND_OPA, UN_OPACITY);
 
-    if (AlipayInitList() == false) {
+    if (!AlipayInitList()) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransList::InitView AlipayInitList() false");
         return false;
     }
 
-    if (AlipayInitButton() == false) {
+    if (!AlipayInitButton()) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransList::InitView AlipayInitButton() false");
         return false;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransRes.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransRes.cpp
index e0fed12..c7b5558 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransRes.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransRes.cpp
@@ -178,16 +178,16 @@ bool AlipayTransRes::InitResView(uint32_t index)
     SetOnDragListener(presenter_);\r
     SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
 \r
-    if (AlipayInitLabel(g_AlipayTransResMapper[index].str) == false) {\r
+    if (!AlipayInitLabel(g_AlipayTransResMapper[index].str)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransRes::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
-    if (AlipayInitImage(PNG_ALIPAY_BIND_FAILURE) == false) {\r
+    if (!AlipayInitImage(PNG_ALIPAY_BIND_FAILURE)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransRes::InitView AlipayInitImage() false");\r
         return false;\r
     }\r
 \r
-    if (AlipayInitButton(index) == false) {\r
+    if (!AlipayInitButton(index)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransRes::InitView AlipayInitButton() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp
index 2f92fed..1170666 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp
@@ -154,16 +154,16 @@ bool AlipayTransTips::InitTipsView(uint32_t index)
     SetOnDragListener(presenter_);\r
     SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
 \r
-    if (AlipayInitLabel(g_AlipayTransTipsMapper[index].str) == false) {\r
+    if (!AlipayInitLabel(g_AlipayTransTipsMapper[index].str)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransTips::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
-    if (AlipayInitImage(PNG_ALIPAY_BIND_FAILURE) == false) {\r
+    if (!AlipayInitImage(PNG_ALIPAY_BIND_FAILURE)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransTips::InitView AlipayInitImage() false");\r
         return false;\r
     }\r
 \r
-    if (AlipayInitButton(index) == false) {\r
+    if (!AlipayInitButton(index)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayTransTips::InitView AlipayInitButton() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbind.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbind.cpp
index 5c6d185..2c081ca 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbind.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbind.cpp
@@ -130,13 +130,13 @@ bool AlipayUnbind::InitSimilarButton(int16 num, int16 alipayX, int16 alipayY, co
 \r
 bool AlipayUnbind::AlipayInitButton()\r
 {\r
-    if (InitSimilarButton(ALIPAY_SET_ZERO, EXIT_BUTTON_EXIT_X, EXIT_BUTTON_EXIT_Y, UNBIND_BUTTON_TEXT_FIRST,\r
-        ALIPAY_SETTING_UNBIND) == false) {\r
+    if (!InitSimilarButton(ALIPAY_SET_ZERO, EXIT_BUTTON_EXIT_X, EXIT_BUTTON_EXIT_Y, UNBIND_BUTTON_TEXT_FIRST,\r
+        ALIPAY_SETTING_UNBIND)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayUnbind::AlipayInitButton new alipayButton[ALIPAY_SET_ZERO] fail");\r
         return false;\r
     }\r
-    if (InitSimilarButton(ALIPAY_SET_ONE, EXIT_BUTTON_BIND_X, EXIT_BUTTON_BIND_Y, UNBIND_BUTTON_TEXT_SECOND,\r
-        ALIPAY_SETTING_CANCEL) == false) {\r
+    if (!InitSimilarButton(ALIPAY_SET_ONE, EXIT_BUTTON_BIND_X, EXIT_BUTTON_BIND_Y, UNBIND_BUTTON_TEXT_SECOND,\r
+        ALIPAY_SETTING_CANCEL)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayUnbind::AlipayInitButton new alipayButton[ALIPAY_SET_ONE] fail");\r
         return false;\r
     }\r
@@ -152,11 +152,11 @@ bool AlipayUnbind::InitView()
     SetOnDragListener(presenter_);\r
     SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
     \r
-    if (AlipayInitLabel() == false) {\r
+    if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayUnbind::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
-    if (AlipayInitButton() == false) {\r
+    if (!AlipayInitButton()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayUnbind::InitView AlipayInitButton() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbindFinish.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbindFinish.cpp
index b7f4940..817d90b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbindFinish.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbindFinish.cpp
@@ -126,11 +126,11 @@ bool AlipayUnbindFinish::InitView()
     SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
     SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);\r
 \r
-    if (AlipayInitLabel() == false) {\r
+    if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayUnbindFinish::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
-    if (AlipayInitButton() == false) {\r
+    if (!AlipayInitButton()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayUnbindFinish::InitView AlipayInitButton() false");\r
         return false;\r
     }\r