.

jinyan.yi
1 parent 56d0caf2
Showing 2 changed files with 36 additions and 47 deletions
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
gimiCinema/src/main/java/com/qnbar/smc/soketProtocol/DataInfo.java
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @794ca6f
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @794ca6f
@@ -11,6 +11,7 @@ import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
+
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.model.RoomInfo;
 import com.gimi.common.cinema.utils.ActivityCollector;
@@ -36,6 +37,7 @@ import com.xgimi.gimicinema.activity.QrCodeShowActivity;
 import com.xgimi.gimicinema.application.FangTangApplication;
 import com.xgimi.gimicinema.service.CinemaControlService;
 import com.xgimi.smartscreen.encrypt.AuthCode;
+
 import org.greenrobot.eventbus.EventBus;
 import java.io.IOException;
@@ -415,11 +417,11 @@ public class SocketService1 extends BaseService {
     /**
      * 处理服务器发送的命令
+     *
      * @param socketResponse
      */
     private void serverCommandDeal(MainResponse socketResponse) {
-        switch (socketResponse.getCmd())
-        {
+        switch (socketResponse.getCmd()) {
             case OPEN_DOOR://开门
                 if (socketResponse.getData() != null) {
                     OpenDoor openDoorResponse = gson.fromJson(socketResponse.getData(), OpenDoor.class);
@@ -435,7 +437,7 @@ public class SocketService1 extends BaseService {
                 break;
             case REPORT_EQU_STATUS://获取声音,灯光,播放暂停状态
-                Log.d("ReportInfo","收到上报命令");
+                Log.d("ReportInfo", "收到上报命令");
                 //获取serverId
                 ReportEquStatus rps = gson.fromJson(socketResponse.getData(), ReportEquStatus.class);
 //                String serverId = rps.getServerId();
@@ -443,7 +445,7 @@ public class SocketService1 extends BaseService {
                 break;
             case SET_EQU_STATUS://设置声音,灯光,播放暂停
-                Log.d("ReportInfo","收到控制命令:"+socketResponse.getData());
+                Log.d("ReportInfo", "收到控制命令:" + socketResponse.getData());
                 EquipmentControl equc = gson.fromJson(socketResponse.getData(), EquipmentControl.class);
                 setEquipmentStatus(equc);
                 break;
@@ -487,19 +489,19 @@ public class SocketService1 extends BaseService {
     private void reportEquStatus(String serverId) {
         //填充返回数据
-        int volume = getAudioVolume()/6 + 1;
+        int volume = getAudioVolume() / 6 + 1;
         int lightStatus = 2;
         int playStatus = 0;
         try {
             playStatus = iPlayer.getCurrentStatus();
-            Log.d("ReportInfo","playStatus:"+playStatus);
+            Log.d("ReportInfo", "playStatus:" + playStatus);
         } catch (RemoteException e) {
             e.printStackTrace();
         }
-        if( Lights.getInstance().getByMeshAddress(
-                ((FangTangApplication) getApplication()).getConnectDevice().meshAddress).status == ConnectionStatus.ON )
-        {
+        if (Lights.getInstance().getByMeshAddress(
+                ((FangTangApplication) getApplication()).getConnectDevice().meshAddress).status
+                == ConnectionStatus.ON) {
             lightStatus = 1;
         }
@@ -515,19 +517,16 @@ public class SocketService1 extends BaseService {
         rep.setData(equStatus);
         String msg = gson.toJson(rep) + END_SYMBOL;
         sendMsg(msg);
-        Log.d("ReportInfo",msg);
+        Log.d("ReportInfo", msg);
     }
     private void setLight(int op) {
-        if (op == 1)//打开灯光
-        {
-            Log.d("setEqu","打开灯光");
+        if (op == 1) {//打开灯光
+            Log.d("setEqu", "打开灯光");
             LightOperationUtils.open();
             LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
-        }
-        else if(op == 2)//关闭灯光
-        {
-            Log.d("setEqu","关闭灯光");
+        } else if (op == 2) {//关闭灯光
+            Log.d("setEqu", "关闭灯光");
             LightOperationUtils.setLightValue(5);
             LightOperationUtils.close();
         }
@@ -541,14 +540,11 @@ public class SocketService1 extends BaseService {
             e.printStackTrace();
         }
-        if (op == 1 && status == 2)
-        {
-            Log.d("setEqu","开始播放");
+        if (op == 1 && status == 2) {
+            Log.d("setEqu", "开始播放");
             ShellUtils.execCommand("input keyevent 23", false);
-        }
-        else if (op == 2 && status == 1)
-        {
-            Log.d("setEqu","暂停播放");
+        } else if (op == 2 && status == 1) {
+            Log.d("setEqu", "暂停播放");
             ShellUtils.execCommand("input keyevent 23", false);
         }
     }
@@ -569,46 +565,38 @@ public class SocketService1 extends BaseService {
     private int getAudioVolume() {
         AudioManager mAudioManager;
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-        int current = mAudioManager.getStreamVolume( AudioManager.STREAM_MUSIC );
+        int current = mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
         return current;
     }
     private int setAudioVolume(int volume) {
         AudioManager mAudioManager;
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-        int now = getAudioVolume()/6;
+        int now = getAudioVolume() / 6;
-        if (volume == 0)
-        {
+        if (volume == 0) {
             return now;
-        }
-        else
-        {
+        } else {
             volume--;
         }
-        if (volume > now)//加音量
-        {
-            Log.d("setEqu","加音量"+now+":"+volume);
-            while(now < volume)
-            {
+        if (volume > now) {//加音量
+            Log.d("setEqu", "加音量" + now + ":" + volume);
+            while (now < volume) {
                 mAudioManager.adjustStreamVolume(
                         AudioManager.STREAM_MUSIC,
                         AudioManager.ADJUST_RAISE,
                         AudioManager.FLAG_PLAY_SOUND | AudioManager.FLAG_SHOW_UI);
-                now ++;
+                now++;
             }
-        }
-        else if(volume < now)//减音量
-        {
-            Log.d("setEqu","减音量"+now+":"+volume);
-            while(now > volume)
-            {
+        } else if (volume < now) {//减音量
+            Log.d("setEqu", "减音量" + now + ":" + volume);
+            while (now > volume) {
                 mAudioManager.adjustStreamVolume(
                         AudioManager.STREAM_MUSIC,
                         AudioManager.ADJUST_LOWER,
                         AudioManager.FLAG_PLAY_SOUND | AudioManager.FLAG_SHOW_UI);
-                now --;
+                now--;
             }
         }
@@ -622,6 +610,8 @@ public class SocketService1 extends BaseService {
         }
         public void onServiceDisconnected(ComponentName className) {
-        };
+        }
+
+        ;
     };
 }
--- a/gimiCinema/src/main/java/com/qnbar/smc/soketProtocol/DataInfo.java
View file @794ca6f
+++ b/gimiCinema/src/main/java/com/qnbar/smc/soketProtocol/DataInfo.java
View file @794ca6f
@@ -4,5 +4,4 @@ package com.qnbar.smc.soketProtocol;
  * Created by jinyan.yi on 2017/5/23.
  */
-public abstract class DataInfo {
-}
+public abstract class DataInfo {}