Merge "[feature][ZXW-62][ZXW-63][ZXW-64]add sim/sms demo and qser sim/sms demo 2"
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-call/lynq_call.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-call/lynq_call.cpp
index d1e2293..bee6e5e 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-call/lynq_call.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-call/lynq_call.cpp
@@ -1016,7 +1016,9 @@
{
cleanCallList(lynq_call_id);
}
-
+
+ //fix bug T106BUG-56
+ send_call_state_change();
return RESULT_OK;
}
int lynq_call_hungup_all()
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/include/lynq-qser-data.h b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/include/lynq-qser-data.h
index 3485b72..c84ab21 100644
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/include/lynq-qser-data.h
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/include/lynq-qser-data.h
@@ -1,6 +1,8 @@
#ifndef __LYNQ_QSER_DATA_H__
#define __LYNQ_QSER_DATA_H__
-
+#ifdef __cplusplus
+extern "C" {
+#endif
#include <stdbool.h>
#include <netinet/in.h>
@@ -263,6 +265,8 @@
*
*/
extern int qser_apn_get_list(qser_apn_info_list_s *apn_list);
-
+#ifdef __cplusplus
+}
+#endif
#endif
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/include/lynq-qser-voice.h b/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/include/lynq-qser-voice.h
old mode 100644
new mode 100755
index 528acc0..13622db
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/include/lynq-qser-voice.h
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/include/lynq-qser-voice.h
@@ -86,9 +86,7 @@
int qser_voice_call_answer(voice_client_handle_type h_voice,
int call_id );
-int qser_voice_call_hold( voice_client_handle_type h_voice);
-
-int qser_voice_call_unhold(voice_client_handle_type h_voice);
+int qser_voice_call_switch_waiting_or_holding_and_active(voice_client_handle_type h_voice);
//Set voice call waiting
int qser_voice_call_setwaiting
@@ -98,7 +96,7 @@
);
//Get voice call waiting status
-int qser_voice_call_getwaitingsatus
+int qser_voice_call_getwaitingstatus
(
int h_voice,
qser_voice_call_waiting_service_t *pe_service
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/lynq-qser-voice.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/lynq-qser-voice.cpp
index faa1a1b..1799ea1 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/lynq-qser-voice.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/lynq-qser-voice.cpp
@@ -99,7 +99,7 @@
int qser_voice_call_client_deinit(voice_client_handle_type h_voice)
{
- if (NULL == h_voice)
+ if (0 == h_voice)
{
LYERRLOG("init first");
return RESULT_ERROR;
@@ -150,7 +150,7 @@
s_lynq_voice_tid = -1;
}
s_voice_thread_status = 0;
- s_voice_cb == NULL;
+ s_voice_cb = NULL;
return RESULT_OK;
}
@@ -187,7 +187,7 @@
return lynq_call_answer();
}
-int qser_voice_call_getwaitingsatus(int h_voice,qser_voice_call_waiting_service_t *pe_service)
+int qser_voice_call_getwaitingstatus(int h_voice,qser_voice_call_waiting_service_t *pe_service)
{
LYINFLOG("To be completed");
return RESULT_OK;
@@ -199,17 +199,8 @@
return RESULT_OK;
}
-int qser_voice_call_hold(voice_client_handle_type h_voice)
-{
- if (h_voice == 0)
- {
- LYERRLOG("init first");
- return RESULT_ERROR;
- }
- return lynq_switch_waiting_or_holding_and_active();
-}
-int qser_voice_call_unhold(voice_client_handle_type h_voice)
+int qser_voice_call_switch_waiting_or_holding_and_active(voice_client_handle_type h_voice)
{
if (h_voice == 0)
{
diff --git a/update_version.sh b/update_version.sh
index 21e5fee..e313489 100644
--- a/update_version.sh
+++ b/update_version.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#export LYNQ_VERSION="T106_lynq_version_ap_build_sh"
-LYNQ_AP_VERSION="T106CN-ZS03.V2.01.01.02P49.AP.05.00"
-LYNQ_CAP_INSIDE_VERSION="CAP.05.00"
+LYNQ_AP_VERSION="T106CN-ZS03.V2.01.01.02P49.AP.05.02"
+LYNQ_CAP_INSIDE_VERSION="CAP.05.02"
LYNQ_CAP_VERSION="CAP.05"
COMMIT_ID="$(git rev-parse HEAD)"