{
class ConfigModel
{
+ struct cat1_msg_config
+ {
+ char * imei;
+ int sim;
+ char * oper;
+ //uint8_t signal;
+ };
+
public:
static ConfigModel *GetInstance();
cJSON *GetcJSON(void);
void SetDialId(uint8_t id);
int GetDialId();
char * Getimei();
+ char* GetpyVer();
+ char* GetmoderVer();
void Setimei(char *str);
- /* -------------------------------------------------------------------------- */
+ void SetpyVer(char *str);
+ void SetmoderVer(char *str);
+
+ // -------------------------------------------------------------------------- */
private:
ConfigModel(); // 私有构造函数，确保无法在外部实例化
ConfigModel(const ConfigModel &) = delete; // 禁止拷贝构造
int HeartRateOrBloodOxygenQuickAccessSwitch{0}; // 心率或血氧快速访问开关，默认快速访问血氧打开
int dialid;
char * imei_str=NULL;
+ char * pyVer=NULL;
+ char * moderVer=NULL;
+
+ cat1_msg_config cat1_msg_config_t;
/* -------------------------------------------------------------------------- */
};
return imei_str;
}
- void ConfigModel::Setimei(char *str)
+ char* ConfigModel::GetpyVer()
+ {
+
+ return pyVer;
+ }
+ char* ConfigModel::GetmoderVer()
+ {
+
+ return moderVer;
+ }
+
+
+ void ConfigModel::Setimei(char *str)
{
if(imei_str==NULL || strcmp(imei_str,str)!=0)
{
}
else
{
+ memset(imei_str,0,strlen(imei_str));
strcpy(imei_str,str);
}
}
return ;
}
+
+ void ConfigModel::SetpyVer(char *str)
+ {
+ if(pyVer==NULL || strcmp(pyVer,str)!=0)
+ {
+ if(pyVer==NULL)
+ {
+ pyVer=(char*)malloc(strlen(str));
+ strcpy(pyVer,str);
+ }
+ else
+ {
+ memset(pyVer,0,strlen(pyVer));
+ strcpy(pyVer,str);
+ }
+ }
+ return ;
+ }
+
+ void ConfigModel::SetmoderVer(char *str)
+ {
+ if(moderVer==NULL || strcmp(moderVer,str)!=0)
+ {
+ if(moderVer==NULL)
+ {
+ moderVer=(char*)malloc(strlen(str));
+ strcpy(moderVer,str);
+ }
+ else
+ {
+ memset(moderVer,0,strlen(moderVer));
+ strcpy(moderVer,str);
+ }
+ }
+ return ;
+ }
/* ------------------------------ ImageAnimator ----------------------------- */
ImageAnimator::ImageAnimator()
#include "components/ui_label.h"
#include "components/ui_image_view.h"
#include "producttest/include/testLCD.h"
+#include "components/ui_label_button_ext.h"
//#include "cmsis_os.h"
#include <iostream>
namespace OHOS
bool testLCDScrollViewcrollViewinit(void);
UIScrollView *testLCDScrollView{nullptr};
bool initViewStatus{false};
+ UILabelButtonExt* labelButton_next = nullptr;
};
}
#endif
\ No newline at end of file
#include "producttest/include/testmakephone.h"\r
#include "producttest/include/testcat1.h" \r
#include "producttest/include/testhrsenson.h" \r
+#include "components/ui_label_button_ext.h"\r
#include "common/key_code.h"\r
namespace OHOS\r
{\r
#include "components/ui_image_view.h"
#include "producttest/include/testTP.h"
#include "producttest/include/testPresenter.h"
+#include "components/ui_label_button_ext.h"
//#include "cmsis_os.h"
#include <iostream>
namespace OHOS
bool testTPScrollViewcrollViewinit(void);
UIScrollView *testTPScrollView{nullptr};
bool initViewStatus{false};
+ UILabelButtonExt* labelButton_next = nullptr;
};
}
#endif
\ No newline at end of file
testAboutView *test_about_view;\r
UIScrollView *SystemScrollView[20]{nullptr};\r
UILabel *SystemLabel{nullptr}; // 标题\r
- UIButton *AboutTheWatchButton{nullptr};\r
- UIButton *SuperviseButton = {nullptr};\r
- UIButton *SystemLanguageButton = {nullptr};\r
- UIButton *FactoryResetButton{nullptr};\r
UILabelButtonExt *SystemUpgradeButtonExt{nullptr};\r
\r
testLCDView *test_LCD_view{nullptr};\r
testbuttonView *test_KEY_view{nullptr};\r
testMagicView *test_MG_view{nullptr};\r
testhrsenson1View *test_hr_view{nullptr};\r
-\r
testmakephoneView *test_MP_view{nullptr};\r
-\r
+ \r
+ UILabelButtonExt *button[10]={NULL};\r
bool initViewStatus{false};\r
};\r
} // namespace OHOS\r
#include "components/ui_label.h"
#include "components/ui_image_view.h"
#include "producttest/include/testabout.h"
+#include "components/ui_label_button_ext.h"
#include <iostream>
namespace OHOS
{
UIScrollView *SystemAbouTheWatchtInitIView(void);
void ClearAll(void);
UILabel *InitLabel(LabelConfig &labelConfig);
+ UILabelButtonExt* init_button_next(int x,int y,char *view_id);
private:
bool testAboutTheWatchScrollViewinit(void);
UILabel *LANAddress = nullptr;
UILabel *FONTTitle = nullptr;
UILabel *FONT = nullptr;
+ UILabelButtonExt* labelButton_next = nullptr;
bool initViewStatus{false};
};
}
UILabelButtonExt *SetTheButton_ext(ButtonConfig_ext_t &buttonconfig);//, UIView::OnTouchListener *clickListener);
bool testBUTTONScrollViewcrollViewinit(void);
UIScrollView *testBUTTONScrollView{nullptr};
+ UILabelButtonExt* labelButton_next = nullptr;
+ UILabelButtonExt* button[2]{NULL};
bool initViewStatus{false};
};
}
// UILabel *label_1_cat1msg_oper{nullptr};
// UILabel *label_1_cat1msg_sim{nullptr};
// UILabel *label_1_cat1msg_signal{nullptr};
-
+ UILabelButtonExt* labelButton_next = nullptr;
UILabel *label_1_cat1vison{nullptr};
+ UILabel *label_1_cat1vison_1{nullptr};
bool initViewStatus{false};
+ UILabelButtonExt* button{NULL};
};
}
#endif
\ No newline at end of file
bool testCHANINGScrollViewcrollViewinit(void);
UIScrollView *testCHANINGScrollView{nullptr};
bool initViewStatus{false};
+ 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;
};
}
#endif
\ No newline at end of file
#include "producttest/include/testTP.h"
#include "producttest/include/testPresenter.h"
#include "components/ui_slider.h"
+#include "components/ui_label_button_ext.h"
//#include "cmsis_os.h"
#include <iostream>
namespace OHOS
UIScrollView *testLUMScrollView{nullptr};
bool initViewStatus{false};
UISlider *BrightnessControlViewSlider = nullptr;
+
+ UILabelButtonExt* labelButton_next = nullptr;
};
}
#endif
\ No newline at end of file
#include "components/ui_image_view.h"
#include "producttest/include/testmagnetic.h"
#include "CompassModel.h"
+#include "components/ui_label_button_ext.h"
//#include "cmsis_os.h"
#include <iostream>
UILabel *x{nullptr}; // “手表名称”
UILabel *y{nullptr};
UILabel *z{nullptr}; // "固件版本"
+
+ UILabelButtonExt* labelButton_next = nullptr;
};
}
#endif
\ No newline at end of file
UILabelButtonExt *SetTheButton_ext(ButtonConfig_ext_t &buttonconfig);//, UIView::OnTouchListener *clickListener);
bool testphoneScrollViewcrollViewinit(void);
UIScrollView *testmakephoneScrollView{nullptr};
+ UILabelButtonExt* labelButton_next = nullptr;
+ UILabelButtonExt* button{NULL};
bool initViewStatus{false};
};
}
#include "components/ui_image_view.h"
#include "components/ui_label_button_ext.h"
#include "producttest/include/testPresenter.h"
+#include "components/ui_label_button_ext.h"
//#include "cmsis_os.h"
#include <iostream>
namespace OHOS
UILabelButtonExt *SetTheButton_ext(ButtonConfig_ext_t &buttonconfig);//, UIView::OnTouchListener *clickListener);
bool testMOTORScrollViewcrollViewinit(void);
UIScrollView *tesMOTORScrollView{nullptr};
+ UILabelButtonExt* labelButton_next = nullptr;
+ UILabelButtonExt* button[2]{NULL};
bool initViewStatus{false};
};
}
private:
UILabelButtonExt *SetTheButton_ext(ButtonConfig_ext_t &buttonconfig);//, UIView::OnTouchListener *clickListener);
bool tesSPEAKScrollViewcrollViewinit(void);
- UIScrollView *testSOEAKScrollView{nullptr};
+ UIScrollView *testSPEAKScrollView{nullptr};
bool initViewStatus{false};
+ UILabelButtonExt* labelButton_next = nullptr;
+ UILabelButtonExt* button[2]{NULL};
};
}
#endif
\ No newline at end of file
return g_pSystemAboutTheWatchView;
}
-
+ static osTimerId_t MG_TEST_timer=NULL;
void testLCDView::ClearAll()
{
- if (initViewStatus == true)
- {
- }
- }
+ if(testLCDScrollView)
+ {
+
+ if(MG_TEST_timer!=NULL)
+ {
+ osTimerStop(MG_TEST_timer);
+ int ret= osTimerDelete(MG_TEST_timer);
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "osTimerDelete %d",ret);
+ MG_TEST_timer = NULL;
+
+ }
+ if(labelButton_next)
+ {
+ delete labelButton_next;
+ labelButton_next=nullptr;
+ }
+
+ delete testLCDScrollView;
+ testLCDScrollView=nullptr;
+ }
+ }
+
void colorTimerCallBack(int data)
{
- testLCDView::GetInstance()->set_LCD_color();
+ testLCDView* t= testLCDView::GetInstance();
+ if(t!=NULL)
+ t->set_LCD_color();
}
uint8_t LCD_TEST_FALG=0;
void testLCDView :: set_LCD_color(void)
case 1:
testLCDScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full);
break;
- case 3:
+ case 2:
testLCDScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Yellow().full);
break;
default:
}
- static osTimerId_t MG_TEST_timer=NULL;
+
bool testLCDView::testLCDScrollViewcrollViewinit(void)
{
uint32_t tick;
testLCDScrollView->SetStyle(STYLE_BORDER_RADIUS, 1294);
testLCDScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
+
+ labelButton_next= testAboutView::GetInstance()->init_button_next(167,378,"TPButton_next");
+ testLCDScrollView->Add(labelButton_next);
+
LCD_TEST_FALG=0;
MG_TEST_timer = osTimerNew((osTimerFunc_t)colorTimerCallBack, osTimerPeriodic, NULL, NULL);
testLCDScrollView->SetTouchable(true);
testLCDScrollView->SetDraggable(false);
-
+
return true;
}
{\r
const int16_t viewId;\r
char *viewid_str;\r
+ char *viewid_str_next;\r
bool enable_falg;\r
};\r
\r
// 2.ViewMapper[] 是一个静态的视图映射数组，将视图ID与MainStopWatchView类中的特定成员函数指针进行了绑定。\r
static TEST_ext_p ViewMapper_t[] = \r
{\r
- {VISON,"AboutTheWatchButton",true},\r
- {LCD,"SuperviseButton",true},\r
- {TP,"SystemLanguageButton",true},\r
- {MAGETIC,"MAGETICButton",true},\r
- {LUMINANCE,"luminanceButton",true},\r
- {CHAR,"chargingButton",true},\r
- {SPEAK,"speakButton",true},\r
- {MOTOR,"motorButton",true},\r
- {CAT1,"cat1button",true},\r
- {BUTTON,"buttonbutton",true},\r
- {MAKEPHONE,"makephonebutton",true},\r
- {HRSENSON,"hrsensonbutton",true},\r
+ {VISON,"AboutTheWatchButton", "LCDButton_next",true},\r
+ {LCD,"LCDButton", "TPButton_next",true},\r
+ {TP,"TPButton", "MAGETICButton_next",true},\r
+ {MAGETIC,"MAGETICButton", "luminanceButton_next",true},\r
+ {LUMINANCE,"luminanceButton", "chargingButton_next",true},\r
+ {CHAR,"chargingButton", "speakButton_next",true},\r
+ {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
+ {HRSENSON,"hrsensonbutton", "xxxxxxxxxx",true},\r
};\r
// {FACTORYRESETVIEW,"FactoryResetButton",true},\r
// {SYSTEMLUPGRADE,"systemupgread",true},\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) != nullptr && p_SystemView->GetSystemScrollView(i)->IsVisible() == true)\r
+ // {\r
+ // p_SystemView->ChangeView(i, TESTVIEW);\r
+ // break;\r
+ // }\r
+ // }\r
+ // return true;\r
+ // }\r
return false;\r
}\r
\r
int len=sizeof(ViewMapper_t)/sizeof(TEST_ext_p);\r
//int len=5;\r
// 根据控件id查找是哪个控件触发了点击回调\r
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnClick");\r
\r
for(int i=0;i<len;i++)\r
{\r
testView::GetInstance()->ChangeView(TESTVIEW, ViewMapper_t[i].viewId);\r
return true;\r
}\r
+ if(strcmp(view.GetViewId(),ViewMapper_t[i].viewid_str_next) == 0)\r
+ {\r
+ if(ViewMapper_t[i+1].enable_falg==true)\r
+ testView::GetInstance()->ChangeView(ViewMapper_t[i].viewId, ViewMapper_t[i+1].viewId);\r
+ return true;\r
+ }\r
+\r
}\r
\r
if(strcmp(view.GetViewId(),"speak_play") == 0)\r
return g_pSystemAboutTheWatchView;
}
-
+ static UIButton* button[16]={NULL};
void testTPView::ClearAll()
{
- if (initViewStatus == true)
+ if(testTPScrollView)
{
+ testTPScrollView->RemoveAll();
+ for(int i=9;i<16;i++)
+ {
+ if(button[i]!=NULL)
+ {
+ delete button[i];
+ button[i]=NULL;
+ }
+ }
+
+ if(labelButton_next)
+ {
+ delete labelButton_next;
+ labelButton_next=NULL;
+ }
+
}
}
- static UIButton* button[16]={NULL};
+
char* viewid_str[]=
{
"TP_1", "TP_2", "TP_3", "TP_4",
testTPScrollView->SetTouchable(true);
testTPScrollView->SetDraggable(true);
+ labelButton_next= testAboutView::GetInstance()->init_button_next(167,378,"MAGETICButton_next");
+ testTPScrollView->Add(labelButton_next);
return true;
}
char *Labe_str;\r
bool (testView::*func)(int16_t thisView);\r
};\r
- static UILabelButtonExt *button[10]={NULL};\r
- \r
+ \r
\r
// 2.ViewMapper[] 是一个静态的视图映射数组，将视图ID与MainStopWatchView类中的特定成员函数指针进行了绑定。\r
static test_ext ViewMapper_t[] = {\r
{VISON,"AboutTheWatchButton","Verison",&testView::ChangeSystemAboutView},\r
- {LCD,"SuperviseButton","LCD",&testView::ChangeLCDTESTView},\r
- {TP,"SystemLanguageButton","TP", &testView::ChangeTPTESTView},\r
+ {LCD,"LCDButton","LCD",&testView::ChangeLCDTESTView},\r
+ {TP,"TPButton","TP", &testView::ChangeTPTESTView},\r
{MAGETIC,"MAGETICButton","Magetic", &testView::ChangeMGTESTView},\r
{LUMINANCE,"luminanceButton","luminance", &testView::ChangLUMTESTView},\r
{CHAR,"chargingButton","charging", &testView::ChangchargingTESTView},\r
{\r
if (initViewStatus == true)\r
{\r
- // SystemScrollView[SYSTEMVIEW]->RemoveAll();\r
+ SystemScrollView[TESTVIEW]->RemoveAll();\r
// UIView::OnDragListener *draglistener = SystemScrollView[SYSTEMVIEW]->GetOnDragListener();\r
// if (draglistener != nullptr)\r
// {\r
// delete draglistener;\r
// draglistener = nullptr;\r
// }\r
- // delete p_SystemAboutTheWatchView;\r
- // p_SystemAboutTheWatchView = nullptr;\r
- // delete p_SystemSuperviseView;\r
- // p_SystemSuperviseView = nullptr;\r
- // delete p_SystemLanguageView;\r
- // p_SystemLanguageView = nullptr;\r
- // delete p_SystemFactoryResetView;\r
- // p_SystemFactoryResetView = nullptr;\r
- // delete SystemLabel;\r
- // SystemLabel = nullptr;\r
- // delete AboutTheWatchButton;\r
- // AboutTheWatchButton = nullptr;\r
- // delete SuperviseButton;\r
- // SuperviseButton = nullptr;\r
- // delete SystemLanguageButton;\r
- // SystemLanguageButton = nullptr;\r
- // delete FactoryResetButton;\r
- // FactoryResetButton = nullptr;\r
-\r
- // delete SystemScrollView[SYSTEMVIEW];\r
- // SystemScrollView[SYSTEMVIEW] = nullptr;\r
+\r
+ int funcSize = sizeof(ViewMapper_t) / sizeof(ViewMapper_t[TESTVIEW]);\r
+ for (int i = 0; i < funcSize; i++)\r
+ {\r
+ if(button[i])\r
+ {\r
+ delete button[i];\r
+ button[i]=NULL;\r
+ }\r
+ }\r
+ delete test_about_view; \r
+ test_about_view = nullptr;\r
+ delete test_LCD_view; \r
+ test_LCD_view = nullptr;\r
+ delete test_TP_view;\r
+ test_TP_view = nullptr;\r
+ delete test_lum_view;\r
+ test_lum_view = nullptr;\r
+ delete test_charging_view;\r
+ test_charging_view = nullptr;\r
+ delete test_speak_view;\r
+ test_speak_view = nullptr;\r
+ delete test_motor_view;\r
+ test_motor_view = nullptr;\r
+ delete test_cat1_view;\r
+ test_cat1_view = nullptr;\r
+ delete test_KEY_view;\r
+ test_KEY_view = nullptr;\r
+ delete test_MG_view;\r
+ test_MG_view = nullptr;\r
+ delete test_hr_view;\r
+ test_hr_view = nullptr;\r
+ delete test_MP_view;\r
+ test_MP_view = nullptr;\r
+ delete SystemLabel;\r
+ SystemLabel = nullptr;\r
+\r
+ delete SystemScrollView[TESTVIEW];\r
+ SystemScrollView[TESTVIEW] = nullptr;\r
}\r
}\r
\r
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::SystemLabel new fail!");\r
return false;\r
}\r
- SystemLabel->SetPosition(203, 52);\r
+ SystemLabel->SetPosition(180, 52);\r
SystemLabel->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
SystemLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
SystemLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
ClickFunc(showView);\r
SystemScrollView[showView]->SetVisible(true);\r
Draw();\r
+ // if(hideView!=0)\r
+ // {\r
+ // switch (hideView)\r
+ // {\r
+ // case VISON:\r
+ // delete test_about_view; \r
+ // test_about_view = nullptr;\r
+ // break;\r
+ // case LCD:\r
+ // delete test_LCD_view; \r
+ // test_LCD_view = nullptr;\r
+ // break;\r
+ // case TP:\r
+ // delete test_TP_view; \r
+ // test_TP_view = nullptr;\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
/* -------------------------------------------------------------------------- */\r
\r
{\r
SystemScrollView[TESTVIEW]->Add(button[i]);\r
}\r
+ \r
// SystemScrollView[SYSTEMVIEW]->Add(SuperviseButton);\r
// SystemScrollView[SYSTEMVIEW]->Add(SystemLanguageButton);\r
// SystemScrollView[SYSTEMVIEW]->Add(FactoryResetButton);\r
FONTTitle = nullptr;
delete FONT;
FONT = nullptr;
+ delete labelButton_next;
+ labelButton_next=nullptr;
delete testAboutTheWatchScrollView;
testAboutTheWatchScrollView = nullptr;
}
}
+
+ UILabelButtonExt *testAboutView:: init_button_next(int x,int y,char *view_id)
+ {
+
+ UILabelButtonExt *label_button = new UILabelButtonExt();
+ if (label_button == nullptr)
+ {
+ return nullptr;
+ }
+ label_button->SetPosition(x, y); // widget's left position and top position
+ label_button->Resize(135, 88); // widget's width and height
+ label_button->SetViewId(view_id);// Set style
+
+ // Set additional property
+ label_button->SetText("next");
+ label_button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 44);
+ label_button->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);
+ UIView::OnClickListener *touchListener = static_cast<UIView::OnClickListener *>(testPresenter::GetInstance());
+ label_button->SetOnClickListener(touchListener);
+ // Add to rootView
+ label_button->SetVisible(true);
+
+ return label_button;
+
+ }
UILabel *testAboutView::InitLabel(LabelConfig &labelConfig)
{
UILabel *label = new UILabel();
LANAddress->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));
testAboutTheWatchScrollView->Add(LANAddress);
initViewStatus = true;
+
+ labelButton_next =init_button_next(165, 960,"LCDButton_next");
+
+ testAboutTheWatchScrollView->Add(labelButton_next);
return testAboutTheWatchScrollView;
}
}
\ No newline at end of file
void testbuttonView::ClearAll()
{
- if (initViewStatus == true)
+ if(testBUTTONScrollView)
{
- }
+ testBUTTONScrollView->RemoveAll();
+
+ if(button[0])
+ {
+ delete button[0];
+ button[0]=nullptr;
+ }
+ if(button[1])
+ {
+ delete button[1];
+ button[1]=nullptr;
+ }
+
+ if(labelButton_next)
+ {
+ delete labelButton_next;
+ labelButton_next=nullptr;
+ }
+
+ delete testBUTTONScrollView;
+ testBUTTONScrollView=nullptr;
+ }
}
UILabelButtonExt *testbuttonView::SetTheButton_ext(ButtonConfig_ext_t &buttonconfig)
}
- static UILabelButtonExt* button[2]{NULL};
+
void testbuttonView::Changbutton(int i,bool falg)
{
- if(button!=NULL)
+ if(button[0]!=NULL)
{
if(i==0)
// }
// testcat1ScrollView->SetOnDragListener(draglistener);
-
+ labelButton_next= testAboutView::GetInstance()->init_button_next(267,278,"makephonebutton_next");
+ testBUTTONScrollView->Add(labelButton_next);
void testcat1View::ClearAll()
{
- if (initViewStatus == true)
+ if(testcat1ScrollView)
{
- }
+ testcat1ScrollView->RemoveAll();
+
+ if(button)
+ {
+ delete button;
+ button=nullptr;
+ }
+ if(labelButton_next)
+ {
+ delete labelButton_next;
+ labelButton_next=nullptr;
+ }
+ if(label_1_cat1msg_1)
+ {
+ delete label_1_cat1msg_1;
+ label_1_cat1msg_1=nullptr;
+ }
+
+ if(label_1_cat1vison)
+ {
+ delete label_1_cat1vison;
+ label_1_cat1vison=nullptr;
+ }
+
+ if(label_1_cat1vison_1)
+ {
+ delete label_1_cat1vison_1;
+ label_1_cat1vison_1=nullptr;
+ }
+
+
+ delete testcat1ScrollView;
+ testcat1ScrollView=nullptr;
+ }
}
void testcat1View:: setcat1msg(cat1_msg t)
{
static bool speakfalg=false;
- static UILabelButtonExt* button{NULL};
+
char *phone="112";
void testcat1View::dial_112(bool falg)
Config = {
.left = 50,
.top = 200,
- .width = 60,
+ .width = 200,
.height = 35,
.fontSize = 30,
.lineHeigh = 35,
.text = "",
- .lineBreakMode = UILabel::LINE_BREAK_ADAPT,
+ .lineBreakMode = UILabel::LINE_BREAK_WRAP,
};
label_1_cat1vison= InitLabel(Config);
if (label_1_cat1vison == nullptr)
return false;
}
testcat1ScrollView->Add(label_1_cat1vison);
-
Config = {
.left = 50,
- .top = 200,
+ .top = 250,
.width = 60,
.height = 35,
.fontSize = 30,
.text = "",
.lineBreakMode = UILabel::LINE_BREAK_ADAPT,
};
- label_1_cat1vison= InitLabel(Config);
- if (label_1_cat1vison == nullptr)
+ label_1_cat1vison_1= InitLabel(Config);
+ if (label_1_cat1vison_1 == nullptr)
{
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::SystemAboutTheWatchTitle new fail!");
return false;
}
- testcat1ScrollView->Add(label_1_cat1vison);
+ testcat1ScrollView->Add(label_1_cat1vison_1);
// }
// testcat1ScrollView->SetOnDragListener(draglistener);
+ labelButton_next= testAboutView::GetInstance()->init_button_next(267,278,"buttonbutton_next");
+ testcat1ScrollView->Add(labelButton_next);
return g_pSystemAboutTheWatchView;
}
-
+ static UILabelButtonExt* button{NULL};
void testCHANINGView::ClearAll()
{
- if (initViewStatus == true)
+ if(testCHANINGScrollView)
{
+ testCHANINGScrollView->RemoveAll();
+
+ if(button)
+ {
+ delete button;
+ button=nullptr;
+ }
+ if(labelButton_next)
+ {
+ delete labelButton_next;
+ labelButton_next=nullptr;
+ }
+
+ delete testCHANINGScrollView;
+ testCHANINGScrollView=nullptr;
}
}
- static UILabelButtonExt* button{NULL};
+
void testCHANINGView::ChangeViewcolor(bool falg)
if(falg==true)
{
button->SetStyle(STYLE_BACKGROUND_COLOR, Color::Red().full);
- button->SetText("usb::0");
+ button->SetText("usb::1");
}
else
{
button->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full);
- button->SetText("usb::1");
+ button->SetText("usb::0");
}
RootView::GetInstance()->Invalidate();
testCHANINGScrollView->SetTouchable(true);
testCHANINGScrollView->SetDraggable(false);
+ labelButton_next= testAboutView::GetInstance()->init_button_next(267,378,"speakButton_next");
+ testCHANINGScrollView->Add(labelButton_next);
return true;
}
void testhrsenson1View::ClearAll()
{
- if (initViewStatus == true)
- {
- }
+ if(testhrsensonScrollView)
+ {
+ if(label_hrsenson_value_vison)
+ {
+ delete label_hrsenson_value_vison;
+ label_hrsenson_value_vison=nullptr;
+ }
+ if(button_1)
+ {
+ delete button_1;
+ button_1=nullptr;
+ }
+ if(button_2)
+ {
+ delete button_2;
+ button_2=nullptr;
+ }
+ if(labelButton_next)
+ {
+ delete labelButton_next;
+ labelButton_next=nullptr;
+ }
+
+ delete testhrsensonScrollView;
+ testhrsensonScrollView=nullptr;
+
+
+ }
+
}
static bool button_falg=true;
void testhrsenson1View:: setgrayvalue(int g,int r,int ir)
void testLUMView::ClearAll()
{
- if (initViewStatus == true)
+ if(testLUMScrollView)
{
+ testLUMScrollView->RemoveAll();
+
+ if(BrightnessControlViewSlider)
+ {
+ delete BrightnessControlViewSlider;
+ BrightnessControlViewSlider=nullptr;
+ }
+ if(labelButton_next)
+ {
+ delete labelButton_next;
+ labelButton_next=nullptr;
+ }
+
+ delete testLUMScrollView;
+ testLUMScrollView=nullptr;
}
}
testLUMScrollView->SetTouchable(true);
testLUMScrollView->SetDraggable(true);
+ labelButton_next= testAboutView::GetInstance()->init_button_next(267,378,"chargingButton_next");
+ testLUMScrollView->Add(labelButton_next);
return true;
}
return g_pSystemAboutTheWatchView;
}
-
+ osTimerId_t magneyic_TEST_timer=NULL;
void testMagicView::ClearAll()
{
- if (initViewStatus == true)
+ if(testmagicScrollView)
{
+ testmagicScrollView->RemoveAll();
+
+ if (magneyic_TEST_timer != NULL) {
+ osTimerDelete(magneyic_TEST_timer);
+ magneyic_TEST_timer = NULL;
+ return ;
+ }
+
+ if(title!=NULL)
+ {
+ delete title;
+ title=nullptr;
+ }
+ if(x!=NULL)
+ {
+ delete x;
+ x=nullptr;
+ }
+ if(labelButton_next)
+ {
+ delete labelButton_next;
+ labelButton_next=nullptr;
+ }
+ delete testmagicScrollView;
+ testmagicScrollView=nullptr;
}
}
}
- osTimerId_t magneyic_TEST_timer=NULL;
+
bool testMagicView::testmagicScrollViewcrollViewinit(void)
{
uint32_t tick;
testmagicScrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
testmagicScrollView->SetStyle(STYLE_BORDER_RADIUS, 1294);
- testmagicScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::White().full);
+ testmagicScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
MG_TEST_FALG=0;
magneyic_TEST_timer = osTimerNew((osTimerFunc_t)mgdataTimerCallBack, osTimerPeriodic, NULL, NULL);
testmagicScrollView->Add(x);
/* -------------------------------------------------------------------------- */
-
+ labelButton_next= testAboutView::GetInstance()->init_button_next(167,378,"luminanceButton_next");
+ testmagicScrollView->Add(labelButton_next);
testmagicScrollView->SetTouchable(true);
void testmakephoneView::ClearAll()
{
- if (initViewStatus == true)
+ if(testmakephoneScrollView)
{
+ testmakephoneScrollView->RemoveAll();
+
+ if(button!=NULL)
+ {
+ delete button;
+ button=nullptr;
+ }
+ if(labelButton_next)
+ {
+ delete labelButton_next;
+ labelButton_next=nullptr;
+ }
+ delete testmakephoneScrollView;
+ testmakephoneScrollView=nullptr;
}
}
}
- static UILabelButtonExt* button{NULL};
+
uint8_t makphone_falg=0;
static char *Path= "/user/music/test_makephone.mp3";
void testmakephoneView::buttoncallback()
// }
// testcat1ScrollView->SetOnDragListener(draglistener);
-
+ labelButton_next= testAboutView::GetInstance()->init_button_next(50,278,"hrsensonbutton_next");
+ testmakephoneScrollView->Add(labelButton_next);
void testMOTORView::ClearAll()
{
- if (initViewStatus == true)
+ if(tesMOTORScrollView)
{
+ tesMOTORScrollView->RemoveAll();
+
+ if(button[0]!=NULL)
+ {
+ delete button[0];
+ button[0]=nullptr;
+ }
+ if(labelButton_next)
+ {
+ delete labelButton_next;
+ labelButton_next=nullptr;
+ }
+ delete tesMOTORScrollView;
+ tesMOTORScrollView=nullptr;
}
}
- static UILabelButtonExt* button[2]{NULL};
+
static bool motorfalg=false;
void testMOTORView::Changstatr(bool falg)
VibratorFunc vibratorFunc = VibratorManager::GetInstance()->GetVibratorFunc();
if (vibratorFunc != nullptr)
{
- vibratorFunc(VibratorType::VIBRATOR_TYPE_TWO);
+ vibratorFunc(VibratorType::VIBRATOR_TYPE_THREE);
//vibratorFunc(VibratorType::VIBRATOR_TYPE_THREE);
//GRAPHIC_LOGI("UIList::MoveChildByOffset calls TYPE_THREE vibrator");
// } else {
tesMOTORScrollView->SetTouchable(true);
tesMOTORScrollView->SetDraggable(false);
+ labelButton_next= testAboutView::GetInstance()->init_button_next(267,278,"cat1button_next");
+ tesMOTORScrollView->Add(labelButton_next);
+
return true;
}
void testSPEAKView::ClearAll()
{
- if (initViewStatus == true)
+ if(testSPEAKScrollView)
{
+ testSPEAKScrollView->RemoveAll();
+
+ if(button[0])
+ {
+ delete button[0];
+ button[0]=nullptr;
+ }
+ if(button[1])
+ {
+ delete button[1];
+ button[1]=nullptr;
+ }
+ if(labelButton_next)
+ {
+ delete labelButton_next;
+ labelButton_next=nullptr;
+ }
+ delete testSPEAKScrollView;
+ testSPEAKScrollView=nullptr;
}
}
// }
- static UILabelButtonExt* button[2]{NULL};
+
void testSPEAKView::Changspeak(bool falg)
bool testSPEAKView::tesSPEAKScrollViewcrollViewinit(void)
{
- testSOEAKScrollView = new UIScrollView();
- if (testSOEAKScrollView == nullptr)
+ testSPEAKScrollView = new UIScrollView();
+ if (testSPEAKScrollView == nullptr)
{
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::testSOEAKScrollView new fail!");
return false;
}
- testSOEAKScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
- testSOEAKScrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
- testSOEAKScrollView->SetStyle(STYLE_BORDER_RADIUS, 0);
- testSOEAKScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::White().full);
- testSOEAKScrollView->SetStyle(STYLE_BORDER_COLOR, Color::Yellow().blue);
+ 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_BORDER_COLOR, Color::Yellow().blue);
buttonconfig.str="play";
buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
button[0]=SetTheButton_ext(buttonconfig);
- testSOEAKScrollView->Add(button[0]);
+ testSPEAKScrollView->Add(button[0]);
buttonconfig.x = 100;
buttonconfig.y = 300;
buttonconfig.str="puase";
buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
button[1]=SetTheButton_ext(buttonconfig);
- testSOEAKScrollView->Add(button[1]);
+ 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;
// }
- // testSOEAKScrollView->SetOnDragListener(draglistener);
+ // testSPEAKScrollView->SetOnDragListener(draglistener);
+ labelButton_next= testAboutView::GetInstance()->init_button_next(267,278,"motorButton_next");
+ testSPEAKScrollView->Add(labelButton_next);
- testSOEAKScrollView->SetTouchable(true);
- testSOEAKScrollView->SetDraggable(false);
+ testSPEAKScrollView->SetTouchable(true);
+ testSPEAKScrollView->SetDraggable(false);
return true;
{
return nullptr;
}
- return testSOEAKScrollView;
+ return testSPEAKScrollView;
}
}
\ No newline at end of file
UIScrollView *SystemupgradeViewInit(void);
void ClearAll(void);
void set_string_value(char *str,bool);
+ void cat1_up_success(void);
struct LabelConfig
{
int16_t left;
UILabel *FirmwareVersionTitle{nullptr}; // "固件版本"
UILabel *FirmwareVersion{nullptr};
UILabel *new_label{nullptr};
+
+ UILabel *cat1Version{nullptr};
+ UILabel *cat1label{nullptr};
+
void init_fail(uint8_t);
private:
UIScrollView *scrollView{nullptr};
UILabel *systemupgrade{nullptr}; // "固件版本"
UILabel *label_updating{nullptr};
UILabel *label1_fail{nullptr};
+
UIViewGroup *container_updating{nullptr};
UIViewGroup *container_fail{nullptr};
UILabelButtonExt *labelButton1_exit=NULL;
void init_updating();
bool is_new_version=false;
+ bool is_new_cat1_version=false;
bool is_fwpkg_ready=false;
#include "thread_init.h"
#include "lwip/apps/http_client.h"
#include "tcxo.h"
+ #include "cat1_server.h"
namespace OHOS
{
//SystemupgradeView::GetInstance()->newVersion->SetText(OtaPackageVersion);
cJSON_Delete(root);
char buf[1024]={0};
- sprintf(buf,"%s\n\n%s",OtaPackageVersion,description);
+ sprintf(buf,"%s\n%s",OtaPackageVersion,description);
#ifdef UP_TEST
SystemupgradeView::GetInstance()->set_string_value(buf,true);
#else
}
fclose(fp);
+
}
{
settings.result_fn=httpc_download_result_ui_packpage;
}
+ FILE * fp= fopen((char *)Path,"rb");
+ if(fp!=NULL)
+ {
+ fclose(fp);
+ int ret= remove((char *)Path);
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "file remove!!!!!!!!!!!!! %d ",ret);
+ }
settings.headers_done_fn=httpc_download_headers_done_ui;
httpc_state_t* connection=NULL;
display_api->turn_on_screen();
}
int t=ConfigModel::GetInstance()->GetScreenDurationRadioButtonSlectValue();
+ if(t>2)
+ t=1;
display_api->set_screen_set_keepon_timeout(5000+t*5000);
// }
}
}
void SystemupgradeView::statr_down_fwpkg(void)
{
- if(is_new_version)
+ if(is_new_cat1_version)
+ {
+ char *imei_str= ConfigModel::GetInstance()->Getimei();
+ char * version_buf=ConfigModel::GetInstance()->GetmoderVer();
+ sprintf((char *)uri,"http://icfota.snicker.com.cn:8089/fd230ota.jsp?product=FD230&pkgver=%s&imei=%s",version_buf,imei_str);
+ cat1_ota_update((char *)"0");
+ container_updating->SetVisible(true);
+ scrollView->SetTouchable(false);
+ scrollView->SetDraggable(false);
+ }
+ else if(is_new_version)
{
//下载差分包
//**********
}
}
- void SystemupgradeView::set_string_value(char *str,bool falg)
+ void SystemupgradeView::cat1_up_success(void)
{
- if(falg)
+ if(is_new_cat1_version)
{
- newVersion->SetText(str);
- newVersionTitle->SetText("有最新固件版本");
- newVersion->SetVisible(true);
- newVersionTitle->SetVisible(true);
- new_label->SetVisible(true);
- is_new_version=true;
-
+ label_updating->SetText(" success");
+ container_updating->SetVisible(true);
+ scrollView->SetTouchable(true);
+ scrollView->SetDraggable(true);
+ is_new_cat1_version=false;
+ statr_down_fwpkg();
}
- else
+
+ }
+
+
+ static uint8_t falg_dwon_json=0;
+ void SystemupgradeView::set_string_value(char *str,bool falg)
+ {
+ if(falg_dwon_json==0)
{
- newVersionTitle->SetText("已是最新固件版本");
- newVersionTitle->SetVisible(true);
- is_new_version=false;
-
- }
- UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(SystemPresenter::GetInstance());
- if (draglistener == nullptr)
+ if(falg)
+ {
+ newVersion->SetText(str);
+ newVersionTitle->SetText("有最新固件版本");
+
+ newVersion->SetVisible(true);
+ newVersionTitle->SetVisible(true);
+ //new_label->SetVisible(true);
+ is_new_version=true;
+
+ }
+ else
+ {
+ newVersionTitle->SetText("已是最新固件版本");
+ newVersionTitle->SetVisible(true);
+ is_new_version=false;
+
+ }
+
+ char *imei_str= ConfigModel::GetInstance()->Getimei();
+ char * version_buf=ConfigModel::GetInstance()->GetmoderVer();
+ sprintf((char *)uri,
+ "http://icfota.snicker.com.cn:8089/fd230ota.jsp?product=FD230&pkgver=%s&imei=%s",
+ version_buf,imei_str);
+ custom_start_ota_download_ui_1(uri,(uint8_t*)Path,true);
+ falg_dwon_json++;
+ }
+ else if (falg_dwon_json==1)
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
- return ;
+ if(falg)
+ {
+ const char *text= newVersion->GetText();
+ char buf[256]={0};
+ sprintf(buf,"%s\n%s",text,str);
+ newVersion->SetText(buf);
+ newVersionTitle->SetText("有最新固件版本");
+ newVersion->SetVisible(true);
+ newVersionTitle->SetVisible(true);
+ is_new_cat1_version=true;
+
+ }
+ else
+ {
+ if(is_new_version!=true)
+ {
+ newVersionTitle->SetText("已是最新固件版本");
+ newVersionTitle->SetVisible(true);
+ is_new_version=false;
+ is_new_cat1_version=false;
+
+ }
+
+
+ }
+
+ 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 ;
+ }
+ scrollView->SetOnDragListener(draglistener);
+ falg_dwon_json++;
}
- scrollView->SetOnDragListener(draglistener);
+
+
+
+
RootView::GetInstance()->Invalidate();
}
newVersionTitle->SetVisible(false);
scrollView->Add(newVersionTitle);
- char version_buf_1[128]={0};
- version_len=128;
- uapi_get_buildversion((uint8_t*)version_buf_1,version_len);
+
+
Config = {
.left = 37,
.top = 240,
.height = 30,
.fontSize = 26,
.lineHeigh = 30,
- .text = (char*)version_buf_1,
+ .text = (char*)"",
.lineBreakMode = UILabel::LINE_BREAK_WRAP,
};
newVersion = InitLabel(Config);
- if (FirmwareVersion == nullptr)
- {
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::FirmwareVersion new fail!");
- return nullptr;
- }
newVersion->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));
newVersion->SetTouchable(true);
newVersion->SetViewId("newVersion");
newVersion->SetVisible(false);
scrollView->Add(newVersion);
- Config = {
- .left = 367,
- .top = 240,
- .width = 45,
- .height = 30,
- .fontSize = 26,
- .lineHeigh = 30,
- .text = "新!",
- .lineBreakMode = UILabel::LINE_BREAK_WRAP,
- };
- new_label = InitLabel(Config);
- if (FirmwareVersion == nullptr)
- {
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::FirmwareVersion new fail!");
- return nullptr;
- }
- new_label->SetTextColor(Color::GetColorFromRGBA(0xff, 0x00, 0x00, 0x87));
- new_label->SetVisible(false);
- scrollView->Add(new_label);
-
+ // Config = {
+ // .left = 367,
+ // .top = 240,
+ // .width = 45,
+ // .height = 30,
+ // .fontSize = 26,
+ // .lineHeigh = 30,
+ // .text = "新!",
+ // .lineBreakMode = UILabel::LINE_BREAK_WRAP,
+ // };
+ // new_label = InitLabel(Config);
+ // if (FirmwareVersion == nullptr)
+ // {
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::FirmwareVersion new fail!");
+ // return nullptr;
+ // }
+ // new_label->SetTextColor(Color::GetColorFromRGBA(0xff, 0x00, 0x00, 0x87));
+ // new_label->SetVisible(false);
+ // scrollView->Add(new_label);
+ /* -------------------------------------------------------------------------- */
// UILabelButtonExt * SystemUpgradeButton = new UILabelButtonExt();
// if (SystemUpgradeButton == nullptr)
// {
//SystemUpgradeButton->SetOnClickListener(clickListener);
//char *Path= "/user/data/ota_start_1.json";
-
- FILE * fp = fopen(Path,"rb");
- if(fp!=NULL)
- {
- fclose(fp);
- int ret= remove(Path);
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "file remove!!!!!!!!!!!!! %d ",ret);
- }
-
-
const power_display_svr_api_t *display_api = power_display_svr_get_api();
if (display_api->get_screen_state() != SCREEN_ON)
{
sprintf((char *)uri,"http://icfota.snicker.com.cn:8089/fd230ota.jsp?product=FD230&pkgver=%s&imei=%s",version_buf,imei_str);
custom_start_ota_download_ui_1(uri,(uint8_t*)Path,true);
+ falg_dwon_json=0;
//uograde_service_service_init();
return scrollView;
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/callerlog/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/phoneservice/include
${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/producttest/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/system/include
${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/config/include
${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/main/include/dial
${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/bloodoxygen/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarmclockmanage/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarmclocktimerconfig/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarm/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/system/include
${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/producttest/include
${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/config/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/callerlog/include
bool OnClick(OHOS::UIView& view, const OHOS::ClickEvent& event) override;
bool OnDrag(UIView& view, const DragEvent& event) override;
- virtual bool OnDragEnd(OHOS::UIView& view, const OHOS::DragEvent& event) override
- {
- return true;
- }
+ bool OnDragEnd(OHOS::UIView& view, const OHOS::DragEvent& event) override;
virtual bool OnPress(OHOS::UIView& view, const OHOS::PressEvent& event) override
{
return true;
#include "testhrsenson.h"
#include "ConfigModel.h"
#include "power_display_service.h"
+//#include "Systemupgrade.h"
namespace OHOS {
#ifdef __cplusplus
tokbuf=strtok(NULL,",");
cat1_ver_T.cat1appver=(char*)malloc(strlen(tokbuf));
strcpy( cat1_ver_T.cat1appver,tokbuf);
-
+ ConfigModel::GetInstance()->SetpyVer(tokbuf);
tokbuf=strtok(NULL,",");
tokbuf=strtok(NULL,",");
cat1_ver_T.modem_version=(char*)malloc(strlen(tokbuf));
strcpy( cat1_ver_T.modem_version,tokbuf);
+ ConfigModel::GetInstance()->SetmoderVer(tokbuf);
testcat1View* t=testcat1View::GetInstance();
if(t!=NULL)
free(cat1_ver_T.cat1appver);
free(cat1_ver_T.modem_version);
+ } //"BOOTUP,pyVer,PY_SRV_V4,modemVer,EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312"
+ else if(strcmp(tokbuf,"BOOTUP")==0)
+ {
+ //testcat1View ::cat1_Ver cat1_ver_T;
+ tokbuf=strtok(NULL,",");
+ if(strcmp(tokbuf,"pyVer")==0)
+ {
+ tokbuf=strtok(NULL,",");
+ ConfigModel::GetInstance()->SetpyVer(tokbuf);
+ }
+ tokbuf=strtok(NULL,",");
+ if(strcmp(tokbuf,"modemVer")==0)
+ {
+ tokbuf=strtok(NULL,"\0");
+ ConfigModel::GetInstance()->SetmoderVer(tokbuf);
+ }
+ // SystemupgradeView* t=SystemupgradeView::GetInstance();
+ // if(t!=NULL)
+ // t->cat1_up_success();
}
}
return &callViewEventListener;
}
-bool CallViewEventListener::OnDrag(UIView& view, const DragEvent& event)
+bool CallViewEventListener::OnDragEnd(OHOS::UIView& view, const OHOS::DragEvent& event)
{
if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)
{
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "xxxxxxxxxxxxxxx");
volumeSettingView->SetVisible(false);
+ volumeSetting->SetVisible(false);
unsigned char volumeValue;
volumeValue = (unsigned char) ((double) (volumeSetting->sounding * CALL_VOLUME_MAX) / (VOLUME_MAX - VOLUME_MIN)); // 音量转换
SetSpeakerVolume(volumeValue);
+ return true;
}
+
+}
+bool CallViewEventListener::OnDrag(UIView& view, const DragEvent& event)
+{
+ return true;
}
//#define SUPPORT_CAT1_SERVICE
strcpy(msg.buffer,"10086");
cat1_handle_call_incomming(&msg);
}
+
char networkmsg[124]={0};
int cat1_handle_networ_msg(struct tcp_msg_t *msg)
{
if(msg->head[1]=='0')
{
networkmsg[5]=':';
- }
+ } //"pyVer:PY_OTA_V3,modemVer,EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312"
WEARABLE_LOGI(WEARABLE_LOG_MODULE_MAIN_SERVICE,"cat1 cat1_handle_networ_msg %s\n",networkmsg);
cat1_msg_event_sendmsg_toUI(networkmsg);
//显示UI 信号
return 1;
}
+static char BOOTUP_msg[124]={0};
+int cat1_handle_version_msg(struct tcp_msg_t *msg)
+{
+ memset(BOOTUP_msg,0,124);
+ strcpy(BOOTUP_msg,msg->buffer);
+ if(msg->head[1]=='F')
+ {
+ BOOTUP_msg[6]=':';
+ }
+ WEARABLE_LOGI(WEARABLE_LOG_MODULE_MAIN_SERVICE,"cat1 cat1_handle_networ_msg %s\n",msg->buffer);
+ WEARABLE_LOGI(WEARABLE_LOG_MODULE_MAIN_SERVICE,"cat1 cat1_handle_networ_msg %s\n",BOOTUP_msg);
+ cat1_msg_event_sendmsg_toUI(BOOTUP_msg);
+ //显示UI 信号
+ return 1;
+}
+
+
int cat1_handle_sms(struct tcp_msg_t *msg)
{
break;
case UDP_MSG_REPLY:
printf("UDP_MSG_REPLY reply %s\n",msg->buffer);
- //BOOTUP,pyVer,PY_SRV_V4,modemVer,EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312
+ //"BOOTUP,pyVer,PY_SRV_V4,modemVer,EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312"
if(strstr(msg->buffer,"BOOTUP")!=NULL)
- cat1_getsignal();
+ {
+ cat1_getsignal();
+ cat1_handle_version_msg(msg);
+ // restart_time_sync();
+ }
+
break;
case UDP_CMD_GET_CAT1VER:
index = cat1_handle_networ_msg(msg);
static errcode_t calldial_event_notify(char* callno)
{
- CustomEventPublish(TOPIC_EVENT_CAT1_CALLDIAL,(uint8_t*)callno,strlen(callno));
+ CustomEventPublish(TOPIC_EVENT_CAT1_CALLDIAL,(uint8_t*)callno,strlen(callno)+1);
return 0;
}
static errcode_t incomingcall_event_notify(char* callno)
{
- CustomEventPublish(TOPIC_EVENT_CAT1_INCOMMING,(uint8_t*)callno,strlen(callno));
+ CustomEventPublish(TOPIC_EVENT_CAT1_INCOMMING,(uint8_t*)callno,strlen(callno)+1);
return 0;
}
static errcode_t incomed_call_event_notify(char* callno)
{
- CustomEventPublish(TOPIC_EVENT_CAT1_CALLCONNTED,(uint8_t*)callno,strlen(callno));
+ CustomEventPublish(TOPIC_EVENT_CAT1_CALLCONNTED,(uint8_t*)callno,strlen(callno)+1);
return 0;
}
static errcode_t callend_event_notify(char* callno)
{
- CustomEventPublish(TOPIC_EVENT_CAT1_CALLENDED,(uint8_t*)callno,strlen(callno));
+ CustomEventPublish(TOPIC_EVENT_CAT1_CALLENDED,(uint8_t*)callno,strlen(callno)+1);
return 0;
}
static errcode_t cat1msg_event_notify(char* callno)
{
- CustomEventPublish(TOPIC_EVENT_CAT1_SIGNAL_UPDATE,(uint8_t*)callno,strlen(callno));
+ CustomEventPublish(TOPIC_EVENT_CAT1_SIGNAL_UPDATE,(uint8_t*)callno,strlen(callno)+1);
return 0;
}
return ERRCODE_SUCC;
}
+
+
+
#ifdef __cplusplus
}
projects / mirrors / FD230.git / commitdiff