Merge branch 'appstore_piko' into develop_piko

# Conflicts: # YuMi.xcodeproj/project.pbxproj # YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m
2024-06-11 11:32:54 +08:00
parent a464393464 78b43c70dd
commit 4bf6eabd01
10 changed files with 35 additions and 43 deletions
--- a/YuMi.xcodeproj/project.pbxproj
+++ b/YuMi.xcodeproj/project.pbxproj
@@ -12770,7 +12770,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.22;
+				MARKETING_VERSION = 20.20.23;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12808,7 +12808,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.22;
+				MARKETING_VERSION = 20.20.23;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
--- a/YuMi/Assets.xcassets/AppIcon.appiconset/1024＊1024.png
+++ b/YuMi/Assets.xcassets/AppIcon.appiconset/1024＊1024.png
--- a/YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.m
+++ b/YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.m
@@ -40,10 +40,15 @@
    
 }
 -(void)getExchangeDiamondInformation{
+    @kWeakify(self);
    [Api getExchangeDiamondInformation:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
+        @kStrongify(self);
        XPExchangeDiamondsModel *model = [XPExchangeDiamondsModel modelWithDictionary:data.data];
-        [[self getView]getExchangeDiamondInformation:model];
-        } showLoading:YES]];
+        XPExchangeDiamondsModel *tempModel = [XPExchangeDiamondsModel modelWithDictionary:data.data];
+        model.golds = tempModel.diamonds;
+        model.diamonds = tempModel.golds;
+        [[self getView] getExchangeDiamondInformation:model];
+    } showLoading:YES]];
 }
 -(void)confirmExchangeDiamondWithGoldNum:(NSString *)goldNum diamondNum:(NSString *)diamondNum currency:(NSString *)currency{
    [Api confirmExchangeDiamond:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
--- a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m
+++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m
@@ -36,15 +36,12 @@
 #pragma mark - Private Method
 - (void)initSubViews {
    self.backgroundColor = [UIColor clearColor];
-    
-    
-    
+
    [self addSubview:self.myGoldView];
    [self addSubview:self.myDiamondsView];
    [self addSubview:self.confirmBtn];
-    
-    
-      @kWeakify(self)
+
+    @kWeakify(self)
    self.myGoldView.inputCounthandle = ^(NSString *_Nonnull goldNum,NSString *_Nonnull diamondNum) {
       @kStrongify(self)
        if(goldNum.integerValue == 0 && diamondNum.integerValue == 0){
@@ -118,7 +115,7 @@
    }
    if(self.diamondNum.doubleValue > self.model.maxDiamonds){
        [XNDJTDDLoadingTool showErrorWithMessage:[NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsView4"),self.model.maxDiamonds]];
-        return;
+        return; 
    }
    [self.myGoldView resignResponder];
    [self.myDiamondsView resignResponder];
@@ -228,12 +225,12 @@
 -(void)setModel:(XPExchangeDiamondsModel *)model{
    _model = model;
    if(self.type == IncomeRecord_Gold){
-        _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView0"),@(_model.diamonds)];
+        _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView0"),@(_model.golds)];
        UIImage *image = [UIImage imageNamed:@"ms_exchange_coin_icon"];
        [_iconView setImage:image forState:UIControlStateNormal];

    }else{
-        _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView1"),_model.golds];
+        _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView1"),_model.diamonds];
        UIImage *image = [UIImage imageNamed:@"exchange_new_diamonds_icon"];
        [_iconView setImage:image forState:UIControlStateNormal];
    }
--- a/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h
+++ b/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h
@@ -46,7 +46,6 @@ NS_ASSUME_NONNULL_BEGIN
 //是否为周榜top1
@property(nonatomic,assign) BOOL isWeekTop1;
@property(nonatomic,copy) NSString *inRoomUid;
-
 //是否在麦位
@property(nonatomic,assign) BOOL inMic;
 ///是否在线
--- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.h
+++ b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.h
@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface XPNewHomePartyTableViewCell : UITableViewCell

@property (nonatomic,strong) HomePlayRoomModel *roomInfo;
-@property (nonatomic,strong) HomeRecommendRoomModel *roomInfo1;
+
@property(nonatomic,weak) id<XPNewHomePartyTableViewCellDelegate>delegate;
 ///声音卡时，svga是否播放动画
 -(void)setPlaySoundStatus:(BOOL)isPlay;
--- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m
+++ b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m
@@ -243,14 +243,7 @@
 -(void)setPlaySoundTime:(NSInteger)time{
    _audioView.voiceDura = @(time).stringValue;
 }
- (void)setRoomInfo1:(HomeRecommendRoomModel *)roomInfo1 {
-	_roomInfo1 = roomInfo1;
-	if (_roomInfo1) {
-		
-		
-		
-	}
-}
+

 -(void)didSelectItemAction{
 
--- a/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m
+++ b/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m
@@ -384,6 +384,7 @@ UIKIT_EXTERN NSString * const kShieldingNotification;
 -(void)xPNewHomePartyTableViewCell:(XPNewHomePartyTableViewCell *_Nullable)cell didSelectChat:(HomePlayRoomModel *_Nonnull)roomModel{
    if(roomModel.inMic == YES){
        [XPRoomViewController openRoom:roomModel.inRoomUid fromNick:roomModel.nick fromType:UserEnterRoomFromType_Follow_User fromUid:roomModel.uid viewController:self];
+
        return;
    }
    
--- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m
+++ b/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m
@@ -104,9 +104,6 @@
 #else
 	isTestEnv = NO;
 #endif
-    if(isEnterprise == NO){
-    [[SudMGP getCfg]setBackgroundMode:NO];
-    }
 	[SudMGP initSDK:KeyWithType(KeyType_SudGameAppID) appKey:KeyWithType(KeyType_SudGameAppKey) isTestEnv:isTestEnv listener:^(int retCode, const NSString *retMsg) {
 		if (retCode == 0) {
 			if (!self.currentmgId) {
--- a/YuMi/Modules/YMWeb/MSRoomGameWebVC.m
+++ b/YuMi/Modules/YMWeb/MSRoomGameWebVC.m
@@ -72,14 +72,18 @@ NSString * const kMSGameLoaded = @"gameLoaded";
 - (void)viewDidLoad {
    [super viewDidLoad];
    [self installUI];
+    [self setupBackButton];
+}
+
+- (void)setupBackButton {
    self.backBtn = [UIButton new];
    [self.view addSubview:self.backBtn];
    [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) {
        make.edges.equalTo(self.view);
    }];
    [self.backBtn addTarget:self action:@selector(backBtnAction) forControlEvents:UIControlEventTouchUpInside];
-   
 }
+
 -(void)installUI{
    self.view.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4];
    MSWeakWebViewScriptMessageDelegate *weakScriptMessageDelegate = [[MSWeakWebViewScriptMessageDelegate alloc] initWithDelegate:self];
@@ -149,12 +153,14 @@ NSString * const kMSGameLoaded = @"gameLoaded";
        [self.webview evaluateJavaScript:jsMethods completionHandler:^(id
                                                                       _Nullable resp, NSError * _Nullable error) {
            NSLog(@"error = %@ , response = %@",error, resp);
+            [self.backBtn removeFromSuperview];
        }];
    } else {
        NSString *jsMethods = [NSString stringWithFormat:@"%@({})", method];
        [self.webview evaluateJavaScript:jsMethods completionHandler:^(id
                                                                       _Nullable resp, NSError * _Nullable error) {
            NSLog(@"error = %@ , response = %@",error, resp);
+            [self.backBtn removeFromSuperview];
        }];
    }
    
@@ -185,19 +191,22 @@ NSString * const kMSGameLoaded = @"gameLoaded";
 {
    NSString* method = [NSString stringWithFormat:@"%@:", message.name];
    NSDictionary *dicBody = [self dictionaryWithJsonString:message.body];
-    SEL selector = NSSelectorFromString(method);
-    if([self respondsToSelector:selector]){
-        //使⽤反映射
-        [self performSelector:selector withObject:dicBody];
-    }else{
+
+    if ([message.name isEqualToString:kMSGetConfig]) {
+        [self getConfig:dicBody];
+    } else if ([message.name isEqualToString:kMSDestroy]) {
+        [self destroy:dicBody];
+    } else if ([message.name isEqualToString:kMSGameLoaded]) {
+        [self gameLoaded:dicBody];
+    } else if ([message.name isEqualToString:kMSGameRecharge]) {
+        [self gameRecharge:dicBody];
+    } else {
        NSLog(@"未实现⽅法 : %@ --> %@", message.name, message.body);
    }
 }
 // 获取信息配置
 - (void) getConfig:(NSDictionary*)args
 {
-    
-   
    NSLog(@"BSGAME %s","游戏调⽤getConfig");
    NSString* method = [args objectForKey:@"jsCallback"];
    RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo;
@@ -283,16 +292,7 @@ NSString * const kMSGameLoaded = @"gameLoaded";
    // 游戏加载完毕 TODO 客⼾端
    [self.backBtn removeFromSuperview];
 }
-//加载完成
- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
-    //加载完成后隐藏progressView

-}
-//加载失败
- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error {
-    //加载失败同样需要隐藏progressView
-   
-}
@end