${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testspeak.cpp
${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testmotor.cpp
${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testbutton.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testmakephone.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testmicrophone.cpp
${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testcat1.cpp
${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testhrsenson.cpp
${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testgsenson.cpp
bool testLCDScrollViewcrollViewinit(void);
UIScrollView *testLCDScrollView{nullptr};
bool initViewStatus{false};
- UILabelButtonExt* labelButton_next = nullptr;
+ UILabelButtonExt* labelButton_next = nullptr;
+ UILabel *Title{nullptr}; // 标题
};
}
#endif
\ No newline at end of file
#include "components/ui_radio_button.h"\r
#include "producttest/include/testmotor.h"\r
#include "producttest/include/testbutton.h" \r
-#include "producttest/include/testmakephone.h"\r
+#include "producttest/include/testmicrophone.h"\r
#include "producttest/include/testcat1.h" \r
#include "producttest/include/testhrsenson.h" \r
#include "components/ui_label_button_ext.h"\r
MOTOR,\r
CAT1,\r
BUTTON,\r
- MAKEPHONE,\r
+ MICROPHONE,\r
HRSENSON,\r
GSENSON,\r
OLDTEST,\r
UIScrollView *testTPScrollView{nullptr};
bool initViewStatus{false};
UILabelButtonExt* labelButton_next = nullptr;
+ UILabel *Title{nullptr}; // 标题
};
}
#endif
\ No newline at end of file
#include "producttest/include/testmotor.h"\r
#include "producttest/include/testbutton.h"\r
#include "producttest/include/testmagnetic.h"\r
-#include "producttest/include/testmakephone.h"\r
+#include "producttest/include/testmicrophone.h"\r
#include "producttest/include/testcat1.h" \r
#include "producttest/include/testhrsenson.h" \r
#include "producttest/include/testgsenson.h"\r
testbuttonView *test_KEY_view{nullptr};\r
testMagicView *test_MG_view{nullptr};\r
testhrsenson1View *test_hr_view{nullptr};\r
- testmakephoneView *test_MP_view{nullptr};\r
+ testmicrohoneView *test_MP_view{nullptr};\r
\r
testgsensonView *test_G_view{nullptr};\r
testoldView *test_old_view{nullptr};\r
void ClearAll(void);
UILabel *InitLabel(LabelConfig &labelConfig);
UILabelButtonExt* init_button_next(int x,int y,char *view_id);
+ UILabel *init_title(int x,int y,char *view_text);
private:
bool testAboutTheWatchScrollViewinit(void);
UILabel *FONTTitle = nullptr;
UILabel *FONT = nullptr;
UILabelButtonExt* labelButton_next = nullptr;
+ UILabel *Title{nullptr}; // 标题
bool initViewStatus{false};
};
}
UIScrollView *testBUTTONScrollView{nullptr};
UILabelButtonExt* labelButton_next = nullptr;
UILabelButtonExt* button[2]{NULL};
+ UILabel *Title{nullptr}; // 标题
bool initViewStatus{false};
};
}
UILabel *label_1_cat1vison{nullptr};
UILabel *label_1_cat1vison_1{nullptr};
bool initViewStatus{false};
+ UILabel *Title{nullptr}; // 标题
UILabelButtonExt* button{NULL};
};
}
bool testCHANINGScrollViewcrollViewinit(void);
UIScrollView *testCHANINGScrollView{nullptr};
bool initViewStatus{false};
- UILabelButtonExt* labelButton_next = nullptr;
+ UILabel *Title{nullptr}; // 标题
+ UILabelButtonExt* labelButton_next = nullptr;
};
}
#endif
\ No newline at end of file
UILabelButtonExt* button_2{NULL};
UILabel *label_hrsenson_value_vison{nullptr};
bool initViewStatus{false};
- UILabelButtonExt* labelButton_next = nullptr;
+ UILabelButtonExt* labelButton_next = nullptr;
+ UILabel *Title{nullptr}; // 标题
};
}
#endif
\ No newline at end of file
UISlider *BrightnessControlViewSlider = nullptr;
UILabelButtonExt* labelButton_next = nullptr;
+ UILabel *Title{nullptr}; // 标题
};
}
#endif
\ No newline at end of file
-#ifndef TEST_MAKPHONE_VIEW_H
-#define TEST_MAKPHONE_VIEW_H
+#ifndef TEST_MICRPHONE_VIEW_H
+#define TEST_MICRPHONE_VIEW_H
#include "BaseView.h"
#include "View.h"
#include "components/ui_button.h"
#include "components/ui_image_view.h"
#include "components/ui_label_button_ext.h"
-#include "producttest/include/testPresenter.h"
+#include "producttest/include/testPresenter.h"
#include "record/include/RecordingModel.h"
//#include "cmsis_os.h"
#include <iostream>
namespace OHOS
{
- class testmakephoneView
+ class testmicrohoneView
{
public:
};
- testmakephoneView();
- virtual ~testmakephoneView();
- static testmakephoneView *GetInstance(void);
+ testmicrohoneView();
+ virtual ~testmicrohoneView();
+ static testmicrohoneView *GetInstance(void);
void buttoncallback();
- UIScrollView *testmakephoneInitIView(void);
+ UIScrollView *testmicrophoneInitIView(void);
void ClearAll(void);
private:
UILabelButtonExt *SetTheButton_ext(ButtonConfig_ext_t &buttonconfig);//, UIView::OnTouchListener *clickListener);
UILabelButtonExt* labelButton_next = nullptr;
UILabelButtonExt* button{NULL};
bool initViewStatus{false};
+ UILabel *Title{nullptr}; // 标题
};
}
#endif
\ No newline at end of file
UILabelButtonExt* labelButton_next = nullptr;
UILabelButtonExt* button[2]{NULL};
bool initViewStatus{false};
+ UILabel *Title{nullptr}; // 标题
};
}
#endif
\ No newline at end of file
bool initViewStatus{false};
UILabelButtonExt* labelButton_next = nullptr;
UILabelButtonExt* button[2]{NULL};
+ UILabel *Title{nullptr}; // 标题
};
}
#endif
\ No newline at end of file
testLCDView::~testLCDView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testLCDView::~testLCDView");
ClearAll();
g_pSystemAboutTheWatchView = nullptr;
}
{
if(testLCDScrollView)
{
-
-
+ testLCDScrollView->RemoveAll();
if(MG_TEST_timer!=NULL)
{
osTimerStop(MG_TEST_timer);
delete labelButton_next;
labelButton_next=nullptr;
}
+ if(Title)
+ {
+ delete Title;
+ Title=nullptr;
+ }
delete testLCDScrollView;
testLCDScrollView=nullptr;
testLCDScrollView->SetScrollBlankSize(35);
testLCDScrollView->SetReboundSize(50);
testLCDScrollView->SetDirection(1);
- //UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(SystemPresenter::GetInstance());
- // if (draglistener == nullptr)
- // {
- // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
- // return false;
- // }
- // testLCDScrollView->SetOnDragListener(draglistener);
+ UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());
+ if (draglistener == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
+ return false;
+ }
+ testLCDScrollView->SetOnDragListener(draglistener);
testLCDScrollView->SetTouchable(true);
- testLCDScrollView->SetDraggable(false);
+ testLCDScrollView->SetDraggable(true);
+
+ Title= testAboutView::GetInstance()->init_title(163,45,"LCD_TEST");
+ testLCDScrollView->Add(Title);
+
return true;
{SPEAK,"speakButton", "motorButton_next",true},\r
{MOTOR,"motorButton", "cat1button_next",true},\r
{CAT1,"cat1button", "buttonbutton_next",true},\r
- {BUTTON,"buttonbutton", "makephonebutton_next",true},\r
- {MAKEPHONE,"makephonebutton", "hrsensonbutton_next",true},\r
+ {BUTTON,"buttonbutton", "microphonebutton_next",true},\r
+ {MICROPHONE,"microphonebutton", "hrsensonbutton_next",true},\r
{HRSENSON,"hrsensonbutton", "gsensonbutton_next",true},\r
{GSENSON,"gsensonbutton","xxxx" ,true},\r
- {OLDTEST,"oldtestbutton","xxxx",true},\r
+ {OLDTEST,"oldtestbutton","oldtestexit",true},\r
{shutdown,"shutdown","xxxxxxxxx",true},\r
};\r
// {FACTORYRESETVIEW,"FactoryResetButton",true},\r
\r
bool testPresenter::OnDrag(UIView &view, const DragEvent &event)\r
{\r
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemPresenter::");\r
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemPresenter::");\r
if(strcmp(view.GetViewId(),"BrightnessControl") == 0 || strcmp(view.GetViewId(),"Brightnesview") == 0 )\r
{\r
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "xxxxxxxxxxxxx::");\r
{\r
return true;\r
}\r
- // if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)\r
- // {\r
- // for (int i = 1; i < MAX_TESTVIEWID; i++)\r
- // {\r
- // if (p_SystemView->GetSystemScrollView(i) != nullptr && p_SystemView->GetSystemScrollView(i)->IsVisible() == true)\r
- // {\r
- // p_SystemView->ChangeView(i, TESTVIEW);\r
- // break;\r
- // }\r
- // }\r
- // return true;\r
- // }\r
+ if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)\r
+ {\r
+ for (int i = 1; i < MAX_TESTVIEWID; i++)\r
+ {\r
+ if (p_SystemView->GetSystemScrollView(i))\r
+ {\r
+ p_SystemView->ChangeView(i, TESTVIEW);\r
+ break;\r
+ }\r
+ }\r
+ return true;\r
+ }\r
return false;\r
}\r
\r
//int len=5;\r
// 根据控件id查找是哪个控件触发了点击回调\r
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnClick");\r
-\r
- if(strcmp(view.GetViewId(),"xxxx") == 0)\r
+ \r
+ if(strcmp(view.GetViewId(),"xxxx") == 0) \r
{ \r
//testSPEAKView::GetInstance()->Changspeak(true);\r
testView::GetInstance()->ChangeView(GSENSON,TESTVIEW);\r
return true;\r
}\r
+ \r
+ if(strcmp(view.GetViewId(),"oldtestexit") == 0) \r
+ { \r
+ //testSPEAKView::GetInstance()->Changspeak(true);\r
+ testView::GetInstance()->ChangeView(OLDTEST,TESTVIEW);\r
+ return true;\r
+ }\r
if(strcmp(view.GetViewId(),"shutdown") == 0)\r
{\r
uapi_poweroff_device();\r
testMOTORView::GetInstance()->Changstatr(true);\r
}\r
\r
- if(strcmp(view.GetViewId(),"testmakephoneView") == 0)\r
+ if(strcmp(view.GetViewId(),"testmicrohoneView") == 0)\r
{ \r
- testmakephoneView::GetInstance()->buttoncallback();\r
+ testmicrohoneView::GetInstance()->buttoncallback();\r
} \r
\r
if(strcmp(view.GetViewId(),"dial_112") == 0)\r
uint8_t keystate=event.GetState();\r
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, ":xxxxxxx:%d",keyID);\r
// 如果是power键就返回上一级\r
- if (keyID == 41 )\r
+ if(testbuttonView::GetInstance())\r
+ {\r
+ if (keyID == 41 )\r
{\r
if(keystate)\r
testbuttonView::GetInstance()-> Changbutton(0,true);\r
// uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
// NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);\r
}\r
+\r
+ }\r
+ \r
return true;\r
}\r
\r
testTPView::~testTPView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testTPView::~testTPView");
ClearAll();
g_pSystemAboutTheWatchView = nullptr;
}
delete labelButton_next;
labelButton_next=NULL;
}
+ if(Title)
+ {
+ delete Title;
+ Title=nullptr;
+ }
}
}
labelButton_next= testAboutView::GetInstance()->init_button_next(167,378,"MAGETICButton_next");
testTPScrollView->Add(labelButton_next);
+ Title= testAboutView::GetInstance()->init_title(175,45,"TP_TEST");
+ testTPScrollView->Add(Title);
+
+
+
return true;
}
{MOTOR,"motorButton","motor", &testView::ChangmotorTESTView},\r
{CAT1,"cat1button","CAT1", &testView::ChangeCAT1TESTView},\r
{BUTTON,"buttonbutton","button" ,&testView::ChangKEYTESTView},\r
- {MAKEPHONE,"makephonebutton","makephone" ,&testView::ChangeMPTESTView},\r
+ {MICROPHONE,"microphonebutton","microphone" ,&testView::ChangeMPTESTView},\r
{HRSENSON,"hrsensonbutton","hrsensor" ,&testView::ChangeHRTESTView},\r
{GSENSON,"gsensonbutton","gsensor" ,&testView::ChangeGTESTView},\r
{OLDTEST,"oldtestbutton","aging" ,&testView::ChangeoldTESTView},\r
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::SystemLabel new fail!");\r
return false;\r
}\r
- SystemLabel->SetPosition(180, 52);\r
+ SystemLabel->SetPosition(162, 52);\r
SystemLabel->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
SystemLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
SystemLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
if (SystemScrollView[thisView] == nullptr)\r
{\r
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeSystemAboutView");\r
- test_MP_view = new testmakephoneView();\r
+ test_MP_view = new testmicrohoneView();\r
if (test_MP_view == nullptr)\r
{\r
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: new scrollView[%d] fail", thisView);\r
return false;\r
}\r
- SystemScrollView[thisView] = test_MP_view->testmakephoneInitIView();\r
+ SystemScrollView[thisView] = test_MP_view->testmicrophoneInitIView();\r
RootView::GetInstance()->Add(SystemScrollView[thisView]);\r
}\r
return true;\r
RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
delete test_about_view; \r
test_about_view = nullptr;\r
+ SystemScrollView[hideView]=nullptr;\r
break;\r
case LCD:\r
RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
delete test_LCD_view; \r
test_LCD_view = nullptr;\r
+ SystemScrollView[hideView]=nullptr;\r
break;\r
case TP:\r
RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
delete test_TP_view; \r
test_TP_view = nullptr;\r
+ SystemScrollView[hideView]=nullptr;\r
+ break; \r
+ case MAGETIC:\r
+ RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+ delete test_MG_view; \r
+ test_MG_view = nullptr;\r
+ SystemScrollView[hideView]=nullptr;\r
+ break;\r
+ case LUMINANCE:\r
+ RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+ delete test_lum_view; \r
+ test_lum_view = nullptr;\r
+ SystemScrollView[hideView]=nullptr;\r
+ break;\r
+ case CHAR:\r
+ RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+ delete test_charging_view; \r
+ test_charging_view = nullptr;\r
+ SystemScrollView[hideView]=nullptr;\r
+ break;\r
+\r
+ case SPEAK:\r
+ RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+ delete test_speak_view; \r
+ test_speak_view = nullptr;\r
+ SystemScrollView[hideView]=nullptr;\r
+ break;\r
+ case MOTOR:\r
+ RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+ delete test_motor_view; \r
+ test_motor_view = nullptr;\r
+ SystemScrollView[hideView]=nullptr;\r
+ break;\r
+ case CAT1:\r
+ RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+ delete test_cat1_view; \r
+ test_cat1_view = nullptr;\r
+ SystemScrollView[hideView]=nullptr;\r
+ break;\r
+ case BUTTON:\r
+ RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+ delete test_KEY_view; \r
+ test_KEY_view = nullptr;\r
+ SystemScrollView[hideView]=nullptr;\r
+ break;\r
+ case MICROPHONE:\r
+ RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+ delete test_MP_view; \r
+ test_MP_view = nullptr;\r
+ SystemScrollView[hideView]=nullptr;\r
+ break;\r
+ case HRSENSON:\r
+ RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+ delete test_hr_view; \r
+ test_hr_view = nullptr;\r
+ SystemScrollView[hideView]=nullptr;\r
+ break;\r
+ case GSENSON:\r
+ RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+ delete test_G_view; \r
+ test_G_view = nullptr;\r
+ SystemScrollView[hideView]=nullptr;\r
+ break;\r
+ // case OLDTEST:\r
+ // RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+ // delete test_old_view; \r
+ // test_old_view = nullptr;\r
+ // SystemScrollView[hideView]=nullptr;\r
+ // break;\r
+ default:\r
+ break;\r
}\r
}\r
- // break;\r
- // case MAGETIC:\r
- // delete test_MG_view; \r
- // test_MG_view = nullptr;\r
- // break;\r
- // case LUMINANCE:\r
- // delete test_lum_view; \r
- // test_lum_view = nullptr;\r
- // break;\r
- // case CHAR:\r
- // delete test_charging_view; \r
- // test_charging_view = nullptr;\r
- // break;\r
-\r
- // case SPEAK:\r
- // delete test_speak_view; \r
- // test_speak_view = nullptr;\r
- // break;\r
- // case MOTOR:\r
- // delete test_motor_view; \r
- // test_motor_view = nullptr;\r
- // break;\r
- // case CAT1:\r
- // delete test_cat1_view; \r
- // test_cat1_view = nullptr;\r
- // break;\r
- // case BUTTON:\r
- // delete test_KEY_view; \r
- // test_KEY_view = nullptr;\r
- // break;\r
- // case MAKEPHONE:\r
- // delete test_MP_view; \r
- // test_MP_view = nullptr;\r
- // break;\r
- // case HRSENSON:\r
- // delete test_hr_view; \r
- // test_hr_view = nullptr;\r
- // break;\r
- // default:\r
- // break;\r
- // }\r
- // }\r
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "change>>>>>>>>>>>>>");\r
\r
}\r
return label_button;
}
+
+
+ UILabel *testAboutView::init_title(int x,int y,char *view_text)
+ {
+
+ UILabel *label = new UILabel();
+ if (label == nullptr)
+ {
+ return nullptr;
+ }
+ // label->SetPosition(x, y); // widget's left position and top position
+ // label->Resize(135, 88); // widget's width and height
+ label->SetPosition(x, y); // widget's left position and top position
+ label->Resize(460, 62);
+ // Set additional property
+ label->SetText(view_text);
+ label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+ label->SetVisible(true);
+
+ return label;
+
+ }
+
+
UILabel *testAboutView::InitLabel(LabelConfig &labelConfig)
{
UILabel *label = new UILabel();
testAboutTheWatchScrollView->SetScrollBlankSize(0);
testAboutTheWatchScrollView->SetReboundSize(0);
testAboutTheWatchScrollView->SetDirection(1);
- //UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(SystemPresenter::GetInstance());
- // if (draglistener == nullptr)
- // {
- // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
- // return false;
- // }
- // testAboutTheWatchScrollView->SetOnDragListener(draglistener);
+ UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());
+ if (draglistener == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
+ return false;
+ }
+ testAboutTheWatchScrollView->SetOnDragListener(draglistener);
testAboutTheWatchScrollView->SetTouchable(true);
+
testAboutTheWatchScrollView->SetDraggable(true);
return true;
}
testbuttonView::~testbuttonView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testbuttonView::~testbuttonView");
ClearAll();
- g_pSystemAboutTheWatchView = nullptr;
+ // g_pSystemAboutTheWatchView = nullptr;
}
testbuttonView *testbuttonView::GetInstance()
labelButton_next=nullptr;
}
+ if(Title)
+ {
+ delete Title;
+ Title=nullptr;
+ }
+
delete testBUTTONScrollView;
testBUTTONScrollView=nullptr;
}
button->SetAlign(TEXT_ALIGNMENT_LEFT);
button->SetLabelPosition(buttonconfig.label_x,buttonconfig.label_y );
button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, buttonconfig.Fontsize);
+
// UIView:: OnClickListener *touchListener = static_cast<UIView::OnClickListener *>(testPresenter::GetInstance());
// button->SetOnClickListener(touchListener);
testBUTTONScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
testBUTTONScrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
testBUTTONScrollView->SetStyle(STYLE_BORDER_RADIUS, 0);
- testBUTTONScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::White().full);
+ testBUTTONScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
testBUTTONScrollView->SetStyle(STYLE_BORDER_COLOR, Color::Yellow().blue);
// }
// testcat1ScrollView->SetOnDragListener(draglistener);
- labelButton_next= testAboutView::GetInstance()->init_button_next(267,278,"makephonebutton_next");
+ labelButton_next= testAboutView::GetInstance()->init_button_next(267,220,"microphonebutton_next");
testBUTTONScrollView->Add(labelButton_next);
+ Title= testAboutView::GetInstance()->init_title(165,45,"KEY_TEST");
+ testBUTTONScrollView->Add(Title);
+
+ UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());
+ if (draglistener == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
+ return false;
+ }
+ testBUTTONScrollView->SetOnDragListener(draglistener);
+
testBUTTONScrollView->SetTouchable(true);
- testBUTTONScrollView->SetDraggable(false);
+ testBUTTONScrollView->SetDraggable(true);
return true;
testcat1View::~testcat1View()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testcat1View::~testcat1View");
ClearAll();
- g_pSystemAboutTheWatchView = nullptr;
+ //g_pSystemAboutTheWatchView = nullptr;
}
testcat1View *testcat1View::GetInstance()
delete label_1_cat1vison_1;
label_1_cat1vison_1=nullptr;
}
+
+ if(Title)
+ {
+ delete Title;
+ Title=nullptr;
+ }
delete testcat1ScrollView;
ButtonConfig_ext_t buttonconfig;
buttonconfig.x = 100;
buttonconfig.y = 300;
- buttonconfig.w = 200;
+ buttonconfig.w = 180;
buttonconfig.h = 116;
buttonconfig.label_x=40;
buttonconfig.label_y=0;
button=SetTheButton_ext(buttonconfig);
testcat1ScrollView->Add(button);
+ UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());
+ if (draglistener == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
+ return false;
+ }
+ testcat1ScrollView->SetOnDragListener(draglistener);
+
// buttonconfig.x = 100;
labelButton_next= testAboutView::GetInstance()->init_button_next(267,278,"buttonbutton_next");
testcat1ScrollView->Add(labelButton_next);
-
+ Title= testAboutView::GetInstance()->init_title(165,45,"CAT1_TEST");
+ testcat1ScrollView->Add(Title);
testcat1ScrollView->SetTouchable(true);
- testcat1ScrollView->SetDraggable(false);
+ testcat1ScrollView->SetDraggable(true);
return true;
testCHANINGView::~testCHANINGView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testCHANINGView::~testCHANINGView");
ClearAll();
- g_pSystemAboutTheWatchView = nullptr;
+ //g_pSystemAboutTheWatchView = nullptr;
}
testCHANINGView *testCHANINGView::GetInstance()
delete labelButton_next;
labelButton_next=nullptr;
}
+ if(Title)
+ {
+ delete Title;
+ Title=nullptr;
+ }
delete testCHANINGScrollView;
testCHANINGScrollView=nullptr;
testCHANINGScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
testCHANINGScrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
testCHANINGScrollView->SetStyle(STYLE_BORDER_RADIUS, 0);
- testCHANINGScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::White().full);
+ testCHANINGScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
testCHANINGScrollView->SetStyle(STYLE_BORDER_COLOR, Color::Yellow().blue);
// }
// testCHANINGScrollView->SetOnDragListener(draglistener);
testCHANINGScrollView->SetTouchable(true);
- testCHANINGScrollView->SetDraggable(false);
+ testCHANINGScrollView->SetDraggable(true);
- labelButton_next= testAboutView::GetInstance()->init_button_next(267,378,"speakButton_next");
+ labelButton_next= testAboutView::GetInstance()->init_button_next(267,278,"speakButton_next");
testCHANINGScrollView->Add(labelButton_next);
+ UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());
+ if (draglistener == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
+ return false;
+ }
+ testCHANINGScrollView->SetOnDragListener(draglistener);
+
+ Title= testAboutView::GetInstance()->init_title(120,45,"CHANING_TEST");
+ testCHANINGScrollView->Add(Title);
+
return true;
}
testgsensonView::~testgsensonView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testgsensonView::~testgsensonView");
ClearAll();
g_pSystemAboutTheWatchView = nullptr;
}
// }
// testGsonsonScrollView->SetOnDragListener(draglistener);
+ UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());
+ if (draglistener == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
+ return false;
+ }
+ testGsonsonScrollView->SetOnDragListener(draglistener);
+
LabelConfig Config = {
- .left = 203,
+ .left = 121,
.top = 52,
.width = 60,
.height = 35,
.fontSize = 30,
.lineHeigh = 35,
- .text = "GSENSON",
+ .text = "GSENSOR_TEST",
.lineBreakMode = UILabel::LINE_BREAK_ADAPT,
};
title = InitLabel(Config);
testGsonsonScrollView->SetTouchable(true);
- testGsonsonScrollView->SetDraggable(false);
+ testGsonsonScrollView->SetDraggable(true);
testhrsenson1View::~testhrsenson1View()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testhrsenson1View::~testhrsenson1View");
ClearAll();
g_pSystemAboutTheWatchView = nullptr;
}
{
if(testhrsensonScrollView)
{
+ testhrsensonScrollView->RemoveAll();
if(label_hrsenson_value_vison)
{
delete label_hrsenson_value_vison;
delete labelButton_next;
labelButton_next=nullptr;
}
+ if(Title)
+ {
+ delete Title;
+ Title=nullptr;
+ }
delete testhrsensonScrollView;
testhrsensonScrollView=nullptr;
LabelConfig Config = {
.left = 50,
- .top = 70,
+ .top = 80,
.width = 60,
.height = 35,
.fontSize = 30,
buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
button_1=SetTheButton_ext(buttonconfig);
testhrsensonScrollView->Add(button_1);
-
+ button_1->SetVisible(false);
buttonconfig.x = 300;
// button[1]=SetTheButton_ext(buttonconfig);
// testhrsensonScrollView->Add(button[1]);
- // UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());
- // if (draglistener == nullptr)
- // {
- // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
- // return false;
- // }
- // testhrsensonScrollView->SetOnDragListener(draglistener);
+ UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());
+ if (draglistener == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
+ return false;
+ }
+ testhrsensonScrollView->SetOnDragListener(draglistener);
+
labelButton_next= testAboutView::GetInstance()->init_button_next(167,378,"gsensonbutton_next");
testhrsensonScrollView->Add(labelButton_next);
+ Title= testAboutView::GetInstance()->init_title(102,45,"HRSSONSER_TEST");
+ testhrsensonScrollView->Add(Title);
+
testhrsensonScrollView->SetTouchable(true);
- testhrsensonScrollView->SetDraggable(false);
+ testhrsensonScrollView->SetDraggable(true);
int8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST;
send_ppg_cmd_msg(md);
testLUMView::~testLUMView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testLUMView::~testLUMView");
ClearAll();
g_pSystemAboutTheWatchView = nullptr;
}
delete labelButton_next;
labelButton_next=nullptr;
}
+ if(Title)
+ {
+ delete Title;
+ Title=nullptr;
+ }
delete testLUMScrollView;
testLUMScrollView=nullptr;
return false;
}
BrightnessControlViewSlider->SetSliderColor(Color::Gray(), Color::Silver());
- BrightnessControlViewSlider->SetPosition(167, 77, 130, 310);
+ BrightnessControlViewSlider->SetPosition(150, 90, 130, 310);
BrightnessControlViewSlider->SetDirection(UISlider::Direction::DIR_BOTTOM_TO_TOP);
BrightnessControlViewSlider->SetViewId("BrightnessControl");
BrightnessControlViewSlider->SetRange(0xff, 51);
testLUMScrollView->SetTouchable(true);
testLUMScrollView->SetDraggable(true);
- labelButton_next= testAboutView::GetInstance()->init_button_next(267,378,"chargingButton_next");
+ labelButton_next= testAboutView::GetInstance()->init_button_next(300,278,"chargingButton_next");
testLUMScrollView->Add(labelButton_next);
+ Title= testAboutView::GetInstance()->init_title(99,54,"BRIGHTNESS_TEST");
+ testLUMScrollView->Add(Title);
+
return true;
}
testMagicView::~testMagicView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testMagicView::~testMagicView");
ClearAll();
g_pSystemAboutTheWatchView = nullptr;
}
testmagicScrollView->SetScrollBlankSize(0);
testmagicScrollView->SetReboundSize(0);
testmagicScrollView->SetDirection(1);
- //UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(SystemPresenter::GetInstance());
- // if (draglistener == nullptr)
- // {
- // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
- // return false;
- // }
- // testmagicScrollView->SetOnDragListener(draglistener);
+ UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());
+ if (draglistener == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
+ return false;
+ }
+ testmagicScrollView->SetOnDragListener(draglistener);
LabelConfig Config = {
- .left = 203,
- .top = 52,
+ .left = 112,
+ .top = 75,
.width = 60,
.height = 35,
.fontSize = 30,
.lineHeigh = 35,
- .text = "磁力测试",
+ .text = "MAGNETIC_TEST",
.lineBreakMode = UILabel::LINE_BREAK_ADAPT,
};
title = InitLabel(Config);
testmagicScrollView->SetTouchable(true);
- testmagicScrollView->SetDraggable(false);
+ testmagicScrollView->SetDraggable(true);
#include "wearable_log.h"
#include "custom_utils.h"
#include "producttest/include/testPresenter.h"
-#include "producttest/include/testmakephone.h"
+#include "producttest/include/testmicrophone.h"
#include "AlarmClockModel.h"
#include "cmsis_os2.h"
#include "audio_capture_wrapper.h"
namespace OHOS
{
- static testmakephoneView *g_pSystemAboutTheWatchView{nullptr};
+ static testmicrohoneView *g_pSystemAboutTheWatchView{nullptr};
- testmakephoneView::testmakephoneView()
+ testmicrohoneView::testmicrohoneView()
{
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
g_pSystemAboutTheWatchView = this;
}
- testmakephoneView::~testmakephoneView()
+ testmicrohoneView::~testmicrohoneView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testmicrohoneView::~testmicrohoneView");
ClearAll();
g_pSystemAboutTheWatchView = nullptr;
}
- testmakephoneView *testmakephoneView::GetInstance()
+ testmicrohoneView *testmicrohoneView::GetInstance()
{
return g_pSystemAboutTheWatchView;
}
- void testmakephoneView::ClearAll()
+ void testmicrohoneView::ClearAll()
{
if(testmakephoneScrollView)
{
delete labelButton_next;
labelButton_next=nullptr;
}
+ if(Title)
+ {
+ delete Title;
+ Title=nullptr;
+ }
delete testmakephoneScrollView;
testmakephoneScrollView=nullptr;
}
}
- UILabelButtonExt *testmakephoneView::SetTheButton_ext(ButtonConfig_ext_t &buttonconfig)
+ UILabelButtonExt *testmicrohoneView::SetTheButton_ext(ButtonConfig_ext_t &buttonconfig)
{
UILabelButtonExt *button = new UILabelButtonExt();
if (button == nullptr)
uint8_t makphone_falg=0;
- static char *Path= "/user/music/test_makephone.mp3";
- void testmakephoneView::buttoncallback()
+ static char *Path= "/user/music/microphone.mp3";
+ void testmicrohoneView::buttoncallback()
{
if(button!=NULL)
{
if(makphone_falg==0)
{
char *args[6] = {0};
- const char *defaultArgs[6] = {"01", "mp3", "16000", "1", "16","/user/music/test_makephone.mp3"}; // 默认参数数组
+ const char *defaultArgs[6] = {"01", "mp3", "16000", "1", "16","/user/music/microphone.mp3"}; // 默认参数数组
for (int i = 0; i < 6; ++i)
{
- args[i] = (char *)malloc(64); // 分配内存
- sprintf(args[i], "%s", defaultArgs[i]); // 设置默认参数值
+ args[i] = (char *)malloc(64);
+ sprintf(args[i], "%s", defaultArgs[i]);
}
- //args[5] = (char *)malloc(100); // 分配内存
-
- // 获取形如：19700101000641格式的日期时间
-
/* ---------------------------------- 开始录音 ---------------------------------- */
AudioCaptureSample(6, (const char **)args);
button->SetText("stop");
button->SetText("play");
makphone_falg++;
- FILE *file =fopen("/user/music/test_makephone.mp3","rb");
+ FILE *file =fopen("/user/music/microphone.mp3","rb");
if(file==NULL)
{
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ffffffffffffffffsssssss");
- bool testmakephoneView::testphoneScrollViewcrollViewinit(void)
+ bool testmicrohoneView::testphoneScrollViewcrollViewinit(void)
{
testmakephoneScrollView = new UIScrollView();
testmakephoneScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
testmakephoneScrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
testmakephoneScrollView->SetStyle(STYLE_BORDER_RADIUS, 0);
- testmakephoneScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::White().full);
+ testmakephoneScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
testmakephoneScrollView->SetStyle(STYLE_BORDER_COLOR, Color::Yellow().blue);
buttonconfig.label_x=40;
buttonconfig.label_y=0;
buttonconfig.Fontsize=30;
- buttonconfig.ViewId="testmakephoneView";
+ buttonconfig.ViewId="testmicrohoneView";
buttonconfig.str="statr";
buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
button=SetTheButton_ext(buttonconfig);
testmakephoneScrollView->Add(button);
makphone_falg=0;
- // UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());
- // if (draglistener == nullptr)
- // {
- // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
- // return false;
- // }
- // testcat1ScrollView->SetOnDragListener(draglistener);
+ UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());
+ if (draglistener == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
+ return false;
+ }
+ testmakephoneScrollView->SetOnDragListener(draglistener);
labelButton_next= testAboutView::GetInstance()->init_button_next(50,278,"hrsensonbutton_next");
testmakephoneScrollView->Add(labelButton_next);
+ Title= testAboutView::GetInstance()->init_title(99,45,"MICRPPHONE_TEST");
+ testmakephoneScrollView->Add(Title);
+
testmakephoneScrollView->SetTouchable(true);
- testmakephoneScrollView->SetDraggable(false);
+ testmakephoneScrollView->SetDraggable(true);
return true;
}
- UIScrollView *testmakephoneView::testmakephoneInitIView()
+ UIScrollView *testmicrohoneView::testmicrophoneInitIView()
{
if (!testphoneScrollViewcrollViewinit())
{
testMOTORView::~testMOTORView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testMOTORView::~testMOTORView");
ClearAll();
g_pSystemAboutTheWatchView = nullptr;
}
delete labelButton_next;
labelButton_next=nullptr;
}
+ if(Title)
+ {
+ delete Title;
+ Title=nullptr;
+ }
delete tesMOTORScrollView;
tesMOTORScrollView=nullptr;
}
tesMOTORScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
tesMOTORScrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
tesMOTORScrollView->SetStyle(STYLE_BORDER_RADIUS, 0);
- tesMOTORScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::White().full);
+ tesMOTORScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
tesMOTORScrollView->SetStyle(STYLE_BORDER_COLOR, Color::Yellow().blue);
labelButton_next= testAboutView::GetInstance()->init_button_next(267,278,"cat1button_next");
tesMOTORScrollView->Add(labelButton_next);
+
+ Title= testAboutView::GetInstance()->init_title(136,45,"MOTOR_TEST");
+ tesMOTORScrollView->Add(Title);
return true;
//#include "acc_service.h"
namespace OHOS
{
+ static uint8 AGING_task_falg=0;
static void AGING_task(void *arg)
{
- while (1)
+ while (AGING_task_falg==1)
{
msleep(1000);
// uapi_tcxo_delay_ms(3000);
uint16_t angle_value= (int16_t)mag_service_get_fAzimuth();
char buf[16]={0};
sprintf(buf,"angle:%d",angle_value);
- testoldView::GetInstance()->x->SetText(buf);
- RootView::GetInstance()->Invalidate();
- msleep(1000);
+ if( testoldView::GetInstance()->x)
+ {
+ testoldView::GetInstance()->x->SetText(buf);
+ RootView::GetInstance()->Invalidate();
+ msleep(1000);
+ }
+ else{
+ break;
+ }
+
}
for(int i=0;i<3;i++)
{
uint16 y_t=t.y;
uint16 z_t=t.z;
sprintf(buf,"gsensor:\nX:%d\nY:%d\nZ:%d",x_t,y_t,z_t);
- testoldView::GetInstance()->x->SetText(buf);
- RootView::GetInstance()->Invalidate();
-
- msleep(1000);
+ if(testoldView::GetInstance()->x)
+ {
+ testoldView::GetInstance()->x->SetText(buf);
+ RootView::GetInstance()->Invalidate();
+ msleep(1000);
+ }
+ else{
+ break;
+ }
}
// uapi_tcxo_delay_ms(3000);
}
+ testoldView::GetInstance()->ClearAll();
}
errcode_t old_test_init(void)
{
-
+ AGING_task_falg=1;
PRINT("uapi_ppg_service_init !\r\n");
app_task_definition_t taskcfg={0};
taskcfg.create_queue_handle = NULL;
- taskcfg.attr.name="old_test_service";
+ taskcfg.attr.name="AGING_test_service";
taskcfg.attr.priority = TASK_PRIORITY_APP;
taskcfg.attr.stack_size = 1024*8;
taskcfg.func = AGING_task;
char buf[124]={0};
sprintf(buf,"leaklight:\ngreen:%d\nred:%d\nir:%d",g,r,ir);
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s",buf);
- x->SetText(buf);
- RootView::GetInstance()->Invalidate();
+ if(x)
+ {
+ x->SetText(buf);
+ RootView::GetInstance()->Invalidate();
+
+ }
int8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST;
send_ppg_cmd_msg(md);
}
testoldView::~testoldView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
- ClearAll();
- g_pSystemAboutTheWatchView = nullptr;
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testoldView::~testoldView");
+ AGING_task_falg=0;
}
testoldView *testoldView::GetInstance()
return g_pSystemAboutTheWatchView;
}
- static osTimerId_t Gsenson_TEST_timer=NULL;
void testoldView::ClearAll()
{
if(testoldScrollView)
{
testoldScrollView->RemoveAll();
-
- if (Gsenson_TEST_timer != NULL) {
- osTimerDelete(Gsenson_TEST_timer);
- Gsenson_TEST_timer = NULL;
- return ;
- }
-
if(title!=NULL)
{
delete title;
delete testoldScrollView;
testoldScrollView=nullptr;
}
+ g_pSystemAboutTheWatchView=nullptr;
}
CompassModel::GetInstance()->OpenCompassSensor();
- testoldScrollView = new UIScrollView();
- if (testoldScrollView == nullptr)
+ if(testoldScrollView==NULL)
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::testoldScrollView new fail!");
- return false;
- }
- testoldScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
- testoldScrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
- testoldScrollView->SetStyle(STYLE_BORDER_RADIUS, 1294);
+ testoldScrollView = new UIScrollView();
+ if (testoldScrollView == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::testoldScrollView new fail!");
+ return false;
+ }
+ testoldScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
+ testoldScrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
+ testoldScrollView->SetStyle(STYLE_BORDER_RADIUS, 1294);
-
- testoldScrollView->SetScrollBlankSize(0);
- testoldScrollView->SetReboundSize(0);
- testoldScrollView->SetDirection(1);
+
+ testoldScrollView->SetScrollBlankSize(0);
+ testoldScrollView->SetReboundSize(0);
+ testoldScrollView->SetDirection(1);
+ }
//UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(SystemPresenter::GetInstance());
// if (draglistener == nullptr)
// {
.height = 35,
.fontSize = 30,
.lineHeigh = 35,
- .text = "old_test",
+ .text = "AGING_TEST",
.lineBreakMode = UILabel::LINE_BREAK_ADAPT,
};
- title = InitLabel(Config);
- if (title == nullptr)
+ if(title==NULL)
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::SystemAboutTheWatchTitle new fail!");
- return false;
+ title = InitLabel(Config);
+ if (title == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::SystemAboutTheWatchTitle new fail!");
+ return false;
+ }
+ testoldScrollView->Add(title);
}
- testoldScrollView->Add(title);
+
/* -------------------------------------------------------------------------- */
// uint16_t angle_value= (int16_t)mag_service_get_fAzimuth();
gsenson_t t;
.lineBreakMode = UILabel::LINE_BREAK_ADAPT,
};
- x = InitLabel(Config);
- if (x == nullptr)
+ if(x==NULL)
{
+ x = InitLabel(Config);
+ if (x == nullptr)
+ {
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::WatchNameTitle new fail!");
return false;
+ }
+ testoldScrollView->Add(x);
}
- testoldScrollView->Add(x);
+
/* -------------------------------------------------------------------------- */
-
- labelButton_next= testAboutView::GetInstance()->init_button_next(167,378,"xxxx");
- testoldScrollView->Add(labelButton_next);
+ if(labelButton_next==NULL)
+ {
+ labelButton_next= testAboutView::GetInstance()->init_button_next(167,378,"oldtestexit");
+ testoldScrollView->Add(labelButton_next);
+
+ }
+
testoldScrollView->SetTouchable(true);
}
display_api->set_screen_set_keepon_timeout(-1);
+
+
old_test_init();
testSPEAKView::~testSPEAKView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testSPEAKView::~testSPEAKView");
ClearAll();
g_pSystemAboutTheWatchView = nullptr;
}
delete labelButton_next;
labelButton_next=nullptr;
}
+ if(Title)
+ {
+ delete Title;
+ Title=nullptr;
+ }
delete testSPEAKScrollView;
testSPEAKScrollView=nullptr;
}
{
//开始
AlarmClockModel::GetInstance()->AlarmPlayerStart();
- speakfalg=true;
// if(speak_TEST_timer!=NULL)
// osTimerDelete(speak_TEST_timer);
testSPEAKScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
testSPEAKScrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
testSPEAKScrollView->SetStyle(STYLE_BORDER_RADIUS, 0);
- testSPEAKScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::White().full);
+ testSPEAKScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
testSPEAKScrollView->SetStyle(STYLE_BORDER_COLOR, Color::Yellow().blue);
button[1]=SetTheButton_ext(buttonconfig);
testSPEAKScrollView->Add(button[1]);
- // UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());
- // if (draglistener == nullptr)
- // {
- // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
- // return false;
- // }
- // testSPEAKScrollView->SetOnDragListener(draglistener);
-
- labelButton_next= testAboutView::GetInstance()->init_button_next(267,278,"motorButton_next");
+ UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());
+ if (draglistener == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
+ return false;
+ }
+ testSPEAKScrollView->SetOnDragListener(draglistener);
+
+ labelButton_next= testAboutView::GetInstance()->init_button_next(267,220,"motorButton_next");
testSPEAKScrollView->Add(labelButton_next);
-
+ Title= testAboutView::GetInstance()->init_title(120,45,"SPEAK_TEST");
+ testSPEAKScrollView->Add(Title);
testSPEAKScrollView->SetTouchable(true);
- testSPEAKScrollView->SetDraggable(false);
+ testSPEAKScrollView->SetDraggable(true);
return true;
projects / mirrors / FD230.git / commitdiff