.

@@ -46,6 +46,8 @@ import java.io.OutputStream;
 import java.lang.ref.WeakReference;
 import java.lang.ref.WeakReference;
 import java.net.Socket;
 import java.net.Socket;
 import java.util.Arrays;
 import java.util.Arrays;
+import java.util.Timer;
+import java.util.TimerTask;
 
 
 //import static com.qnbar.smc.service.SocketService.JUST_OPEN_DOOR;
 //import static com.qnbar.smc.service.SocketService.JUST_OPEN_DOOR;
 //import static com.qnbar.smc.service.SocketService.USER_OPEN_DOOR;
 //import static com.qnbar.smc.service.SocketService.USER_OPEN_DOOR;
@@ -441,7 +443,7 @@ public class SocketService1 extends BaseService {
                 //获取serverId
                 //获取serverId
                 ReportEquStatus rps = gson.fromJson(socketResponse.getData(), ReportEquStatus.class);
                 ReportEquStatus rps = gson.fromJson(socketResponse.getData(), ReportEquStatus.class);
 //                String serverId = rps.getServerId();
 //                String serverId = rps.getServerId();
-                reportEquStatus(rps.getServerId());
+                reportEquStatus(rps.getServerId(),0);
                 break;
                 break;
 
 
             case SET_EQU_STATUS://设置声音,灯光,播放暂停
             case SET_EQU_STATUS://设置声音,灯光,播放暂停
@@ -487,7 +489,7 @@ public class SocketService1 extends BaseService {
         }
         }
     }
     }
 
 
-    private void reportEquStatus(String serverId) {
+    private void reportEquStatus(String serverId,int lightSet) {
         //填充返回数据
         //填充返回数据
         int volume = getAudioVolume() / 6 + 1;
         int volume = getAudioVolume() / 6 + 1;
         int lightStatus = 2;
         int lightStatus = 2;
@@ -499,10 +501,18 @@ public class SocketService1 extends BaseService {
         } catch (RemoteException e) {
         } catch (RemoteException e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
-        if (Lights.getInstance().getByMeshAddress(
-                ((FangTangApplication) getApplication()).getConnectDevice().meshAddress).status
-                == ConnectionStatus.ON) {
-            lightStatus = 1;
+
+        if (lightSet == 1 || lightSet == 2) {
+            lightStatus = lightSet;
+        } else {
+            ConnectionStatus stu = Lights.getInstance().getByMeshAddress(((FangTangApplication) getApplication()).getConnectDevice().meshAddress).status;
+            if( Lights.getInstance().getByMeshAddress(
+                    ((FangTangApplication) getApplication()).getConnectDevice().meshAddress).status == ConnectionStatus.ON ) {
+                Log.d("ReportInfo","lightStatus==1");
+                lightStatus = 1;
+            } else {
+                Log.d("ReportInfo", "lightStatus:"+stu);
+            }
         }
         }
 
 
         EquipmentStatus equStatus = new EquipmentStatus();
         EquipmentStatus equStatus = new EquipmentStatus();
@@ -524,11 +534,26 @@ public class SocketService1 extends BaseService {
         if (op == 1) {//打开灯光
         if (op == 1) {//打开灯光
             Log.d("setEqu", "打开灯光");
             Log.d("setEqu", "打开灯光");
             LightOperationUtils.open();
             LightOperationUtils.open();
-            LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
-        } else if (op == 2) {//关闭灯光
-            Log.d("setEqu", "关闭灯光");
             LightOperationUtils.setLightValue(5);
             LightOperationUtils.setLightValue(5);
-            LightOperationUtils.close();
+
+            //延时增亮
+            Timer timer=new Timer();//实例化Timer类
+            timer.schedule(new TimerTask(){
+                public void run(){
+                    LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
+                    this.cancel();}},2000);//毫秒
+        }
+        else if(op == 2)//关闭灯光
+        {
+            Log.d("setEqu","关闭灯光");
+            LightOperationUtils.setLightValue(5);
+
+            //延时关闭
+            Timer timer=new Timer();//实例化Timer类
+            timer.schedule(new TimerTask(){
+                public void run(){
+                    LightOperationUtils.close();
+                    this.cancel();}},2000);//毫秒
         }
         }
     }
     }
 
 
@@ -556,8 +581,13 @@ public class SocketService1 extends BaseService {
 
 
         setAudioVolume(equc.getAudioCtl());
         setAudioVolume(equc.getAudioCtl());
 
 
-        reportEquStatus(equc.getServerId());
+        try {
+            Thread.sleep(500);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
 
 
+        reportEquStatus(equc.getServerId(),equc.getLightCtl());
     }
     }
 
 
 /*--命令处理-end-----------------------------------*/
 /*--命令处理-end-----------------------------------*/