浏览代码

#IQRV #comment [XML] 调整 ScannerSet.xml 节点位置,避免生成声明文件失败 by 良瑜

gifur 4 年之前
父节点
当前提交
f54d706b1f
共有 2 个文件被更改,包括 40 次插入36 次删除
  1. 19 17
      Module/mod_ScannerSet/ScannerSet.xml
  2. 21 19
      addin/res/StructConfig/ScannerSet.xml

+ 19 - 17
Module/mod_ScannerSet/ScannerSet.xml

@@ -93,6 +93,8 @@
 				<param name="reserved4" type="string" />
 			</res>
 		</twoway>
+		<oneway name="Exit" overlap="true">			
+		</oneway>	
 		<twoway name="GetOnlineCameras" overlap="true">
 			<req>
 				<param name="reserved1" type="int"/>
@@ -106,6 +108,21 @@
      		<param name="reserved2" type="array_string"/>
 			</res>
 		</twoway>
+		<oneway name="CrossTermInvokeInfo" overlap="true">
+				<param name="type" type="int"/>
+				<param name="result" type="int"/>
+				<param name="fromTerminalNo" type="string"/>
+				<param name="toTerminalNo" type="string"/>
+				<param name="nEntityID" type="int"/>
+				<param name="param1" type="string"/>
+				<param name="param2" type="string"/>
+				<param name="param3" type="int"/>
+				<param name="param4" type="int"/>
+				<param name="paramX" type="blob"/>
+				<param name="reserved1" type="array_int"/>
+				<param name="reserved2" type="array_string"/>
+				<param name="reservedX" type="array_blob"/>	
+		</oneway>
 		<twoway name="CrossTermCall" overlap="true">
 			<req>
 				<param name="type" type="int"/>
@@ -133,21 +150,7 @@
 				<param name="reservedX" type="array_blob"/>
 			</res>				
 		</twoway>
-		<oneway name="CrossTermInvokeInfo" overlap="true">
-				<param name="type" type="int"/>
-				<param name="result" type="int"/>
-				<param name="fromTerminalNo" type="string"/>
-				<param name="toTerminalNo" type="string"/>
-				<param name="nEntityID" type="int"/>
-				<param name="param1" type="string"/>
-				<param name="param2" type="string"/>
-				<param name="param3" type="int"/>
-				<param name="param4" type="int"/>
-				<param name="paramX" type="blob"/>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>
-				<param name="reservedX" type="array_blob"/>	
-		</oneway>
+		
 		<twoway name="GetDevInfo" overlap="true" method_id="65535">
 			<req>
 			</req>
@@ -160,8 +163,7 @@
 				<param name="reserved2" type="string"/>
 			</res>
 		</twoway>													
-		<oneway name="Exit" overlap="true">			
-		</oneway>							
+								
 	</class>
 		<message name="EventMsg">
 			<param name="eventType" type="int"/>

+ 21 - 19
addin/res/StructConfig/ScannerSet.xml

@@ -93,9 +93,9 @@
 				<param name="reserved4" type="string" />
 			</res>
 		</twoway>
-    <oneway name="Exit" overlap="true">
-    </oneway>
-    <twoway name="GetOnlineCameras" overlap="true">
+		<oneway name="Exit" overlap="true">			
+		</oneway>	
+		<twoway name="GetOnlineCameras" overlap="true">
 			<req>
 				<param name="reserved1" type="int"/>
 			</req>
@@ -108,21 +108,21 @@
      		<param name="reserved2" type="array_string"/>
 			</res>
 		</twoway>
-    <oneway name="CrossTermInvokeInfo" overlap="true">
-      <param name="type" type="int"/>
-      <param name="result" type="int"/>
-      <param name="fromTerminalNo" type="string"/>
-      <param name="toTerminalNo" type="string"/>
-      <param name="nEntityID" type="int"/>
-      <param name="param1" type="string"/>
-      <param name="param2" type="string"/>
-      <param name="param3" type="int"/>
-      <param name="param4" type="int"/>
-      <param name="paramX" type="blob"/>
-      <param name="reserved1" type="array_int"/>
-      <param name="reserved2" type="array_string"/>
-      <param name="reservedX" type="array_blob"/>
-    </oneway>
+		<oneway name="CrossTermInvokeInfo" overlap="true">
+				<param name="type" type="int"/>
+				<param name="result" type="int"/>
+				<param name="fromTerminalNo" type="string"/>
+				<param name="toTerminalNo" type="string"/>
+				<param name="nEntityID" type="int"/>
+				<param name="param1" type="string"/>
+				<param name="param2" type="string"/>
+				<param name="param3" type="int"/>
+				<param name="param4" type="int"/>
+				<param name="paramX" type="blob"/>
+				<param name="reserved1" type="array_int"/>
+				<param name="reserved2" type="array_string"/>
+				<param name="reservedX" type="array_blob"/>	
+		</oneway>
 		<twoway name="CrossTermCall" overlap="true">
 			<req>
 				<param name="type" type="int"/>
@@ -150,6 +150,7 @@
 				<param name="reservedX" type="array_blob"/>
 			</res>				
 		</twoway>
+		
 		<twoway name="GetDevInfo" overlap="true" method_id="65535">
 			<req>
 			</req>
@@ -161,7 +162,8 @@
 			  <param name="reserved1" type="int"/>
 				<param name="reserved2" type="string"/>
 			</res>
-		</twoway>																			
+		</twoway>													
+								
 	</class>
 		<message name="EventMsg">
 			<param name="eventType" type="int"/>