|
@@ -11,7 +11,6 @@ import android.widget.RelativeLayout;
|
|
|
|
|
|
import com.artncore.WallPadDataMgr.WallpadDeviceSet;
|
|
import com.artncore.WallPadDataMgr.WallpadDeviceSet;
|
|
import com.artncore.commons.DataClasses;
|
|
import com.artncore.commons.DataClasses;
|
|
-import com.artncore.wallpadapi.CooktopAPI;
|
|
|
|
import com.artncore.wallpadapi.CurtainAPI;
|
|
import com.artncore.wallpadapi.CurtainAPI;
|
|
import com.artncore.wallpadapi.WallPadAPI;
|
|
import com.artncore.wallpadapi.WallPadAPI;
|
|
import com.artncore.wallpadapi.WallPadDevAPI;
|
|
import com.artncore.wallpadapi.WallPadDevAPI;
|
|
@@ -30,7 +29,7 @@ import kr.co.icontrols.wallpadsupport.WpadTextView;
|
|
|
|
|
|
public class CurTainV1MainScreen extends WpadScreen {
|
|
public class CurTainV1MainScreen extends WpadScreen {
|
|
|
|
|
|
- private final String TAG = "HybridCookTopMainScreen";
|
|
|
|
|
|
+ private final String TAG = "CurTainV1MainScreen";
|
|
|
|
|
|
private boolean isNoUseData = true;
|
|
private boolean isNoUseData = true;
|
|
private final boolean DEBUG_LOG_ON = true;
|
|
private final boolean DEBUG_LOG_ON = true;
|
|
@@ -339,6 +338,7 @@ public class CurTainV1MainScreen extends WpadScreen {
|
|
|
|
|
|
int OnCount = 0;
|
|
int OnCount = 0;
|
|
boolean isLivingRoomData = true;
|
|
boolean isLivingRoomData = true;
|
|
|
|
+ //그룹아이디 정보를 가지고 확인하기
|
|
if(mData.Device[0].curtain.getCurtainGroupID() == 0x80)
|
|
if(mData.Device[0].curtain.getCurtainGroupID() == 0x80)
|
|
{
|
|
{
|
|
isLivingRoomData = true;
|
|
isLivingRoomData = true;
|
|
@@ -428,11 +428,11 @@ public class CurTainV1MainScreen extends WpadScreen {
|
|
}
|
|
}
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
- // MultiSwitch
|
|
|
|
|
|
+ // CurTain
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
- // 3. Load API (Light)
|
|
|
|
- DebugLogOutput("[Device_ApiLoad] - Step1 : MultiSwitchAPI API Load...");
|
|
|
|
|
|
+ // 3. Load API
|
|
|
|
+ DebugLogOutput("[Device_ApiLoad] - Step1 : CurTain API Load...");
|
|
try
|
|
try
|
|
{
|
|
{
|
|
curtainAPI = wpapi.Get_CurTainController();
|
|
curtainAPI = wpapi.Get_CurTainController();
|
|
@@ -546,16 +546,13 @@ public class CurTainV1MainScreen extends WpadScreen {
|
|
}
|
|
}
|
|
catch (Exception e)
|
|
catch (Exception e)
|
|
{
|
|
{
|
|
- Log.e(TAG, "[Device_Update] - [Exception Error] multiSwitchAPI.Refresh(index:" + index + ", real:" + real + ")");
|
|
|
|
|
|
+ Log.e(TAG, "[Device_Update] - [Exception Error] curtainAPI.Refresh(index:" + index + ", real:" + real + ")");
|
|
//e.printStackTrace();
|
|
//e.printStackTrace();
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
return -100;
|
|
return -100;
|
|
}
|
|
}
|
|
|
|
|
|
- // 3. Range Check
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- // 4. Data Copy
|
|
|
|
|
|
+ // 3. Data Copy
|
|
mData = curtainAPI.data;
|
|
mData = curtainAPI.data;
|
|
|
|
|
|
if(isNoUseData)
|
|
if(isNoUseData)
|
|
@@ -570,8 +567,6 @@ public class CurTainV1MainScreen extends WpadScreen {
|
|
mData.Device[0].curtain.setCurtainStatus((byte) 0);
|
|
mData.Device[0].curtain.setCurtainStatus((byte) 0);
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
if(mData == null) return -1;
|
|
if(mData == null) return -1;
|
|
|
|
|
|
// 5. Debug Msg
|
|
// 5. Debug Msg
|
|
@@ -586,6 +581,4 @@ public class CurTainV1MainScreen extends WpadScreen {
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
-
|
|
|
|
-
|
|
|
|
}
|
|
}
|