Signed-off-by: lqq <lqq@wswin.cn>

Client/Condition/ConditionConfig.pas

@@ -19,6 +19,7 @@ type
     FDev: Boolean;
     FRemoteUIHost: string;
     FRemoteUI: Boolean;
+    FMapHost: string;
 
   public
     constructor Create;
@@ -36,6 +37,7 @@ type
     property Dev: Boolean read FDev;
     property RemoteUI: Boolean read FRemoteUI;
     property RemoteUIHost: string read FRemoteUIHost;
+    property MapHost: string read FMapHost;
   end;
 
 implementation
@@ -93,6 +95,7 @@ begin
     Result.FDev := jo.B['dev'];
     Result.FRemoteUI := jo.B['remoteUI'];
     Result.FRemoteUIHost := jo.S['remoteUIHost'];
+    Result.FMapHost := jo.S['mapHost'];
   except
     on E: Exception do
     begin

Client/Services/TextMessageService.pas

@@ -316,7 +316,7 @@ begin
   reg := TPerlRegEx.Create;
   try
     reg.Subject := AMessageContent;
-    reg.RegEx   := '\[(\w+)\-src=\"(http://[\w\W]+)\"\]';
+    reg.RegEx   := '\[(\w+)\-src=\"(http://[\w\W]+?)\"\]';
 
     while reg.MatchAgain do
     begin
@@ -344,10 +344,10 @@ begin
   reg := TPerlRegEx.Create;
   try
     reg.Subject := AMessageContent;
-    reg.RegEx   := '\[IMG:([\w\W]+)\]';
+    reg.RegEx   := '\[IMG:([\w\W]+?)\]';
     ReplacesTag;
 
-    reg.RegEx   := '\[image\-src=\"([\w\W]+)\"\]';
+    reg.RegEx   := '\[image\-src=\"([\w\W]+?)\"\]';
     ReplacesTag;
     AMessageContent := reg.Subject;
   finally

Controls/RealICQUI/xFonts.pas

@@ -1,132 +1,137 @@
-unit xFonts;
-
-interface
-
-uses Classes, Graphics, SysUtils;
-
-procedure StringToFont(sFont: string; Font: TFont; bIncludeColor: Boolean = True);
-function FontToString(Font: TFont; bIncludeColor: Boolean = True): string;
-function FontStyleToString(Font: TFont):String;
-
-implementation
-
-const
-  csfsBold      = '|Bold';     
-  csfsItalic    = '|Italic';   
-  csfsUnderline = '|Underline';
-  csfsStrikeout = '|Strikeout';
-  
-  //
-  // Expected format:
-  //   "Arial", 9, [Bold], [clRed]
-  //
-procedure StringToFont(sFont: string; Font: TFont; bIncludeColor: Boolean = True);
-var
-  P     : Integer;
-  sStyle: string; 
-begin
-  with Font do
-    try
-      // get font name
-      P := Pos(',', sFont);
-      name := Copy(sFont, 2, P - 3);
-      Delete(sFont, 1, P);
-      
-      // get font size
-      P := Pos(',', sFont);
-      Size := StrToInt(Copy(sFont, 2, P - 2));
-      Delete(sFont, 1, P);
-      
-      // get font style
-      P := Pos(',', sFont);
-      sStyle := '|' + Copy(sFont, 3, P - 4);
-      Delete(sFont, 1, P);
-      
-      // get font color
-      if bIncludeColor then
-        Color := StringToColor(Copy(sFont, 3, Length(sFont) - 3));
-      
-      // convert str font style to
-      // font style
-      Style := [];
-      
-      if (Pos(csfsBold, sStyle) > 0) then
-        Style := Style + [fsBold];
-      
-      if (Pos(csfsItalic, sStyle) > 0) then
-        Style := Style + [fsItalic];
-      
-      if (Pos(csfsUnderline, sStyle) > 0) then
-        Style := Style + [fsUnderline];
-      
-      if (Pos(csfsStrikeout, sStyle) > 0) then
-        Style := Style + [fsStrikeOut];
-    except
-    end;
-end;
-
-//
-// Output format:
-//   "Aril", 9, [Bold|Italic], [clAqua]
-//
-function FontToString(Font: TFont; bIncludeColor: Boolean = True): string;
-var
-  sStyle: string;
-begin
-  with Font do
-  begin
-    // convert font style to string
-    sStyle := '';
-
-    if (fsBold in Style) then
-      sStyle := sStyle + csfsBold;
-
-    if (fsItalic in Style) then
-      sStyle := sStyle + csfsItalic;
-
-    if (fsUnderline in Style) then
-      sStyle := sStyle + csfsUnderline;
-
-    if (fsStrikeOut in Style) then
-      sStyle := sStyle + csfsStrikeout;
-
-    if ((Length(sStyle) > 0) and ('|' = sStyle[1])) then
-      sStyle := Copy(sStyle, 2, Length(sStyle) - 1);
-
-    Result := Format('"%s", %d, [%s]',[name, Size, sStyle]);
-    if bIncludeColor then
-      Result := Result + Format(', [%s]',[ColorToString(Color)]);
-  end;
-end;
-
-function FontStyleToString(Font: TFont):String;
-var
-  sStyle: string;
-begin
-  with Font do
-  begin
-    // convert font style to string
-    sStyle := '';
-
-    if (fsBold in Style) then
-      sStyle := sStyle + csfsBold;
-
-    if (fsItalic in Style) then
-      sStyle := sStyle + csfsItalic;
-
-    if (fsUnderline in Style) then
-      sStyle := sStyle + csfsUnderline;
-
-    if (fsStrikeOut in Style) then
-      sStyle := sStyle + csfsStrikeout;
-
-    if ((Length(sStyle) > 0) and ('|' = sStyle[1])) then
-      sStyle := Copy(sStyle, 2, Length(sStyle) - 1);
-
-    Result := Format('%s',[sStyle]);
-
-  end;
-end;
-
-end.
-
+unit xFonts;
+
+interface
+
+uses Classes, Graphics, SysUtils;
+
+procedure StringToFont(sFont: string; Font: TFont; bIncludeColor: Boolean = True);
+function FontToString(Font: TFont; bIncludeColor: Boolean = True): string;
+function FontStyleToString(Font: TFont):String;
+
+implementation
+
+const
+  csfsBold      = '|Bold';     
+  csfsItalic    = '|Italic';   
+  csfsUnderline = '|Underline';
+  csfsStrikeout = '|Strikeout';
+  
+  //
+  // Expected format:
+  //   "Arial", 9, [Bold], [clRed]
+  //
+procedure StringToFont(sFont: string; Font: TFont; bIncludeColor: Boolean = True);
+var
+  P     : Integer;
+  sStyle: string;
+  sColor: string;
+begin
+  with Font do
+    try
+      // get font name
+      P := Pos(',', sFont);
+      name := Copy(sFont, 2, P - 3);
+      Delete(sFont, 1, P);
+      
+      // get font size
+      P := Pos(',', sFont);
+      Size := StrToInt(Copy(sFont, 2, P - 2));
+      Delete(sFont, 1, P);
+      
+      // get font style
+      P := Pos(',', sFont);
+      sStyle := '|' + Copy(sFont, 3, P - 4);
+      Delete(sFont, 1, P);
+      
+      // get font color
+      if bIncludeColor then
+      begin
+        sColor := Copy(sFont, 3, Length(sFont) - 3);
+        if sColor <> '' then                
+          Color := StringToColor(sColor);
+      end;
+      
+      // convert str font style to
+      // font style
+      Style := [];
+      
+      if (Pos(csfsBold, sStyle) > 0) then
+        Style := Style + [fsBold];
+      
+      if (Pos(csfsItalic, sStyle) > 0) then
+        Style := Style + [fsItalic];
+      
+      if (Pos(csfsUnderline, sStyle) > 0) then
+        Style := Style + [fsUnderline];
+      
+      if (Pos(csfsStrikeout, sStyle) > 0) then
+        Style := Style + [fsStrikeOut];
+    except
+    end;
+end;
+
+//
+// Output format:
+//   "Aril", 9, [Bold|Italic], [clAqua]
+//
+function FontToString(Font: TFont; bIncludeColor: Boolean = True): string;
+var
+  sStyle: string;
+begin
+  with Font do
+  begin
+    // convert font style to string
+    sStyle := '';
+
+    if (fsBold in Style) then
+      sStyle := sStyle + csfsBold;
+
+    if (fsItalic in Style) then
+      sStyle := sStyle + csfsItalic;
+
+    if (fsUnderline in Style) then
+      sStyle := sStyle + csfsUnderline;
+
+    if (fsStrikeOut in Style) then
+      sStyle := sStyle + csfsStrikeout;
+
+    if ((Length(sStyle) > 0) and ('|' = sStyle[1])) then
+      sStyle := Copy(sStyle, 2, Length(sStyle) - 1);
+
+    Result := Format('"%s", %d, [%s]',[name, Size, sStyle]);
+    if bIncludeColor then
+      Result := Result + Format(', [%s]',[ColorToString(Color)]);
+  end;
+end;
+
+function FontStyleToString(Font: TFont):String;
+var
+  sStyle: string;
+begin
+  with Font do
+  begin
+    // convert font style to string
+    sStyle := '';
+
+    if (fsBold in Style) then
+      sStyle := sStyle + csfsBold;
+
+    if (fsItalic in Style) then
+      sStyle := sStyle + csfsItalic;
+
+    if (fsUnderline in Style) then
+      sStyle := sStyle + csfsUnderline;
+
+    if (fsStrikeOut in Style) then
+      sStyle := sStyle + csfsStrikeout;
+
+    if ((Length(sStyle) > 0) and ('|' = sStyle[1])) then
+      sStyle := Copy(sStyle, 2, Length(sStyle) - 1);
+
+    Result := Format('%s',[sStyle]);
+
+  end;
+end;
+
+end.
+

ZWT/Config/condition.config

@@ -1,14 +1,15 @@
-//配置文件
-{
- 	"faceSize":20,
-	//用户信息可见性控制是否启�?
-	"userInfoController":false,
-	//是否启用全市功能
-	"otherServersDisable":false,
-	//两字节的问题
-	"newCenterServer":true,
-	//用户信息完整性检�?
-	"userInfoCheck":false,
-	"remoteUI":true,
-	"remoteUIHost":"http://120.26.136.253:8080/LXTalkUI"
-}
+//配置文件
+{
+ 	"faceSize":20,
+	//用户信息可见性控制是否启�?
+	"userInfoController":false,
+	//是否启用全市功能
+	"otherServersDisable":false,
+	//两字节的问题
+	"newCenterServer":true,
+	//用户信息完整性检�?
+	"userInfoCheck":false,
+	"remoteUI":true,
+	"remoteUIHost":"http://120.26.136.253:8080/LXTalkUI",
+	"mapHost":"http://120.26.126.129:30001/v1/common/maps"
+}

ZWT/XML/DefaultConfig.xml

@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="gb2312"?>
-<DefaultConfig>
-	<SkinName Value="VStyle"/>
-	<UIMainColor Value="15392442"/>
-	<MainFormLeft Value="1278"/>
-	<MainFormTop Value="235"/>
-	<MainFormWidth Value="-300"/>
-	<MainFormHeight Value="583"/>
-	<TalkingFormLeft Value="836"/>
-	<TalkingFormTop Value="374"/>
-	<TalkingFormWidth Value="663"/>
-	<TalkingFormHeight Value="513"/>
-	<ShowMainFormOnStart Value="True"/>
-	<AutoHideMainForm Value="False"/>
-	<AlwaysOnTop Value="False"/>
-	<AutoShowRequestMessage Value="False"/>
-	<SMSFormLeft Value="0"/>
-	<SMSFormTop Value="0"/>
-	<SMSFormWidth Value="460"/>
-	<SMSFormHeight Value="410"/>
-	<ConfirmSendOfflineFile Value="False"/>
-</DefaultConfig>
+<?xml version="1.0" encoding="gb2312"?>
+<DefaultConfig>
+	<SkinName Value="VStyle"/>
+	<UIMainColor Value="15392442"/>
+	<MainFormLeft Value="2023"/>
+	<MainFormTop Value="298"/>
+	<MainFormWidth Value="258"/>
+	<MainFormHeight Value="636"/>
+	<TalkingFormLeft Value="1045"/>
+	<TalkingFormTop Value="571"/>
+	<TalkingFormWidth Value="663"/>
+	<TalkingFormHeight Value="513"/>
+	<ShowMainFormOnStart Value="True"/>
+	<AutoHideMainForm Value="False"/>
+	<AlwaysOnTop Value="False"/>
+	<AutoShowRequestMessage Value="False"/>
+	<SMSFormLeft Value="0"/>
+	<SMSFormTop Value="0"/>
+	<SMSFormWidth Value="460"/>
+	<SMSFormHeight Value="410"/>
+	<ConfirmSendOfflineFile Value="False"/>
+</DefaultConfig>