test

jni/logic/callLogic.cc

@@ -13,6 +13,9 @@
 #include "voip/wav_player.h"
 #include "manager/LanguageManager.h"
 
+#include "media/ZKMediaPlayer.h"
+static ZKMediaPlayer* player;
+
 std::string _isOutgoing;
 
 voip::WAVPlayer wavPlayer;	// 播放音频
@@ -192,6 +195,9 @@ static S_ACTIVITY_TIMEER REGISTER_ACTIVITY_TIMER_TAB[] = {
  * 当界面构造时触发
  */
 static void onUI_init(){
+	player = new ZKMediaPlayer(ZKMediaPlayer::E_MEDIA_TYPE_AUDIO);
+
+
 	CallingStatus::instance()->setBusy(true);
 
 	EASYUICONTEXT->hideStatusBar();
@@ -230,13 +236,15 @@ static void onUI_init(){
  * 当切换到该界面时触发
  */
 static void onUI_intent(const Intent *intentPtr) {
+	player->play("/mnt/extsd/ui/hl.mp3");
 	if(intentPtr != NULL) {
 		BRIGHTNESSHELPER->screenOn();
 		_isSleepTimerRegistered = getSleepTimerRegistered();
 		LOGD("_isSleepTimerRegistered = %d", _isSleepTimerRegistered);
 		setSleepTimerRegistered(false);
 
-		wavPlayer.Play(CONFIGMANAGER->getResFilePath("ring.wav"));
+
+//		wavPlayer.Play(CONFIGMANAGER->getResFilePath("ring.wav"));
 		// 键值解析
 		_isOutgoing = intentPtr->getExtra(isOutgoing);
 		std::string _audioOnly = intentPtr->getExtra(audioOnly);

jni/logic/mainLogic.cc

@@ -607,6 +607,7 @@ static bool onButtonClick_CallBedButton(ZKButton *pButton) {
 
 static bool onButtonClick_CallNurseButton(ZKButton *pButton) {
     LOGD(" ButtonClick CallNurseButton !!!\n");
+    EASYUICONTEXT->openActivity("callActivity");
     return false;
 }
 

jni/logic/startLogic.cc

@@ -499,9 +499,9 @@ static void onUI_init(){
 	GpioHelper::registerGpioListener("A4", iGpioListenerA1, E_GPIO_EDGE_TYPE_FALLING);
 
 	//TCP启动
-	TcpClient::instance()->startTcp();
+	//TcpClient::instance()->startTcp();
 	//监听SIP信令
-	GetTelephone()->AddCallStateListener(OnCallStateChanged);
+	//GetTelephone()->AddCallStateListener(OnCallStateChanged);
 
 	//请求版本号
 //	if(UartContext::Uart3IsOpen()) {