更新Demo UI

雷浩杰
1 parent 3f01bc31
Showing 2 changed files with 83 additions and 24 deletions
CNLiveXMPPManagerDemo/CNLiveXMPPManagerDemo/Base.lproj/Main.storyboard
CNLiveXMPPManagerDemo/CNLiveXMPPManagerDemo/ViewController.m
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="06n-aH-okM">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
@@ -18,9 +22,29 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
+                    <navigationItem key="navigationItem" id="BWk-fb-LQT"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="964" y="36.431784107946029"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="AHB-iF-bKU">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="06n-aH-okM" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="ZOL-0v-2oc">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="BYZ-38-t0r" kind="relationship" relationship="rootViewController" id="fMx-a7-zk6"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="AKz-aK-FZ7" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="116" y="-646.32683658170924"/>
         </scene>
     </scenes>
 </document>
@@ -11,6 +11,7 @@
 #import <CNLiveXMPPSDK/CNLiveXMPPManager.h>
 #define ScreenWidth ([UIScreen mainScreen].bounds.size.width)
+#define ScreenHeight ([UIScreen mainScreen].bounds.size.height)
 #define ButtonWidth (ScreenWidth / 4)
 #define KAppId @"60_irn9cdak77"
@@ -37,7 +38,9 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.view.backgroundColor = [UIColor cyanColor];
+    
+    self.title = @"视讯云 聊天室SDK Demo";
+    
     // Do any additional setup after loading the view, typically from a nib.
     [self.view addSubview:self.button];
     [self.view addSubview:self.leaveRoomBtn];
@@ -47,16 +50,24 @@
     [self.view addSubview:self.changeNickBtn];
     [self.view addSubview:self.textField];
     [self.view addSubview:self.textView];
-    self.nickStr = @"王小帅";
+    self.nickStr = @"CNLiveChatTest1";
     [self.manager joinRoomWithNickName:self.nickStr];
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(textFieldResignFirstResponder)];
+    [self.view addGestureRecognizer:tap];
+    
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetHeight([UIScreen mainScreen].bounds)-40, CGRectGetWidth(self.view.frame), 30)];
+    label.text = @"北京中投视讯文化传媒股份有限公司";
+    [self.view addSubview:label];
+    label.font = [UIFont systemFontOfSize:12];
+    label.textAlignment = NSTextAlignmentCenter;
 }
 - (UITextField *)textField
 {
     if (!_textField) {
-        _textField = [[UITextField alloc] initWithFrame:CGRectMake(0, 70, ScreenWidth, 30)];
-        _textField.backgroundColor = [UIColor redColor];
+        _textField = [[UITextField alloc] initWithFrame:CGRectMake(0, 154, ScreenWidth, 40)];
+        _textField.borderStyle = UITextBorderStyleLine;
     }
     return _textField;
 }
@@ -65,12 +76,12 @@
 {
     if (!_button) {
         _button = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_button setFrame:CGRectMake(ButtonWidth / 2, 100, ButtonWidth, 30)];
-        [_button setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        [_button setBackgroundColor:[UIColor yellowColor]];
+        [_button setFrame:CGRectMake(40, 204, 100, 30)];
+        [_button setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
         [_button setTitle:@"发送" forState:UIControlStateNormal];
         _button.tag = 10001;
         [_button addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
+        [self setButtonBorder:_button];
     }
     return _button;
 }
@@ -79,11 +90,12 @@
 {
     if (!_changeNickBtn) {
         _changeNickBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_changeNickBtn setFrame:CGRectMake(ButtonWidth * 2.5, 100, ButtonWidth, 30)];
+        [_changeNickBtn setFrame:CGRectMake(ScreenWidth-140, 204, 100, 30)];
         [_changeNickBtn setTitle:@"更改昵称" forState:UIControlStateNormal];
-        [_changeNickBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        [_changeNickBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
         _changeNickBtn.tag = 10002;
         [_changeNickBtn addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
+        [self setButtonBorder:_changeNickBtn];
     }
     return _changeNickBtn;
 }
@@ -92,12 +104,13 @@
 {
     if (!_leaveRoomBtn) {
         _leaveRoomBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_leaveRoomBtn setFrame:CGRectMake(ButtonWidth * 2, 40, ButtonWidth, 30)];
+        [_leaveRoomBtn setFrame:CGRectMake(ScreenWidth-150, 74, 120, 30)];
         [_leaveRoomBtn setTitle:@"离开聊天室" forState:UIControlStateNormal];
-        [_leaveRoomBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        [_leaveRoomBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
         [_leaveRoomBtn.titleLabel setAdjustsFontSizeToFitWidth:YES];
         _leaveRoomBtn.tag = 10003;
         [_leaveRoomBtn addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
+        [self setButtonBorder:_leaveRoomBtn];
     }
     return _leaveRoomBtn;
 }
@@ -106,12 +119,13 @@
 {
     if (!_disconnectXmppBtn) {
         _disconnectXmppBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_disconnectXmppBtn setFrame:CGRectMake(0, 40, ButtonWidth, 30)];
+        [_disconnectXmppBtn setFrame:CGRectMake(30, 74, 120, 30)];
         [_disconnectXmppBtn setTitle:@"断开XMPP" forState:UIControlStateNormal];
-        [_disconnectXmppBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        [_disconnectXmppBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
         [_disconnectXmppBtn.titleLabel setAdjustsFontSizeToFitWidth:YES];
         _disconnectXmppBtn.tag = 10004;
         [_disconnectXmppBtn addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
+        [self setButtonBorder:_disconnectXmppBtn];
     }
     return _disconnectXmppBtn;
 }
@@ -120,12 +134,13 @@
 {
     if (!_reconnectBtn) {
         _reconnectBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_reconnectBtn setFrame:CGRectMake(ButtonWidth, 40, ButtonWidth, 30)];
+        [_reconnectBtn setFrame:CGRectMake(30, 114, 120, 30)];
         [_reconnectBtn setTitle:@"重连XMPP" forState:UIControlStateNormal];
-        [_reconnectBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        [_reconnectBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
         [_reconnectBtn.titleLabel setAdjustsFontSizeToFitWidth:YES];
         _reconnectBtn.tag = 10005;
         [_reconnectBtn addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
+        [self setButtonBorder:_reconnectBtn];
     }
     return _reconnectBtn;
 }
@@ -134,22 +149,32 @@
 {
     if (!_rejoinChatroomBtn) {
         _rejoinChatroomBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_rejoinChatroomBtn setFrame:CGRectMake(ButtonWidth * 3, 40, ButtonWidth, 30)];
+        [_rejoinChatroomBtn setFrame:CGRectMake(ScreenWidth-150, 114, 120, 30)];
         [_rejoinChatroomBtn setTitle:@"重连聊天室" forState:UIControlStateNormal];
-        [_rejoinChatroomBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        [_rejoinChatroomBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
         [_rejoinChatroomBtn.titleLabel setAdjustsFontSizeToFitWidth:YES];
         _rejoinChatroomBtn.tag = 10006;
         [_rejoinChatroomBtn addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
+        [self setButtonBorder:_rejoinChatroomBtn];
     }
     return _rejoinChatroomBtn;
 }
+- (void)setButtonBorder:(UIButton *)button
+{
+    button.layer.borderWidth = 1;
+    button.layer.borderColor = [UIColor blackColor].CGColor;
+    button.layer.cornerRadius = 15;
+    button.layer.masksToBounds = YES;
+}
+
 - (UITextView *)textView
 {
     if (!_textView) {
-        _textView = [[UITextView alloc] initWithFrame:CGRectMake(0, 140, ScreenWidth, 170)];
+        _textView = [[UITextView alloc] initWithFrame:CGRectMake(0, 244, ScreenWidth, ScreenHeight-294)];
         _textView.editable = NO;
-        _textView.backgroundColor = [UIColor cyanColor];
+        _textView.layer.borderWidth = 1;
+        _textView.layer.borderColor = [UIColor blackColor].CGColor;
     }
     return _textView;
 }
@@ -162,6 +187,11 @@
     return _mutableStr;
 }
+- (void)textFieldResignFirstResponder
+{
+    [self.textField resignFirstResponder];
+}
+
 - (void)buttonAction:(UIButton *)button
 {
     switch (button.tag) {
@@ -169,6 +199,8 @@
         {
             NSDictionary *dic = @{@"name":self.nickStr,@"content":self.textField.text};
             [self.manager sendMessage:[self dictionaryToJson:dic]];
+            self.textField.text = @"";
+            [self.textField resignFirstResponder];
         }
             break;
         case 10002:
@@ -176,6 +208,7 @@
             self.nickStr = self.textField.text;
             [self.manager changeNickname:self.textField.text];
             self.textField.text = @"";
+            [self.textField resignFirstResponder];
         }
             break;
         case 10003:
@@ -277,7 +310,9 @@
 {
     [self.mutableStr appendString:[NSString stringWithFormat:@"%@\n",msg]];
     self.textView.text = self.mutableStr;
-    self.textField.text = @"";
+    [self.textView scrollRangeToVisible:NSMakeRange(self.textView.text.length, 1)];
+
+//    [self.textView sc]
 }