|
@@ -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에 출력
|
|
@@ -400,7 +400,6 @@ public class MainActivity extends WpadActivity {
|
|
if (ConfigValues.eWallPadType == WALLPADTYPE.MAIN) LOG_INFO("[onCreate] Model Type [IHN_1010-I]");
|
|
if (ConfigValues.eWallPadType == WALLPADTYPE.MAIN) LOG_INFO("[onCreate] Model Type [IHN_1010-I]");
|
|
else LOG_INFO("[onCreate] Model Type [IHN_1010-IS]"); // 서브월패드
|
|
else LOG_INFO("[onCreate] Model Type [IHN_1010-IS]"); // 서브월패드
|
|
}
|
|
}
|
|
- else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010_I_LX2) LOG_INFO("[onCreate] Model Type [IHN_1010-I-LX2]");
|
|
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1030_I) LOG_INFO("[onCreate] Model Type [IHN_1030-I]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1030_I) LOG_INFO("[onCreate] Model Type [IHN_1030-I]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1040) LOG_INFO("[onCreate] Model Type [IHN_1040]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1040) LOG_INFO("[onCreate] Model Type [IHN_1040]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1040_I) LOG_INFO("[onCreate] Model Type [IHN_1040-I]");
|
|
else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1040_I) LOG_INFO("[onCreate] Model Type [IHN_1040-I]");
|
|
@@ -415,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,9 +3726,9 @@ public class MainActivity extends WpadActivity {
|
|
try {
|
|
try {
|
|
LOG_INFO("[saveFrontPicture]");
|
|
LOG_INFO("[saveFrontPicture]");
|
|
if (mFrontCamera != null) {
|
|
if (mFrontCamera != null) {
|
|
- if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2
|
|
|
|
|
|
+ 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,9 +4586,9 @@ public class MainActivity extends WpadActivity {
|
|
case IGW300CMD.AUDIO_PSTN_WALLPAD:
|
|
case IGW300CMD.AUDIO_PSTN_WALLPAD:
|
|
Log.d(TAG, "[MainHandler] AUDIO_PSTN_WALLPAD");
|
|
Log.d(TAG, "[MainHandler] AUDIO_PSTN_WALLPAD");
|
|
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 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2
|
|
|
|
|
|
+ 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,9 +4625,9 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
case IGW300CMD.AUDIO_PSTN_REJECT:
|
|
case IGW300CMD.AUDIO_PSTN_REJECT:
|
|
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 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2
|
|
|
|
|
|
+ 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();
|
|
}
|
|
}
|
|
|
|
|