Release SealTalk Demo version 1.1.9

sealtalk · Dec 8, 2016 · db0d4a3 · db0d4a3
1 parent ee0b609
commit db0d4a3
Show file tree

Hide file tree

Showing 48 changed files with 1,478 additions and 62 deletions.
diff --git a/ios-rongimdemo/RCDPersonDetailViewController.m b/ios-rongimdemo/RCDPersonDetailViewController.m
@@ -604,6 +604,8 @@ - (void)setLayoutIsHaveRemarks:(BOOL)isHaveRemarks
         [self.infoView removeConstraints:self.constraintdisplayNameLabel];
     }
 
+    [self setPhoneNumber];
+
   if (isHaveRemarks == YES) {
     self.displayNameLabel.hidden = NO;
     self.displayNameLabel.translatesAutoresizingMaskIntoConstraints = NO;
@@ -618,30 +620,7 @@ - (void)setLayoutIsHaveRemarks:(BOOL)isHaveRemarks
     self.lblName.font = [UIFont systemFontOfSize:14.f];
 
 
-    self.phoneNumberLabel.textColor = [UIColor colorWithHexString:@"999999" alpha:1.f];
-    self.phoneNumberLabel.font = [UIFont systemFontOfSize:14.f];
-    self.phoneNumberLabel.text = @"手机号: --";
-    self.phoneNumberLabel.userInteractionEnabled = YES;
-    UITapGestureRecognizer *clickPhoneNumber = [[UITapGestureRecognizer alloc]
-                                                initWithTarget:self
-                                                action:@selector(doCall:)];
-    [AFHttpTool getFriendDetailsByID:self.friendInfo.userId
-                             success:^(id response) {
-                               if ([response[@"code"] integerValue] == 200) {
-                                 NSDictionary *dic = response[@"result"];
-                                 NSDictionary *infoDic = dic[@"user"];
-                                 self.phoneNumberLabel.text = [NSString stringWithFormat:@"手机号: %@",[infoDic objectForKey:@"phone"]];
-                                   //创建 NSMutableAttributedString
-                                   NSMutableAttributedString *attributedStr = [[NSMutableAttributedString alloc] initWithString: self.phoneNumberLabel.text];
-                                   [attributedStr addAttribute: NSForegroundColorAttributeName value: [UIColor colorWithHexString:@"0099ff" alpha:1.f] range: NSMakeRange(5, 11)];
-                                   self.phoneNumberLabel.attributedText = attributedStr;
-                                 self.phonenumber = [NSString stringWithFormat:@"%@",[infoDic objectForKey:@"phone"]];
-                                 [self.phoneNumberLabel addGestureRecognizer:clickPhoneNumber];
-
-                               }
-                             } failure:^(NSError *err) {
-                             }];
-
+
 
     self.subViews = NSDictionaryOfVariableBindings(_displayNameLabel,_phoneNumberLabel,_lblName);
 
@@ -678,30 +657,7 @@ - (void)setLayoutIsHaveRemarks:(BOOL)isHaveRemarks
     self.lblName.text = self.friendInfo.name;
     self.lblName.font = [UIFont systemFontOfSize:16.f];
     self.lblName.textColor = [UIColor colorWithHexString:@"000000" alpha:1.f];
-    self.phoneNumberLabel.userInteractionEnabled = YES;
-    UITapGestureRecognizer *clickPhoneNumber = [[UITapGestureRecognizer alloc]
-                                                initWithTarget:self
-                                                action:@selector(doCall:)];
-    self.phoneNumberLabel.text = @"手机号: --";
-    [AFHttpTool getFriendDetailsByID:self.friendInfo.userId
-                             success:^(id response) {
-                               if ([response[@"code"] integerValue] == 200) {
-                                 NSDictionary *dic = response[@"result"];
-                                 NSDictionary *infoDic = dic[@"user"];
-                                 self.phoneNumberLabel.text = [NSString stringWithFormat:@"手机号: %@",[infoDic objectForKey:@"phone"]];
-                                   //创建 NSMutableAttributedString
-                                   NSMutableAttributedString *attributedStr = [[NSMutableAttributedString alloc] initWithString: self.phoneNumberLabel.text];
-                                   [attributedStr addAttribute: NSForegroundColorAttributeName value: [UIColor colorWithHexString:@"0099ff" alpha:1.f] range: NSMakeRange(5, 11)];
-                                   self.phoneNumberLabel.attributedText = attributedStr;
-                                 self.phonenumber = [NSString stringWithFormat:@"%@",[infoDic objectForKey:@"phone"]];
-                                 [self.phoneNumberLabel addGestureRecognizer:clickPhoneNumber];
-                               }
-                             } failure:^(NSError *err) {
-                             }];
-    self.phoneNumberLabel.font = [UIFont systemFontOfSize:14.f];
-
-    self.phoneNumberLabel.textColor = [UIColor colorWithHexString:@"999999" alpha:1.f];
-
+
     self.subViews = NSDictionaryOfVariableBindings(_displayNameLabel,_phoneNumberLabel,_lblName);
     [self.infoView
        addConstraint:[NSLayoutConstraint
@@ -741,6 +697,33 @@ - (void)setLayoutIsHaveRemarks:(BOOL)isHaveRemarks
 
 }
 
+-(void)setPhoneNumber {
+   self.phoneNumberLabel.textColor = [UIColor colorWithHexString:@"999999" alpha:1.f];
+    self.phoneNumberLabel.font = [UIFont systemFontOfSize:14.f];
+    self.phoneNumberLabel.text = @"手机号: --";
+    self.phoneNumberLabel.userInteractionEnabled = YES;
+    UITapGestureRecognizer *clickPhoneNumber = [[UITapGestureRecognizer alloc]
+                                                initWithTarget:self
+                                                action:@selector(doCall:)];
+    [AFHttpTool getFriendDetailsByID:self.friendInfo.userId
+                             success:^(id response) {
+                                 if ([response[@"code"] integerValue] == 200) {
+                                     NSDictionary *dic = response[@"result"];
+                                     NSDictionary *infoDic = dic[@"user"];
+                                     self.phoneNumberLabel.text = [NSString stringWithFormat:@"手机号: %@",[infoDic objectForKey:@"phone"]];
+                                     //创建 NSMutableAttributedString
+                                     NSMutableAttributedString *attributedStr = [[NSMutableAttributedString alloc] initWithString: self.phoneNumberLabel.text];
+                                     [attributedStr addAttribute: NSForegroundColorAttributeName value: [UIColor colorWithHexString:@"0099ff" alpha:1.f] range: NSMakeRange(5, 11)];
+                                     self.phoneNumberLabel.attributedText = attributedStr;
+                                     self.phonenumber = [NSString stringWithFormat:@"%@",[infoDic objectForKey:@"phone"]];
+                                     [self.phoneNumberLabel addGestureRecognizer:clickPhoneNumber];
+
+                                 }
+                             } failure:^(NSError *err) {
+                             }];
+
+}
+
 
 - (void)gotoRemarksView:(id)sender
 {

diff --git a/ios-rongimdemo/RCDSearchViewController.m b/ios-rongimdemo/RCDSearchViewController.m
@@ -101,7 +101,7 @@ - (void)loadSearchView{
   _searchBars.delegate = self;
   _searchBars.tintColor=[UIColor blueColor];
   [_searchBars becomeFirstResponder];
-  _searchBars.frame = CGRectMake( 0, 0,self.searchView.frame.size.width-55, 44);
+  _searchBars.frame = CGRectMake( 0, 0,self.searchView.frame.size.width-65, 44);
   [self.searchView addSubview:self.searchBars];
 
   _cancelButton = [[UIButton alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_searchBars.frame)-3, CGRectGetMinY(self.searchBars.frame),55, 44)];

diff --git a/ios-rongimdemo/RCloudMessage.xcodeproj/project.pbxproj b/ios-rongimdemo/RCloudMessage.xcodeproj/project.pbxproj
@@ -271,6 +271,8 @@
 		F836AB0E1C2262C400A1A5D2 /* RCDTestMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = F836AB0D1C2262C400A1A5D2 /* RCDTestMessage.m */; };
 		F836AB151C226A7F00A1A5D2 /* RCDTestMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F836AB141C226A7F00A1A5D2 /* RCDTestMessageCell.m */; };
 		F880EA791D0808B300FD5CC4 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F880EA781D0808B300FD5CC4 /* VideoToolbox.framework */; };
+		F894EC391DF7E47600EFD084 /* BQMM.bundle in Resources */ = {isa = PBXBuildFile; fileRef = F894EC371DF7E47600EFD084 /* BQMM.bundle */; };
+		F894EC3A1DF7E47600EFD084 /* BQMMRongCloudExt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F894EC381DF7E47600EFD084 /* BQMMRongCloudExt.framework */; };
 		F8AD4A551CAE56A4006C1CBB /* PushKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8AD4A541CAE56A4006C1CBB /* PushKit.framework */; };
 		F8AD4A571CAE5702006C1CBB /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F8AD4A561CAE5702006C1CBB /* libicucore.tbd */; };
 		F8AD4A5B1CAE5782006C1CBB /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8AD4A5A1CAE5782006C1CBB /* CoreMotion.framework */; };
@@ -809,6 +811,8 @@
 		F836AB141C226A7F00A1A5D2 /* RCDTestMessageCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RCDTestMessageCell.m; path = RCloudMessage/RCDTestMessageCell.m; sourceTree = SOURCE_ROOT; };
 		F880EA781D0808B300FD5CC4 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
 		F8944F731D7FC3D100111E3A /* SealTalkShareExtension.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = SealTalkShareExtension.entitlements; sourceTree = "<group>"; };
+		F894EC371DF7E47600EFD084 /* BQMM.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = BQMM.bundle; path = framework/bqmm/BQMM.bundle; sourceTree = SOURCE_ROOT; };
+		F894EC381DF7E47600EFD084 /* BQMMRongCloudExt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BQMMRongCloudExt.framework; path = framework/bqmm/BQMMRongCloudExt.framework; sourceTree = SOURCE_ROOT; };
 		F8AD4A541CAE56A4006C1CBB /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = System/Library/Frameworks/PushKit.framework; sourceTree = SDKROOT; };
 		F8AD4A561CAE5702006C1CBB /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; };
 		F8AD4A581CAE5766006C1CBB /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
@@ -867,6 +871,7 @@
 				A68AFAF21CCF0B1600F16B3D /* RongCallLib.framework in Frameworks */,
 				A6EFABA71BB0EDFB007E9D67 /* libc++.tbd in Frameworks */,
 				A6EFABA51BB0EDE1007E9D67 /* libsqlite3.tbd in Frameworks */,
+				F894EC3A1DF7E47600EFD084 /* BQMMRongCloudExt.framework in Frameworks */,
 				A6EFABA11BB0EDAC007E9D67 /* libxml2.tbd in Frameworks */,
 				2E29FF3D1DC1BE8400AF2DF0 /* AlipaySDK.framework in Frameworks */,
 				F821B7F51BE75BFD00F0D14C /* libMobClickLibrary.a in Frameworks */,
@@ -972,6 +977,7 @@
 		27C42EE91DE30637003E2306 /* ifly */ = {
 			isa = PBXGroup;
 			children = (
+				27C42ED41DE2FD7B003E2306 /* RongiFlyKit.framework */,
 				27C42EEA1DE30637003E2306 /* iflyMSC.framework */,
 				27C42EEB1DE30637003E2306 /* RongCloudiFly.bundle */,
 			);
@@ -1563,8 +1569,8 @@
 		E4C4E7E71A0A309100140067 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				F894EC361DF7E3A200EFD084 /* BQMM */,
 				27C42EE91DE30637003E2306 /* ifly */,
-				27C42ED41DE2FD7B003E2306 /* RongiFlyKit.framework */,
 				27AADC251DDC4DB800E1AE31 /* AddressBook.framework */,
 				F82B553F1DE03E40007392BD /* SafariServices.framework */,
 				2E29FF391DC1BE8400AF2DF0 /* AlipaySDK */,
@@ -1912,6 +1918,15 @@
 			name = Cell;
 			sourceTree = "<group>";
 		};
+		F894EC361DF7E3A200EFD084 /* BQMM */ = {
+			isa = PBXGroup;
+			children = (
+				F894EC371DF7E47600EFD084 /* BQMM.bundle */,
+				F894EC381DF7E47600EFD084 /* BQMMRongCloudExt.framework */,
+			);
+			name = BQMM;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -2088,6 +2103,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F894EC391DF7E47600EFD084 /* BQMM.bundle in Resources */,
 				2E29FF3C1DC1BE8400AF2DF0 /* AlipaySDK.bundle in Resources */,
 				27C42EED1DE30637003E2306 /* RongCloudiFly.bundle in Resources */,
 				2E29FF351DC1BE7300AF2DF0 /* JrmfInfo.strings in Resources */,
@@ -2564,6 +2580,7 @@
 					"$(PROJECT_DIR)/framework/JrmfIMLib",
 					"$(PROJECT_DIR)/framework/AlipaySDK",
 					"$(PROJECT_DIR)/framework/ifly",
+					"$(PROJECT_DIR)/framework/bqmm",
 				);
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -2708,6 +2725,7 @@
 					"$(PROJECT_DIR)/framework/JrmfIMLib",
 					"$(PROJECT_DIR)/framework/AlipaySDK",
 					"$(PROJECT_DIR)/framework/ifly",
+					"$(PROJECT_DIR)/framework/bqmm",
 				);
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -3011,6 +3029,7 @@
 					"$(PROJECT_DIR)/framework/JrmfIMLib",
 					"$(PROJECT_DIR)/framework/AlipaySDK",
 					"$(PROJECT_DIR)/framework/ifly",
+					"$(PROJECT_DIR)/framework/bqmm",
 				);
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -3050,6 +3069,7 @@
 					"$(PROJECT_DIR)/framework/JrmfIMLib",
 					"$(PROJECT_DIR)/framework/AlipaySDK",
 					"$(PROJECT_DIR)/framework/ifly",
+					"$(PROJECT_DIR)/framework/bqmm",
 				);
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;

diff --git a/ios-rongimdemo/RCloudMessage/AFHttpTool.m b/ios-rongimdemo/RCloudMessage/AFHttpTool.m
@@ -18,6 +18,7 @@
 #define PrivateCloudDemoServer @"http://139.217.26.223/" //私有云测试
 
 #define DemoServer @"http://api.sealtalk.im/" //线上正式环境
+//#define DemoServer @"http://apiqa.rongcloud.net/" //线上非正式环境
 //#define DemoServer @"http://api.hitalk.im/" //测试环境
 
 //#define ContentType @"text/plain"

diff --git a/ios-rongimdemo/RCloudMessage/AppDelegate.m b/ios-rongimdemo/RCloudMessage/AppDelegate.m
@@ -28,6 +28,7 @@
 #import "RCDMainTabBarViewController.h"
 
 //#define RONGCLOUD_IM_APPKEY @"e0x9wycfx7flq" //offline key
+//#define RONGCLOUD_IM_APPKEY @"c9kqb3rdkbb8j" // pre key
 #define RONGCLOUD_IM_APPKEY @"n19jmcy59f1q9" // online key
 
 #define UMENG_APPKEY @"563755cbe0f55a5cb300139c"

diff --git a/ios-rongimdemo/RCloudMessage/Info.plist b/ios-rongimdemo/RCloudMessage/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.8.2 Dev</string>
+	<string>2.8.3 Stable</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -42,7 +42,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>201611242004</string>
+	<string>201612082049</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -95,11 +95,39 @@
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>
 			</dict>
-			<key>cn.ronghub.com</key>
+			<key>apiqa.rongcloud.net</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>
-				<key>NSIncludesSubdomains</key>
+			</dict>
+			<key>apixiaoqiao.cn.ronghub.com</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+			<key>nav.cn.ronghub.com</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+			<key>navqa.cn.ronghub.com</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+			<key>navxiaoqiao.cn.ronghub.com</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+			<key>rongcloud-file.ronghub.com</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+			<key>rongcloud-image.ronghub.com</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>
 			</dict>
 		</dict>
@@ -115,7 +143,7 @@
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>访问相册</string>
 	<key>SealTalk Version</key>
-	<string>1.1.8</string>
+	<string>1.1.9</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>