|
@@ -703,18 +703,19 @@ public class ServiceMain extends Service {
|
|
|
|
|
|
else if(attsName.equals("CookTopFinder_Driver"))
|
|
|
{
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- cooktopfinder_Controller = new CookTopFinder_Controller();
|
|
|
-
|
|
|
-
|
|
|
- RegistrationDeviceManager = cooktopfinder_Controller;
|
|
|
-
|
|
|
-
|
|
|
- ServiceMain.deviceInitChecker.Add(attsName);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
}
|
|
|
else if (attsName.equals("GasValve_Driver")) {
|
|
@@ -735,7 +736,8 @@ public class ServiceMain extends Service {
|
|
|
|
|
|
RegistrationDeviceManager = gasValve_Controller;
|
|
|
|
|
|
- bSetDeviceHandler = false;
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
ServiceMain.deviceInitChecker.Add(attsName);
|
|
@@ -746,17 +748,18 @@ public class ServiceMain extends Service {
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
- cooktop_Controller = new Cooktop_Controller();
|
|
|
-
|
|
|
-
|
|
|
- RegistrationDeviceManager = cooktop_Controller;
|
|
|
-
|
|
|
- bSetDeviceHandler = false;
|
|
|
-
|
|
|
-
|
|
|
- ServiceMain.deviceInitChecker.Add(attsName);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
else if (attsName.equals("MultiSwitch_Driver")) {
|
|
|
|
|
@@ -1458,15 +1461,21 @@ public class ServiceMain extends Service {
|
|
|
|
|
|
|
|
|
|
|
|
+ WallpadDeviceSet mWallpadDeviceSet = new WallpadDeviceSet(svcContext);
|
|
|
+ boolean isUseShading = mWallpadDeviceSet.Get_Shading_Use();
|
|
|
+ mWallpadDeviceSet.closeDB();
|
|
|
+ if(isUseShading)
|
|
|
+ {
|
|
|
+
|
|
|
+ CurtainV1_LivingRoom_controller = new CurtainV1_Controller(false);
|
|
|
|
|
|
-
|
|
|
- CurtainV1_LivingRoom_controller = new CurtainV1_Controller(false);
|
|
|
+
|
|
|
+ RegistrationDeviceManager = CurtainV1_LivingRoom_controller;
|
|
|
|
|
|
-
|
|
|
- RegistrationDeviceManager = CurtainV1_LivingRoom_controller;
|
|
|
+
|
|
|
+ ServiceMain.deviceInitChecker.Add(attsName);
|
|
|
+ }
|
|
|
|
|
|
-
|
|
|
- ServiceMain.deviceInitChecker.Add(attsName);
|
|
|
}
|
|
|
else if (attsName.equals("Curtain_Room_Driver")) {
|
|
|
|
|
@@ -1474,13 +1483,20 @@ public class ServiceMain extends Service {
|
|
|
|
|
|
|
|
|
|
|
|
- CurtainV1_Room_controller = new CurtainV1_Controller(true);
|
|
|
+ WallpadDeviceSet mWallpadDeviceSet = new WallpadDeviceSet(svcContext);
|
|
|
+ boolean isUseShading = mWallpadDeviceSet.Get_Shading_Use();
|
|
|
+ mWallpadDeviceSet.closeDB();
|
|
|
+ if(isUseShading)
|
|
|
+ {
|
|
|
+ CurtainV1_Room_controller = new CurtainV1_Controller(true);
|
|
|
|
|
|
-
|
|
|
- RegistrationDeviceManager = CurtainV1_Room_controller;
|
|
|
+
|
|
|
+ RegistrationDeviceManager = CurtainV1_Room_controller;
|
|
|
+
|
|
|
+
|
|
|
+ ServiceMain.deviceInitChecker.Add(attsName);
|
|
|
+ }
|
|
|
|
|
|
-
|
|
|
- ServiceMain.deviceInitChecker.Add(attsName);
|
|
|
}
|
|
|
|
|
|
if (RegistrationDeviceManager != null) {
|