|
@@ -1,5 +1,6 @@
|
|
|
import 'authentication.m.dart';
|
|
|
import 'notification.m.dart';
|
|
|
+import 'upgrade.m.dart';
|
|
|
import 'user.m.dart';
|
|
|
import 'liveConsultation.m.dart';
|
|
|
import 'patient.m.dart';
|
|
@@ -708,9 +709,74 @@ class ChangeLiveStatusRequest {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+class ICollection<T> {
|
|
|
+ int count;
|
|
|
+ bool isReadOnly;
|
|
|
+
|
|
|
+ ICollection({
|
|
|
+ this.count = 0,
|
|
|
+ this.isReadOnly = false,
|
|
|
+ });
|
|
|
+
|
|
|
+ factory ICollection.fromJson(Map<String, dynamic> map) {
|
|
|
+ return ICollection(
|
|
|
+ count: map['Count'],
|
|
|
+ isReadOnly: map['IsReadOnly'],
|
|
|
+ );
|
|
|
+ }
|
|
|
+
|
|
|
+ Map<String, dynamic> toJson() {
|
|
|
+ final map = Map<String, dynamic>();
|
|
|
+ map['Count'] = count;
|
|
|
+ map['IsReadOnly'] = isReadOnly;
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+class IDictionary<T> {
|
|
|
+ List<T>? item;
|
|
|
+ ICollection<T>? keys;
|
|
|
+ ICollection<List<String>>? values;
|
|
|
+
|
|
|
+ IDictionary({
|
|
|
+ this.item,
|
|
|
+ this.keys,
|
|
|
+ this.values,
|
|
|
+ });
|
|
|
+
|
|
|
+ factory IDictionary.fromJson(Map<String, dynamic> map) {
|
|
|
+ List<T> itemList = [];
|
|
|
+ if (map['Item'] != null) {
|
|
|
+ itemList.addAll(
|
|
|
+ (map['Item'] as List).map((e) => FJsonConvert.fromJson<T>(e)!));
|
|
|
+ }
|
|
|
+ List<T> keysList = [];
|
|
|
+ if (map['Keys'] != null) {
|
|
|
+ keysList.addAll(
|
|
|
+ (map['Keys'] as List).map((e) => FJsonConvert.fromJson<T>(e)!));
|
|
|
+ }
|
|
|
+ return IDictionary(
|
|
|
+ item: itemList,
|
|
|
+ keys: keysList,
|
|
|
+ values: map['Values'] != null ? map['Values'].cast<List<String>>().toList() : null,
|
|
|
+ );
|
|
|
+ }
|
|
|
+
|
|
|
+ Map<String, dynamic> toJson() {
|
|
|
+ final map = Map<String, dynamic>();
|
|
|
+ if(item != null)
|
|
|
+ map['Item'] = item;
|
|
|
+ if(keys != null)
|
|
|
+ map['Keys'] = keys;
|
|
|
+ if(values != null)
|
|
|
+ map['Values'] = values;
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
class CreateRoomRequest {
|
|
|
String? initiatorCode;
|
|
|
- List<String >? userCodes;
|
|
|
+ IDictionary<String>? userCodes;
|
|
|
String? deviceCode;
|
|
|
String? name;
|
|
|
DateTime? liveTime;
|
|
@@ -9864,7 +9930,7 @@ class LiveRoomInfoDTO {
|
|
|
LiveMemberDTO? initiator;
|
|
|
List<LiveMemberDTO >? userInfos;
|
|
|
List<LiveMemberDTO >? deviceInfos;
|
|
|
- List<LiveMemberDTO >? mainUserInfos;
|
|
|
+ List<LiveMemberDTO >? expertUserInfos;
|
|
|
List<LiveMemberDTO >? assistantsInfos;
|
|
|
LiveRoomStatus status;
|
|
|
String? name;
|
|
@@ -9880,7 +9946,7 @@ class LiveRoomInfoDTO {
|
|
|
this.initiator,
|
|
|
this.userInfos,
|
|
|
this.deviceInfos,
|
|
|
- this.mainUserInfos,
|
|
|
+ this.expertUserInfos,
|
|
|
this.assistantsInfos,
|
|
|
this.status = LiveRoomStatus.Default,
|
|
|
this.name,
|
|
@@ -9898,7 +9964,7 @@ class LiveRoomInfoDTO {
|
|
|
initiator: map['Initiator'] != null ? LiveMemberDTO.fromJson(map['Initiator']) : null,
|
|
|
userInfos: map['UserInfos'] != null ? (map['UserInfos'] as List).map((e)=>LiveMemberDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
|
|
|
deviceInfos: map['DeviceInfos'] != null ? (map['DeviceInfos'] as List).map((e)=>LiveMemberDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
|
|
|
- mainUserInfos: map['MainUserInfos'] != null ? (map['MainUserInfos'] as List).map((e)=>LiveMemberDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
|
|
|
+ expertUserInfos: map['ExpertUserInfos'] != null ? (map['ExpertUserInfos'] as List).map((e)=>LiveMemberDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
|
|
|
assistantsInfos: map['AssistantsInfos'] != null ? (map['AssistantsInfos'] as List).map((e)=>LiveMemberDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
|
|
|
status: LiveRoomStatus.values.firstWhere((e) => e.index == map['Status']),
|
|
|
name: map['Name'],
|
|
@@ -9923,8 +9989,8 @@ class LiveRoomInfoDTO {
|
|
|
map['UserInfos'] = userInfos;
|
|
|
if(deviceInfos != null)
|
|
|
map['DeviceInfos'] = deviceInfos;
|
|
|
- if(mainUserInfos != null)
|
|
|
- map['MainUserInfos'] = mainUserInfos;
|
|
|
+ if(expertUserInfos != null)
|
|
|
+ map['ExpertUserInfos'] = expertUserInfos;
|
|
|
if(assistantsInfos != null)
|
|
|
map['AssistantsInfos'] = assistantsInfos;
|
|
|
map['Status'] = status.index;
|
|
@@ -13786,6 +13852,8 @@ class LiveMemberDTO2 {
|
|
|
String? loginServerHost;
|
|
|
LiveDataDTO2? liveData;
|
|
|
bool isControllingParameter;
|
|
|
+ bool isExpertUser;
|
|
|
+ bool isAssistantUser;
|
|
|
|
|
|
LiveMemberDTO2({
|
|
|
this.code,
|
|
@@ -13798,6 +13866,8 @@ class LiveMemberDTO2 {
|
|
|
this.loginServerHost,
|
|
|
this.liveData,
|
|
|
this.isControllingParameter = false,
|
|
|
+ this.isExpertUser = false,
|
|
|
+ this.isAssistantUser = false,
|
|
|
});
|
|
|
|
|
|
factory LiveMemberDTO2.fromJson(Map<String, dynamic> map) {
|
|
@@ -13812,6 +13882,8 @@ class LiveMemberDTO2 {
|
|
|
loginServerHost: map['LoginServerHost'],
|
|
|
liveData: map['LiveData'] != null ? LiveDataDTO2.fromJson(map['LiveData']) : null,
|
|
|
isControllingParameter: map['IsControllingParameter'],
|
|
|
+ isExpertUser: map['IsExpertUser'],
|
|
|
+ isAssistantUser: map['IsAssistantUser'],
|
|
|
);
|
|
|
}
|
|
|
|
|
@@ -13832,6 +13904,8 @@ class LiveMemberDTO2 {
|
|
|
if(liveData != null)
|
|
|
map['LiveData'] = liveData;
|
|
|
map['IsControllingParameter'] = isControllingParameter;
|
|
|
+ map['IsExpertUser'] = isExpertUser;
|
|
|
+ map['IsAssistantUser'] = isAssistantUser;
|
|
|
return map;
|
|
|
}
|
|
|
}
|
|
@@ -13843,8 +13917,13 @@ class LiveRoomDTO {
|
|
|
int integerRoomId;
|
|
|
BusinessModuleEnum businessModule;
|
|
|
DateTime? lastEndTime;
|
|
|
+ DateTime? liveTime;
|
|
|
List<LiveMemberDTO2 >? deviceInfos;
|
|
|
List<LiveMemberDTO2 >? userInfos;
|
|
|
+ LiveRoomStatus status;
|
|
|
+ int liveStatus;
|
|
|
+ NotificationTypeEnum reStartNotificationType;
|
|
|
+ TransactionTypeEnum transactionType;
|
|
|
|
|
|
LiveRoomDTO({
|
|
|
this.liveRoomCode,
|
|
@@ -13853,8 +13932,13 @@ class LiveRoomDTO {
|
|
|
this.integerRoomId = 0,
|
|
|
this.businessModule = BusinessModuleEnum.RemoteDiagnosis,
|
|
|
this.lastEndTime,
|
|
|
+ this.liveTime,
|
|
|
this.deviceInfos,
|
|
|
this.userInfos,
|
|
|
+ this.status = LiveRoomStatus.Default,
|
|
|
+ this.liveStatus = 0,
|
|
|
+ this.reStartNotificationType = NotificationTypeEnum.Unknown,
|
|
|
+ this.transactionType = TransactionTypeEnum.Consultion,
|
|
|
});
|
|
|
|
|
|
factory LiveRoomDTO.fromJson(Map<String, dynamic> map) {
|
|
@@ -13865,8 +13949,13 @@ class LiveRoomDTO {
|
|
|
integerRoomId: map['IntegerRoomId'],
|
|
|
businessModule: BusinessModuleEnum.values.firstWhere((e) => e.index == map['BusinessModule']),
|
|
|
lastEndTime: map['LastEndTime'] != null ? DateTime.parse(map['LastEndTime']) : null,
|
|
|
+ liveTime: map['LiveTime'] != null ? DateTime.parse(map['LiveTime']) : null,
|
|
|
deviceInfos: map['DeviceInfos'] != null ? (map['DeviceInfos'] as List).map((e)=>LiveMemberDTO2.fromJson(e as Map<String,dynamic>)).toList() : null,
|
|
|
userInfos: map['UserInfos'] != null ? (map['UserInfos'] as List).map((e)=>LiveMemberDTO2.fromJson(e as Map<String,dynamic>)).toList() : null,
|
|
|
+ status: LiveRoomStatus.values.firstWhere((e) => e.index == map['Status']),
|
|
|
+ liveStatus: map['LiveStatus'],
|
|
|
+ reStartNotificationType: NotificationTypeEnum.values.firstWhere((e) => e.index == map['ReStartNotificationType']),
|
|
|
+ transactionType: TransactionTypeEnum.values.firstWhere((e) => e.index == map['TransactionType']),
|
|
|
);
|
|
|
}
|
|
|
|
|
@@ -13882,10 +13971,16 @@ class LiveRoomDTO {
|
|
|
map['BusinessModule'] = businessModule.index;
|
|
|
if(lastEndTime != null)
|
|
|
map['LastEndTime'] = JsonRpcUtils.dateFormat(lastEndTime!);
|
|
|
+ if(liveTime != null)
|
|
|
+ map['LiveTime'] = JsonRpcUtils.dateFormat(liveTime!);
|
|
|
if(deviceInfos != null)
|
|
|
map['DeviceInfos'] = deviceInfos;
|
|
|
if(userInfos != null)
|
|
|
map['UserInfos'] = userInfos;
|
|
|
+ map['Status'] = status.index;
|
|
|
+ map['LiveStatus'] = liveStatus;
|
|
|
+ map['ReStartNotificationType'] = reStartNotificationType.index;
|
|
|
+ map['TransactionType'] = transactionType.index;
|
|
|
return map;
|
|
|
}
|
|
|
}
|
|
@@ -14173,6 +14268,31 @@ class DistributedServerInfoDTO extends BaseDTO{
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+class DiagnosisResultDTO {
|
|
|
+ int index;
|
|
|
+ String? diagnosisResult;
|
|
|
+
|
|
|
+ DiagnosisResultDTO({
|
|
|
+ this.index = 0,
|
|
|
+ this.diagnosisResult,
|
|
|
+ });
|
|
|
+
|
|
|
+ factory DiagnosisResultDTO.fromJson(Map<String, dynamic> map) {
|
|
|
+ return DiagnosisResultDTO(
|
|
|
+ index: map['Index'],
|
|
|
+ diagnosisResult: map['DiagnosisResult'],
|
|
|
+ );
|
|
|
+ }
|
|
|
+
|
|
|
+ Map<String, dynamic> toJson() {
|
|
|
+ final map = Map<String, dynamic>();
|
|
|
+ map['Index'] = index;
|
|
|
+ if(diagnosisResult != null)
|
|
|
+ map['DiagnosisResult'] = diagnosisResult;
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
class BoardPointDTO {
|
|
|
double x;
|
|
|
double y;
|