|
@@ -1078,7 +1078,7 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
//카카오홈 사용 여부 체크(카카오홈)
|
|
|
boolean isUseKakao = getKakaoHomeCheck();
|
|
|
- if(isUseKakao)
|
|
|
+ if((Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == MODEL_TYPE.IHN_D101K_I) && isUseKakao && MAINStatus == MAIN_NORMAL)
|
|
|
{
|
|
|
WallpadStatusData wdb = new WallpadStatusData(this.getContext());
|
|
|
if (wdb != null) {
|
|
@@ -1280,7 +1280,9 @@ public class MainActivity extends WpadActivity {
|
|
|
*/
|
|
|
private Runnable mLaunchTaskKakao = new Runnable() {
|
|
|
public void run() {
|
|
|
- String Packagename = "com.hdc_icontrols.kakao.stage";
|
|
|
+ //String Packagename = "com.hdc_icontrols.kakao.stage";
|
|
|
+ String Packagename = "com.hdc_icontrols.kakao.real";
|
|
|
+
|
|
|
//Handler를 이용하여 Timer 사용
|
|
|
Intent mainIntent = mContext.getPackageManager().getLaunchIntentForPackage(Packagename);
|
|
|
if (mainIntent != null) {
|
|
@@ -2258,7 +2260,7 @@ public class MainActivity extends WpadActivity {
|
|
|
*/
|
|
|
public boolean StartPopup(int ScreenId, Intent data) {
|
|
|
try {
|
|
|
- if (ID.POPUPS.POPUP_INTERFLOORNOISEOCCURED <= ScreenId && ScreenId <= ID.POPUPS.POPUP_POSTRECEIVED) { // 알림 팝업에 한하여
|
|
|
+ if ((ID.POPUPS.POPUP_INTERFLOORNOISEOCCURED <= ScreenId && ScreenId <= ID.POPUPS.POPUP_POSTRECEIVED) || ScreenId == ID.POPUPS.POPUP_CHARGINGELECTRICVEHICLE) { // 알림 팝업에 한하여
|
|
|
if (Common.bWallPadCallLive) {
|
|
|
Log.w(TAG, "[StartPopup] StartPopup denied!!! === WallPadCall is running!! ScreenId [" + ScreenId + "]");
|
|
|
return false; // 통화 앱이 실행되어 있는 경우, 팝업 출력 안함
|
|
@@ -2810,19 +2812,6 @@ public class MainActivity extends WpadActivity {
|
|
|
String strCarNum = intent.getStringExtra("sCar_Num");
|
|
|
String strChargerNum = intent.getStringExtra("sCharger_Num");
|
|
|
if (strState.equals("start")) {
|
|
|
- try {
|
|
|
- WallpadStatusData SetData = new WallpadStatusData(getContext());
|
|
|
- boolean soundOut = SetData.GetSoundOutputOfEventAlarm();
|
|
|
- SetData.closeDB();
|
|
|
- if (soundOut) Sound().Play(SND.effect.EFFECT1);
|
|
|
- } catch (RuntimeException re) {
|
|
|
- LogUtil.errorLogInfo("", TAG, re);
|
|
|
- }
|
|
|
- catch (Exception e) {
|
|
|
-
|
|
|
- LogUtil.errorLogInfo("", TAG, e);
|
|
|
- }
|
|
|
-
|
|
|
// 충전시작
|
|
|
Intent data = new Intent();
|
|
|
data.putExtra("CarNum", strCarNum);
|
|
@@ -2833,18 +2822,6 @@ public class MainActivity extends WpadActivity {
|
|
|
StartPopup(ID.POPUPS.POPUP_CHARGINGELECTRICVEHICLE, data);
|
|
|
}
|
|
|
else if (strState.equals("stop")) {
|
|
|
- try {
|
|
|
- WallpadStatusData SetData = new WallpadStatusData(getContext());
|
|
|
- boolean soundOut = SetData.GetSoundOutputOfEventAlarm();
|
|
|
- SetData.closeDB();
|
|
|
- if (soundOut) Sound().Play(SND.effect.EFFECT1);
|
|
|
- } catch (RuntimeException re) {
|
|
|
- LogUtil.errorLogInfo("", TAG, re);
|
|
|
- }
|
|
|
- catch (Exception e) {
|
|
|
-
|
|
|
- LogUtil.errorLogInfo("", TAG, e);
|
|
|
- }
|
|
|
// 충전 종료
|
|
|
Intent data = new Intent();
|
|
|
data.putExtra("CarNum", strCarNum);
|