Skip to content
This repository has been archived by the owner on Oct 9, 2021. It is now read-only.

Commit

Permalink
Release SealTalk Demo version 1.1.15
Browse files Browse the repository at this point in the history
  • Loading branch information
RongRobot committed Apr 10, 2017
1 parent 129aade commit 5660ddd
Show file tree
Hide file tree
Showing 20 changed files with 63 additions and 15 deletions.
6 changes: 3 additions & 3 deletions ios-rongimdemo/RCloudMessage/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
#import "RCDSettingUserDefaults.h"
#import "RCDSettingServerUrlViewController.h"

#define RONGCLOUD_IM_APPKEY @"n19jmcy59f1q9" //offline key
#define RONGCLOUD_IM_APPKEY @"n19jmcy59f1q9" //online key
//#define RONGCLOUD_IM_APPKEY @"c9kqb3rdkbb8j" // pre key
//#define RONGCLOUD_IM_APPKEY @"e0x9wycfx7flq" // online key
//#define RONGCLOUD_IM_APPKEY @"e0x9wycfx7flq" // offline key

#define UMENG_APPKEY @"563755cbe0f55a5cb300139c"

Expand Down Expand Up @@ -112,9 +112,9 @@ - (BOOL)application:(UIApplication *)application
}

}else {

//非debug模式初始化sdk
[[RCIM sharedRCIM]initWithAppKey:RONGCLOUD_IM_APPKEY];

}


Expand Down
6 changes: 3 additions & 3 deletions ios-rongimdemo/RCloudMessage/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.8.8 Stable</string>
<string>2.8.9 Stable</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -42,7 +42,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>201703201822</string>
<string>201704101731</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand Down Expand Up @@ -126,7 +126,7 @@
<key>NSPhotoLibraryUsageDescription</key>
<string>访问相册</string>
<key>SealTalk Version</key>
<string>1.1.14</string>
<string>1.1.15</string>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>
Expand Down
1 change: 1 addition & 0 deletions ios-rongimdemo/RCloudMessage/RCDChatViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ - (void)viewWillAppear:(BOOL)animated {
//self.defaultInputType = RCChatSessionInputBarInputExtention;

[self refreshTitle];
[self.chatSessionInputBarControl updateStatus:self.chatSessionInputBarControl.currentBottomBarStatus animated:NO];
}

- (void)viewWillDisappear:(BOOL)animated {
Expand Down
2 changes: 1 addition & 1 deletion ios-rongimdemo/RCloudMessage/RCDTestMessageCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ - (void)initialize {
self.bubbleBackgroundView = [[UIImageView alloc] initWithFrame:CGRectZero];
[self.messageContentView addSubview:self.bubbleBackgroundView];

self.textLabel = [[RCAttributedLabel alloc] initWithFrame:CGRectZero];
self.textLabel = [[UILabel alloc] initWithFrame:CGRectZero];
[self.textLabel setFont:[UIFont systemFontOfSize:Test_Message_Font_Size]];

self.textLabel.numberOfLines = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ @interface RCDShareChatListController ()
#define ReuseIdentifier @"cellReuseIdentifier"

#define DemoServer @"http://api.sealtalk.im/" //线上正式环境
//#define DemoServer @"http://api.sealtalk.im/" //测试环境
//#define DemoServer @"http://api.hitalk.im/" //测试环境

@implementation RCDShareChatListController

Expand Down
27 changes: 26 additions & 1 deletion ios-rongimdemo/autobuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ MANUAL_NAVI_SERVER_URL=$PPARAM
elif [ $PFLAG == "-f" ]
then
MANUAL_FILE_SERVER_URL=$PPARAM
elif [ $PFLAG == "-a" ]
then
MANUAL_STATS_SERVER_URL=$PPARAM
elif [ $PFLAG == "-o" ]
then
VOIP_FLAG=$PPARAM
Expand All @@ -67,6 +70,8 @@ if [ -n "${MANUAL_DEMO_APPKEY}" ]; then
sed -i '' -e '/RONGCLOUD_IM_APPKEY/s/@"n19jmcy59f1q9"/@"'$MANUAL_DEMO_APPKEY'"/g' ./RCloudMessage/AppDelegate.m
elif [ ${ENV_FLAG} == "dev" ]; then
sed -i '' -e '/RONGCLOUD_IM_APPKEY/s/@"n19jmcy59f1q9"/@"e0x9wycfx7flq"/g' ./RCloudMessage/AppDelegate.m
elif [ ${ENV_FLAG} == "dev_backup" ]; then
sed -i '' -e '/RONGCLOUD_IM_APPKEY/s/@"n19jmcy59f1q9"/@"e0x9wycfx7flq"/g' ./RCloudMessage/AppDelegate.m
elif [ ${ENV_FLAG} == "pre" ]; then
sed -i '' -e '/RONGCLOUD_IM_APPKEY/s/@"n19jmcy59f1q9"/@"c9kqb3rdkbb8j"/g' ./RCloudMessage/AppDelegate.m
fi
Expand All @@ -91,6 +96,10 @@ elif [ ${ENV_FLAG} == "dev" ]; then
sed -i '' -e 's?http://api.sealtalk.im?http://api.hitalk.im?g' ./RCloudMessage/AFHttpTool.m
sed -i '' -e 's?http://api.sealtalk.im?http://api.hitalk.im?g' ./SealTalkShareExtension/RCDShareChatListController.m
sed -i '' -e 's/api.sealtalk.im/api.hitalk.im/g' ./RCloudMessage/Info.plist
elif [ ${ENV_FLAG} == "dev_backup" ]; then
sed -i '' -e 's?http://api.sealtalk.im?http://api.hitalk.im?g' ./RCloudMessage/AFHttpTool.m
sed -i '' -e 's?http://api.sealtalk.im?http://api.hitalk.im?g' ./SealTalkShareExtension/RCDShareChatListController.m
sed -i '' -e 's/api.sealtalk.im/api.hitalk.im/g' ./RCloudMessage/Info.plist
elif [ ${ENV_FLAG} == "pre" ]; then
sed -i '' -e 's?http://api.sealtalk.im?http://apiqa.rongcloud.net?g' ./RCloudMessage/AFHttpTool.m
sed -i '' -e 's?http://api.sealtalk.im?http://apiqa.rongcloud.net?g' ./SealTalkShareExtension/RCDShareChatListController.m
Expand Down Expand Up @@ -122,9 +131,23 @@ if [ -n "${MANUAL_FILE_SERVER_URL}" ]; then
fi
fi

if [ -n "${MANUAL_STATS_SERVER_URL}" ]; then
sed -i '' -e '/RONGCLOUD_STATS_SERVER/s?stats.cn.ronghub.com?'$MANUAL_STATS_SERVER_URL'?g' ./RCloudMessage/AppDelegate.m
if [[ $MANUAL_STATS_SERVER_URL =~ ^https ]]; then
sed -i '' -e 's/stats.cn.ronghub.com/'${MANUAL_STATS_SERVER_URL/https\:\/\//""}'/g' ./RCloudMessage/Info.plist
elif [[ $MANUAL_STATS_SERVER_URL =~ ^http ]]; then
sed -i '' -e 's/stats.cn.ronghub.com/'${MANUAL_STATS_SERVER_URL/http\:\/\//""}'/g' ./RCloudMessage/Info.plist
else
sed -i '' -e 's/nstats.cn.ronghub.com/'$MANUAL_STATS_SERVER_URL'/g' ./RCloudMessage/Info.plist
fi
fi

if [ ${ENV_FLAG} == "dev" ]; then
sed -i '' -e '/SERVICE_ID/s/@"KEFU146001495753714"/@"KEFU145760441681012"/g' ./RCloudMessage/RCDMeTableViewController.m
sed -i '' -e 's/nav.cn.ronghub.com/navxiaoqiao.cn.ronghub.com/g' ./RCloudMessage/Info.plist
elif [ ${ENV_FLAG} == "dev_backup" ]; then
sed -i '' -e '/SERVICE_ID/s/@"KEFU146001495753714"/@"KEFU145760441681012"/g' ./RCloudMessage/RCDMeTableViewController.m
sed -i '' -e 's/nav.cn.ronghub.com/navzhouyu.cn.rongcloud.net/g' ./RCloudMessage/Info.plist
elif [ ${ENV_FLAG} == "pre" ]; then
sed -i '' -e '/SERVICE_ID/s/@"KEFU146001495753714"/@"KEFU147980517733135"/g' ./RCloudMessage/RCDMeTableViewController.m
sed -i '' -e 's/nav.cn.ronghub.com/navqa.cn.ronghub.com/g' ./RCloudMessage/Info.plist
Expand All @@ -137,12 +160,14 @@ if [ ${ENV_FLAG} == "pri" ]; then
sed -i '' -e 's/\/\/NSString \*RONGCLOUD_IM_NAVI/NSString \*RONGCLOUD_IM_NAVI/g' ./RCloudMessage/AppDelegate.m
sed -i '' -e 's/\/\/NSString \*RONGCLOUD_FILE_SERVER/NSString \*RONGCLOUD_FILE_SERVER/g' ./RCloudMessage/AppDelegate.m
sed -i '' -e 's/\/\/\[\[RCIMClient sharedRCIMClient\] setServerInfo/\[\[RCIMClient sharedRCIMClient\] setServerInfo/g' ./RCloudMessage/AppDelegate.m
sed -i '' -e 's/\/\/NSString \*RONGCLOUD_STATS_SERVER/NSString \*RONGCLOUD_STATS_SERVER/g' ./RCloudMessage/AppDelegate.m
sed -i '' -e 's/\/\/\[\[RCIMClient sharedRCIMClient\] setStatisticServer/\[\[RCIMClient sharedRCIMClient\] setStatisticServer/g' ./RCloudMessage/AppDelegate.m
if [ -z "${MANUAL_DEMO_APPKEY}" ] && [ -z "${MANUAL_DEMO_SERVER_URL}" ] && [ -z "${MANUAL_NAVI_SERVER_URL}" ] && [ -z "${MANUAL_FILE_SERVER_URL}" ]; then
sed -i '' -e 's/RCDPrivateCloudManualMode 0/\RCDPrivateCloudManualMode 1/g' ./RCloudMessage/Utilities/RCDCommonDefine.h
fi
cp -af RCloudMessage/private_test.plist RCloudMessage/info.plist
else
sed -i '' -e '/for private cloud test/,/RONGCLOUD_FILE_SERVER\];/d' ./RCloudMessage/AppDelegate.m
sed -i '' -e '/for private cloud test/,/RONGCLOUD_STATS_SERVER\];/d' ./RCloudMessage/AppDelegate.m
if [ ${ENV_FLAG} == "pro" ]; then
# 删除用户状态接口
sed -i '' -e '/For Private Cloud Only ++/,/For Private Cloud Only --/d' ./RCDPersonDetailViewController.m
Expand Down
Binary file modified ios-rongimdemo/framework/RongCallKit.framework/Info.plist
Binary file not shown.
Binary file modified ios-rongimdemo/framework/RongCallKit.framework/RongCallKit
Binary file not shown.
Binary file modified ios-rongimdemo/framework/RongCallLib.framework/Info.plist
Binary file not shown.
Binary file modified ios-rongimdemo/framework/RongCallLib.framework/RongCallLib
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ typedef NS_ENUM(NSInteger, KBottomBarStatus) {
@property(weak, nonatomic) id<RCChatSessionInputBarControlDelegate> delegate;

/*!
输入工具栏的点击回调监听
输入工具栏获取用户信息的回调
*/
@property(weak, nonatomic) id<RCChatSessionInputBarControlDataSource> dataSource;

Expand Down
Loading

0 comments on commit 5660ddd

Please sign in to comment.