增加录音音量显示开关，增加wifi功能，屏幕亮度根据科室设置

i18n/zh_CN.tr

@@ -174,6 +174,7 @@
     <!-- 设置界面 -->
     <string name="SettingText">设备设置</string>
     <string name="IsLight">是否常亮</string>
+    <string name="IsVolume">开启音量控制</string>
     <!-- 测试界面 -->
     <string name="DebugText">设备调试</string>
     <string name="InputSip">输入目标SIP账号</string>

jni/activity/settingActivity.cpp

@@ -4,6 +4,8 @@
 #include "settingActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKCheckBox* mVolumeCheckboxPtr;
+static ZKTextView* mVolumeTextViewPtr;
 static ZKTextView* mTitleTextViewPtr;
 static ZKPainter* mSettingPainterPtr;
 static ZKCheckBox* mLightCheckboxPtr;
@@ -115,6 +117,7 @@ typedef struct {
 }S_CheckboxCallback;
 /*TAG:CheckboxCallbackTab*/
 static S_CheckboxCallback SCheckboxCallbackTab[] = {
+    ID_SETTING_VolumeCheckbox, onCheckedChanged_VolumeCheckbox,
     ID_SETTING_LightCheckbox, onCheckedChanged_LightCheckbox,
 };
 
@@ -131,6 +134,8 @@ settingActivity::~settingActivity() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mActivityPtr = NULL;
+    mVolumeCheckboxPtr = NULL;
+    mVolumeTextViewPtr = NULL;
     mTitleTextViewPtr = NULL;
     mSettingPainterPtr = NULL;
     mLightCheckboxPtr = NULL;
@@ -146,6 +151,8 @@ const char* settingActivity::getAppName() const{
 //TAG:onCreate
 void settingActivity::onCreate() {
 	Activity::onCreate();
+    mVolumeCheckboxPtr = (ZKCheckBox*)findControlByID(ID_SETTING_VolumeCheckbox);if(mVolumeCheckboxPtr!= NULL){mVolumeCheckboxPtr->setCheckedChangeListener(this);}
+    mVolumeTextViewPtr = (ZKTextView*)findControlByID(ID_SETTING_VolumeTextView);
     mTitleTextViewPtr = (ZKTextView*)findControlByID(ID_SETTING_TitleTextView);
     mSettingPainterPtr = (ZKPainter*)findControlByID(ID_SETTING_SettingPainter);
     mLightCheckboxPtr = (ZKCheckBox*)findControlByID(ID_SETTING_LightCheckbox);if(mLightCheckboxPtr!= NULL){mLightCheckboxPtr->setCheckedChangeListener(this);}

jni/activity/settingActivity.h

@@ -28,6 +28,8 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_SETTING_VolumeCheckbox    21002
+#define ID_SETTING_VolumeTextView    50003
 #define ID_SETTING_TitleTextView    50002
 #define ID_SETTING_SettingPainter    52001
 #define ID_SETTING_LightCheckbox    21001

jni/logic/callLogic.cc

@@ -223,6 +223,12 @@ static void onUI_init(){
 
 //	mSeekBarOutputVolumePtr->setMax(zk_audio_output_volume_native_max());
 
+    bool isVolume = StoragePreferences::getBool(STORE_VOLUME, false);
+    mSeekBarGainPtr->setVisible(isVolume);
+    mTextViewGainPtr->setVisible(isVolume);
+    mSeekBarInputPtr->setVisible(isVolume);
+    mTextViewInputPtr->setVisible(isVolume);
+
 	//打开时的声音大小
 	int serverVol = StoragePreferences::getInt(STORE_DAY_VOL,PartSetting::dayBedVol);
 	if (checkIsDay()){

jni/logic/deviceInfoLogic.cc

@@ -365,7 +365,8 @@ static bool onButtonClick_ServerButton(ZKButton *pButton) {
 
 static bool onButtonClick_NetworkButton(ZKButton *pButton) {
     LOGD(" ButtonClick NetworkButton !!!\n");
-    EASYUICONTEXT->openActivity("EthernetSettingActivity");
+//    EASYUICONTEXT->openActivity("EthernetSettingActivity");
+    EASYUICONTEXT->openActivity("NetSettingActivity");
     return false;
 }
 

jni/logic/mainLogic.cc

@@ -262,7 +262,7 @@ public:
 			partSetting.screenLight = root["screen_light"].asInt();
 			partSetting.roomCallBed = root["room_call_bed"].asInt();
 
-			if (root["linux_door_volume_native"].size() != 0) {
+            if (root.isMember("linux_bed_volume_native")) {
 				partSetting.linuxDoorVolumeNative = root["linux_door_volume_native"].asInt();
 				partSetting.linuxDoorGainSize = root["linux_door_gain_size"].asInt();
 
@@ -566,10 +566,8 @@ static bool onmainActivityTouchEvent(const MotionEvent &ev) {
 }
 static int getListItemCount_BedListView(const ZKListView *pListView) {
     //LOGD("getListItemCount_BedListView !\n");
-	if (frameBedList.size() > 3) {
-		return frameBedList.size();
-	}
-	return 3;
+
+	return frameBedList.size();
 }
 
 static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {

jni/logic/settingLogic.cc

@@ -50,6 +50,7 @@ static S_ACTIVITY_TIMEER REGISTER_ACTIVITY_TIMER_TAB[] = {
 static void onUI_init(){
     //Tips :添加 UI初始化的显示代码到这里,如:mText1Ptr->setText("123");
 	mLightCheckboxPtr->setChecked(StoragePreferences::getBool(STORE_LIGHT, false));
+    mVolumeCheckboxPtr->setChecked(StoragePreferences::getBool(STORE_VOLUME, false));
 }
 
 /**
@@ -144,3 +145,7 @@ static bool onButtonClick_sys_back(ZKButton *pButton) {
     LOGD(" ButtonClick sys_back !!!\n");
     return false;
 }
+static void onCheckedChanged_VolumeCheckbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox VolumeCheckbox checked %d", isChecked);
+    StoragePreferences::putBool(STORE_VOLUME, isChecked);
+}

jni/logic/startLogic.cc

@@ -241,6 +241,13 @@ void handleMsg(byte* inBytes){
 			sync();
 			reboot(RB_AUTOBOOT);
 		}
+        else if (tcpModel.action == DeviceAction::REBOOT) {
+            const char* req = "-1";
+            TcpClient::instance()->sendMsg(req);
+            //重启
+            sync();
+            reboot(RB_AUTOBOOT);
+        }
 		else if (tcpModel.action == DeviceAction::DEVICE_REFRESH) {	// 设备刷新
 			dataRefresh();
 		}

jni/logic/statusbar.cc

@@ -162,24 +162,36 @@ static void updateNetState(){
 		}
 	}
 
-	EEthConnState connState = ETHERNETMANAGER->getConnState();
-	switch (connState){
-	case E_ETH_DISCONNECTED:	// 以太网断开
-		mPainter1Ptr->setBackgroundColor(0xFF949494);
-		break;
-	case E_ETH_CONNECTING:		// 以太网连接中
-		mPainter1Ptr->setBackgroundColor(0xFF2F9DF1);
-		break;
-	case E_ETH_CONNECTED:		// 以太网连接
-		mPainter1Ptr->setBackgroundColor(0xFF37C127);
-		break;
-	case E_ETH_DISCONNECTING:	// 以太网断开连接中
-		mPainter1Ptr->setBackgroundColor(0xFF949494);
-		break;
-	case E_ETH_CONN_UNKNOWN:	// 以太网未知
-		mPainter1Ptr->setBackgroundColor(0xFF949494);
+    ENetChannel channel = NETMANAGER->getConnChannel();
+    switch (channel) {
+    case E_NET_CHANNEL_ETHERNET:
+        if (ETHERNETMANAGER->isConnected()) {
+            mPainter1Ptr->setBackgroundColor(0xFF37C127);
+        }
+        else {
+            mPainter1Ptr->setBackgroundColor(0xFF949494);
+        }
 		break;
 	}
+
+//	EEthConnState connState = ETHERNETMANAGER->getConnState();
+//	switch (connState){
+//	case E_ETH_DISCONNECTED:	// 以太网断开
+//		mPainter1Ptr->setBackgroundColor(0xFF949494);
+//		break;
+//	case E_ETH_CONNECTING:		// 以太网连接中
+//		mPainter1Ptr->setBackgroundColor(0xFF2F9DF1);
+//		break;
+//	case E_ETH_CONNECTED:		// 以太网连接
+//		mPainter1Ptr->setBackgroundColor(0xFF37C127);
+//		break;
+//	case E_ETH_DISCONNECTING:	// 以太网断开连接中
+//		mPainter1Ptr->setBackgroundColor(0xFF949494);
+//		break;
+//	case E_ETH_CONN_UNKNOWN:	// 以太网未知
+//		mPainter1Ptr->setBackgroundColor(0xFF949494);
+//		break;
+//	}
 }
 
 void OnRegisterStateChanged(voip::Telephone* telephone, int code){
@@ -271,6 +283,8 @@ int getTime(char* timeStr) {
 	return time;
 }
 
+int dayLight = 100;
+int nightLight = 100;
 void isTimeScale(char* timeStr) {
 	std::string dayTime = StoragePreferences::getString(STORE_DAY_START, "07:00:00");
 	std::string nightTime = StoragePreferences::getString(STORE_NIGHT_START, "18:00:00");
@@ -283,12 +297,24 @@ void isTimeScale(char* timeStr) {
 		if (day <= now && now <= night) {	// 这个时候，时间处于白天
 			if (isSleepTime) {	// isSleepTime就是定时任务开启，需要关闭
 				setSleepTimerRegistered(false);	// 关闭息屏功能
+                dayLight = StoragePreferences::getInt(STORE_DAY_LIGHT, 100);
+                if (dayLight > 100) {
+                    dayLight = 100;
+                }
+                LOGD("dayLight == %d", dayLight);
+				BRIGHTNESSHELPER->setBrightness(dayLight);
 				LOGD("白天开始时间小于晚上开始时间，切换至白天");
 			}
 		}
 		else {	// 这个时间处于晚上
 			if (!isSleepTime) {	// isSleepTime就是定时任务关闭，需要开启
 				setSleepTimerRegistered(true);	// 开启息屏功能
+                nightLight = StoragePreferences::getInt(STORE_NIGHT_LIGHT, 70);
+                if (nightLight > 100) {
+                    nightLight = 100;
+                }
+                LOGD("nightLight == %d", nightLight);
+				BRIGHTNESSHELPER->setBrightness(nightLight);
 				LOGD("白天开始时间小于晚上开始时间，切换至晚上");
 			}
 		}
@@ -297,11 +323,23 @@ void isTimeScale(char* timeStr) {
 		if (night <= now && now < day) {	// 这个其实是晚上时间
 			if (!isSleepTime) {	// isSleepTime就是定时任务关闭，需要开启
 				setSleepTimerRegistered(true);	// 开启息屏功能
+                nightLight = StoragePreferences::getInt(STORE_NIGHT_LIGHT, 70);
+                if (nightLight > 100) {
+                    nightLight = 100;
+                }
+                LOGD("nightLight == %d", nightLight);
+				BRIGHTNESSHELPER->setBrightness(nightLight);
 				LOGD("白天开始时间大于晚上开始时间，切换至晚上");
 			}
 		} else {
 			if (isSleepTime) {	// isSleepTime就是定时任务开启，需要关闭
 				setSleepTimerRegistered(false);	// 关闭息屏功能
+                dayLight = StoragePreferences::getInt(STORE_DAY_LIGHT, 100);
+                if (dayLight > 100) {
+                    dayLight = 100;
+                }
+                LOGD("dayLight == %d", dayLight);
+				BRIGHTNESSHELPER->setBrightness(dayLight);
 				LOGD("白天开始时间大于晚上开始时间，切换至白天");
 			}
 		}
@@ -428,6 +466,7 @@ static void onUI_init(){
 
 	ping_thread.run("ping");
 
+    StoragePreferences::putBool(STORE_LIGHT, true);
 	isLight = StoragePreferences::getBool(STORE_LIGHT, false);
 }
 

jni/net/tcp_model.h

@@ -61,6 +61,7 @@ public:
 class DeviceAction {
 public:
 	inline static std::string RESTART = "RESTART";
+	inline static std::string REBOOT = "REBOOT";
 	inline static std::string CONNECT = "CONNECT";
 	inline static std::string APP_UPDATE = "APP_UPDATE";
 	inline static std::string DEVICE_REFRESH = "DEVICE_REFRESH";

jni/service/BusinessConfig.h

@@ -53,6 +53,7 @@
 #define STORE_ROOM_CALL_BED "room_call_bed"
 
 #define STORE_LIGHT "light"
+#define STORE_VOLUME "volume"
 
 #define SIGNAL_TYPE "TCP" //TCP,SIP