跑通SDKDemo环境与被呼逻辑

Change-Id: Ic0b6d348904526331f54b410c594889f72cc6736

Author: tonychanchen

LinkApp.xcodeproj/project.pbxproj

@@ -273,6 +273,7 @@
 		EDF126FE23BDBE8D00FB1638 /* TIoTWaterFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = EDF126FD23BDBE8D00FB1638 /* TIoTWaterFlowLayout.m */; };
 		EDF1270223BDC51A00FB1638 /* TIoTPanelVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EDF1270023BDC51A00FB1638 /* TIoTPanelVC.m */; };
 		EDF93D9923B367A000D477C7 /* TIoTRequestObject.m in Sources */ = {isa = PBXBuildFile; fileRef = EDF93D9823B367A000D477C7 /* TIoTRequestObject.m */; };
+		F4027793257775D70004E20F /* TIoTNetConfigViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4027792257775D70004E20F /* TIoTNetConfigViewController.m */; };
 		F4103F90249B971100CB678F /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4103F8F249B971100CB678F /* CoreData.framework */; };
 		F47D60E7254FF4EF009BC66E /* TIoTWebVC+BLE.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47D60E6254FF4EF009BC66E /* TIoTWebVC+BLE.swift */; };
 		F4833EBC24DD2E100033FAB2 /* TIoTDebugtools.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4833EBB24DD2E100033FAB2 /* TIoTDebugtools.swift */; };
@@ -897,6 +898,8 @@
 		EDF1270023BDC51A00FB1638 /* TIoTPanelVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TIoTPanelVC.m; sourceTree = "<group>"; };
 		EDF93D9723B367A000D477C7 /* TIoTRequestObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TIoTRequestObject.h; sourceTree = "<group>"; };
 		EDF93D9823B367A000D477C7 /* TIoTRequestObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TIoTRequestObject.m; sourceTree = "<group>"; };
+		F4027791257775D70004E20F /* TIoTNetConfigViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TIoTNetConfigViewController.h; sourceTree = "<group>"; };
+		F4027792257775D70004E20F /* TIoTNetConfigViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TIoTNetConfigViewController.m; sourceTree = "<group>"; };
 		F4103F8F249B971100CB678F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
 		F47D60E6254FF4EF009BC66E /* TIoTWebVC+BLE.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TIoTWebVC+BLE.swift"; sourceTree = "<group>"; };
 		F4833EBB24DD2E100033FAB2 /* TIoTDebugtools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TIoTDebugtools.swift; sourceTree = "<group>"; };
@@ -2263,6 +2266,8 @@
 				F4F3D77924938EBD005D3396 /* TIoTCoreRepeatVC.m */,
 				F4F3D78624938EBD005D3396 /* WifiInfoVC.h */,
 				F4F3D77B24938EBD005D3396 /* WifiInfoVC.m */,
+				F4027791257775D70004E20F /* TIoTNetConfigViewController.h */,
+				F4027792257775D70004E20F /* TIoTNetConfigViewController.m */,
 				F4F3D78524938EBD005D3396 /* HomeVC.h */,
 				F4F3D77C24938EBD005D3396 /* HomeVC.m */,
 				F4F3D77D24938EBD005D3396 /* TIoTCoreTimerListVC.h */,
@@ -2887,6 +2892,7 @@
 				F4F3D53E24935BD3005D3396 /* main.m in Sources */,
 				F4F3D7CB24938EBE005D3396 /* HomeVC.m in Sources */,
 				F4DB306925676DF7006C45CD /* TRTCAudioCallViewController.swift in Sources */,
+				F4027793257775D70004E20F /* TIoTNetConfigViewController.m in Sources */,
 				F4DB306725676DF7006C45CD /* TRTCVideoCallViewController.swift in Sources */,
 				F4F3D7B324938EBE005D3396 /* InviteVC.m in Sources */,
 				F4F3D7B024938EBE005D3396 /* TIoTCoreAddFamilyVC.m in Sources */,

Podfile

@@ -15,6 +15,7 @@ end
 def common_all_pods
   pod 'Masonry', '1.1.0'
   pod 'SDWebImage', '4.4.2'
+  pod 'YYModel', '1.0.4'
   pod 'QCloudCOSXML/Transfer', '5.5.2'
   pod 'Firebase/Analytics', '6.31.1'
   pod 'Firebase/Crashlytics', '6.31.1'
@@ -31,7 +32,6 @@ target 'LinkApp' do
   pod 'IQKeyboardManager', '6.1.1'
   pod 'FDFullscreenPopGesture', '1.1'
   pod 'SocketRocket', '0.5.1'
-  pod 'YYModel', '1.0.4'
   pod 'TZImagePickerController', '3.2.1'
   pod 'MGJRouter', '0.10.0'
   pod 'TrueTime','5.0.3'

Podfile.lock

@@ -282,6 +282,6 @@ SPEC CHECKSUMS:
   TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d
   YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
 
-PODFILE CHECKSUM: 8d22b7e788bc0fab4190e59d62d3e5c418734979
+PODFILE CHECKSUM: 8a0500bd4eba3874e6a4d3c396cf6b7de0a30ef9
 
 COCOAPODS: 1.9.3

Source/LinkSDK/QCFoundation/TIoTCoreRequestObject.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
+#define SDKGlobalDebugUin @"1234567890"
 /**
  请求失败响应
  */

Source/LinkSDK/QCFoundation/TIoTCoreRequestObject.m

@@ -33,6 +33,7 @@ + (TIoTCoreRequestObject *)shared {
 - (void)post:(NSString *)urlStr Param:(NSDictionary *)param success:(SuccessResponseBlock)success
 failure:(FailureResponseBlock)failure
 {
+//    NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@?uin=%@",[TIoTCoreAppEnvironment shareEnvironment].oemTokenApi,urlStr, SDKGlobalDebugUin]];
     NSURL *url  = [NSURL URLWithString:[TIoTCoreAppEnvironment shareEnvironment].oemTokenApi];
 
     [self postRequestWithAction:urlStr url:url isWithoutToken:NO param:param urlAndBodySetting:nil isShowHelpCenter:nil success:success failure:failure];
@@ -45,8 +46,8 @@ - (void)post:(NSString *)urlStr Param:(NSDictionary *)param success:(SuccessResp
 - (void)postWithoutToken:(NSString *)urlStr Param:(NSDictionary *)param success:(SuccessResponseBlock)success
 failure:(FailureResponseBlock)failure
 {
-    
-    NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@",[TIoTCoreAppEnvironment shareEnvironment].oemAppApi,urlStr]];    
+//    NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@?uin=%@",[TIoTCoreAppEnvironment shareEnvironment].oemAppApi,urlStr, SDKGlobalDebugUin]];
+    NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@",[TIoTCoreAppEnvironment shareEnvironment].oemAppApi,urlStr]];
     [self postRequestWithAction:urlStr url:url isWithoutToken:YES param:param urlAndBodySetting:^NSURL *(NSMutableDictionary *accessParam, NSURL *requestUrl) {
         TIoTCoreAppEnvironment *environment = [TIoTCoreAppEnvironment shareEnvironment];
         if(environment.appSecret.length > 0 && ![NSString matchSinogram:environment.appSecret]) {

Source/LinkSDK/TRTC/TIoTTRTCSessionManager.m

@@ -77,6 +77,7 @@ - (void)preEnterRoom:(TIOTtrtcPayloadParamModel *)deviceParam failure:(FRHandler
         NSDictionary *tempDic = responseObject[@"TRTCParams"];
         TIOTTRTCModel *model = [TIOTTRTCModel yy_modelWithJSON:tempDic];
         [self configRoom:model];
+        [self enterRoom];
 
         self->_state = TIoTTRTCSessionType_calling;
     } failure:^(NSString * _Nonnull reason, NSError * _Nonnull error,NSDictionary *dic) {