lqq лет назад: 9
Родитель
Сommit
a58bd55d10

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
AppCom/AppCentreCom.dproj


BIN
AppCom/AppCentreCom.res


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
CA/CA.dproj



Разница между файлами не показана из-за своего большого размера
+ 1 - 1
COM/RealICQCOMInterfaces/RealICQCOMInterfaces.dproj


BIN
COM/RealICQCOMInterfaces/RealICQCOMInterfaces.res


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
Client/Lxtalk.dproj


BIN
Client/Lxtalk.res


+ 9 - 9
Client/MainFrm.dfm

@@ -11050,7 +11050,7 @@ object MainForm: TMainForm
     Left = 463
     Top = 441
     Bitmap = {
-      494C0101080009000C0320002000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010108000900100320002000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       00000000000036000000280000008000000060000000010020000000000000C0
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -13627,7 +13627,7 @@ object MainForm: TMainForm
     Left = 367
     Top = 440
     Bitmap = {
-      494C0101060009000C0310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010106000900100310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000002000000001002000000000000020
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000010185A0018299C002139
@@ -14027,7 +14027,7 @@ object MainForm: TMainForm
     Left = 400
     Top = 440
     Bitmap = {
-      494C0101010004000C0310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010101000400100310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000001000000001002000000000000010
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -14201,7 +14201,7 @@ object MainForm: TMainForm
     Left = 496
     Top = 442
     Bitmap = {
-      494C0101020004000C0310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010102000400100310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000001000000001002000000000000010
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -14585,7 +14585,7 @@ object MainForm: TMainForm
     Left = 366
     Top = 472
     Bitmap = {
-      494C0101020004000C0310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010102000400100310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000001000000001002000000000000010
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -14728,7 +14728,7 @@ object MainForm: TMainForm
     Left = 399
     Top = 473
     Bitmap = {
-      494C0101030004000C0310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010103000400100310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000001000000001002000000000000010
       0000000000000000000000000000000000000000000000000000000000000000
       0000949494009494940094949400949494009494940094949400949494009494
@@ -14873,7 +14873,7 @@ object MainForm: TMainForm
     Left = 335
     Top = 440
     Bitmap = {
-      494C0101050009000C0318001800FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010105000900100318001800FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000600000003000000001002000000000000048
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -15761,7 +15761,7 @@ object MainForm: TMainForm
     Left = 280
     Top = 72
     Bitmap = {
-      494C0101060009000C030B000B00FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C01010600090010030B000B00FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       00000000000036000000280000002C000000160000000100200000000000200F
       00000000000000000000000000000000000000000000000000008CA5C6001852
       B5001839C6001831BD001839C6001852B5008CA5C60000000000000000000000
@@ -15900,7 +15900,7 @@ object MainForm: TMainForm
     Left = 312
     Top = 72
     Bitmap = {
-      494C0101060009000C0309000900FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010106000900100309000900FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       000000000000360000002800000024000000120000000100200000000000200A
       00000000000000000000000000000000000000000000F7F7F7002163B5001842
       C6002139C6001842C6002163B500F7F7F7000000000000000000F7F7F7002984

+ 1 - 1
Client/MainFrm.pas

@@ -13918,7 +13918,7 @@ begin
   jo := SO();
   if TConditionConfig.GetConfig.RemoteUI then
   begin
-    jo.S['url'] := Format('%s/guideview/#/',[TConditionConfig.GetConfig.RemoteUIHost]);
+    jo.S['url'] := Format('%s/guideview/index.html?v=%d',[TConditionConfig.GetConfig.RemoteUIHost, GetTickCount]);
   end
   else
     jo.S['url'] := ExtractFilePath(paramstr(0))+ 'html/guideview/#/';

+ 14 - 14
Client/Views/GuideView.dfm

@@ -4,25 +4,25 @@ inherited GuideViewForm: TGuideViewForm
   Margins.Right = 0
   Margins.Bottom = 0
   Caption = 'GuideViewForm'
-  ClientHeight = 560
-  ClientWidth = 750
+  ClientHeight = 570
+  ClientWidth = 760
   OnClose = FormClose
   OnCreate = FormCreate
-  ExplicitWidth = 766
-  ExplicitHeight = 599
+  ExplicitWidth = 776
+  ExplicitHeight = 609
   PixelsPerInch = 96
   TextHeight = 13
   inherited Chrome: TChromium
-    Width = 750
-    Height = 560
+    Width = 760
+    Height = 570
     ExplicitWidth = 750
     ExplicitHeight = 560
   end
   object pnlClient: TPanel
     Left = 0
     Top = 0
-    Width = 750
-    Height = 560
+    Width = 760
+    Height = 570
     Align = alClient
     BevelOuter = bvNone
     Padding.Left = 7
@@ -30,13 +30,13 @@ inherited GuideViewForm: TGuideViewForm
     Padding.Right = 7
     Padding.Bottom = 7
     TabOrder = 1
-    ExplicitWidth = 673
-    ExplicitHeight = 448
+    ExplicitWidth = 750
+    ExplicitHeight = 560
     object rndContent: TRealICQRoundBorderPanel
       Left = 7
       Top = 7
-      Width = 736
-      Height = 546
+      Width = 746
+      Height = 556
       Margins.Left = 0
       Margins.Top = 0
       Margins.Right = 0
@@ -49,8 +49,8 @@ inherited GuideViewForm: TGuideViewForm
       BorderColor = 11579568
       BackColor = clWhite
       RoundValue = 6
-      ExplicitWidth = 659
-      ExplicitHeight = 434
+      ExplicitWidth = 736
+      ExplicitHeight = 546
     end
   end
 end

Разница между файлами не показана из-за своего большого размера
+ 24 - 24
Controls/RealICQComponents.dproj


BIN
Controls/RealICQComponents.res


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
Log/Logger.dproj


BIN
Log/Logger.res


+ 1 - 1
ZWT/Config/customer.config

@@ -1 +1 @@
-{"showGuideView":false}
+{"showGuideView":true}

+ 0 - 30
ZWT/ConfigKFQ/appCentre.config

@@ -1,30 +0,0 @@
-//配置文件
-{
-	"list":
-	[
-	  {
-		 "id":"appCentre",
-  		 "pluginID":"appCentre",
-  		 "lib":"binary\\AppCentre_XE6.dll",
- 		 "singleton":true
-	  },
-	  {
-		 "id":"appCentreConfig",
-  		 "pluginID":"appCentreConfig",
-  		 "lib":"binary\\AppCentre_XE6.dll",
- 		 "singleton":true
-	  }
-   ],
-   //stForm 独立窗体
-   //stOnMainform 集成窗体
-   "showType":"stForm",
-   "lxtAppKey":"0B6AC133A3E1FC7F5A3109F8A81E0825",
-   "lxtAppSecret":"F48CF467B796B55B6F0C9A1D8EF2BA0A",
-   "ip":"172.28.93.5",
-   "port":8989,
-   //用于登录
-   "clientIP":"172.28.93.5",
-   "clientPort":8988,
-   "enable":false,
-   "DanDianDengLu":false
-}

+ 0 - 14
ZWT/ConfigKFQ/behavior.config

@@ -1,14 +0,0 @@
-//配置文件
-{
-   "list":
-   [
-      {
-         "id":"Monitor",
-         "pluginID":"Monitor",
-         "lib":"binary\\Logger.dll",
-         "singleton":true
-      }
-   ],
-   "enable":true,
-   "url":"http://172.28.93.18:8080/api/loginrecord"
-}

+ 0 - 23
ZWT/ConfigKFQ/ca.config

@@ -1,23 +0,0 @@
-//配置文件
-{
-	"list":
-	[   
-		{
-         "id":"caconfig",
-         "pluginID":"caconfig",
-         "lib":"binary\\CA.dll",
-         "singleton":true
-		},
-		{
-         "id":"caclient",
-         "pluginID":"caclient",
-         "lib":"binary\\CA.dll",
-         "singleton":true
-		}		
-	],
-	
-	"url":"http://10.41.220.70:6180/MessageService",
-	"enable":false,
-	"appid":"testApp",
-	"casubject":"CN=Private Certificate Authority Of MOF, O=MOF, C=CN"
-}

+ 0 - 10
ZWT/ConfigKFQ/condition.config

@@ -1,10 +0,0 @@
-//配置文件
-{
- 	"faceSize":20,
-	//用户信息可见性控制是否启用
-	"userInfoController":false,
-	//是否启用全市功能
-	"otherServersDisable":false,
-	//两字节的问题
-	"newCenterServer":false
-}

+ 0 - 30
ZWT/ConfigKFQ/dataprovider.config

@@ -1,30 +0,0 @@
-//配置文件
-{
-	"list":
-	[
-	  {
-		 "id":"AppIconProvider",
-  		 "pluginID":"AppIconProvider",
-  		 "lib":"binary\\DataProvider.dll",
- 		 "singleton":true
- 	  },
-      {
-		 "id":"UsersHashProvider",
-  		 "pluginID":"UsersHashProvider",
-  		 "lib":"binary\\DataProvider.dll",
- 		 "singleton":true
- 	  },
-      {
-		 "id":"MapTeamUsersProvider",
-  		 "pluginID":"MapTeamUsersProvider",
-  		 "lib":"binary\\DataProvider.dll",
- 		 "singleton":true
- 	  },
-      {
-		 "id":"DataModule",
-  		 "pluginID":"DataModule",
-  		 "lib":"binary\\DataProvider.dll",
- 		 "singleton":true
- 	  }
-   ]
-}

+ 0 - 9
ZWT/ConfigKFQ/db.config

@@ -1,9 +0,0 @@
-//配置文件
-[db.config]
-Encoding=UTF8
-
-[SQLitePool]
-DriverID=SQLite
-Database=temp.sdb
-LockingMode=Normal
-Pooled=true

+ 0 - 18
ZWT/ConfigKFQ/group.config

@@ -1,18 +0,0 @@
-//配置文件
-{
-		//gvIndependent独立群组
-		//gvIntegration集成群组
-		"version":"gvIndependent",
-		"groupServerAddress":
-		[
-			{"ip":"172.28.93.16", "port":6714, "enable":true}
-		],
-		"imageServerAddress":
-		[
-			{"ip":"172.28.93.15", "port":6713, "enable":true}
-		],
-		"gatewayServerAddress":
-		[
-			{"ip":"172.28.93.16", "port":6715, "enable":true}
-		]
-}

+ 0 - 6
ZWT/ConfigKFQ/groupShare.config

@@ -1,6 +0,0 @@
-//配置文件
-{
-	"version":"gsvNew",
-        "ip":"172.28.93.4",
-        "port":8083
-}

+ 0 - 16
ZWT/ConfigKFQ/logger.config

@@ -1,16 +0,0 @@
-//配置文件
-{
-   "list":
-   [
-      {
-         "id":"ResfulLogger",
-         "pluginID":"NoLogger",
-         "lib":"binary\\Logger.dll",
-         "singleton":true
-      }
-   ],
-   "enable":true,
-   "url":"http://61.153.67.119:8080/log",
-   "appCode":"PC-IMClient@LS",
-   "clientVersion":"7.10"
-}

+ 0 - 9
ZWT/ConfigKFQ/offlineFile.config

@@ -1,9 +0,0 @@
-//配置文件
-{
-	"version":"gvIndependent",
-	"packageSize":512000,
-	"address":
-	[
-		{"ip":"172.28.93.20", "port":8124, "enable":true}
-	]
-}

+ 2 - 2
ZWT/XML/DefaultConfig.xml

@@ -6,8 +6,8 @@
 	<MainFormTop Value="370"/>
 	<MainFormWidth Value="-300"/>
 	<MainFormHeight Value="734"/>
-	<TalkingFormLeft Value="703"/>
-	<TalkingFormTop Value="125"/>
+	<TalkingFormLeft Value="1308"/>
+	<TalkingFormTop Value="340"/>
 	<TalkingFormWidth Value="663"/>
 	<TalkingFormHeight Value="507"/>
 	<ShowMainFormOnStart Value="True"/>