|
@@ -97,33 +97,6 @@ namespace FlutterCodeGenerator
|
|
|
var modelType = new ArrayModelType(type, argName);
|
|
|
return modelType;
|
|
|
}
|
|
|
- else if (type.BaseType != typeof(object))
|
|
|
- {
|
|
|
- _tempTypes[type] = duplicatedTime;
|
|
|
- var modelType = new UserDefinedDerivedModelType(type, argName);
|
|
|
- if (!CodeGenerator.ConflictModelTypeList.ContainsKey(modelType.ParameterType.Name))
|
|
|
- {
|
|
|
- CodeGenerator.ConflictModelTypeList[modelType.ParameterType.Name] = new Dictionary<ModelType, int>() { { modelType, 1 } };
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- if (!CodeGenerator.ConflictModelTypeList[modelType.ParameterType.Name].Any(x => x.Key.ParameterType.Namespace == modelType.ParameterType.Namespace))
|
|
|
- {
|
|
|
- var index = CodeGenerator.ConflictModelTypeList[modelType.ParameterType.Name].Count() + 1;
|
|
|
- modelType.Index = index;
|
|
|
- CodeGenerator.ConflictModelTypeList[modelType.ParameterType.Name][modelType] = index;
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- modelType.Index = CodeGenerator.ConflictModelTypeList[modelType.ParameterType.Name].FirstOrDefault(x => x.Key.ParameterType.Namespace == modelType.ParameterType.Namespace).Value;
|
|
|
- }
|
|
|
- }
|
|
|
- if (!ServiceMap.TemporaryList.Any(x => x.ParameterType == type))
|
|
|
- {
|
|
|
- ServiceMap.TemporaryList.Add(modelType);
|
|
|
- }
|
|
|
- return modelType;
|
|
|
- }
|
|
|
else if (type.IsGenericType)
|
|
|
{
|
|
|
if (type.Name == "List`1")
|
|
@@ -136,6 +109,11 @@ namespace FlutterCodeGenerator
|
|
|
var modelType = new DictionaryModelType(type, argName);
|
|
|
return modelType;
|
|
|
}
|
|
|
+ else if (type.Name == "Nullable`1")
|
|
|
+ {
|
|
|
+ var modelType = new EnumNullableModelType(type.GetGenericArguments()[0], argName);
|
|
|
+ return modelType;
|
|
|
+ }
|
|
|
else
|
|
|
{
|
|
|
_tempTypes[type] = duplicatedTime;
|
|
@@ -164,6 +142,33 @@ namespace FlutterCodeGenerator
|
|
|
return modelType;
|
|
|
}
|
|
|
}
|
|
|
+ else if (type.BaseType != typeof(object))
|
|
|
+ {
|
|
|
+ _tempTypes[type] = duplicatedTime;
|
|
|
+ var modelType = new UserDefinedDerivedModelType(type, argName);
|
|
|
+ if (!CodeGenerator.ConflictModelTypeList.ContainsKey(modelType.ParameterType.Name))
|
|
|
+ {
|
|
|
+ CodeGenerator.ConflictModelTypeList[modelType.ParameterType.Name] = new Dictionary<ModelType, int>() { { modelType, 1 } };
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if (!CodeGenerator.ConflictModelTypeList[modelType.ParameterType.Name].Any(x => x.Key.ParameterType.Namespace == modelType.ParameterType.Namespace))
|
|
|
+ {
|
|
|
+ var index = CodeGenerator.ConflictModelTypeList[modelType.ParameterType.Name].Count() + 1;
|
|
|
+ modelType.Index = index;
|
|
|
+ CodeGenerator.ConflictModelTypeList[modelType.ParameterType.Name][modelType] = index;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ modelType.Index = CodeGenerator.ConflictModelTypeList[modelType.ParameterType.Name].FirstOrDefault(x => x.Key.ParameterType.Namespace == modelType.ParameterType.Namespace).Value;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!ServiceMap.TemporaryList.Any(x => x.ParameterType == type))
|
|
|
+ {
|
|
|
+ ServiceMap.TemporaryList.Add(modelType);
|
|
|
+ }
|
|
|
+ return modelType;
|
|
|
+ }
|
|
|
else
|
|
|
{
|
|
|
_tempTypes[type] = duplicatedTime;
|