部分解耦

Assets/Plugins/Android/BTPluginAndroid.aar.meta

@@ -1,14 +1,15 @@
 fileFormatVersion: 2
 guid: dbd87312a872da045b50fc427851aa45
-timeCreated: 1569408333
-licenseType: Store
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
   isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
   - first:
       Android: Android

Assets/TCPClient/Script/Source/DataEventModel.cs

@@ -5,15 +5,15 @@ using QFramework;
 using UnityEngine;
 using UnityEngine.Events;
 
-namespace TCPClientTools {
 
-    //任何通讯类围绕DataEventModel进行
+//任何通讯类围绕DataEventModel进行
-    public abstract class DataEventModel : AbstractModel, ICanSendCommand, ICanRegisterEvent
+public abstract class DataEventModel : AbstractModel, ICanSendCommand, ICanRegisterEvent
-    {
+{
     public IOCContainer mCommandContainer = new IOCContainer();
     public UnityStringEvent onDataRecived = new UnityStringEvent();
 
-        public void sendResponseCommand<T>(string json) where T : IResponse, new()
+
+    public void excuteResponseCommand<T>(string json) where T : IResponse, new()
     {
         if (mCommandContainer.Get<ExcuteResponseCommand<T>>() == null)
         {
@@ -28,7 +28,7 @@ namespace TCPClientTools {
     /// <typeparam name="T">数据格式类型</typeparam>
     public void onReceive<T>() where T : IResponse, new()
     {
-            onDataRecived.AddListener(sendResponseCommand<T>);
+        onDataRecived.AddListener(excuteResponseCommand<T>);
     }
     /// <summary>
     /// 关闭接收指定数据
@@ -36,7 +36,7 @@ namespace TCPClientTools {
     /// <typeparam name="T">数据格式类型</typeparam>
     public void offReceive<T>() where T : IResponse, new()
     {
-            onDataRecived.RemoveListener(sendResponseCommand<T>);
+        onDataRecived.RemoveListener(excuteResponseCommand<T>);
     }
     /// <summary>
     /// 发送数据
@@ -52,15 +52,15 @@ namespace TCPClientTools {
         mCommandContainer.Get<SendRequestCommand<T>>().setRequest(request);
         this.SendCommand(mCommandContainer.Get<SendRequestCommand<T>>());
     }
-    }
+}
 
-    #region Command
+#region Command
-    /// <summary>
+/// <summary>
-    /// 处理响应数据，添加对应的Command进行处理，需要提前生成命令池
+/// 处理响应数据，添加对应的Command进行处理，需要提前生成命令池
-    /// </summary>
+/// </summary>
-    /// <typeparam name="TResponse">响应数据格式</typeparam>
+/// <typeparam name="TResponse">响应数据格式</typeparam>
-    public class ExcuteResponseCommand<TResponse> : AbstractCommand where TResponse : IResponse
+public class ExcuteResponseCommand<TResponse> : AbstractCommand where TResponse : IResponse
-    {
+{
     public string json;
     private TResponse response;
     public ExcuteResponseCommand(TResponse response)
@@ -83,10 +83,10 @@ namespace TCPClientTools {
     {
         this.json = json;
     }
-    }
+}
 
-    public class SendRequestCommand<TRequest> : AbstractCommand where TRequest : IRequest
+public class SendRequestCommand<TRequest> : AbstractCommand where TRequest : IRequest
-    {
+{
     public TRequest request;
     public SendRequestCommand(TRequest request)
     {
@@ -94,26 +94,18 @@ namespace TCPClientTools {
     }
     protected override void OnExecute()
     {
-            if (this.GetUtility<TCPUtility>().isOpenTCP)
+        this.SendEvent(new RequestMsgEvent(request));
-            {
-                this.GetUtility<TCPUtility>().sendData(request.toJson());
-            }
-            else
-            {
-                Debug.LogWarning("请先开启TCP链接");
-            }
-            //throw new NotImplementedException();
     }
     public void setRequest(TRequest request)
     {
         this.request = request;
     }
-    }
+}
-    #endregion
+#endregion
 
-    #region interface
+#region interface
-    public interface IResponse
+public interface IResponse
-    {
+{
     string toJson();
     /// <summary>
     /// 尝试填充数据，如果json不合法，则返回false，忽略该条数据响应
@@ -122,21 +114,37 @@ namespace TCPClientTools {
     /// <returns></returns>
     bool trySetData(string json);
     string getException();
-    }
+}
 
-    public interface IRequest
+public interface IRequest
-    {
+{
     string toJson();
+}
+
+//用于标准化通讯方案(具体链接管理，由外部类决定，本接口只提供开启链接跟关闭链接)
+public interface IProtocol {
+    void linkServer();
+    void closeServer();
+}
+#endregion
+
+#region Extention
+/*
+public static class CanGetStateExtention {
+    public static void GetState<TLinkStatus>(this IProtocol self) { 
+         
     }
-    #endregion
+}
+*/
+#endregion
 
-    #region AbstractClass
+#region AbstractClass
-    /// <summary>
+/// <summary>
-    /// 使用抽象类时，必须满足可序列化
+/// 使用抽象类时，必须满足可序列化
-    /// </summary>
+/// </summary>
-    [Serializable]
+[Serializable]
-    public abstract class AbstractResponse : IResponse
+public abstract class AbstractResponse : IResponse
-    {
+{
     private string exceptionMsg;
     public virtual string toJson()
     {
@@ -159,22 +167,28 @@ namespace TCPClientTools {
     {
         return exceptionMsg;
     }
-    }
+}
-    #endregion
+#endregion
 
-    #region event
+#region event
-    public struct ResponseMsgEvent
+public struct ResponseMsgEvent
-    {
+{
     public IResponse res;
     public ResponseMsgEvent(IResponse res_)
     {
         res = res_;
     }
-    };
+};
-    #endregion
+public struct RequestMsgEvent {
-    [Serializable]
+    public IRequest req;
-    public class UnityStringEvent : UnityEvent<string>
+    public RequestMsgEvent(IRequest req_) {
-    {
+        req = req_;
-
     }
 }
+#endregion
+
+[Serializable]
+public class UnityStringEvent : UnityEvent<string>
+{
+
+}

Assets/TCPClient/Script/Source/TCPEventModel.cs

@@ -1,21 +1,10 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.Events;
 using QFramework;
-using System;
 
 namespace TCPClientTools
 {
-    public class TCPMangerArchitecture : Architecture<TCPMangerArchitecture>
-    {
-        protected override void Init()
-        {
-            this.RegisterUtility(new TCPUtility());
-            this.RegisterModel(new TCPEventModel());
-        }
-    }
-
     //统筹管理TCP的命令池以及相关链接信息
     public class TCPEventModel : DataEventModel, ICanSendCommand,ICanRegisterEvent
     {
@@ -30,6 +19,17 @@ namespace TCPClientTools
                 setTCPState(TCPLinkState.LinkTimeOut);
                 this.GetUtility<TCPUtility>().CloseTCPClient();
             });
+            //注册重写发送事件
+            this.RegisterEvent<RequestMsgEvent>(e => {
+                if (this.GetUtility<TCPUtility>().isOpenTCP)
+                {
+                    this.GetUtility<TCPUtility>().sendData(e.req.toJson());
+                }
+                else
+                {
+                    Debug.LogWarning("请先开启TCP链接");
+                }
+            });
         }
         public void setTCPState(TCPLinkState state) {
             this.tcpState = state;

Assets/TCPClient/Script/View/TCPClientView.cs

@@ -6,6 +6,14 @@ using QFramework;
 using TCPClientTools;
 using System;
 
+public class TCPMangerArchitecture : Architecture<TCPMangerArchitecture>
+{
+    protected override void Init()
+    {
+        this.RegisterUtility(new TCPUtility());
+        this.RegisterModel(new TCPEventModel());
+    }
+}
 public class TCPClientView : MonoBehaviour,IController,ICanSendEvent
 {
     public UnityEvent onRecievedOpenDevice;