增加wifi连接功能，增加录音音量显示控制，去掉门口机常亮控制

i18n/zh_CN.tr

@@ -117,6 +117,7 @@
     <string name="Call">呼叫</string>
     <!-- 设置界面 -->
     <string name="IsLight">是否常亮</string>
+    <string name="IsVolume">开启音量控制</string>
     <!-- 测试界面 -->
     <string name="InputSip">输入目标SIP账号</string>
     <string name="ChangeToRtc">切换成RTC通话</string>

jni/activity/settingActivity.cpp

@@ -4,6 +4,8 @@
 #include "settingActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKCheckBox* mVolumeCheckboxPtr;
+static ZKTextView* mVolumeTextViewPtr;
 static ZKCheckBox* mLightCheckboxPtr;
 static ZKTextView* mLightTextViewPtr;
 static ZKButton* msys_backPtr;
@@ -113,6 +115,7 @@ typedef struct {
 }S_CheckboxCallback;
 /*TAG:CheckboxCallbackTab*/
 static S_CheckboxCallback SCheckboxCallbackTab[] = {
+    ID_SETTING_VolumeCheckbox, onCheckedChanged_VolumeCheckbox,
     ID_SETTING_LightCheckbox, onCheckedChanged_LightCheckbox,
 };
 
@@ -129,6 +132,8 @@ settingActivity::~settingActivity() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mActivityPtr = NULL;
+    mVolumeCheckboxPtr = NULL;
+    mVolumeTextViewPtr = NULL;
     mLightCheckboxPtr = NULL;
     mLightTextViewPtr = NULL;
     msys_backPtr = NULL;
@@ -142,6 +147,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);
     mLightCheckboxPtr = (ZKCheckBox*)findControlByID(ID_SETTING_LightCheckbox);if(mLightCheckboxPtr!= NULL){mLightCheckboxPtr->setCheckedChangeListener(this);}
     mLightTextViewPtr = (ZKTextView*)findControlByID(ID_SETTING_LightTextView);
     msys_backPtr = (ZKButton*)findControlByID(ID_SETTING_sys_back);

jni/activity/settingActivity.h

@@ -27,6 +27,8 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_SETTING_VolumeCheckbox    21002
+#define ID_SETTING_VolumeTextView    50002
 #define ID_SETTING_LightCheckbox    21001
 #define ID_SETTING_LightTextView    50001
 #define ID_SETTING_sys_back   100

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/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

@@ -705,9 +705,6 @@ static void onUI_init(){
 	// 启动的时候更改为tcp模式
 	StoragePreferences::putString(STORE_SIGNAL_TYPE, "TCP");
 
-	// 启动的时候更改为tcp模式
-	StoragePreferences::putBool(STORE_LIGHT, true);
-
 
 	//请求版本号
 //	if(UartContext::Uart3IsOpen()) {

jni/logic/statusbar.cc

@@ -162,24 +162,45 @@ 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);
+
+	ENetChannel channel = NETMANAGER->getConnChannel();
+	switch (channel) {
+	case E_NET_CHANNEL_ETHERNET:
+		if (ETHERNETMANAGER->isConnected()) {
+			mPainter1Ptr->setBackgroundColor(0xFF37C127);
+		}
+		else {
+			mPainter1Ptr->setBackgroundColor(0xFF949494);
+		}
 		break;
-	case E_ETH_CONN_UNKNOWN:	// 以太网未知
-		mPainter1Ptr->setBackgroundColor(0xFF949494);
+	case E_NET_CHANNEL_WIFI:
+		if (WIFIMANAGER->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){
@@ -454,6 +475,7 @@ static void onUI_init(){
 
 	ping_thread.run("ping");
 
+	StoragePreferences::putBool(STORE_LIGHT, true);
 	isLight = StoragePreferences::getBool(STORE_LIGHT, false);
 }
 

jni/logic/ui3Logic.cc

@@ -414,7 +414,8 @@ static bool onButtonClick_BtnRestart(ZKButton *pButton) {
 }
 static bool onButtonClick_BtnNetSetting(ZKButton *pButton) {
     LOGD(" ButtonClick BtnNetSetting !!!\n");
-    EASYUICONTEXT->openActivity("EthernetSettingActivity");
+//    EASYUICONTEXT->openActivity("EthernetSettingActivity");
+    EASYUICONTEXT->openActivity("NetSettingActivity");
     return false;
 }
 

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