diff --git a/Podfile b/Podfile index 5d634aab..e0d60edd 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,6 @@ source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git' target 'YuMi' do use_frameworks! - pod 'Adjust', '~> 4.31.0' # 滑动标签栏 pod 'JXCategoryView' diff --git a/YuMi/Config/ClientConfig.m b/YuMi/Config/ClientConfig.m index c23952dd..127369dc 100644 --- a/YuMi/Config/ClientConfig.m +++ b/YuMi/Config/ClientConfig.m @@ -63,7 +63,21 @@ ///开始下载 [[XPRoomFaceTool shareFaceTool] downFaceData]; } - + NSString *trtcAppId = [NSString stringWithFormat:@"%@",initData[@"trtcAppId"]]; + NSString *curTtcKey = [[NSUserDefaults standardUserDefaults]valueForKey:@"kTrtcAppId"]; + if(curTtcKey == nil){ + if(trtcAppId != nil){ + [[NSUserDefaults standardUserDefaults]setValue:trtcAppId forKey:@"kTrtcAppId"]; + [[NSUserDefaults standardUserDefaults]synchronize]; + } + }else{ + if(![trtcAppId isEqualToString:curTtcKey]){ + if(trtcAppId != nil){ + [[NSUserDefaults standardUserDefaults]setValue:trtcAppId forKey:@"kTrtcAppId"]; + [[NSUserDefaults standardUserDefaults]synchronize]; + } + } + } //是否展示公屏 NSString *serverVer = initData[@"appStoreAuditNoticeVersion"]; NSString *shortVer = [YYUtility appVersion]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.m index 86ee3b5e..eb7fb372 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.m @@ -35,7 +35,7 @@ [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.trailing.equalTo(self).inset(kGetScaleWidth(5)); make.bottom.equalTo(self.titleView.mas_top).mas_offset(-kGetScaleWidth(2)); - make.top.mas_equalTo(kGetScaleWidth(0)); + make.top.mas_lessThanOrEqualTo(kGetScaleWidth(28)); }]; } - (void)setNum:(NSString *)num{ diff --git a/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m b/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m index 93202ac9..141e40ae 100644 --- a/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m +++ b/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m @@ -40,7 +40,12 @@ [self.engine enableAudioVolumeEvaluation:900]; TRTCParams *params = [[TRTCParams alloc] init]; UInt32 appId; - sscanf([KeyWithType(KeyType_TRTC) UTF8String], "%u", &appId); + NSString *curTtcKey = [[NSUserDefaults standardUserDefaults]valueForKey:@"kTrtcAppId"]; + if(curTtcKey != nil && curTtcKey.length > 0){ + sscanf([curTtcKey UTF8String], "%u", &appId); + }else{ + sscanf([KeyWithType(KeyType_TRTC) UTF8String], "%u", &appId); + } params.sdkAppId = appId; UInt32 roomId; sscanf([channelId UTF8String], "%u", &roomId);