Bläddra i källkod

누락 commit

jslee(madeinlab) 3 år sedan
förälder
incheckning
edf0f8d645
17 ändrade filer med 17 tillägg och 28 borttagningar
  1. 2 2
      WallPadCall/src/main/java/kr/co/icontrols/callengine/pstn/PSTNController.java
  2. 8 8
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/MainActivity.java
  3. 4 4
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/declare/Global.java
  4. 0 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/MainActivity.java
  5. 1 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/data/AirconData.java
  6. 1 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/data/HeatingData.java
  7. 1 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/data/LightData.java
  8. 0 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconMainScreen.java
  9. 0 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2MainScreen.java
  10. 0 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxMainScreen.java
  11. 0 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2PopupTestScreen.java
  12. 0 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2TestScreen.java
  13. 0 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconMainTestScreen.java
  14. 0 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconPopupTestScreen.java
  15. 0 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxMainTestScreen.java
  16. 0 2
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxPopupTestScreen.java
  17. 0 3
      WallPadMultiControlService/src/main/java/kr/co/icontrols/wallpadmulticontrolservice/DataSenderService.java

+ 2 - 2
WallPadCall/src/main/java/kr/co/icontrols/callengine/pstn/PSTNController.java

@@ -378,9 +378,9 @@ public class PSTNController {
             if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
 //                ((MainActivity) mContext).sendHandlerMsg(IGW300CMD.AUDIO_PSTN_REJECT, 0, 0);   // 핸들러로 동작시니키, 메시지가 전달되는 지연이 발생한다.
 
-                if (ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I_LX2
+                if (ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I
                         || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101K_I
-                        || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I_OCF) {
+                        || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I_OCF || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I_LX2) {
                     ((MainActivity) mContext).sendPSTNRingEndBR();
                 }
 

+ 8 - 8
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/MainActivity.java

@@ -142,7 +142,7 @@ import static kr.co.icontrols.wallpadcall.declare.Declare.BR.ACNAME_MAIN_NOTI;
  */
 public class MainActivity extends WpadActivity {
     private final static String TAG = "MainActivity";
-//test
+// test
     /**
      * MoIP 영상통화시, FFMPEG 사용 여부 설정
      * 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]");
                 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_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]");
@@ -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_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_1010_I_LX2) LOG_INFO("[onCreate] Model Type [IHN_1010_I_LX2]");
             else LOG_INFO("[onCreate] ConfigValues.DEVICE_MODELTYPE [" + ConfigValues.DEVICE_MODELTYPE + "]");
 
             // @ AutoScale 설정
@@ -3726,9 +3726,9 @@ public class MainActivity extends WpadActivity {
         try {
             LOG_INFO("[saveFrontPicture]");
             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_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);
                 }
                 else {
@@ -4586,9 +4586,9 @@ public class MainActivity extends WpadActivity {
                 case IGW300CMD.AUDIO_PSTN_WALLPAD:
                     Log.d(TAG, "[MainHandler] AUDIO_PSTN_WALLPAD");
                     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_D101_I_OCF)
+                            || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2)
                     {
                         sendPSTNRingEndBR();
                     }
@@ -4625,9 +4625,9 @@ public class MainActivity extends WpadActivity {
 
                 case IGW300CMD.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_D101_I_OCF) {
+                            || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2) {
                         sendPSTNRingEndBR();
                     }
 

+ 4 - 4
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/declare/Global.java

@@ -2133,23 +2133,23 @@ public final class Global {
         try {
             Log.i(TAG, "[applyDerivedType] nModelType [" + nModelType + "]");
             // 모델에 따른 설정정보를 정의한다.
-            if (nModelType == MODEL_TYPE.IHN_D101 || nModelType == MODEL_TYPE.IHN_D101_I || nModelType == MODEL_TYPE.IHN_D101_I_LX2
+            if (nModelType == MODEL_TYPE.IHN_D101 || nModelType == MODEL_TYPE.IHN_D101_I
                     || nModelType == MODEL_TYPE.IHN_D101K || nModelType == MODEL_TYPE.IHN_D101K_I
                     || nModelType == MODEL_TYPE.IHN_1010GL || nModelType == MODEL_TYPE.IHN_1010GL_I
                     || nModelType == MODEL_TYPE.IHN_1010GL_I_2443 || nModelType == MODEL_TYPE.IHN_1010GL_I_6410
-                    || nModelType == MODEL_TYPE.IHN_D101_I_OCF) {
+                    || nModelType == MODEL_TYPE.IHN_D101_I_OCF || nModelType == MODEL_TYPE.IHN_D101_I_LX2) {
                 ConfigValues.bPSTNEnable = true;
                 ConfigValues.bSubPhoneEnable = true;
                 ConfigValues.bWallPadCameraEnable = false;
             }
-            else if (nModelType == MODEL_TYPE.IHN_1010 || nModelType == MODEL_TYPE.IHN_1010_I || nModelType == MODEL_TYPE.IHN_1010_I_LX2
+            else if (nModelType == MODEL_TYPE.IHN_1010 || nModelType == MODEL_TYPE.IHN_1010_I
                     || nModelType == MODEL_TYPE.IHN_1030_I
                     || nModelType == MODEL_TYPE.IHN_1040 || nModelType == MODEL_TYPE.IHN_1040_I
                     || nModelType == MODEL_TYPE.IHN_1050 || nModelType == MODEL_TYPE.IHN_1050_I
                     || nModelType == MODEL_TYPE.IHN_T1010 || nModelType == MODEL_TYPE.IHN_T1010_I
                     || nModelType == MODEL_TYPE.IHN_HS101 || nModelType == MODEL_TYPE.IHN_HS101_I
                     || nModelType == MODEL_TYPE.IHN_DW101_I || nModelType == MODEL_TYPE.IHN_1020B_I
-                    || nModelType == MODEL_TYPE.IHN_1303_I) {
+                    || nModelType == MODEL_TYPE.IHN_1303_I || nModelType == MODEL_TYPE.IHN_1010_I_LX2) {
                 ConfigValues.bPSTNEnable = true;
                 ConfigValues.bSubPhoneEnable = true;
                 ConfigValues.bWallPadCameraEnable = true;

+ 0 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/MainActivity.java

@@ -116,7 +116,6 @@ import static com.artncore.WallPadDataMgr.WallpadDeviceSet.DOORLOCK_TYPE_RF;
  */
 public class MainActivity extends WpadActivity {
 	private final static String TAG = "MainActivity";
-
 	private final boolean DEBUG_LOG_ON = true;
 
 	private void DebugLogOutput(String s)

+ 1 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/data/AirconData.java

@@ -13,6 +13,7 @@ public class AirconData implements Parcelable {
     private String data_seq;
     private String title_name;
 
+
     protected AirconData(Parcel in) {
         aircon_status = in.readInt();
         support_auto = in.readByte() != 0;

+ 1 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/data/HeatingData.java

@@ -15,6 +15,7 @@ public class HeatingData implements Parcelable {
     private String data_seq;
     private String title_name;
 
+
     protected HeatingData(Parcel in) {
         support_setpoint05 = in.readByte() != 0;
         support_outing = in.readByte() != 0;

+ 1 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/data/LightData.java

@@ -14,6 +14,7 @@ public class LightData {
     private String data_seq;
     private String title_name;
 
+
     public boolean getMaster_info_fault() {
         return master_info_fault;
     }

+ 0 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconMainScreen.java

@@ -38,7 +38,6 @@ import kr.co.icontrols.wallpadsupport.WpadTextView;
 public class KnxSystemAirconMainScreen extends WpadScreen {
 
     private final String TAG = "KnxSysAirconMainScrn";
-
     private final boolean DEBUG_LOG_ON = true;
 
     private void DebugLogOutput(String s) {

+ 0 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2MainScreen.java

@@ -55,7 +55,6 @@ import kr.co.icontrols.wallpadsupport.WpadTextView;
 @SuppressLint({ "ViewConstructor", "DefaultLocale" })
 public class HeatingV2MainScreen extends WpadScreen {
     private final String TAG = "HeatingV2MainScreen";
-
     private final boolean DEBUG_LOG_ON = true;
     private void DebugLogOutput(String s) { if(DEBUG_LOG_ON) Log.d(TAG, s); }
 

+ 0 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxMainScreen.java

@@ -45,7 +45,6 @@ import kr.co.icontrols.wallpadsupport.WpadTextView;
 public class LightKnxMainScreen extends WpadScreen {
     // [Define]
     String TAG = this.getClass().getSimpleName();
-
     private void DebugLogOutput(String s) {
         if (Common.DEBUG_LOG_ON) Log.d(TAG, s);
     }

+ 0 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2PopupTestScreen.java

@@ -64,7 +64,6 @@ import kr.co.icontrols.wallpadsupport.WpadUtil;
 public class HeatingV2PopupTestScreen extends WpadScreen {
     private final String TAG = "HeatingV2PopupTest";
     private Context mContext;
-
     private final boolean DEBUG_LOG_ON = true;
 
     private void DebugLogOutput(String s) {

+ 0 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2TestScreen.java

@@ -67,7 +67,6 @@ import kr.co.icontrols.wallpadsupport.WpadTextView;
 @SuppressLint({ "ViewConstructor", "DefaultLocale" })
 public class HeatingV2TestScreen extends WpadScreen {
     private final String TAG = "HeatingV2TestScreen";
-
     private final boolean DEBUG_LOG_ON = true;
     private void DebugLogOutput(String s) { if(DEBUG_LOG_ON) Log.d(TAG, s); }
 

+ 0 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconMainTestScreen.java

@@ -53,7 +53,6 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
 
     private final String TAG = "KnxAirconMainTestScrn";
     private Context mContext;
-
     private final boolean DEBUG_LOG_ON = true;
 
     private void DebugLogOutput(String s) {

+ 0 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconPopupTestScreen.java

@@ -44,7 +44,6 @@ public class KnxSystemAirconPopupTestScreen extends WpadScreen {
 
     private final String TAG = "KnxSysAirconPopScrn";
     private Context mContext;
-
     private final boolean DEBUG_LOG_ON = true;
 
     private void DebugLogOutput(String s) {

+ 0 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxMainTestScreen.java

@@ -63,7 +63,6 @@ import kr.co.icontrols.wallpadsupport.WpadTextView;
 public class LightKnxMainTestScreen extends WpadScreen {
     // [Define]
     String TAG = this.getClass().getSimpleName();
-
     private void DebugLogOutput(String s) {
         if (Common.DEBUG_LOG_ON) Log.d(TAG, s);
     }

+ 0 - 2
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxPopupTestScreen.java

@@ -62,8 +62,6 @@ import kr.co.icontrols.wallpadsupport.WpadUtil;
 public class LightKnxPopupTestScreen extends WpadScreen {
     private final String TAG = "LightKnxPopupTestScreen";
     private Context mContext;
-
-
     private final boolean DEBUG_LOG_ON = true;
 
     private void DebugLogOutput(String s) {

+ 0 - 3
WallPadMultiControlService/src/main/java/kr/co/icontrols/wallpadmulticontrolservice/DataSenderService.java

@@ -65,13 +65,10 @@ import kr.co.icontrols.wallpadsupport.WpadSound;
 
 public class DataSenderService extends Service {
     String TAG = this.getClass().getSimpleName();
-
     private void DebugLogOutput(String s) {
         if (Common.DEBUG_LOG_ON) Log.d(TAG, s);
     }
-
     protected Context mContext = null;
-
     public Context getContext() {
         return mContext;
     }