代码调整

@@ -412,8 +412,7 @@ public class SocketService1 extends BaseService {
      * 处理服务器发送的命令
      * 处理服务器发送的命令
      * @param socketResponse
      * @param socketResponse
      */
      */
-    private void serverCommandDeal(MainResponse socketResponse)
-    {
+    private void serverCommandDeal(MainResponse socketResponse) {
         switch (socketResponse.getCmd())
         switch (socketResponse.getCmd())
         {
         {
             case OPEN_DOOR://开门
             case OPEN_DOOR://开门
@@ -448,8 +447,7 @@ public class SocketService1 extends BaseService {
 
 
 /*--命令处理-start-----------------------------------*/
 /*--命令处理-start-----------------------------------*/
 
 
-    private void openDoor(OpenDoor openDoorResponse)
-    {
+    private void openDoor(OpenDoor openDoorResponse) {
         switch (openDoorResponse.getUser()) {
         switch (openDoorResponse.getUser()) {
             //10用户,20管理员,默认值为0
             //10用户,20管理员,默认值为0
             case 10:
             case 10:
@@ -482,20 +480,18 @@ public class SocketService1 extends BaseService {
         }
         }
     }
     }
 
 
-    private void reportEquStatus(String serverId)
-    {
+    private void reportEquStatus(String serverId) {
         //填充返回数据
         //填充返回数据
         int volume = getAudioVolume()/6 + 1;
         int volume = getAudioVolume()/6 + 1;
         int lightStatus = 2;
         int lightStatus = 2;
-
         int playStatus = 0;
         int playStatus = 0;
+
         try {
         try {
             playStatus = iPlayer.getCurrentStatus();
             playStatus = iPlayer.getCurrentStatus();
             Log.d("ReportInfo","playStatus:"+playStatus);
             Log.d("ReportInfo","playStatus:"+playStatus);
         } catch (RemoteException e) {
         } catch (RemoteException e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
-
         if( Lights.getInstance().getByMeshAddress(
         if( Lights.getInstance().getByMeshAddress(
                 ((FangTangApplication) getApplication()).getConnectDevice().meshAddress).status == ConnectionStatus.ON )
                 ((FangTangApplication) getApplication()).getConnectDevice().meshAddress).status == ConnectionStatus.ON )
         {
         {
@@ -517,8 +513,7 @@ public class SocketService1 extends BaseService {
         Log.d("ReportInfo",msg);
         Log.d("ReportInfo",msg);
     }
     }
 
 
-    private void setLight(int op)
-    {
+    private void setLight(int op) {
         if (op == 1)//打开灯光
         if (op == 1)//打开灯光
         {
         {
             Log.d("setEqu","打开灯光");
             Log.d("setEqu","打开灯光");
@@ -533,8 +528,7 @@ public class SocketService1 extends BaseService {
         }
         }
     }
     }
 
 
-    private void playCtl(int op)
-    {
+    private void playCtl(int op) {
         int status = -1;
         int status = -1;
         try {
         try {
             status = iPlayer.getCurrentStatus();
             status = iPlayer.getCurrentStatus();
@@ -552,16 +546,9 @@ public class SocketService1 extends BaseService {
             Log.d("setEqu","暂停播放");
             Log.d("setEqu","暂停播放");
             ShellUtils.execCommand("input keyevent 23", false);
             ShellUtils.execCommand("input keyevent 23", false);
         }
         }
-
-        try {
-            status = iPlayer.getCurrentStatus();
-        } catch (RemoteException e) {
-            e.printStackTrace();
-        }
     }
     }
 
 
-    private void setEquipmentStatus(EquipmentControl equc)
-    {
+    private void setEquipmentStatus(EquipmentControl equc) {
         setLight(equc.getLightCtl());
         setLight(equc.getLightCtl());
 
 
         playCtl(equc.getPlayCtl());
         playCtl(equc.getPlayCtl());
@@ -574,16 +561,14 @@ public class SocketService1 extends BaseService {
 
 
 /*--命令处理-end-----------------------------------*/
 /*--命令处理-end-----------------------------------*/
 
 
-    private int getAudioVolume()
-    {
+    private int getAudioVolume() {
         AudioManager mAudioManager;
         AudioManager mAudioManager;
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
         int current = mAudioManager.getStreamVolume( AudioManager.STREAM_MUSIC );
         int current = mAudioManager.getStreamVolume( AudioManager.STREAM_MUSIC );
         return current;
         return current;
     }
     }
 
 
-    private int setAudioVolume(int volume)
-    {
+    private int setAudioVolume(int volume) {
         AudioManager mAudioManager;
         AudioManager mAudioManager;
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
         int now = getAudioVolume()/6;
         int now = getAudioVolume()/6;

@@ -23,4 +23,12 @@ public class MainRequest {
     public void setData(DataInfo data) {
     public void setData(DataInfo data) {
         this.data = data;
         this.data = data;
     }
     }
+
+    @Override
+    public String toString() {
+        return "MainRequest{" +
+                "cmd=" + cmd +
+                ", data=" + data +
+                '}';
+    }
 }
 }

@@ -52,4 +52,15 @@ public class EquipmentStatus extends DataInfo {
     public void setRoom_sn(String room_sn) {
     public void setRoom_sn(String room_sn) {
         this.room_sn = room_sn;
         this.room_sn = room_sn;
     }
     }
+
+    @Override
+    public String toString() {
+        return "EquipmentStatus{" +
+                "volume=" + volume +
+                ", lightStatus=" + lightStatus +
+                ", playStatus=" + playStatus +
+                ", serverId='" + serverId + '\'' +
+                ", room_sn='" + room_sn + '\'' +
+                '}';
+    }
 }
 }

@@ -49,7 +49,7 @@ public class CinemaControlService extends Service {
     private int currentState = 0;
     private int currentState = 0;
     private String currentPath = null;
     private String currentPath = null;
     //    private static final int SAVE_BEAT = 500;
     //    private static final int SAVE_BEAT = 500;
-    private static final int SAVE_BEAT = 100;//default 500
+    private static final int SAVE_BEAT = 50;//default 50
     private int saveBeat = SAVE_BEAT;
     private int saveBeat = SAVE_BEAT;
 
 
     private final ICinemaControl.Stub cinemaControl = new ICinemaControl.Stub() {
     private final ICinemaControl.Stub cinemaControl = new ICinemaControl.Stub() {
@@ -82,7 +82,7 @@ public class CinemaControlService extends Service {
                     if (!fadeOuting && Lights.getInstance().getByMeshAddress(
                     if (!fadeOuting && Lights.getInstance().getByMeshAddress(
                             ((FangTangApplication) getApplication()).getConnectDevice().meshAddress).status
                             ((FangTangApplication) getApplication()).getConnectDevice().meshAddress).status
                             == ConnectionStatus.ON) {
                             == ConnectionStatus.ON) {
-//                        fadeOut();
+                        fadeOut();
                     }
                     }
                 } catch (Exception e) {
                 } catch (Exception e) {
                     e.printStackTrace();
                     e.printStackTrace();