Merge branch 'master' of http://129.204.155.107:3000/zengwei/jixin_new

* 'master' of http://129.204.155.107:3000/zengwei/jixin_new:
  修复了 dyld: Library not loaded: @rpath/libswiftCore.dylib   Referenced from: /private/var/mobile/Containers/Bundle/Application/1EE407C5-D004-4F7C-88D1-35869ACA97C7/即信.app/Frameworks/JitsiMeet.framework/JitsiMeet   Reason: image not found

shiku_im.xcodeproj/project.pbxproj

@@ -11585,7 +11585,7 @@
 				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/shiku_im/Socket/ProtocolBuffer";
 				INFOPLIST_FILE = share/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 3.0.6;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -11637,7 +11637,7 @@
 				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/shiku_im/Socket/ProtocolBuffer";
 				INFOPLIST_FILE = share/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 3.0.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -11745,6 +11745,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 3A78E10A69C6765E8435B8FE /* Pods-shiku_im.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -11821,7 +11822,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/shiku_im/audioRecorder",
 				);
-				MARKETING_VERSION = 3.0.5;
+				MARKETING_VERSION = 3.0.7;
 				NGN_STACK_HOME = "";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
@@ -11840,6 +11841,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = E5270F113887E459AE140C95 /* Pods-shiku_im.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -11908,7 +11910,7 @@
 					"$(PROJECT_DIR)/shiku_im/3rd/UMSocial_Sdk_5.2.1/QQ",
 					"$(PROJECT_DIR)/shiku_im/3rd/QQ",
 				);
-				MARKETING_VERSION = 3.0.5;
+				MARKETING_VERSION = 3.0.7;
 				NGN_STACK_HOME = "";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";

shiku_im/ClassesNew/classes/homeVc/CYWebAddPointVC.m

@@ -104,7 +104,8 @@
         [g_server actGetconfigconcatdomainnow:self];
     }
  }
- 
+
+  
 
 //服务器返回数据
 -(void) didServerResultSucces:(JXConnection*)aDownload dict:(NSDictionary*)dict array:(NSArray*)array1{
@@ -147,6 +148,8 @@
           [g_default setObject:dict[@"url"] forKey:@"selectNodeUrl"];
           [g_default synchronize];
           
+          [g_default setObject:dict[@"name"] forKey:@"selectNodeName"];
+          [g_default synchronize];
           [self.wkWebView reload];
           
           [weakSelf removeFromSuperview];
@@ -162,13 +165,12 @@
     
     NSString * urlStr = navigationAction.request.URL.absoluteString;
     NSLog(@"发送跳转请求：%@",urlStr);
-    //自己定义的协议头
-    
+    //自己定义的协议头 
     decisionHandler(WKNavigationActionPolicyAllow);
     
     
 }
-
+ 
 // 根据客户端受到的服务器响应头以及response相关信息来决定是否可以跳转
 - (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler{
     NSString * urlStr = navigationResponse.response.URL.absoluteString;

shiku_im/ClassesNew/classes/homeVc/JXCsHomeVc.m

@@ -221,8 +221,15 @@
     [refreshButton setImage:[UIImage imageNamed:@"home_refresh"] forState:(UIControlStateNormal)];
     [refreshButton setTitleColor:[UIColor blueColor] forState:(UIControlStateNormal)];
     refreshButton.contentMode=UIViewContentModeScaleAspectFit;
-    [refreshButton setTitle:@" 节点1 " forState:(UIControlStateNormal)];
     [backView addSubview:refreshButton];
+    NSString *selectUrl =  [g_default objectForKey:@"selectNodeName"];
+    if (selectUrl.length>0) {
+
+         [refreshButton setTitle:selectUrl forState:(UIControlStateNormal)];
+    }else{
+
+        [refreshButton setTitle:@" 节点1 " forState:(UIControlStateNormal)];
+    }
     //[refreshButton setTitleEdgeInsets:UIEdgeInsetsMake(0, 60, 0, 0)];
     //[refreshButton setImageEdgeInsets:UIEdgeInsetsMake(0, 50, 0, 0)];
     //[refreshButton setTitleEdgeInsets:UIEdgeInsetsMake(0, 0,0,60)];
@@ -349,6 +356,17 @@
 - (void)setupChildViewControllers
 {
     CYWebAddPointVC *vc = [[CYWebAddPointVC alloc] init];
+    NSString *memberAcc=[[NSUserDefaults standardUserDefaults] objectForKey:@"www_url"];
+         
+         NSString *selectNodeUrl=[[NSUserDefaults standardUserDefaults] objectForKey:@"selectNodeUrl"];
+          
+         if (selectNodeUrl.length>0) {
+
+              vc.strURL=selectNodeUrl;
+         }else{
+
+             vc.strURL=memberAcc;
+         }
     [self setupOneChildViewController:vc];
     [self setupOneChildViewController:[XMGMainViewController new]];
 }

shiku_im/ClassesNew/classes/homeVc/JXNodeView.m

@@ -31,7 +31,7 @@
 
        NSArray *urlArray=[[NSUserDefaults standardUserDefaults] objectForKey:@"www_Array"];
 
-      [_dataArr addObjectsFromArray:urlArray];
+       [_dataArr addObjectsFromArray:urlArray];
     
         
         

shiku_im/ClassesNew/classes/messageVc/JXMsgViewController.m

@@ -286,9 +286,9 @@
     [g_notify addObserver:self selector:@selector(onQuitRoom:) name:kQuitRoomNotifaction object:nil];//退出了房间
     [self getServerData];
    // self.tableView.contentInset=UIEdgeInsetsMake(64, 0, 20, 0);
-   [g_server listAttention:10000 userId:MY_USER_ID toView:self];
+   [g_server listAttention:50 userId:MY_USER_ID toView:self];
 
-   [g_server listHisRoom:_page pageSize:1000 toView:self];
+   [g_server listHisRoom:_page pageSize:50 toView:self];
     
     
     _dataArr=[NSMutableArray array];