|
@@ -142,7 +142,7 @@ import static kr.co.icontrols.wallpadcall.declare.Declare.BR.ACNAME_MAIN_NOTI;
|
|
*/
|
|
*/
|
|
public class MainActivity extends WpadActivity {
|
|
public class MainActivity extends WpadActivity {
|
|
private final static String TAG = "MainActivity";
|
|
private final static String TAG = "MainActivity";
|
|
-//test
|
|
|
|
|
|
+// test
|
|
/**
|
|
/**
|
|
* MoIP 영상통화시, FFMPEG 사용 여부 설정
|
|
* MoIP 영상통화시, FFMPEG 사용 여부 설정
|
|
* true: FFMPEG 사용, MoIP 영상을 안드로이드 화면의 surface에 출력
|
|
* true: FFMPEG 사용, MoIP 영상을 안드로이드 화면의 surface에 출력
|
|
@@ -384,6 +384,7 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101) LOG_INFO("[onCreate] Model Type [IHN_D101]");
|
|
if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101) LOG_INFO("[onCreate] Model Type [IHN_D101]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I) LOG_INFO("[onCreate] Model Type [IHN_D101-I]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I) LOG_INFO("[onCreate] Model Type [IHN_D101-I]");
|
|
|
|
+ else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2) LOG_INFO("[onCreate] Model Type [IHN_D101-I_LX2]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF) LOG_INFO("[onCreate] Model Type [IHN_D101-I-OCF]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF) LOG_INFO("[onCreate] Model Type [IHN_D101-I-OCF]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010GL) LOG_INFO("[onCreate] Model Type [IHN_1010GL]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010GL) LOG_INFO("[onCreate] Model Type [IHN_1010GL]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010GL_I) LOG_INFO("[onCreate] Model Type [IHN_1010GL-I]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010GL_I) LOG_INFO("[onCreate] Model Type [IHN_1010GL-I]");
|
|
@@ -413,6 +414,7 @@ public class MainActivity extends WpadActivity {
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_DW101_I) LOG_INFO("[onCreate] Model Type [IHN_DW101_I]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_DW101_I) LOG_INFO("[onCreate] Model Type [IHN_DW101_I]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1020B_I) LOG_INFO("[onCreate] Model Type [IHN_1020B_I]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1020B_I) LOG_INFO("[onCreate] Model Type [IHN_1020B_I]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1303_I) LOG_INFO("[onCreate] Model Type [IHN_1303_I]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1303_I) LOG_INFO("[onCreate] Model Type [IHN_1303_I]");
|
|
|
|
+ else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010_I_LX2) LOG_INFO("[onCreate] Model Type [IHN_1010_I_LX2]");
|
|
else LOG_INFO("[onCreate] ConfigValues.DEVICE_MODELTYPE [" + ConfigValues.DEVICE_MODELTYPE + "]");
|
|
else LOG_INFO("[onCreate] ConfigValues.DEVICE_MODELTYPE [" + ConfigValues.DEVICE_MODELTYPE + "]");
|
|
|
|
|
|
// @ AutoScale 설정
|
|
// @ AutoScale 설정
|
|
@@ -3726,7 +3728,7 @@ public class MainActivity extends WpadActivity {
|
|
if (mFrontCamera != null) {
|
|
if (mFrontCamera != null) {
|
|
if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I
|
|
if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I
|
|
|| ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K_I
|
|
|| ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K_I
|
|
- || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF) {
|
|
|
|
|
|
+ || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2) {
|
|
mFrontCamera.takePicture(null, null, mPicture_IHND101);
|
|
mFrontCamera.takePicture(null, null, mPicture_IHND101);
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
@@ -4586,7 +4588,7 @@ public class MainActivity extends WpadActivity {
|
|
Log.d(TAG, "[MainHandler] ConfigValues.DEVICE_MODELTYPE [" + ConfigValues.DEVICE_MODELTYPE + "]");
|
|
Log.d(TAG, "[MainHandler] ConfigValues.DEVICE_MODELTYPE [" + ConfigValues.DEVICE_MODELTYPE + "]");
|
|
if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I
|
|
if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I
|
|
|| ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K_I
|
|
|| ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K_I
|
|
- || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF)
|
|
|
|
|
|
+ || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2)
|
|
{
|
|
{
|
|
sendPSTNRingEndBR();
|
|
sendPSTNRingEndBR();
|
|
}
|
|
}
|
|
@@ -4625,7 +4627,7 @@ public class MainActivity extends WpadActivity {
|
|
Log.d(TAG, "[MainHandler] AUDIO_PSTN_REJECT");
|
|
Log.d(TAG, "[MainHandler] AUDIO_PSTN_REJECT");
|
|
if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I
|
|
if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I
|
|
|| ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K_I
|
|
|| ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K_I
|
|
- || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF) {
|
|
|
|
|
|
+ || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2) {
|
|
sendPSTNRingEndBR();
|
|
sendPSTNRingEndBR();
|
|
}
|
|
}
|
|
|
|
|