兼容FISLib

Helper/CodeGeneratorForFISLib.cs

@@ -14,7 +14,6 @@ namespace FlutterCodeGenerator.Helper
     {
         private const string FisLibDllName = "FISLib.dll";
         private const string USMachineFolder = "fis_lib_usMachine_jsonrpc";
-        private const string ServicePrefix = "fis";
 
         private readonly string _generatedFolderPathForUS;
         private readonly string _dllPath;
@@ -30,7 +29,7 @@ namespace FlutterCodeGenerator.Helper
             _generatedFolderPathForUS = Path.Combine(filePath, USMachineFolder);
             _dllPath = dllPath;
             _serviceFolderPath = Path.Combine(_generatedFolderPathForUS, "services");
-            _rpcTextPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "rpc.txt");
+            _rpcTextPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "rpcForUSMachine.txt");
             _serviceMapDictionary = new Dictionary<string, IServiceMap>();
             _generatedServiceFileNameList = new List<string>();
             _generatedServiceModelFileNameList = new List<string>();
@@ -51,8 +50,8 @@ namespace FlutterCodeGenerator.Helper
             var interfaceTypes = allTypes.Where(x => x.IsInterface && x.FullName.EndsWith("Service") && x.Name.StartsWith("I") && x.Name != "IService" && !x.Name.Contains("Notification")).ToList();
             foreach (var interfaceType in interfaceTypes)
             {
-                var sericeName = ServicePrefix + interfaceType.Name[1..];
-                var serviceMap = new ServiceMap(interfaceType, ServicePrefix);
+                var sericeName = interfaceType.Name[1..];
+                var serviceMap = new ServiceMap(interfaceType);
                 _serviceMapDictionary.Add(LetterConverterHelper.FirstCharToLower(sericeName), serviceMap);
             }
         }

Helper/CodeGeneratorForWing.cs

@@ -64,7 +64,7 @@ namespace FlutterCodeGenerator.Helper
             foreach (var interfaceType in interfaceTypes)
             {
                 var sericeName = interfaceType.Name[1..];
-                var serviceMap = new ServiceMap(interfaceType, null);
+                var serviceMap = new ServiceMap(interfaceType);
                 _serviceMapDictionary.Add(LetterConverterHelper.FirstCharToLower(sericeName), serviceMap);
             }
             var otherServiceMap = new OtherServiceMap(restNeedGeneratedTypes);

Helper/ModelTypeGenerator.cs

@@ -234,7 +234,7 @@ namespace FlutterCodeGenerator.Helper
             }
             else
             {
-                var modelType = new ExtraObjectModelType(type, "");
+                var modelType = new ExtraObjectModelType(type, argName);
                 return modelType;
             }
         }

Map/MethodMap.cs

@@ -24,7 +24,7 @@ namespace FlutterCodeGenerator.Map
             Type returnParameterType;
             if (!method.ReturnType.IsGenericType)
             {
-                returnParameterType = typeof(void);
+                returnParameterType = method.ReturnType;
             }
             else
             {

Map/ServiceMap.cs

@@ -19,16 +19,9 @@ namespace FlutterCodeGenerator.Map
 
         public List<ComplexModelType> UsedComplexModelTypeList { get; }
 
-        public ServiceMap(Type type, string prefix)
+        public ServiceMap(Type type)
         {
-            if (string.IsNullOrEmpty(prefix))
-            {
-                ServiceName = type.Name[1..];
-            }
-            else
-            {
-                ServiceName = prefix + type.Name[1..];
-            }
+            ServiceName = type.Name[1..];
             UsedComplexModelTypeList = new List<ComplexModelType>();
             GenerateDataCache.Instance.SetCurrentServiceMap(this);
             _methodMapList = new List<MethodMap>();

ModelTypes/ComplexModelType.cs

@@ -263,7 +263,7 @@ namespace FlutterCodeGenerator.ModelTypes
                         }
                     }
                 }
-                else if (child is UserDefinedModelType || child is UserDefinedDerivedModelType)
+                else if (child is UserDefinedModelType || child is UserDefinedDerivedModelType || child is ExtraObjectModelType)
                 {
                     source.AppendLine($"\t\t\t{child.Name_Lower}: map['{child.Name_Upper}'] != null ? {child.GetFlutterTypeName()}.fromJson(map['{child.Name_Upper}']) : null,");
                 }

README.md

@@ -11,6 +11,6 @@
 #### 可输入参数：
 ##### string[] args：
 1. WingInterfaceLibrary.dll以及FISLib.dll的路径，默认为当前目录；
-2. Flutter代码的生成路径，默认为当前目录下GeneratedCode文件夹。
-注: GeneratedCode\fis_lib_jsonrpc为WingInterfaceLibrary.dll的生成目录，供杏聆荟及超声机的Flutter端使用。
-    GeneratedCode\fis_lib_usMachine_jsonrpc为FISLib.dll的生成目录，供超声机的Flutter端使用。
+2. Flutter代码的生成路径，默认为当前目录下GeneratedCode文件夹。  
+**注**: GeneratedCode\fis_lib_jsonrpc为WingInterfaceLibrary.dll的生成目录，供杏聆荟及超声机的Flutter端使用。  
+GeneratedCode\fis_lib_usMachine_jsonrpc为FISLib.dll的生成目录，供超声机的Flutter端使用。

rpcForUSMachine.txt

@@ -1,27 +1,18 @@
-library fis_jsonrpc;
-
 import 'dart:collection';
 
 import 'package:fis_common/extensions/type.dart';
 import 'package:fis_common/logger/logger.dart';
-
-import 'client_base.dart';
-import 'interceptor.dart';
-import 'services/index.dart';
-
-export 'services/index.dart';
-export 'request.dart';
-export 'exception.dart';
-export 'interceptor.dart';
-export 'notifications/index.dart';
+import 'package:fis_jsonrpc/client_base.dart';
+import 'package:fis_jsonrpc/interceptor.dart';
+import 'package:flyinsonolite/fisLib/services/index.dart';
 
 typedef T ServiceBuilder<T extends JsonRpcClientBase>();
 
 const C_SHELL_RPC_DEFAULT_HOST = 'platform.fis.plus';
 
 /// JSON-RPC 代理
-class JsonRpcProxy {
-  JsonRpcProxy({
+class JsonRpcProxyForFISLib {
+  JsonRpcProxyForFISLib({
     String? host,
     this.platformHost = C_SHELL_RPC_DEFAULT_HOST,
   }) {
@@ -42,22 +33,15 @@ class JsonRpcProxy {
 
   HashMap<Type, dynamic> _serviceCache = HashMap();
 
-  static PlatformService? _platformService;
-
   /* 服务代理设置 Start */
 
   /// 平台服务
-  PlatformService get platform {
-    if (_platformService == null)
-      _platformService = PlatformService("http://$platformHost", timeout: 15000);
-    return _platformService!;
-  }
 *******Separator******
   /* 服务代理设置 End */
 
   /// 设置服务主机地址
   void setServerHost(String address, [bool useSSL = false]) {
-    logger.i('JsonRpcProxy setServerHost :' + address);
+    logger.i('JsonRpcProxyForFISLib setServerHost :' + address);
     _currentProtocol = useSSL ? "https" : "http";
     _currentHost = address;
   }
@@ -77,4 +61,4 @@ class JsonRpcProxy {
     }
     return _serviceCache[serviceType] as T;
   }
-}
+}