Merge pull request #579 from zapcannon87/master

release: 12.0.1-beta.1

.gitignore

@@ -1,9 +1,24 @@
 # Local Config
 script_config.json
 
+# macOS
+*.DS_Store
+
 # Xcode
-.DS_Store
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## User settings
+xcuserdata/
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
 build/
+DerivedData/
+*.moved-aside
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -12,18 +27,48 @@ build/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-!default.xcworkspace
-xcuserdata
-*.moved-aside
-DerivedData
-.idea/
-# Pods - for those of you who use CocoaPods
-Pods
-*.xccheckout
-contents.xcworkspacedata
 
-# Xcode code coverage files
-*.gcno
-*.gcda
+## Obj-C/Swift specific
+*.hmap
 
-*.xcscmblueprint
+## App packaging
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build/
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo.
+# Instead, use fastlane to re-generate the screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/

AVOS/AVOSCloud/Analytics/AVAnalyticsUtils.m

@@ -12,7 +12,7 @@
     #import <WatchKit/WatchKit.h>
 #endif
 
-#if AV_TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_SIMULATOR
     #import <CoreTelephony/CTTelephonyNetworkInfo.h>
     #import <CoreTelephony/CTCarrier.h>
 #endif
@@ -198,7 +198,7 @@ +(NSString *)deviceId
 +(NSString *)carrier {
     NSString *carrier = nil;
 
-#if AV_TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_SIMULATOR
     CTTelephonyNetworkInfo *phoneInfo = [[CTTelephonyNetworkInfo alloc] init];
     CTCarrier *phoneCarrier = [phoneInfo subscriberCellularProvider];
     carrier = [phoneCarrier carrierName];

AVOS/AVOSCloud/ThirdParty/LCDB/LCDatabase.m

@@ -354,7 +354,7 @@ - (BOOL)rekey:(NSString*)key {
 }
 
 - (BOOL)rekeyWithData:(NSData *)keyData {
-#ifdef SQLITE_HAS_CODEC
+#ifdef LC_SQLITE_HAS_CODEC
     if (!keyData) {
         return NO;
     }
@@ -379,7 +379,7 @@ - (BOOL)setKey:(NSString*)key {
 }
 
 - (BOOL)setKeyWithData:(NSData *)keyData {
-#ifdef SQLITE_HAS_CODEC
+#ifdef LC_SQLITE_HAS_CODEC
     if (!keyData) {
         return NO;
     }

AVOS/AVOSCloud/UserAgent.h

@@ -1 +1 @@
-#define SDK_VERSION @"12.0.0"
+#define SDK_VERSION @"12.0.1-beta.1"

AVOS/AVOSCloudIM/Commands/AVIMGenericCommand+AVIMMessagesAdditions.h

@@ -46,7 +46,7 @@ typedef void (^AVIMCommandResultBlock)(AVIMGenericCommand *outCommand, AVIMGener
  反序列化时获取Command所属的具体的消息类型对象
  @return Command所属的具体的消息类型对象
  */
-- (LCIMMessage *)avim_messageCommand;
+- (LCGPBMessage *)avim_messageCommand;
 
 /*!
  做 conversation 缓存时，为了使 key 能兼容，需要将 AVIMGenericCommand 对象转换为 AVIMConversationOutCommand 对象

AVOS/AVOSCloudIM/Commands/AVIMGenericCommand+AVIMMessagesAdditions.m

@@ -180,8 +180,8 @@ - (NSArray *)avim_requiredConditions {
     return [requiredKeys copy];
 }
 
-- (LCIMMessage *)avim_messageCommand {
-    LCIMMessage *result = nil;
+- (LCGPBMessage *)avim_messageCommand {
+    LCGPBMessage *result = nil;
     AVIMCommandType commandType = self.cmd;
     switch (commandType) {
 
@@ -264,7 +264,7 @@ - (AVIMConversationOutCommand *)avim_conversationForCache {
 }
 
 - (NSString *)avim_messageClass {
-    LCIMMessage *command = [self avim_messageCommand];
+    LCGPBMessage *command = [self avim_messageCommand];
     Class class = [command class];
     NSString *avim_messageClass = NSStringFromClass(class);
     return avim_messageClass;