Z991239-5470 #comment feat: 增加终端版本传出

Module/mod_ResourceWatcher/ResourceWatcher.xml

@@ -9,6 +9,7 @@
 				<param name="model" type="string" />
 				<param name="version" type="string" />
 				<param name="state" type="int" />
+				<param name="terminalVer" type="string" />
 			</res>			
 		</twoway>		
 			<twoway  name="OperateFile" overlap="true" method_id="3">
@@ -99,7 +100,8 @@
 				<param name="forbidAttributes" type="array_uint" />
 				<!-- 保留字段 -->
 				<param name="reserved1" type="array_int"/>
-     		<param name="reserved2" type="array_string"/>
+				<param name="reserved2" type="array_string"/>
+				<param name="terminalVer" type="string" />
 			</res>
 		</twoway>	
 		<!--网络连接类型检测-->
@@ -111,6 +113,7 @@
 				<param name="netType" type="int"/>
 				<param name="strParam" type="string"/>
 				<param name="intParam" type="int"/>
+				<param name="terminalVer" type="string" />
 			</res>
 		</twoway>
 
@@ -128,6 +131,7 @@
 				<param name="reserved1" type="string"/>
 				<!--后续扩展使用-->
 				<param name="reserved2" type="string"/>
+				<param name="terminalVer" type="string" />
 			</res>
 		</twoway>
 
@@ -154,6 +158,7 @@
 				<param name="reserved1" type="string"/>
 				<!--后续扩展使用-->
 				<param name="reserved2" type="string"/>
+				<param name="terminalVer" type="string" />
 			</res>
 		</twoway>
 
@@ -179,6 +184,7 @@
         <param name="reserverd2" type="string"/>
         <param name="reserverd3" type="int"/>
         <param name="reserverd4" type="int"/>
+		<param name="terminalVer" type="string" />
       </res>
     </twoway>
     <twoway  name="InstallThirdPartyProgram" overlap="true" method_id="11">
@@ -194,6 +200,7 @@
         <param name="path" type="string"/>
         <param name="reserverd1" type="string"/>
         <param name="reserverd2" type="string"/>
+		<param name="terminalVer" type="string" />
       </res>
     </twoway>
     <twoway  name="UninstallThirdPartyProgram" overlap="true" method_id="14">
@@ -208,6 +215,7 @@
         <param name="msg" type="string"/>
         <param name="reserverd1" type="string"/>
         <param name="reserverd2" type="string"/>
+		<param name="terminalVer" type="string" />
       </res>
     </twoway>
 
@@ -224,6 +232,7 @@
 				<param name="msg" type="string"/>
 				<param name="reserverd1" type="string"/>
 				<param name="reserverd2" type="string"/>
+				<param name="terminalVer" type="string" />
 			</res>
 		</twoway>
 
@@ -240,6 +249,7 @@
 				<param name="msg" type="string"/>
 				<param name="reserverd1" type="string"/>
 				<param name="reserverd2" type="string"/>
+				<param name="terminalVer" type="string" />
 			</res>
 		</twoway>
 
@@ -256,6 +266,7 @@
 				<param name="msg" type="string"/>
 				<param name="reserverd1" type="string"/>
 				<param name="reserverd2" type="string"/>
+				<param name="terminalVer" type="string" />
 			</res>
 		</twoway>
 
@@ -272,6 +283,7 @@
 	        <param name="msg" type="string"/>
 	        <param name="reserverd1" type="string"/>
 	        <param name="reserverd2" type="string"/>
+			<param name="terminalVer" type="string" />
 	      </res>
 	    </twoway>
 	</class>

Module/mod_ResourceWatcher/ResourceWatcher_def_g.h

@@ -64,10 +64,11 @@ struct ResourceWatcherService_GetDevInfo_Ans
 	CSimpleStringA model;
 	CSimpleStringA version;
 	int state;
+	CSimpleStringA terminalVer;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & type & model & version & state;
+		auto & buf = Buf & type & model & version & state & terminalVer;
 	}
 
 };
@@ -116,10 +117,11 @@ struct ResourceWatcherService_OperateFile_Ans
 	CAutoArray<unsigned int> forbidAttributes;
 	CAutoArray<int> reserved1;
 	CAutoArray<CSimpleStringA> reserved2;
+	CSimpleStringA terminalVer;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & result & header & attachment1 & attachment2 & fileSize & ftCreate & ftModified & ftAccess & fileAttribute & forbidAttribute & reversed1 & reversed2 & count & fileNames & fileSizes & ftCreates & ftModifieds & ftAccesses & fileAttributes & forbidAttributes & reserved1 & reserved2;
+		auto & buf = Buf & result & header & attachment1 & attachment2 & fileSize & ftCreate & ftModified & ftAccess & fileAttribute & forbidAttribute & reversed1 & reversed2 & count & fileNames & fileSizes & ftCreates & ftModifieds & ftAccesses & fileAttributes & forbidAttributes & reserved1 & reserved2 & terminalVer;
 	}
 
 };
@@ -138,10 +140,11 @@ struct ResourceWatcherService_CheckNetType_Ans
 	int netType;
 	CSimpleStringA strParam;
 	int intParam;
+	CSimpleStringA terminalVer;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & netType & strParam & intParam;
+		auto & buf = Buf & netType & strParam & intParam & terminalVer;
 	}
 
 };
@@ -164,10 +167,11 @@ struct ResourceWatcherService_GetBizLinks_Ans
 	CAutoArray<CSimpleStringA> params1;
 	CSimpleStringA reserved1;
 	CSimpleStringA reserved2;
+	CSimpleStringA terminalVer;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & bizLinks & bizNames & params1 & reserved1 & reserved2;
+		auto & buf = Buf & bizLinks & bizNames & params1 & reserved1 & reserved2 & terminalVer;
 	}
 
 };
@@ -194,10 +198,11 @@ struct ResourceWatcherService_BizLinkDetect_Ans
 	int intParam;
 	CSimpleStringA reserved1;
 	CSimpleStringA reserved2;
+	CSimpleStringA terminalVer;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & bizLinkStatus & bizLinkDelayMS & strParam & intParam & reserved1 & reserved2;
+		auto & buf = Buf & bizLinkStatus & bizLinkDelayMS & strParam & intParam & reserved1 & reserved2 & terminalVer;
 	}
 
 };
@@ -226,10 +231,11 @@ struct ResourceWatcherService_GetThirdPartyInstallState_Ans
 	CSimpleStringA reserverd2;
 	int reserverd3;
 	int reserverd4;
+	CSimpleStringA terminalVer;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & status & version & path & reserverd1 & reserverd2 & reserverd3 & reserverd4;
+		auto & buf = Buf & status & version & path & reserverd1 & reserverd2 & reserverd3 & reserverd4 & terminalVer;
 	}
 
 };
@@ -254,10 +260,11 @@ struct ResourceWatcherService_InstallThirdPartyProgram_Ans
 	CSimpleStringA path;
 	CSimpleStringA reserverd1;
 	CSimpleStringA reserverd2;
+	CSimpleStringA terminalVer;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & result & msg & path & reserverd1 & reserverd2;
+		auto & buf = Buf & result & msg & path & reserverd1 & reserverd2 & terminalVer;
 	}
 
 };
@@ -281,10 +288,11 @@ struct ResourceWatcherService_UninstallThirdPartyProgram_Ans
 	CSimpleStringA msg;
 	CSimpleStringA reserverd1;
 	CSimpleStringA reserverd2;
+	CSimpleStringA terminalVer;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & result & msg & reserverd1 & reserverd2;
+		auto & buf = Buf & result & msg & reserverd1 & reserverd2 & terminalVer;
 	}
 
 };
@@ -308,10 +316,11 @@ struct ResourceWatcherService_RestartThirdPartyProgram_Ans
 	CSimpleStringA msg;
 	CSimpleStringA reserverd1;
 	CSimpleStringA reserverd2;
+	CSimpleStringA terminalVer;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & result & msg & reserverd1 & reserverd2;
+		auto & buf = Buf & result & msg & reserverd1 & reserverd2 & terminalVer;
 	}
 
 };
@@ -335,10 +344,11 @@ struct ResourceWatcherService_ProcessDetectThirdPartyProgram_Ans
 	CSimpleStringA msg;
 	CSimpleStringA reserverd1;
 	CSimpleStringA reserverd2;
+	CSimpleStringA terminalVer;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & result & msg & reserverd1 & reserverd2;
+		auto & buf = Buf & result & msg & reserverd1 & reserverd2 & terminalVer;
 	}
 
 };
@@ -362,10 +372,11 @@ struct ResourceWatcherService_FilesClean_Ans
 	CSimpleStringA msg;
 	CSimpleStringA reserverd1;
 	CSimpleStringA reserverd2;
+	CSimpleStringA terminalVer;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & result & msg & reserverd1 & reserverd2;
+		auto & buf = Buf & result & msg & reserverd1 & reserverd2 & terminalVer;
 	}
 
 };
@@ -389,10 +400,11 @@ struct ResourceWatcherService_FetchSystemSnapshot_Ans
 	CSimpleStringA msg;
 	CSimpleStringA reserverd1;
 	CSimpleStringA reserverd2;
+	CSimpleStringA terminalVer;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & result & msg & reserverd1 & reserverd2;
+		auto & buf = Buf & result & msg & reserverd1 & reserverd2 & terminalVer;
 	}
 
 };