文件修改

Client/Condition/ConditionConfig.pas

@@ -20,6 +20,8 @@ type
     FRemoteUIHost: string;
     FRemoteUI: Boolean;
     FMapHost: string;
+    FArm2Mp3Host: string;
+    procedure SetArm2Mp3Host(const Value: string);
   public
     constructor Create;
     class function Load: TConditionConfig;
@@ -36,6 +38,7 @@ type
     property RemoteUI: Boolean read FRemoteUI;
     property RemoteUIHost: string read FRemoteUIHost;
     property MapHost: string read FMapHost;
+    property Arm2Mp3Host: string read FArm2Mp3Host write SetArm2Mp3Host;
   end;
 
   TCustomerConfig = class
@@ -113,6 +116,7 @@ begin
     Result.FRemoteUI := jo.B['remoteUI'];
     Result.FRemoteUIHost := jo.S['remoteUIHost'];
     Result.FMapHost := jo.S['mapHost'];
+    Result.FArm2Mp3Host := jo.S['arm2mp3Host'];
   except
     on E: Exception do
     begin
@@ -121,6 +125,11 @@ begin
   end;
 end;
 
+procedure TConditionConfig.SetArm2Mp3Host(const Value: string);
+
begin
+  FArm2Mp3Host := Value;
+end;
+
 { TCustomerConfig }
 
 

Client/Group/GroupService.pas

@@ -74,7 +74,7 @@ implementation
 
 uses
   MainFrm, SearchTeamFrm, RealICQUtils, ShareUtils, RealICQClient, LoggerImport,
-  RealICQUtility, ConditionConfig, IdURI, IdHTTP, HTTPApp, IdTStrings;
+  RealICQUtility, ConditionConfig, IdURI, IdHTTP, HTTPApp, IdTStrings, Dialogs;
 
 var
   AGroupService: TGroupService;
@@ -385,7 +385,7 @@ end;
 procedure TGroupService.OnMessage(ATeamID, ASender, AContent, AStyle: string; ASendTime: TDateTime; AMSGType: Integer; ALength: Integer);
 const
   AParam: string = '?center=%s&marker=%s&lat=%s&lng=%s';
-  ARM_2_MP3_URL: string = 'http://127.0.0.1:3000/api/amr2mp3';
+  ARM_2_MP3_URL: string = 'http://120.26.126.129:3001/api/amr2mp3';
   BODY: string = '{"data":"%s"}';
 var
   tmpStrs: TIdStringList;
@@ -405,12 +405,17 @@ begin
       str := Format(BODY, [AContent]);
       tmpStrs.Add(str);
       h.Request.ContentType := 'application/json';
-      AContent := h.Post(ARM_2_MP3_URL, tmpStrs);
+      AContent := h.Post(TConditionConfig.GetConfig.Arm2Mp3Host, tmpStrs);
       jo := SO(AContent);
       if (jo <> nil) and (jo.I['ret'] = 1) then
         MainForm.WebSocketRecivedbroadcastmesssage('', ATeamID, ASender, AStyle, '[voice-src="' + jo.S['url'] + '"]', ASendTime);
-    finally
       tmpStrs.Free;
+    except
+      on e: Exception do
+      begin
+        Error(e.Message, 'arm to mp3');
+        tmpStrs.Free;
+      end;
     end;
   end
   else if AMSGType = 5 then

Client/LXTalk.inc

@@ -1,4 +1,7 @@
 {.$DEFINE OldGroup}
 
 //用于宁夏企税通
-{.$DEFINE NXQST}
+{.$DEFINE NXQST}
+
+//用于丽水市办公助手
+{$DEFINE LSSBGZS}

Client/TalkingFrm.dfm

@@ -9079,7 +9079,7 @@ object TalkingForm: TTalkingForm
     Left = 48
     Top = 312
     Bitmap = {
-      494C0101040009001C0210001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010104000900240210001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000002000000001002000000000000020
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000

Client/TalkingFrm.pas

@@ -3750,15 +3750,15 @@ begin
       begin
         LockWindowUpdate(GetDesktopWindow);
         try
-          if not PasteImage then
-            RichEdInputer.PasteFromClipboard;
-
+//          if not PasteImage then
+//            RichEdInputer.PasteFromClipboard;
+          PasteImage;
         finally
           CheckPastedContent;
           LockWindowUpdate(0);
         end;
 
-        Handled := False;
+        Handled := True;
       end;
     end;
   end;
@@ -4471,6 +4471,7 @@ begin
       pHTML := GlobalLock(hMem);
       StrHTML := StrPas(pHTML);
       GlobalUnlock(hMem);
+//      Clipboard.Clear;
       ABaseURL := '';
       StrHTML := GetHTMLUBBCode(StrHTML, ABaseURL);
       RichEditTemp.Clear;
@@ -4482,8 +4483,9 @@ begin
     
     if (not APasted) then
     begin
-      Result := False;
-      Exit;
+
+//      Result := False;
+//      Exit;
     end
     else
     begin

Controls/RealICQUI/RealICQContacterListView.pas

@@ -16,6 +16,8 @@ uses
   RealICQUIColor, RealICQColors, RealICQClient, Messages, SysUtils, Forms,
   Windows, Classes, Controls, ExtCtrls, StdCtrls, Buttons, Graphics;
 
+{$INCLUDE ..\..\Client\LXTalk.inc}
+
 const
   cntHeightOfBigHeadImage = 35;
   cntHeightOfMiddleHeadImage = 35;
@@ -589,7 +591,8 @@ var
   b, n: string;
 
   function GetCaption(AServerName, ABranchName, ADisplayName: WideString): string;
-  begin    
+  begin
+    {$IFDEF LSSBGZS}
     if AServerName <> '' then
     begin
       if ABranchName <> '' then
@@ -614,6 +617,7 @@ var
         Result := ADisplayName + '£¨' + AServerName + '£©';
     end
     else
+    {$ENDIF}
     begin
       if ABranchName <> '' then
       begin

ZWT/Config/condition.config

@@ -6,5 +6,6 @@
 	"userInfoCheck":false,
 	"remoteUI":true,
 	"remoteUIHost":"http://172.28.93.5:8990/LXTalkUIView",
-	"mapHost":"http://120.26.126.129:30001/v1/common/maps"
+	"mapHost":"http://120.26.126.129:30001/v1/common/maps",
+	"arm2mp3Host":"http://120.26.126.129:3001/api/amr2mp3"
 }

ZWT/Config/logger.config

@@ -4,7 +4,7 @@
    [
       {
          "id":"ResfulLogger",
-         "pluginID":"NoLogger",
+         "pluginID":"CodingLogger",
          "lib":"binary\\Logger.dll",
          "singleton":true
       }

ZWT/XML/ClientConfig.xml

@@ -3,13 +3,13 @@
 	<LoginConfig>
 		<ProxyServer Type="0" Address="120.26.136.253" Port="8080" UserName="A00001" Password="839F90E60B0C48E1D3A6FAB8CB71F27C" Domain=""/>
 		<AutoConnect Value="True" Interval="30" Times="10"/>
-		<LoginName Value="test05"/>
+		<LoginName Value="lslqq"/>
 		<Password Value="08000000E99B55FB7CEAB621E1EA4C074947B805"/>
 		<LoginState Value="1"/>
 		<LeaveMessage Value=""/>
 		<AutoLogin Value="False"/>
 		<AutoStart Value="False"/>
-		<LoginedUsers><User Password="08000000E99B55FB7CEAB621E1EA4C074947B805">ceshilqq</User><User Password="">tester</User><User Password="08000000E99B55FB7CEAB621E1EA4C074947B805">lslqq</User><User Password="0900000012B1A2BF56164C0F000496533BEA6613">lqq</User><User Password="">ceshi05</User><User Password="08000000E99B55FB7CEAB621E1EA4C074947B805">test05</User></LoginedUsers>
+		<LoginedUsers><User Password="08000000E99B55FB7CEAB621E1EA4C074947B805">ceshilqq</User><User Password="">tester</User><User Password="0900000012B1A2BF56164C0F000496533BEA6613">lqq</User><User Password="">ceshi05</User><User Password="08000000E99B55FB7CEAB621E1EA4C074947B805">test05</User><User Password="08000000E99B55FB7CEAB621E1EA4C074947B805">lslqq</User></LoginedUsers>
 		<CALogin Value="False"/></LoginConfig>
 	<TCPListen>
 		<MainListenPort Value="6060"/>

ZWT/XML/DefaultConfig.xml

@@ -2,12 +2,12 @@
 <DefaultConfig>
 	<SkinName Value="VStyle"/>
 	<UIMainColor Value="15392442"/>
-	<MainFormLeft Value="1256"/>
-	<MainFormTop Value="261"/>
-	<MainFormWidth Value="258"/>
+	<MainFormLeft Value="1272"/>
+	<MainFormTop Value="280"/>
+	<MainFormWidth Value="-300"/>
 	<MainFormHeight Value="752"/>
-	<TalkingFormLeft Value="759"/>
-	<TalkingFormTop Value="491"/>
+	<TalkingFormLeft Value="1725"/>
+	<TalkingFormTop Value="527"/>
 	<TalkingFormWidth Value="663"/>
 	<TalkingFormHeight Value="576"/>
 	<ShowMainFormOnStart Value="True"/>

ZWT/XML/ServerConfig.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="gb2312"?>
 <ServerConfig>
-	<LoginServer Address="120.26.136.253" Port="443"/>
+	<LoginServer Address="172.28.93.5" Port="443"/>
 	<CaServer Address="120.26.136.253" Port="9602"/>
 </ServerConfig>