代码优化

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constants.kt

@@ -108,61 +108,61 @@ class Constants {
         /**
          * TCP消息
          */
-        val EVENT_TCP_MSG = 0x01
+        const val EVENT_TCP_MSG = 0x01
 
         /**
          * 通话状态
          */
-        val EVENT_CALL_STATE = 0x02
+        const val EVENT_CALL_STATE = 0x02
 
-        val EVENT_TCP_STATE = 0x03
+        const val EVENT_TCP_STATE = 0x03
 
         //刷新呼叫记录
-        val EVENT_REFRESH_CALL_LIST = 0x04
+        const val EVENT_REFRESH_CALL_LIST = 0x04
 
         //新的来电
-        val EVENT_NEW_CALL = 0x05
+        const val EVENT_NEW_CALL = 0x05
 
         //紧急呼叫
-        val EVENT_SOS_CALL = 0x06
+        const val EVENT_SOS_CALL = 0x06
 
         //串口消息
-        val EVENT_SERIAL_PORT = 0x07
+        const val EVENT_SERIAL_PORT = 0x07
 
         //退出通话界面
-        val EVENT_REMOVE_CALL_FRAGMENT = 0x08
+        const val EVENT_REMOVE_CALL_FRAGMENT = 0x08
 
-        val EVENT_JOIN_HOME_READY = 0x09
+        const val EVENT_JOIN_HOME_READY = 0x09
 
-        val EVENT_RESTART_APP = 0x10
+        const val EVENT_RESTART_APP = 0x10
 
         //手柄拿起
-        val HOOK_OFF = "com.android.PhoneWinowManager.HOOK_OFF"
+        const val HOOK_OFF = "com.android.PhoneWinowManager.HOOK_OFF"
         //手柄放下
-        val HOOK_ON = "com.android.PhoneWinowManager.HOOK_ON"
+        const val HOOK_ON = "com.android.PhoneWinowManager.HOOK_ON"
         //手柄状态: 默认放下
         var hookOn: Boolean = true
 
         //待机
-        val CALL_STANDBY = 0
+        const val CALL_STANDBY = 0
 
         //去电中
-        val CALL_OUTGOING = 1
+        const val CALL_OUTGOING = 1
 
         //来电中
-        val CALL_INCOMING = 2
+        const val CALL_INCOMING = 2
 
         //通话中
-        val CALL_CALLING = 3
+        const val CALL_CALLING = 3
 
         //紧急呼叫
-        val CALL_SOS = 4
+        const val CALL_SOS = 4
 
         //探视请求
-        val CALL_VISITING = 5
+        const val CALL_VISITING = 5
 
         //探视中
-        val CALL_VISIT_CALLING = 6
+        const val CALL_VISIT_CALLING = 6
 
         //通话状态
         var CALL_STATE = CALL_STANDBY

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/TcpClient.java

@@ -128,7 +128,7 @@ public class TcpClient {
                                     public void run() {
                                         System.out.println("TcpClientHandler 重新连接，第" + retryTimes + "次" + ", 重试" + reconnetTimes + "次");
                                         if (reconnetTimes > 2) {
-                                            EventBus.getDefault().post(new MessageEvent(0, Constants.Companion.getEVENT_RESTART_APP()));
+                                            EventBus.getDefault().post(new MessageEvent(0, Constants.EVENT_RESTART_APP));
                                         } else {
                                             doConnect();
                                         }

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/TcpClientHandler.java

@@ -49,7 +49,7 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
         TcpClient.getInstance().sendMsg(tcpModel.toJson());
 
         Constants.Companion.setTcp_connected(true);
-        EventBus.getDefault().post(new MessageEvent(1, Constants.Companion.getEVENT_TCP_STATE()));
+        EventBus.getDefault().post(new MessageEvent(1, Constants.EVENT_TCP_STATE));
     }
 
     //断开连接
@@ -59,7 +59,7 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
         connected = false;
 
         Constants.Companion.setTcp_connected(false);
-        EventBus.getDefault().post(new MessageEvent(0, Constants.Companion.getEVENT_TCP_STATE()));
+        EventBus.getDefault().post(new MessageEvent(0, Constants.EVENT_TCP_STATE));
 		
 		Log.i(TAG, "失去连接");
         TcpClient.getInstance().doConnect();
@@ -109,7 +109,7 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
         System.out.println("TcpClientHandler 失去连接，错误引起");
 
         Constants.Companion.setTcp_connected(false);
-        EventBus.getDefault().post(new MessageEvent(0, Constants.Companion.getEVENT_TCP_STATE()));
+        EventBus.getDefault().post(new MessageEvent(0, Constants.EVENT_TCP_STATE));
     }
 
     //发送消息，不直接调用些方法，调用TcpClient中的发送消息

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/channel/DeviceChannel.java

@@ -31,60 +31,63 @@ public class DeviceChannel {
             case CALLBACK:
                 if(tcpModel.getAction()== TcpAction.CallbackAction.SUCCESS){
                     //todo: 刷新呼叫记录列表
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                 }else if(tcpModel.getAction()== TcpAction.CallbackAction.FAILED){
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                 }
                 break;
             case VOICE:
                 if (tcpModel.getAction()== TcpAction.VoiceAction.CALL){ //语音呼入
                     InteractionVO interactionVO = new Gson().fromJson(tcpModel.getData().toString(), InteractionVO.class);
                     //有新的呼叫进来，添加到语音播报队列
-                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.Companion.getEVENT_NEW_CALL()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_NEW_CALL));
 
-                    if (Constants.Companion.getCALL_STATE() == Constants.Companion.getCALL_STANDBY()) {
+                    if (Constants.Companion.getCALL_STATE() == Constants.CALL_STANDBY) {
                         //待机状态
                         calling = true;
-                        Constants.Companion.setCALL_STATE(Constants.Companion.getCALL_INCOMING());
-                        EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.Companion.getEVENT_TCP_MSG()));
-                    } else if (Constants.Companion.getCALL_STATE() == Constants.Companion.getCALL_CALLING()
-                            || Constants.Companion.getCALL_STATE() == Constants.Companion.getCALL_OUTGOING()
-                            || Constants.Companion.getCALL_STATE() == Constants.Companion.getCALL_VISIT_CALLING()) {
+                        Constants.Companion.setCALL_STATE(Constants.CALL_INCOMING);
+                        EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
+                    } else if (Constants.Companion.getCALL_STATE() == Constants.CALL_CALLING
+                            || Constants.Companion.getCALL_STATE() == Constants.CALL_OUTGOING
+                            || Constants.Companion.getCALL_STATE() == Constants.CALL_VISIT_CALLING) {
                         //通话状态或去电状态
                         responseTcpModel = VoiceUtil.voiceCalling(Constants.Companion.getIds(), tcpModel.getFromId(),interactionVO.getId());
                         return responseTcpModel;
                     }
+
+                    /*calling = true;
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));*/
                 } else if (tcpModel.getAction()== TcpAction.VoiceAction.ACCEPT){ //我方呼出，对方接受
                     //todo: 通话中界面更新；建立数据通话
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     calling = true;
                 } else if (tcpModel.getAction()== TcpAction.VoiceAction.REJECT){ //我方呼出，对方拒绝
                     //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方拒绝并停留3秒，结束至正常界面；更新左侧
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     //calling = false;
                 } else if (tcpModel.getAction()== TcpAction.VoiceAction.CALLING){ //我方呼出，对方通话中
                     //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方占线并停留3秒，结束至正常界面；更新左侧
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     //calling = false;
                 } else if (tcpModel.getAction()== TcpAction.VoiceAction.FAILED){ //我方呼出，对方不在线，设备离线或其它错误
                     //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方离线并停留3秒，结束至正常界面；更新左侧
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     //calling = false;
                 } else if (tcpModel.getAction()== TcpAction.VoiceAction.HANDOFF){ //对方挂断，不论我方呼出或呼入
                     //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方已挂断并停留3秒，结束至正常界面；更新左侧
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     //calling = false;
                 }else if(tcpModel.getAction()== TcpAction.VoiceAction.CANCEL){
                     //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方已挂断并停留3秒，结束至正常界面；更新左侧
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     //calling = false;
                 }else if(tcpModel.getAction()== TcpAction.VoiceAction.SUCCESS){
                     //todo 这个是自己点击了分机的呼叫 服务器返回给我数据 以供我 挂断时传输呼叫记录的id 因为分机
                     //在点击呼叫之前 是没有呼叫记录的
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     calling = true;
                 } else if (tcpModel.getAction()== TcpAction.VoiceAction.VOICE_OFF) {
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                 }
                 break;
             case VIDEO:
@@ -95,50 +98,50 @@ public class DeviceChannel {
                         return responseTcpModel;
                     } else {
                         calling = true;
-                        EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.Companion.getEVENT_TCP_MSG()));
+                        EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     }
                 } else if (tcpModel.getAction()== TcpAction.VideoAction.ACCEPT){ //我方呼出，对方接受
                     calling = true;
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                 } else if (tcpModel.getAction()== TcpAction.VideoAction.REJECT){ //我方呼出，对方拒绝
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     //calling = false;
                 } else if (tcpModel.getAction()== TcpAction.VideoAction.CALLING){ //我方呼出，对方通话中
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     //calling = false;
                 } else if (tcpModel.getAction()== TcpAction.VideoAction.FAILED){ //我方呼出，对方不在线，设备离线或其它错误
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     //calling = false;
                 } else if (tcpModel.getAction()== TcpAction.VideoAction.HANDOFF){ //对方挂断，不论我方呼出或呼入
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     //calling = false;
                 }else if(tcpModel.getAction()== TcpAction.VideoAction.CANCEL){
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     //calling = false;
                 }else if(tcpModel.getAction()== TcpAction.VideoAction.SUCCESS){
                     calling = true;
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                 }
                 break;
             case IM:
                 if (tcpModel.getAction()== TcpAction.IMAction.MSG){
                     //todo: 从接口重新获取左侧数据；使用通话中界面，显示有语音留言，停留3秒，结束至正常界面
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                 } else if (tcpModel.getAction()== TcpAction.IMAction.MSG_READ){ //语音已读取
                     //todo: 从data得到语音id；更新左侧，注意这里不使用通话中界面提示已读
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                 }
                 break;
             case EVENT:
                 if (tcpModel.getAction()== TcpAction.EventAction.KEY_CLICK){ //有新事件过来
                     //todo: 服务端通过data给出具体的事件名称放置data。从接口重新获取左侧数据；使用通话中界面，显示事件名称，停留3秒，结束至正常界面
                     Log.e(TAG,"收到事件tcp");
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
 
                 } else if (tcpModel.getAction()== TcpAction.EventAction.RESPONSE){ //事件已处理，仅分机用
                     //todo: 从data得到事件id，使用通话中界面，显示事件名称及已响应字样，停留3秒，结束至正常界面；更新左侧
                     Log.e(TAG,"");
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_TCP_MSG()));
+                    EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                     Log.e(TAG,"收到事件已处理tcp");
                 }
                 break;
@@ -148,7 +151,7 @@ public class DeviceChannel {
             case REINFORCE:
             case ENTRACEGUARD:
                 //紧急呼叫优先级最高，如果当前正在通话需要将其打断
-                EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.Companion.getEVENT_TCP_MSG()));
+                EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
                 /*if (Constants.Companion.getCALL_STATE() == Constants.Companion.getCALL_CALLING()) {
                     EventBus.getDefault().post(new MessageEvent(tcpModel,Constants.Companion.getEVENT_SOS_CALL()));
                 } else {

webrtc/src/main/java/com/wdkl/core/socket/SocketManager.java

@@ -232,13 +232,13 @@ public class SocketManager implements IEvent {
         }
         if (b) {
             if (audioOnly) {
-                EventBus.getDefault().post(new MessageEvent("audio_call", Constants.Companion.getEVENT_CALL_STATE()));
+                EventBus.getDefault().post(new MessageEvent("audio_call", Constants.EVENT_CALL_STATE));
             } else {
-                EventBus.getDefault().post(new MessageEvent("video_call", Constants.Companion.getEVENT_CALL_STATE()));
+                EventBus.getDefault().post(new MessageEvent("video_call", Constants.EVENT_CALL_STATE));
             }
 
             //门禁请求
-            EventBus.getDefault().post(new MessageEvent(Constants.Companion.getEVENT_JOIN_HOME_READY(),Constants.Companion.getEVENT_JOIN_HOME_READY()));
+            EventBus.getDefault().post(new MessageEvent(Constants.EVENT_JOIN_HOME_READY, Constants.EVENT_JOIN_HOME_READY));
         }
     }
 

webrtc/src/main/java/com/wdkl/core/voip/CallMultiActivity.java

@@ -226,7 +226,7 @@ public class CallMultiActivity extends BaseActivity implements CallSession.CallS
             leave = true;
             handoffVideoCall();
             SkyEngineKit.Instance().leaveRoom();
-            Constants.Companion.setCALL_STATE(Constants.Companion.getCALL_STANDBY());
+            Constants.Companion.setCALL_STATE(Constants.CALL_STANDBY);
             DeviceChannel.calling = false;
         }
         finish();
@@ -262,7 +262,7 @@ public class CallMultiActivity extends BaseActivity implements CallSession.CallS
             leave = true;
             handoffVideoCall();
             SkyEngineKit.Instance().leaveRoom();
-            Constants.Companion.setCALL_STATE(Constants.Companion.getCALL_STANDBY());
+            Constants.Companion.setCALL_STATE(Constants.CALL_STANDBY);
             DeviceChannel.calling = false;
         }
     }
@@ -277,7 +277,7 @@ public class CallMultiActivity extends BaseActivity implements CallSession.CallS
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMoonEvent(MessageEvent messageEvent) {
-        if (messageEvent.getType() != null && messageEvent.getType() == Constants.Companion.getEVENT_TCP_MSG()){
+        if (messageEvent.getType() != null && messageEvent.getType() == Constants.EVENT_TCP_MSG){
             if (messageEvent.getMessage() instanceof TcpModel) {
                 TcpModel tcpModel = (TcpModel) messageEvent.getMessage();
                 if (tcpModel.getType() == TcpType.VIDEO) {

webrtc/src/main/java/com/wdkl/core/voip/CallSingleActivity.java

@@ -103,7 +103,7 @@ public class CallSingleActivity extends BaseActivity implements CallSession.Call
         setContentView(R.layout.activity_single_call);
 
         //进入通话状态
-        Constants.Companion.setCALL_STATE(Constants.Companion.getCALL_CALLING());
+        Constants.Companion.setCALL_STATE(Constants.CALL_CALLING);
 
         try {
             gEngineKit = SkyEngineKit.Instance();
@@ -129,7 +129,7 @@ public class CallSingleActivity extends BaseActivity implements CallSession.Call
             @Override
             public void onReceive(Context context, Intent intent) {
                 if (intent != null) {
-                    if (Constants.Companion.getHOOK_ON().equals(intent.getAction())) {
+                    if (Constants.HOOK_ON.equals(intent.getAction())) {
                         //手柄放下
                         Constants.Companion.setHookOn(true);
                         CallSession session = gEngineKit.getCurrentSession();
@@ -138,7 +138,7 @@ public class CallSingleActivity extends BaseActivity implements CallSession.Call
                         }
                         switchAudioMode(true);
                         finish();
-                    } else if (Constants.Companion.getHOOK_OFF().equals(intent.getAction())) {
+                    } else if (Constants.HOOK_OFF.equals(intent.getAction())) {
                         //手柄拿起
                         Constants.Companion.setHookOn(false);
                         switchAudioMode(false);
@@ -148,8 +148,8 @@ public class CallSingleActivity extends BaseActivity implements CallSession.Call
         };
 
         IntentFilter filter = new IntentFilter();
-        filter.addAction(Constants.Companion.getHOOK_OFF());
-        filter.addAction(Constants.Companion.getHOOK_ON());
+        filter.addAction(Constants.HOOK_OFF);
+        filter.addAction(Constants.HOOK_ON);
         registerReceiver(receiver, filter);
     }
 
@@ -361,17 +361,17 @@ public class CallSingleActivity extends BaseActivity implements CallSession.Call
     protected void onDestroy() {
         super.onDestroy();
         unregisterReceiver(receiver);
-        Constants.Companion.setCALL_STATE(Constants.Companion.getCALL_STANDBY());
+        Constants.Companion.setCALL_STATE(Constants.CALL_STANDBY);
         DeviceChannel.calling = false;
-        EventBus.getDefault().post(new MessageEvent(0, Constants.Companion.getEVENT_REFRESH_CALL_LIST()));
+        EventBus.getDefault().post(new MessageEvent(0, Constants.EVENT_REFRESH_CALL_LIST));
         if (sosCallIn && tcpModel != null) {
-            EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.Companion.getEVENT_TCP_MSG()));
+            EventBus.getDefault().post(new MessageEvent(tcpModel, Constants.EVENT_TCP_MSG));
         }
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMoonEvent(MessageEvent messageEvent) {
-        if (messageEvent.getType() != null && messageEvent.getType() == Constants.Companion.getEVENT_SOS_CALL()) {
+        if (messageEvent.getType() != null && messageEvent.getType() == Constants.EVENT_SOS_CALL) {
             sosCallIn = true;
             if (messageEvent.getMessage() instanceof TcpModel) {
                 tcpModel = (TcpModel) messageEvent.getMessage();

webrtc/src/main/java/com/wdkl/core/window/VisitingWindow.java

@@ -88,7 +88,7 @@ public class VisitingWindow {
      * 删除窗口
      */
     public static void release() {
-        Constants.Companion.setCALL_STATE(Constants.Companion.getCALL_STANDBY());
+        Constants.Companion.setCALL_STATE(Constants.CALL_STANDBY);
         DeviceChannel.calling = false;
         if (view != null) {
             Chronometer time = view.findViewById(R.id.window_visiting_time);