n94G相关代码提交

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/PhoneDirView.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/PhoneDirView.h
index fbb3e2c..49ec43e 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/PhoneDirView.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/PhoneDirView.h
@@ -61,7 +61,6 @@ namespace OHOS
         bool get_container_one_page_is_Visible();\r
 \r
     private:\r
-        UIView::OnDragListener *draglistener{nullptr};\r
         PhoneDirView(PhoneDirView &&) = delete;\r
         PhoneDirView &operator=(PhoneDirView &&) = delete;\r
         UILabelExt  *label[20] ={nullptr};\r

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneDirPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneDirPresenter.cpp
index 3562d6e..5faaf06 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneDirPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneDirPresenter.cpp
@@ -65,7 +65,6 @@ namespace OHOS
             \r
             \r
         }\r
-        UNUSED(view);\r
         return true;\r
     }\r
 \r

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneDirView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneDirView.cpp
index 2164f32..1a253ad 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneDirView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneDirView.cpp
@@ -18,7 +18,6 @@ namespace OHOS
     extern addressbook addressbook_t;\r
     PhoneDirView::PhoneDirView()\r
     {\r
-\r
         g_pPhoneDirView = this;\r
     }\r
 \r
@@ -32,7 +31,7 @@ namespace OHOS
     {\r
         return g_pPhoneDirView;\r
     }\r
-    static char *number_str[]={"0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19"};\r
+    static char *number_str[] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19"};\r
     UILabelButtonExt *PhoneDirView::SetTheButton_ext(ButtonConfig_ext_t &buttonconfig, UIView::OnClickListener *clickListener)\r
     {\r
         UILabelButtonExt *button = new UILabelButtonExt();\r
@@ -43,19 +42,19 @@ namespace OHOS
         }\r
         button->SetPosition(buttonconfig.x, buttonconfig.y, buttonconfig.w, buttonconfig.h);\r
         button->SetViewId(buttonconfig.ViewId);\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "----------%s ---",buttonconfig.ViewId);\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "----------%s ---", buttonconfig.ViewId);\r
         button->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);\r
 \r
-        if(buttonconfig.ImageSrc)\r
-        button->SetImageSrc(buttonconfig.ImageSrc, buttonconfig.ImageSrc);\r
+        if (buttonconfig.ImageSrc)\r
+            button->SetImageSrc(buttonconfig.ImageSrc, buttonconfig.ImageSrc);\r
 \r
-        //button->SetStyleForState(STYLE_BORDER_COLOR, 0xff191919, UIButton::PRESSED);\r
-        if(clickListener!=NULL)\r
-        button->SetOnClickListener(clickListener);\r
+        // button->SetStyleForState(STYLE_BORDER_COLOR, 0xff191919, UIButton::PRESSED);\r
+        if (clickListener != NULL)\r
+            button->SetOnClickListener(clickListener);\r
 \r
         button->SetText(buttonconfig.str);\r
         button->SetAlign(TEXT_ALIGNMENT_LEFT);\r
-        button->SetLabelPosition(buttonconfig.label_x,buttonconfig.label_y );\r
+        button->SetLabelPosition(buttonconfig.label_x, buttonconfig.label_y);\r
         button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, buttonconfig.Fontsize);\r
         button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED);\r
 \r
@@ -63,8 +62,7 @@ namespace OHOS
         return button;\r
     }\r
 \r
-   \r
-    void PhoneDirView::initView_ext(int x,int y,int w,int h,int interval,const char *imagsrc)\r
+    void PhoneDirView::initView_ext(int x, int y, int w, int h, int interval, const char *imagsrc)\r
     {\r
         /* -------------------------------------------------------------------------- */\r
         UIView::OnClickListener *clickListener = static_cast<UIView::OnClickListener *>(PhoneDirPresenter::GetInstance());\r
@@ -75,15 +73,15 @@ namespace OHOS
         buttonconfig.w = w;\r
         buttonconfig.h = h;\r
 \r
-        int len =addressbook_t.num;\r
+        int len = addressbook_t.num;\r
 \r
-        for(int i=0;i<len;i++)\r
+        for (int i = 0; i < len; i++)\r
         {\r
-            buttonconfig.str="";\r
+            buttonconfig.str = "";\r
             label[i] = new UILabelExt();\r
-            label[i]->SetPosition(x+107, buttonconfig.y+33);         // widget's left position and top position\r
-            label[i]->Resize(210, 35);          // widget's width and height\r
-            label[i]->SetViewId("label1");// Set style\r
+            label[i]->SetPosition(x + 107, buttonconfig.y + 33); \r
+            label[i]->Resize(210, 35);                           \r
+            label[i]->SetViewId("label1");                       \r
             label[i]->SetStyle(STYLE_TEXT_FONT, 30);\r
 \r
             // Set additional property\r
@@ -94,84 +92,83 @@ namespace OHOS
             label[i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             label[i]->SetVisible(true);\r
 \r
-            //char buf[32]={0};\r
-            //sprintf(buf,"1",i);\r
-            //buf[0]=i+48;\r
-            buttonconfig.ViewId =number_str[i];\r
-            \r
-            buttonconfig.ImageSrc = addressbook_t.Contact_t[i].sex==1 ? PHONE_DIR_BOY:PHONE_DIR_GIRL;\r
-            buttonconfig.label_x=107;\r
-            buttonconfig.label_y=0;\r
-            buttonconfig.Fontsize=30;\r
-            buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;\r
+            // char buf[32]={0};\r
+            // sprintf(buf,"1",i);\r
+            // buf[0]=i+48;\r
+            buttonconfig.ViewId = number_str[i];\r
+\r
+            buttonconfig.ImageSrc = addressbook_t.Contact_t[i].sex == 1 ? PHONE_DIR_BOY : PHONE_DIR_GIRL;\r
+            buttonconfig.label_x = 107;\r
+            buttonconfig.label_y = 0;\r
+            buttonconfig.Fontsize = 30;\r
+            buttonconfig.ALIGN = TEXT_ALIGNMENT_LEFT;\r
             button[i] = SetTheButton_ext(buttonconfig, clickListener);\r
 \r
-            buttonconfig.y+=interval;\r
+            buttonconfig.y += interval;\r
             scrollview_->Add(button[i]);\r
             scrollview_->Add(label[i]);\r
         }\r
         onepage_address_init();\r
-        /* -------------------------------------------------------------------------- */  \r
+        /* -------------------------------------------------------------------------- */\r
     }\r
 \r
-    void PhoneDirView :: onepage_address_init(void)\r
+    void PhoneDirView ::onepage_address_init(void)\r
     {\r
-        if (container_one_page == nullptr) {\r
-        container_one_page = new UIScrollView();\r
-        container_one_page->SetPosition(0, 0,Screen::GetInstance().GetWidth(),Screen::GetInstance().GetHeight());\r
-        //container_one_page->SetStyle(STYLE_BACKGROUND_OPA, 0);\r
+        if (container_one_page == nullptr)\r
+        {\r
+            container_one_page = new UIScrollView();\r
+            if(container_one_page == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " SystemView::SetTheButton: container new  fail!");\r
+                return;\r
+            }\r
+        }\r
+        container_one_page->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());\r
         container_one_page->SetViewId("container_one_page");\r
         container_one_page->SetScrollBlankSize(35);\r
-        //container_one_page->SetReboundSize(50);\r
         container_one_page->SetDirection(1);\r
-        }\r
-    \r
-        // Add Label to App\r
-        if (label1_phone_name == nullptr) {\r
+        container_one_page->SetOnDragListener(presenter_);\r
+        container_one_page->SetVisible(false);\r
+        container_one_page->SetDraggable(true);\r
+        container_one_page->SetTouchable(true);\r
+        AddViewToRootContainer(container_one_page);\r
+        /* -------------------------------------------------------------------------- */\r
+        if (label1_phone_name == nullptr)\r
+        {\r
             label1_phone_name = new UILabelExt();\r
+            if(label1_phone_name == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " SystemView::SetTheButton: label1_phone_name new  fail!");\r
+                return;\r
+            }\r
         }\r
-        label1_phone_name->SetPosition(128, 52);         // widget's left position and top position\r
-        label1_phone_name->Resize(210, 30);          // widget's width and height\r
-        label1_phone_name->SetViewId("label1");// Set style\r
+        label1_phone_name->SetPosition(128, 52); \r
+        label1_phone_name->Resize(210, 30);      \r
         label1_phone_name->SetStyle(STYLE_TEXT_FONT, 30);\r
-\r
-        // Set additional property\r
         label1_phone_name->SetText(addressbook_t.Contact_t[0].name);\r
         label1_phone_name->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
         label1_phone_name->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         label1_phone_name->SetRollSpeed(23);\r
         label1_phone_name->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-\r
-        // Add to rootView\r
         container_one_page->Add(label1_phone_name);\r
         label1_phone_name->SetVisible(true);\r
-        \r
-        // Add ImageView to App\r
-        if (phone_name == nullptr) {\r
+        /* -------------------------------------------------------------------------- */\r
+        if (phone_name == nullptr)\r
+        {\r
             phone_name = new UIImageView();\r
+            if(phone_name == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " SystemView::SetTheButton: phone_name new  fail!");\r
+                return;\r
+            }\r
         }\r
-        phone_name->SetPosition(158, 107);         // widget's left position and top position\r
-       // phone_name->Resize(150, 150);          // widget's width and height\r
-        phone_name->SetViewId("phone_sex");// Set style\r
-\r
+        phone_name->SetPosition(158, 107);  \r
+        phone_name->SetViewId("phone_sex");\r
+        phone_name->SetVisible(true);\r
         image_boy = ImageCacheManager::GetInstance().LoadSingleRes(PHONE_DIR_BOY_1);\r
-\r
         image_girl = ImageCacheManager::GetInstance().LoadSingleRes(PHONE_DIR_GIRL_1);\r
-\r
-        phone_name->SetSrc(addressbook_t.Contact_t[0].sex ? image_boy:image_girl);\r
-\r
-\r
-\r
+        phone_name->SetSrc(addressbook_t.Contact_t[0].sex ? image_boy : image_girl);\r
         container_one_page->Add(phone_name);\r
-        phone_name->SetVisible(true);\r
-        container_one_page->SetVisible(false);\r
-        container_one_page->SetDraggable(true);\r
-        container_one_page->SetTouchable(true);\r
-       \r
-\r
-\r
-\r
-        UIView::OnClickListener *clickListener = static_cast<UIView::OnClickListener *>(PhoneDirPresenter::GetInstance());\r
         /* -------------------------------------------------------------------------- */\r
         ButtonConfig_ext_t buttonconfig;\r
         buttonconfig.x = 43;\r
@@ -179,44 +176,36 @@ namespace OHOS
         buttonconfig.w = 380;\r
         buttonconfig.h = 100;\r
 \r
-        int len =addressbook_t.Contact_t[0].phone_num;\r
-\r
-        for(int i=0;i<2;i++)\r
+        int len = addressbook_t.Contact_t[0].phone_num;\r
+        for (int i = 0; i < 2; i++)\r
         {\r
-            buttonconfig.str=addressbook_t.Contact_t[0].phone_number_t[0].number;\r
-            buttonconfig.ViewId =addressbook_t.Contact_t[0].phone_number_t[0].number;\r
-            buttonconfig.ImageSrc=nullptr;\r
-            buttonconfig.label_x=50;\r
-            buttonconfig.label_y=0;\r
-            buttonconfig.Fontsize=30;\r
-            buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;\r
-            number_button[i] = SetTheButton_ext(buttonconfig,clickListener);\r
-            buttonconfig.y+=120;\r
+            buttonconfig.str = addressbook_t.Contact_t[0].phone_number_t[0].number;\r
+            buttonconfig.ViewId = addressbook_t.Contact_t[0].phone_number_t[0].number;\r
+            buttonconfig.ImageSrc = nullptr;\r
+            buttonconfig.label_x = 50;\r
+            buttonconfig.label_y = 0;\r
+            buttonconfig.Fontsize = 30;\r
+            buttonconfig.ALIGN = TEXT_ALIGNMENT_LEFT;\r
+            number_button[i] = SetTheButton_ext(buttonconfig, presenter_);\r
+            buttonconfig.y += 120;\r
             container_one_page->Add(number_button[i]);\r
         }\r
-\r
-\r
-        UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(PhoneDirPresenter::GetInstance());\r
-        if (draglistener == nullptr)\r
+        /* -------------------------------------------------------------------------- */\r
+        if (phone_name_ == nullptr)\r
         {\r
-            return;\r
-        }\r
-        container_one_page->SetOnDragListener(draglistener);\r
-\r
-         if (phone_name_ == nullptr) {\r
             phone_name_ = new UIImageView();\r
+            if(phone_name_ == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PhoneDirView::phone_name_ new fail");\r
+                return;\r
+            }\r
         }\r
-        phone_name_->SetPosition(0, 520);         // widget's left position and top position\r
-        phone_name_->Resize(466, 30);          // widget's width and height\r
-        phone_name_->SetViewId("phone_sex");// Set style\r
-\r
-        container_one_page->Add(phone_name_);\r
-\r
+        phone_name_->SetPosition(0, 520);    \r
+        phone_name_->Resize(466, 30);        \r
+        phone_name_->SetViewId("phone_sex");\r
         phone_name_->SetVisible(true);\r
-\r
-        \r
+        container_one_page->Add(phone_name_);\r
         return;\r
-        \r
     }\r
 \r
     bool PhoneDirView::get_container_one_page_is_Visible()\r
@@ -224,53 +213,49 @@ namespace OHOS
         return container_one_page->IsVisible();\r
     }\r
 \r
-\r
     void PhoneDirView::Set_onepage_address(const char *idstr)\r
     {\r
-        if(strcmp("container_one_page",idstr)==0)\r
+        if (strcmp("container_one_page", idstr) == 0)\r
         {\r
             scrollview_->SetVisible(true);\r
             container_one_page->SetVisible(false);\r
             return;\r
-\r
         }\r
         container_one_page->ScrollBy(0, 100);\r
         scrollview_->SetVisible(false);\r
         container_one_page->SetVisible(true);\r
-        uint8_t id= atoi(idstr);//idstr[16];\r
-        if(id>=20)\r
+        uint8_t id = atoi(idstr); // idstr[16];\r
+        if (id >= 20)\r
         {\r
             return;\r
         }\r
 \r
-        if(addressbook_t.Contact_t[id].name)    \r
-        label1_phone_name->SetText(addressbook_t.Contact_t[id].name);\r
+        if (addressbook_t.Contact_t[id].name)\r
+            label1_phone_name->SetText(addressbook_t.Contact_t[id].name);\r
 \r
         label1_phone_name->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
 \r
-        phone_name->SetSrc(addressbook_t.Contact_t[0].sex ? image_boy:image_girl);\r
+        phone_name->SetSrc(addressbook_t.Contact_t[0].sex ? image_boy : image_girl);\r
 \r
-        int len =addressbook_t.Contact_t[id].phone_num;\r
+        int len = addressbook_t.Contact_t[id].phone_num;\r
 \r
-        for(int i=0;i<len;i++)\r
+        for (int i = 0; i < len; i++)\r
         {\r
             number_button[i]->SetVisible(true);\r
-            if(addressbook_t.Contact_t[id].phone_number_t[i].number)\r
+            if (addressbook_t.Contact_t[id].phone_number_t[i].number)\r
             {\r
                 number_button[i]->SetText(addressbook_t.Contact_t[id].phone_number_t[i].number);\r
                 number_button[i]->SetViewId(addressbook_t.Contact_t[id].phone_number_t[i].number);\r
             }\r
         }\r
 \r
-        if(len<2)\r
+        if (len < 2)\r
         {\r
             number_button[1]->SetVisible(false);\r
         }\r
-       RootView::GetInstance()->Invalidate();\r
+        RootView::GetInstance()->Invalidate();\r
         return;\r
     }\r
-    \r
-\r
 \r
     void PhoneDirView::DeInit()\r
     {\r
@@ -280,99 +265,93 @@ namespace OHOS
             scrollview_->ClearFocus();\r
             delete scrollview_;\r
             scrollview_ = nullptr;\r
-          \r
-            if(label1_)\r
+\r
+            if (label1_)\r
             {\r
                 delete label1_;\r
                 label1_ = nullptr;\r
             }\r
-            for(int i=0;i<addressbook_t.num;i++)\r
-            {    \r
-                if( button[i])\r
+            for (int i = 0; i < addressbook_t.num; i++)\r
+            {\r
+                if (button[i])\r
                 {\r
-                    delete  button[i];\r
+                    delete button[i];\r
                     button[i] = nullptr;\r
                 }\r
             }\r
 \r
-            for(int i=0;i<addressbook_t.num;i++)\r
-            {    \r
-                if( label[i])\r
+            for (int i = 0; i < addressbook_t.num; i++)\r
+            {\r
+                if (label[i])\r
                 {\r
-                    delete  label[i];\r
+                    delete label[i];\r
                     label[i] = nullptr;\r
                 }\r
             }\r
-         \r
 \r
-            if(container_one_page)\r
+            if (container_one_page)\r
             {\r
                 container_one_page->RemoveAll();\r
                 delete container_one_page;\r
                 container_one_page = nullptr;\r
 \r
-                if(phone_name)\r
+                if (phone_name)\r
                 {\r
                     delete phone_name;\r
                     phone_name = nullptr;\r
                 }\r
-                if(phone_name_)\r
+                if (phone_name_)\r
                 {\r
                     delete phone_name_;\r
                     phone_name_ = nullptr;\r
                 }\r
 \r
-\r
-                \r
                 ImageCacheManager::GetInstance().UnloadSingleRes(PHONE_DIR_BOY_1);\r
-\r
                 ImageCacheManager::GetInstance().UnloadSingleRes(PHONE_DIR_GIRL_1);\r
 \r
-                if(label1_phone_name)\r
+                if (label1_phone_name)\r
                 {\r
                     delete label1_phone_name;\r
                     label1_phone_name = nullptr;\r
                 }\r
 \r
-                for(int i=0;i<2;i++)\r
-                {    \r
-                    if( number_button[i])\r
+                for (int i = 0; i < 2; i++)\r
+                {\r
+                    if (number_button[i])\r
                     {\r
-                        delete  number_button[i];\r
+                        delete number_button[i];\r
                         number_button[i] = nullptr;\r
                     }\r
                 }\r
-\r
             }\r
-           \r
-            if(label1_no)\r
+\r
+            if (label1_no)\r
             {\r
                 delete label1_no;\r
-                label1_no=nullptr;\r
+                label1_no = nullptr;\r
             }\r
-            if(label2_no)\r
+            if (label2_no)\r
             {\r
                 delete label2_no;\r
-                label2_no=nullptr;\r
+                label2_no = nullptr;\r
             }\r
-            if(image1_no)\r
+            if (image1_no)\r
             {\r
                 delete image1_no;\r
-                image1_no=nullptr;\r
+                image1_no = nullptr;\r
             }\r
         }\r
     }\r
 \r
-\r
     UIView *PhoneDirView::GetView()\r
     {\r
         if (label1_no == nullptr)\r
         {\r
             label1_no = new UILabelExt();\r
         }\r
-        label1_no->SetPosition(158, 52); // widget's left position and top position\r
-        label1_no->Resize(200, 60);      // widget's width and height\r
-        label1_no->SetViewId("label1");  // Set style\r
+        label1_no->SetPosition(158, 52); \r
+        label1_no->Resize(200, 60);      \r
+        label1_no->SetViewId("label1");  \r
         label1_no->SetStyle(STYLE_TEXT_FONT, 30);\r
 \r
         // Set additional property\r
@@ -393,9 +372,9 @@ namespace OHOS
         {\r
             label2_no = new UILabelExt();\r
         }\r
-        label2_no->SetPosition(76, 310); // widget's left position and top position\r
-        label2_no->Resize(312, 70);     // widget's width and height\r
-        label2_no->SetViewId("label2");  // Set style\r
+        label2_no->SetPosition(76, 310); \r
+        label2_no->Resize(312, 70);      \r
+        label2_no->SetViewId("label2");  \r
         label2_no->SetStyle(STYLE_TEXT_FONT, 26);\r
 \r
         // Set additional property\r
@@ -416,9 +395,9 @@ namespace OHOS
         {\r
             image1_no = new UIImageView();\r
         }\r
-        image1_no->SetPosition(158, 120); // widget's left position and top position\r
-        image1_no->Resize(150, 150);      // widget's width and height\r
-        image1_no->SetViewId("image1");   // Set style\r
+        image1_no->SetPosition(158, 120); \r
+        image1_no->Resize(150, 150);      \r
+        image1_no->SetViewId("image1");   \r
 \r
         // Set additional property\r
 \r
@@ -433,80 +412,59 @@ namespace OHOS
     }\r
     void PhoneDirView::OnStart()\r
     {\r
-        scrollview_ = new UIScrollView();\r
-        if (scrollview_ == nullptr)\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PhoneDirView::OnStart");\r
+        if(scrollview_ == nullptr)\r
         {\r
-            return;\r
+            scrollview_ = new UIScrollView();\r
+            if (scrollview_ == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PhoneDirView::scrollview_ new fail");\r
+                return;\r
+            }\r
         }\r
         scrollview_->SetPosition(0, 0);\r
         scrollview_->SetWidth(Screen::GetInstance().GetWidth());\r
         scrollview_->SetHeight(Screen::GetInstance().GetHeight());\r
-\r
         scrollview_->SetScrollBlankSize(35);\r
         scrollview_->SetReboundSize(35);\r
         scrollview_->SetDirection(1);\r
         scrollview_->SetMaxScrollDistance(500);\r
         scrollview_->SetThrowDrag(true);\r
         scrollview_->RequestFocus();\r
-        // 创建 draglistener 实例并设置为拖动监听器\r
-        UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(PhoneDirPresenter::GetInstance());\r
-        if (draglistener == nullptr)\r
-        {\r
-            return;\r
-        }\r
-        scrollview_->SetOnDragListener(draglistener);\r
-\r
+        scrollview_->SetOnDragListener(presenter_);\r
         scrollview_->SetTouchable(true);\r
         scrollview_->SetDraggable(true);\r
-        //read_addressbook_bin_file();\r
-\r
+        AddViewToRootContainer(scrollview_);\r
 \r
-         if (label1_ == nullptr) {\r
-        label1_ = new UILabelExt();\r
+        if (label1_ == nullptr)\r
+        {\r
+            label1_ = new UILabelExt();\r
+            if(label1_ == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PhoneDirView::label1_ new fail");\r
+                return;\r
+            }\r
         }\r
-        label1_->SetPosition(0, 18);         // widget's left position and top position\r
-        label1_->Resize(466, 88);          // widget's width and height\r
-        label1_->SetViewId("label1");// Set style\r
+        label1_->SetPosition(0, 18);  \r
+        label1_->Resize(466, 88);     \r
         label1_->SetStyle(STYLE_TEXT_FONT, 30);\r
-\r
         label1_->SetTextId(STR_FRE_CONTACT);\r
         label1_->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
         label1_->SetTextId(STR_FAVORITE_CONTACTS);\r
-        //label1_->SetTextColor(Color::GetColorFromRGBA(0xac, 0xa4, 0xa4, 0xff));\r
         label1_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         label1_->SetRollSpeed(0);\r
         label1_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         scrollview_->Add(label1_);\r
 \r
-        if(addressbook_t.num<=0 ||addressbook_t.num>20)\r
+        if (addressbook_t.num <= 0 || addressbook_t.num > 20)\r
         {\r
             GetView();\r
         }\r
         else\r
         {\r
-            initView_ext(43,123,380,100,120,NULL);\r
-        }\r
-            \r
-\r
-      \r
-\r
-        AddViewToRootContainer(scrollview_);\r
-        if(container_one_page)\r
-        {\r
-            if (draglistener == nullptr)\r
-            {\r
-                return;\r
-            }\r
-            container_one_page->SetOnDragListener(draglistener);\r
+            initView_ext(43, 123, 380, 100, 120, NULL);\r
         }\r
-        AddViewToRootContainer(container_one_page);\r
-\r
-       \r
-\r
-        // 增加按键监听\r
-        RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::PhoneDirPresenter::GetInstance();\r
-       RootView::GetInstance()->SetOnKeyActListener(keyactListener);\r
+        RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
     }\r
 \r
-   \r
 }\r

diff --git a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_recorder.a b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_recorder.a
index 5ccbce8..515ce65 100644 (file)
Binary files a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_recorder.a and b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_recorder.a differ

diff --git a/code/sdk/open_source/openharmony/third_party/lwip/CMakeLists.txt b/code/sdk/open_source/openharmony/third_party/lwip/CMakeLists.txt
index 3a0e8b4..d00ce71 100644 (file)
--- a/code/sdk/open_source/openharmony/third_party/lwip/CMakeLists.txt
+++ b/code/sdk/open_source/openharmony/third_party/lwip/CMakeLists.txt
@@ -23,6 +23,40 @@ elseif("freertos" IN_LIST TARGET_COMPONENT)
         ${CMAKE_CURRENT_SOURCE_DIR}/lwip_adapter/freertos)     
 endif()
 
+# PPP
+set(lwipppp_SRCS
+    ${LWIP_DIR}/src/netif/ppp/auth.c
+    ${LWIP_DIR}/src/netif/ppp/ccp.c
+    ${LWIP_DIR}/src/netif/ppp/chap-md5.c
+    ${LWIP_DIR}/src/netif/ppp/chap_ms.c
+    ${LWIP_DIR}/src/netif/ppp/chap-new.c
+    ${LWIP_DIR}/src/netif/ppp/demand.c
+    ${LWIP_DIR}/src/netif/ppp/eap.c
+    ${LWIP_DIR}/src/netif/ppp/ecp.c
+    ${LWIP_DIR}/src/netif/ppp/eui64.c
+    ${LWIP_DIR}/src/netif/ppp/fsm.c
+    ${LWIP_DIR}/src/netif/ppp/ipcp.c
+    ${LWIP_DIR}/src/netif/ppp/ipv6cp.c
+    ${LWIP_DIR}/src/netif/ppp/lcp.c
+    ${LWIP_DIR}/src/netif/ppp/magic.c
+    ${LWIP_DIR}/src/netif/ppp/mppe.c
+    ${LWIP_DIR}/src/netif/ppp/multilink.c
+    ${LWIP_DIR}/src/netif/ppp/ppp.c
+    ${LWIP_DIR}/src/netif/ppp/pppapi.c
+    ${LWIP_DIR}/src/netif/ppp/pppcrypt.c
+    ${LWIP_DIR}/src/netif/ppp/pppoe.c
+    ${LWIP_DIR}/src/netif/ppp/pppol2tp.c
+    ${LWIP_DIR}/src/netif/ppp/pppos.c
+    ${LWIP_DIR}/src/netif/ppp/upap.c
+    ${LWIP_DIR}/src/netif/ppp/utils.c
+    ${LWIP_DIR}/src/netif/ppp/vj.c
+    ${LWIP_DIR}/src/netif/ppp/polarssl/arc4.c
+    ${LWIP_DIR}/src/netif/ppp/polarssl/des.c
+    ${LWIP_DIR}/src/netif/ppp/polarssl/md4.c
+    ${LWIP_DIR}/src/netif/ppp/polarssl/md5.c
+    ${LWIP_DIR}/src/netif/ppp/polarssl/sha1.c
+)
+
 set(SOURCES
     ${CMAKE_LWIP_SOURCE_DIR}/src/core/tcp_out.c
     ${CMAKE_LWIP_SOURCE_DIR}/src/core/inet_chksum.c
@@ -76,6 +110,13 @@ set(SOURCES
     ${CMAKE_LWIP_SOURCE_DIR}/src/api/api_lib.c
     ${CMAKE_LWIP_ADAPTER_DIR}/src/arch/sys_arch.c
     ${CMAKE_LWIP_ADAPTER_DIR}/src/arch/ethernetif.c
+    ${CMAKE_LWIP_ADAPTER_DIR}/src/arch/sio.c
+    ${CMAKE_LWIP_SOURCE_DIR}/src/netif/slipif.c
+    ${CMAKE_LWIP_ADAPTER_DIR}/src/test/lwip_test.c
+    ${CMAKE_LWIP_ADAPTER_DIR}/src/test/socket_test.c
+    ${CMAKE_LWIP_ADAPTER_DIR}/src/test/slip_test.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/lwip_adapter/lwip_driver_adapter/lwip_driver_adapter.c
+    ${lwipppp_SRCS}
 )
 
 if("__LITEOS__" IN_LIST DEFINES)

diff --git a/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/freertos/src/test/lwip_test.c b/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/freertos/src/test/lwip_test.c
new file mode 100644 (file)
index 0000000..99e96bd
--- /dev/null
+++ b/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/freertos/src/test/lwip_test.c
@@ -0,0 +1,63 @@
+#include "lwip_test.h"
+#include "lwip/netif.h"
+#include "lwip/netifapi.h"
+#include "lwip/ethernetif.h"
+#define IP_ADDR0 192
+#define IP_ADDR1 168
+#define IP_ADDR2 1
+#define IP_ADDR3 122
+
+#define NETMASK_ADDR0 255
+#define NETMASK_ADDR1 255
+#define NETMASK_ADDR2 255
+#define NETMASK_ADDR3 0
+
+#define GW_ADDR0 192
+#define GW_ADDR1 168
+#define GW_ADDR2 1
+#define GW_ADDR3 1
+
+#define WIFI_DRIVER_IF      801
+#define HWADDR_LEN          6
+
+struct netif g_netif;
+
+err_t my_hw_input(struct pbuf *p, struct netif *netif);
+
+err_t my_hw_input(struct pbuf *p, struct netif *netif)
+{
+    (void)p;
+    (void)netif;
+    printf("enter my_hw_input\n");
+    return 0;
+}
+
+void lwip_test_init(void)
+{
+    int ret = 0;
+    ip4_addr_t ip, gw, netmask;
+
+    IP4_ADDR(&ip, IP_ADDR0, IP_ADDR1, IP_ADDR2, IP_ADDR3);
+    IP4_ADDR(&gw, GW_ADDR0, GW_ADDR1, GW_ADDR2, GW_ADDR3);
+    IP4_ADDR(&netmask, NETMASK_ADDR0, NETMASK_ADDR1, NETMASK_ADDR2, NETMASK_ADDR3);
+
+    g_netif.hwaddr_len = HWADDR_LEN;
+    g_netif.hwaddr[0] = 0x00;
+    g_netif.hwaddr[1] = 0x11;
+    g_netif.hwaddr[2] = 0x22;
+    g_netif.hwaddr[3] = 0x33;
+    g_netif.hwaddr[4] = 0x44;
+    g_netif.hwaddr[5] = 0x55;
+
+    g_netif.flags = 4;
+    g_netif.input = my_hw_input;
+    /* Initilialize the LwIP stack */
+    /* add the network interface */
+    netif_add(&g_netif, &ip, &netmask, &gw, NULL, &ethernetif_init, tcpip_input);
+    /* Registers the default network interface */
+    netif_set_default(&g_netif);
+
+    netif_is_link_up(&g_netif);
+    /* When the netif is fully configured this function must be called */
+    netif_set_up(&g_netif);
+}

diff --git a/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/freertos/src/test/socket_test.c b/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/freertos/src/test/socket_test.c
new file mode 100644 (file)
index 0000000..d6f62e2
--- /dev/null
+++ b/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/freertos/src/test/socket_test.c
@@ -0,0 +1,113 @@
+#include "socket_test.h"
+#include "lwip/opt.h"
+#include "lwip/sys.h"
+#include "lwip/api.h"
+#include <lwip/sockets.h>
+#include <errno.h>
+
+#define SERVER_IP "192.168.1.121"
+#define SEND_PORT 5002
+#define BUFFER_SIZE 1024
+
+void udp_client(void) {
+    int sockfd;
+    struct sockaddr_in server_addr;
+    char buffer[BUFFER_SIZE];
+
+    // 创建 UDP 套接字
+    sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+    if (sockfd == -1) {
+        perror("Error creating socket");
+        exit(EXIT_FAILURE);
+    }
+
+    // 设置服务器地址信息
+    memset(&server_addr, 0, sizeof(server_addr));
+    server_addr.sin_family = AF_INET;
+    server_addr.sin_port = lwip_htons(SEND_PORT);
+    if (inet_aton(SERVER_IP, &server_addr.sin_addr) == 0) {
+        perror("Invalid server IP address");
+        close(sockfd);
+        exit(EXIT_FAILURE);
+    }
+
+    while (1) {
+        // 发送数据
+        const char *message = "Hello, UDP Server!";
+        int len = strlen(message);
+        printf("send message: \n");
+        for (int i = 0; i < len; i++) {
+            printf(" %x ", message[i]);
+        }
+        printf("\n");
+        if (sendto(sockfd, message, strlen(message), 0, (struct sockaddr *)&server_addr, sizeof(server_addr)) == -1) {
+            perror("Error sending data");
+            close(sockfd);
+            exit(EXIT_FAILURE);
+        }
+        sleep(1);
+    }
+}
+
+#define REV_PORT 5001
+#define BUFFER_SIZE 1024
+
+void udp_server(void)
+{
+    int sockfd;
+    struct sockaddr_in server_addr;
+    char buffer[BUFFER_SIZE];
+
+    // 创建 UDP 套接字
+    sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+    if (sockfd == -1) {
+        perror("Error creating socket");
+        exit(EXIT_FAILURE);
+    }
+
+    // 设置服务器地址信息
+    memset(&server_addr, 0, sizeof(server_addr));
+    server_addr.sin_family = AF_INET;
+    server_addr.sin_addr.s_addr = INADDR_ANY;
+    server_addr.sin_port = lwip_htons(REV_PORT);
+
+    // 绑定套接字
+    if (bind(sockfd, (struct sockaddr *)&server_addr, sizeof(server_addr)) == -1) {
+        perror("Error binding socket");
+        close(sockfd);
+        exit(EXIT_FAILURE);
+    }
+
+    while (1) {
+        socklen_t client_len = sizeof(struct sockaddr_in);
+        struct sockaddr_in client_addr;
+
+        // 接收数据
+        ssize_t bytes_received = recvfrom(sockfd, buffer, BUFFER_SIZE, 0, (struct sockaddr *)&client_addr, &client_len);
+        if (bytes_received == -1) {
+            perror("Error receiving data");
+            continue;
+        }
+
+        // 打印接收到的数据
+        printf("Received message from %s:%d\n", inet_ntoa(client_addr.sin_addr), lwip_ntohs(client_addr.sin_port));
+        printf("Received message: %d %s\n", (int)bytes_received, buffer);
+        printf("message: ");
+        for (int i = 0; i < bytes_received; i++) {
+            printf(" %02x ", buffer[i]);
+        }
+        printf("\n");
+
+        // 清空缓冲区
+        memset(buffer, 0, BUFFER_SIZE);
+        // break;
+    }
+
+    close(sockfd);
+}
+
+void client_init(void) {
+    printf("___enter client_init function___\n");
+    sys_thread_new("server", udp_server, NULL, 4096, 4);
+    sys_thread_new("client", udp_client, NULL, 4096, 4);
+}
\ No newline at end of file

diff --git a/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/arch/sio.c b/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/arch/sio.c
index 3fb708d..dc030fd 100644 (file)
--- a/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/arch/sio.c
+++ b/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/arch/sio.c
@@ -641,9 +641,9 @@ errcode_t sio_interrupt_enable(void (*data_callback)(const uint8_t *data, uint32
     
 
     
-    printf("[SIO] Allocated %d x %d bytes = %.2f KB total\n", 
-           SIO_PING_PONG_BUFFER_COUNT, SIO_PING_PONG_BUFFER_SIZE,
-           (SIO_PING_PONG_BUFFER_COUNT * SIO_PING_PONG_BUFFER_SIZE) / 1024.0);
+    // uint32_t total_bytes = SIO_PING_PONG_BUFFER_COUNT * SIO_PING_PONG_BUFFER_SIZE;
+    // printf("[SIO] Allocated %d x %d bytes = %u KB total\n",
+    //        SIO_PING_PONG_BUFFER_COUNT, SIO_PING_PONG_BUFFER_SIZE, total_bytes / 1024);
     
     // 2. 创建消息队列
     int ret = osal_msg_queue_create(

diff --git a/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/include/lwip/lwipopts_default.h b/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/include/lwip/lwipopts_default.h
index 516f985..9400986 100644 (file)
--- a/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/include/lwip/lwipopts_default.h
+++ b/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/include/lwip/lwipopts_default.h
@@ -785,11 +785,7 @@ extern "C" {
 #endif
 
 #ifndef TCP_WND
-#define TCP_WND            (TCP_SND_BUF * 2 / 6) //改善810的下载速度
-#endif
-
-#ifndef LWIP_IGMP
-#define LWIP_IGMP                       1
+#define TCP_WND            (TCP_SND_BUF * 2 / 3)
 #endif
 
 #ifndef LWIP_DNS_REVERSE
@@ -804,10 +800,6 @@ extern "C" {
 #define LWIP_SO_RCVBUF                  0
 #endif
 
-#ifndef LWIP_IPV6_MLD
-#define LWIP_IPV6_MLD 0
-#endif
-
 #ifndef LWIP_IPV6_MLD_QUERIER
 #define LWIP_IPV6_MLD_QUERIER 0
 #endif
@@ -1970,8 +1962,6 @@ TCP sender buffer space (pbufs). This must be at least = 2 *
 #define LWIP_NETIF_LOOPBACK             0
 #endif
 
-
-
 #if LWIP_SNTP
 
 #define LWIP_DHCP_MAX_NTP_SERVERS       1 

diff --git a/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/test/lwip_test.c b/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/test/lwip_test.c
new file mode 100644 (file)
index 0000000..99e96bd
--- /dev/null
+++ b/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/test/lwip_test.c
@@ -0,0 +1,63 @@
+#include "lwip_test.h"
+#include "lwip/netif.h"
+#include "lwip/netifapi.h"
+#include "lwip/ethernetif.h"
+#define IP_ADDR0 192
+#define IP_ADDR1 168
+#define IP_ADDR2 1
+#define IP_ADDR3 122
+
+#define NETMASK_ADDR0 255
+#define NETMASK_ADDR1 255
+#define NETMASK_ADDR2 255
+#define NETMASK_ADDR3 0
+
+#define GW_ADDR0 192
+#define GW_ADDR1 168
+#define GW_ADDR2 1
+#define GW_ADDR3 1
+
+#define WIFI_DRIVER_IF      801
+#define HWADDR_LEN          6
+
+struct netif g_netif;
+
+err_t my_hw_input(struct pbuf *p, struct netif *netif);
+
+err_t my_hw_input(struct pbuf *p, struct netif *netif)
+{
+    (void)p;
+    (void)netif;
+    printf("enter my_hw_input\n");
+    return 0;
+}
+
+void lwip_test_init(void)
+{
+    int ret = 0;
+    ip4_addr_t ip, gw, netmask;
+
+    IP4_ADDR(&ip, IP_ADDR0, IP_ADDR1, IP_ADDR2, IP_ADDR3);
+    IP4_ADDR(&gw, GW_ADDR0, GW_ADDR1, GW_ADDR2, GW_ADDR3);
+    IP4_ADDR(&netmask, NETMASK_ADDR0, NETMASK_ADDR1, NETMASK_ADDR2, NETMASK_ADDR3);
+
+    g_netif.hwaddr_len = HWADDR_LEN;
+    g_netif.hwaddr[0] = 0x00;
+    g_netif.hwaddr[1] = 0x11;
+    g_netif.hwaddr[2] = 0x22;
+    g_netif.hwaddr[3] = 0x33;
+    g_netif.hwaddr[4] = 0x44;
+    g_netif.hwaddr[5] = 0x55;
+
+    g_netif.flags = 4;
+    g_netif.input = my_hw_input;
+    /* Initilialize the LwIP stack */
+    /* add the network interface */
+    netif_add(&g_netif, &ip, &netmask, &gw, NULL, &ethernetif_init, tcpip_input);
+    /* Registers the default network interface */
+    netif_set_default(&g_netif);
+
+    netif_is_link_up(&g_netif);
+    /* When the netif is fully configured this function must be called */
+    netif_set_up(&g_netif);
+}

diff --git a/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/test/socket_test.c b/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/test/socket_test.c
new file mode 100644 (file)
index 0000000..2e8f48b
--- /dev/null
+++ b/code/sdk/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/test/socket_test.c
@@ -0,0 +1,113 @@
+#include "socket_test.h"
+#include "lwip/opt.h"
+#include "lwip/sys.h"
+#include "lwip/api.h"
+#include <lwip/sockets.h>
+#include <errno.h>
+
+#define SERVER_IP "192.168.1.121"
+#define SEND_PORT 5002
+#define BUFFER_SIZE 1024
+
+void udp_client(void) {
+    int sockfd;
+    struct sockaddr_in server_addr;
+    char buffer[BUFFER_SIZE];
+
+    // 创建 UDP 套接字
+    sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+    if (sockfd == -1) {
+        perror("Error creating socket");
+        exit(EXIT_FAILURE);
+    }
+
+    // 设置服务器地址信息
+    memset(&server_addr, 0, sizeof(server_addr));
+    server_addr.sin_family = AF_INET;
+    server_addr.sin_port = lwip_htons(SEND_PORT);
+    if (inet_aton(SERVER_IP, &server_addr.sin_addr) == 0) {
+        perror("Invalid server IP address");
+        close(sockfd);
+        exit(EXIT_FAILURE);
+    }
+
+    while (1) {
+        // 发送数据
+        const char *message = "Hello, UDP Server!";
+        int len = strlen(message);
+        printf("send message: \n");
+        for (int i = 0; i < len; i++) {
+            printf(" %x ", message[i]);
+        }
+        printf("\n");
+        if (sendto(sockfd, message, strlen(message), 0, (struct sockaddr *)&server_addr, sizeof(server_addr)) == -1) {
+            perror("Error sending data");
+            close(sockfd);
+            exit(EXIT_FAILURE);
+        }
+        sleep(1);
+    }
+}
+
+#define REV_PORT 5001
+#define BUFFER_SIZE 1024
+
+void udp_server(void)
+{
+    int sockfd;
+    struct sockaddr_in server_addr;
+    char buffer[BUFFER_SIZE];
+
+    // 创建 UDP 套接字
+    sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+    if (sockfd == -1) {
+        perror("Error creating socket");
+        exit(EXIT_FAILURE);
+    }
+
+    // 设置服务器地址信息
+    memset(&server_addr, 0, sizeof(server_addr));
+    server_addr.sin_family = AF_INET;
+    server_addr.sin_addr.s_addr = INADDR_ANY;
+    server_addr.sin_port = lwip_htons(REV_PORT);
+
+    // 绑定套接字
+    if (bind(sockfd, (struct sockaddr *)&server_addr, sizeof(server_addr)) == -1) {
+        perror("Error binding socket");
+        close(sockfd);
+        exit(EXIT_FAILURE);
+    }
+
+    while (1) {
+        socklen_t client_len = sizeof(struct sockaddr_in);
+        struct sockaddr_in client_addr;
+
+        // 接收数据
+        ssize_t bytes_received = recvfrom(sockfd, buffer, BUFFER_SIZE, 0, (struct sockaddr *)&client_addr, &client_len);
+        if (bytes_received == -1) {
+            perror("Error receiving data");
+            continue;
+        }
+
+        // 打印接收到的数据
+        printf("Received message from %s:%d\n", inet_ntoa(client_addr.sin_addr), lwip_ntohs(client_addr.sin_port));
+        printf("Received message: %d %s\n", (int)bytes_received, buffer);
+        printf("message: ");
+        for (int i = 0; i < bytes_received; i++) {
+            printf(" %02x ", buffer[i]);
+        }
+        printf("\n");
+
+        // 清空缓冲区
+        memset(buffer, 0, BUFFER_SIZE);
+        // break;
+    }
+
+    close(sockfd);
+}
+
+void client_init(void) {
+    printf("___enter client_init function___\n");
+    sys_thread_new("server", udp_server, NULL, 512, 4);
+    sys_thread_new("client", udp_client, NULL, 512, 4);
+}
\ No newline at end of file

diff --git a/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/core/dns.c b/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/core/dns.c
index 5c60238..ff44858 100644 (file)
--- a/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/core/dns.c
+++ b/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/core/dns.c
@@ -333,6 +333,10 @@ dns_init(void)
   for (n = 0; (n < LWIP_DHCP_MAX_DNS_SERVERS); n++) {
     dns_setserver(n, &dnsserver);
   }
+#ifdef DNS_SERVER_ADDRESS_SECONDARY
+  DNS_SERVER_ADDRESS_SECONDARY(&dnsserver);
+  dns_setserver(1, &dnsserver);
+#endif
 #endif /* DNS_SERVER_ADDRESS */
 
   LWIP_ASSERT("sanity check SIZEOF_DNS_QUERY",

diff --git a/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/core/init.c b/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/core/init.c
index 067d51a..ab25144 100644 (file)
--- a/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/core/init.c
+++ b/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/core/init.c
@@ -377,9 +377,7 @@ lwip_init(void)
 #endif /* LWIP_DNS */
 
 #if LWIP_SLIP
-#if 0 // 1201patch 为编译过屏蔽
-  slip_test_init();
-#endif
+  // slip_test_init();暂时屏蔽
 #endif /* LWIP_SLIP */
 #if PPP_SUPPORT
   ppp_init();

diff --git a/code/sdk/zhihui/4g/cat1Service/Service/cat1_utils.c b/code/sdk/zhihui/4g/cat1Service/Service/cat1_utils.c
index 0bc6dea..f61a99f 100644 (file)
--- a/code/sdk/zhihui/4g/cat1Service/Service/cat1_utils.c
+++ b/code/sdk/zhihui/4g/cat1Service/Service/cat1_utils.c
@@ -384,12 +384,10 @@ errcode_t cat1_register_time_ctl_functions(time_ctl_funcs_t *funcs)
 
 void cat1_api_suspend_protocol(void)
 {
-    #if 0 // 1201patch 为编译过屏蔽
     #ifdef SUPPORT_LWIP
         tcpip_thread_suspend();
         slipif_loop_thread_suspend();
     #endif
-    #endif
 }
 
 /**
@@ -405,12 +403,10 @@ void cat1_api_suspend_protocol(void)
  */
 void cat1_api_resume_protocol(void)
 {
-    #if 0 // 1201patch 为编译过屏蔽
     #ifdef SUPPORT_LWIP
         tcpip_thread_resume();
         slipif_loop_thread_resume();
     #endif
-    #endif
 }
 
 /**

diff --git a/code/sdk/zhihui/UI/producttest/include/testView.h b/code/sdk/zhihui/UI/producttest/include/testView.h
index c62f886..1bed26a 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/include/testView.h
+++ b/code/sdk/zhihui/UI/producttest/include/testView.h
@@ -168,7 +168,7 @@ namespace OHOS
 #ifdef SUPPORT_A5133_SERVICE\r
         testA5133View *test_A5133_view{nullptr};\r
 #endif\r
-        UILabelButtonExt *button[30] = {NULL};\r
+        UILabelButtonExt *button[30] = {nullptr};\r
         bool initViewStatus{false};\r
 \r
         // 添加成员变量来存储按钮viewId字符串，避免悬空指针问题\r

diff --git a/code/sdk/zhihui/UI/producttest/src/testView.cpp b/code/sdk/zhihui/UI/producttest/src/testView.cpp
index 73399cc..0f6a253 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testView.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testView.cpp
@@ -118,7 +118,7 @@ namespace OHOS
                     if (button[i])
                     {
                         delete button[i];
-                        button[i] = NULL;
+                        button[i] = nullptr;
                     }
                 }
             }
@@ -1117,7 +1117,10 @@ namespace OHOS
         int len = sizeof(Test_ViewMapper_t) / sizeof(Test_ViewMapper_t[0]);
         for (int i = 0; i < len; i++)
         {
-            SystemScrollView[TESTVIEW]->Add(button[i]);
+            if (button[i] != nullptr)
+            {
+                SystemScrollView[TESTVIEW]->Add(button[i]);
+            }
         }
         group->Add(SystemScrollView[TESTVIEW]);
         AddViewToRootContainer(group);