修正了iOS版核心库的几处代码合并的问题。

shenyue999 · Jun 27, 2018 · d9a2c36 · d9a2c36
1 parent 760085b
commit d9a2c36
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 18 deletions.
diff --git a/..._x_open/MobileIMSDK4i.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/..._x_open/MobileIMSDK4i.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/...eproj/project.xcworkspace/xcuserdata/jackjiang.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/jackjiang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/src_all/libs_src/MobileIMSDK4i_x_open/MobileIMSDK4i/Core/Impl/LocalUDPDataReciever.m b/src_all/libs_src/MobileIMSDK4i_x_open/MobileIMSDK4i/Core/Impl/LocalUDPDataReciever.m
@@ -66,18 +66,18 @@ - (void) handleProtocal:(NSData *)originalProtocalJSONData
         }
         else
         {
-            if([[QoS4SendDaemon sharedInstance] hasRecieved:pFromServer.fp])
+            if([[QoS4ReciveDaemon sharedInstance] hasRecieved:pFromServer.fp])
             {
                 if([ClientCoreSDK isENABLED_DEBUG])
                     NSLog(@"【IMCORE】【QoS机制】%@已经存在于发送列表中，这是重复包，通知应用层收到该包罗！", pFromServer.fp);
 
-                [[QoS4SendDaemon sharedInstance] addRecieved:pFromServer];
+                [[QoS4ReciveDaemon sharedInstance] addRecieved:pFromServer];
                 [self sendRecievedBack:pFromServer];
 
                 return;
             }
 
-            [[QoS4SendDaemon sharedInstance] addRecieved:pFromServer];
+            [[QoS4ReciveDaemon sharedInstance] addRecieved:pFromServer];
             [self sendRecievedBack:pFromServer];
         }
     }
@@ -108,7 +108,7 @@ - (void) handleProtocal:(NSData *)originalProtocalJSONData
             if([ClientCoreSDK sharedInstance].messageQoSEvent != nil)
                 [[ClientCoreSDK sharedInstance].messageQoSEvent messagesBeReceived:theFingerPrint];
 
-            [[QoS4ReciveDaemon sharedInstance] remove:theFingerPrint];
+            [[QoS4SendDaemon sharedInstance] remove:theFingerPrint];
 
             break;
         }

diff --git a/src_all/libs_src/MobileIMSDK4i_x_open/MobileIMSDK4i/Core/Impl/LocalUDPDataSender.m b/src_all/libs_src/MobileIMSDK4i_x_open/MobileIMSDK4i/Core/Impl/LocalUDPDataSender.m
@@ -76,8 +76,8 @@ - (int) sendImpl_:(NSData *)fullProtocalBytes
 
 - (void) putToQoS:(Protocal *)p
 {
-    if(p.QoS && ![[QoS4ReciveDaemon sharedInstance] exist:p.fp])
-        [[QoS4ReciveDaemon sharedInstance] put:p];
+    if(p.QoS && ![[QoS4SendDaemon sharedInstance] exist:p.fp])
+        [[QoS4SendDaemon sharedInstance] put:p];
 }
 
 + (LocalUDPDataSender *)sharedInstance

diff --git a/src_all/libs_src/MobileIMSDK4i_x_open/MobileIMSDK4i/Core/Impl/QoS4ReciveDaemon.h b/src_all/libs_src/MobileIMSDK4i_x_open/MobileIMSDK4i/Core/Impl/QoS4ReciveDaemon.h
@@ -24,9 +24,9 @@
 #import "Protocal.h"
 #import "CompletionDefine.h"
 
-@interface QoS4SendDaemon : NSObject
+@interface QoS4ReciveDaemon : NSObject
 
-+ (QoS4SendDaemon *)sharedInstance;
++ (QoS4ReciveDaemon *)sharedInstance;
 
 - (void) startup:(BOOL)immediately;
 - (void) stop;

diff --git a/src_all/libs_src/MobileIMSDK4i_x_open/MobileIMSDK4i/Core/Impl/QoS4ReciveDaemon.m b/src_all/libs_src/MobileIMSDK4i_x_open/MobileIMSDK4i/Core/Impl/QoS4ReciveDaemon.m
@@ -31,7 +31,7 @@
 static int MESSAGES_VALID_TIME = 10 * 60 * 1000;
 
 
-@interface QoS4SendDaemon ()
+@interface QoS4ReciveDaemon ()
 
 @property (nonatomic, retain) NSMutableDictionary *recievedMessages;
 @property (nonatomic, assign) BOOL running;
@@ -42,11 +42,11 @@ @interface QoS4SendDaemon ()
 @end
 
 
-@implementation QoS4SendDaemon
+@implementation QoS4ReciveDaemon
 
-static QoS4SendDaemon *instance = nil;
+static QoS4ReciveDaemon *instance = nil;
 
-+ (QoS4SendDaemon *)sharedInstance
++ (QoS4ReciveDaemon *)sharedInstance
 {
     if (instance == nil)
     {

diff --git a/src_all/libs_src/MobileIMSDK4i_x_open/MobileIMSDK4i/Core/Impl/QoS4SendDaemon.h b/src_all/libs_src/MobileIMSDK4i_x_open/MobileIMSDK4i/Core/Impl/QoS4SendDaemon.h
@@ -24,9 +24,9 @@
 #import "Protocal.h"
 #import "CompletionDefine.h"
 
-@interface QoS4ReciveDaemon : NSObject
+@interface QoS4SendDaemon : NSObject
 
-+ (QoS4ReciveDaemon *)sharedInstance;
++ (QoS4SendDaemon *)sharedInstance;
 
 - (void) startup:(BOOL)immediately;
 - (void) stop;

diff --git a/src_all/libs_src/MobileIMSDK4i_x_open/MobileIMSDK4i/Core/Impl/QoS4SendDaemon.m b/src_all/libs_src/MobileIMSDK4i_x_open/MobileIMSDK4i/Core/Impl/QoS4SendDaemon.m
@@ -35,7 +35,7 @@
 static int QOS_TRY_COUNT = 2;
 
 
-@interface QoS4ReciveDaemon ()
+@interface QoS4SendDaemon ()
 
 @property (nonatomic, retain) NSMutableDictionary *sentMessages;
 @property (nonatomic, retain) NSMutableDictionary *sendMessagesTimestamp;
@@ -47,11 +47,11 @@ @interface QoS4ReciveDaemon ()
 @end
 
 
-@implementation QoS4ReciveDaemon
+@implementation QoS4SendDaemon
 
-static QoS4ReciveDaemon *instance = nil;
+static QoS4SendDaemon *instance = nil;
 
-+ (QoS4ReciveDaemon *)sharedInstance
++ (QoS4SendDaemon *)sharedInstance
 {
     if (instance == nil)
     {