Jelajahi Sumber

[WallPadHomeCtrl]
1. App Ver. 갱신
- 2022.05.09.01
2. 최신 WallPadAPI 적용
- API Ver.: 2022.05.09.01
3. 주차 출입문 화면 개선
- 주차출입문 명칭 추가
> 1번: 지상 자동 대문
> 2번: 지하 자동 대문
4. 가스밸브 화면 개선
- 오타 수정 (가스벨브 -> 가스밸브)

[WallPadAPI]
1. API Ver. 갱신
- 2022.05.09.01
2. KNX API 수정
- 디밍, 색온도 설정범위 확인 함수 수정
> 기존: 1 ~ 10
> 변경: 0 ~ 10 (0: 설정안함/don't care)

Changwoo Nam 2 tahun lalu
induk
melakukan
1da72e8952

TEMPAT SAMPAH
WallPadHomeCtrl/libs/WallPadAPI.jar


+ 1 - 1
WallPadHomeCtrl/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadhomectrl"
     android:versionCode="17"
-    android:versionName="2022.04.27.01">
+    android:versionName="2022.05.09.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

+ 4 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/declare/ID.java

@@ -3422,6 +3422,10 @@ public final class ID
 			public final static int OPEN_FIRST			= BASE + 200;
 			public final static int OPEN_SECOND			= BASE + 201;
 		}
+		public static final class text {
+			public final static int TITLE_PARRKING_DOOR_01 = BASE + 200;
+			public final static int TITLE_PARRKING_DOOR_02 = BASE + 201;
+		}
 	}
 
 

+ 2 - 2
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_gas/HybridCookTopMainScreen.java

@@ -219,7 +219,7 @@ public class HybridCookTopMainScreen extends WpadScreen {
             if(isGas)
             {
                 //가스
-                TXT_TITLE.setText("가스브");
+                TXT_TITLE.setText("가스브");
             }
             else
             {
@@ -687,7 +687,7 @@ public class HybridCookTopMainScreen extends WpadScreen {
                 roomView[i] = new HybridCookTopMainScreen.RoomView(left, top, i, isGas);
                 if(isGas)
                 {
-                    astrRoomTitle[i] ="가스브";
+                    astrRoomTitle[i] ="가스브";
                 }
                 else
                 {

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

@@ -234,7 +234,7 @@ public class HybridCookTopTestScreen extends WpadScreen {
             if(isGas)
             {
                 //가스
-                TXT_TITLE.setText("가스브");
+                TXT_TITLE.setText("가스브");
             }
             else
             {

+ 18 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/ParkingDoorMainScreen.java

@@ -3,10 +3,12 @@ package kr.co.icontrols.wallpadhomectrl.screen.screen_multi;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.Color;
 import android.os.CountDownTimer;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.RelativeLayout;
@@ -32,6 +34,7 @@ import kr.co.icontrols.wallpadsupport.WpadImageView;
 import kr.co.icontrols.wallpadsupport.WpadImageView.TOUCH_KIND;
 import kr.co.icontrols.wallpadsupport.WpadScreen;
 import kr.co.icontrols.wallpadsupport.WpadSound.SND;
+import kr.co.icontrols.wallpadsupport.WpadTextView;
 
 
 /**
@@ -60,6 +63,9 @@ public class ParkingDoorMainScreen extends WpadScreen {
     // [Button]
     private WpadImageView OpenFirstBtn, OpenSecondBtn;
 
+    // [Text]
+    public WpadTextView TXT_TITLE_PARRKING_DOOR_01, TXT_TITLE_PARRKING_DOOR_02;          // 차량 자동대문 명칭
+
     // [Variables]
     private int OPERATION_MODE = -1;
     private DLockAPI.Data mData = null;
@@ -114,14 +120,26 @@ public class ParkingDoorMainScreen extends WpadScreen {
 
         GarageFirstImage = new WpadImageView(context, TOUCH_KIND.NONE, 544, 547, R.drawable.bg_garage_1, 0, ID.ParkingDoorMainScreenID.image.GARAGE_FIRST_IMG);
         ViewRegistration(layout, GarageFirstImage, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(169));
+
         GarageSecondImage = new WpadImageView(context, TOUCH_KIND.NONE, 544, 547, R.drawable.bg_garage_2, 0, ID.ParkingDoorMainScreenID.image.GARAGE_SECOND_IMG);
         ViewRegistration(layout, GarageSecondImage, Common.ImgPosion.GetX(640), Common.ImgPosion.GetY(169));
 
+        TXT_TITLE_PARRKING_DOOR_01 = new WpadTextView(context, false, 500, 70, Gravity.CENTER, Color.LTGRAY, Common.fontsize._30, true, ID.ParkingDoorMainScreenID.text.TITLE_PARRKING_DOOR_01);
+        ViewRegistration(layout, TXT_TITLE_PARRKING_DOOR_01, Common.ImgPosion.GetX(115), Common.ImgPosion.GetY(180));
+        TXT_TITLE_PARRKING_DOOR_01.setText("지상 자동 대문");
+//        TXT_TITLE_PARRKING_DOOR_01.setBackgroundColor(Color.RED);
+
+        TXT_TITLE_PARRKING_DOOR_02 = new WpadTextView(context, false, 500, 70, Gravity.CENTER, Color.LTGRAY, Common.fontsize._30, true, ID.ParkingDoorMainScreenID.text.TITLE_PARRKING_DOOR_02);
+        ViewRegistration(layout, TXT_TITLE_PARRKING_DOOR_02, Common.ImgPosion.GetX(664), Common.ImgPosion.GetY(180));
+        TXT_TITLE_PARRKING_DOOR_02.setText("지하 자동 대문");
+//        TXT_TITLE_PARRKING_DOOR_02.setBackgroundColor(Color.RED);
+
         // 4. Button Create
         DebugLogOutput("[Create] - Step4 : Button Create");
         OpenFirstBtn = new WpadImageView(context, TOUCH_KIND.BUTTON, 271, 56, R.drawable.btn_garage_open_normal, R.drawable.btn_garage_open_pressed, ID.ParkingDoorMainScreenID.button.OPEN_FIRST);
         ViewRegistration(layout, OpenFirstBtn, Common.ImgPosion.GetX(231), Common.ImgPosion.GetY(619));
         OpenFirstBtn.setTouchDelayMs(Common.BTN_DELAY_DEVCTRL);
+
         OpenSecondBtn = new WpadImageView(context, TOUCH_KIND.BUTTON, 271, 56, R.drawable.btn_garage_open_normal, R.drawable.btn_garage_open_pressed, ID.ParkingDoorMainScreenID.button.OPEN_SECOND);
         ViewRegistration(layout, OpenSecondBtn, Common.ImgPosion.GetX(778), Common.ImgPosion.GetY(619));
         OpenSecondBtn.setTouchDelayMs(Common.BTN_DELAY_DEVCTRL);