新增小喇叭

YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineHallIncomeVC.m

@@ -186,7 +186,9 @@
 }
 
 #pragma mark - XPGuildIncomeHeaderViewDelegate
-- (void)xPNewGuildIncomeHeaderView:(XPMineGuildPersonalBillRecordHeadView *)view didChooseTime:(UIButton *)sender {
+
+- (void)xPMineGuildPersonalBillRecordHeadView:(XPMineGuildPersonalBillRecordHeadView *_Nonnull)view didChooseTime:(UILabel *_Nullable)sender{
+    
     if (self.timeType == NewGuildIncomeRecrdTimeType_Mouth) {
         [self.monthPickerView setDate:[NSDate date] animated:YES];
         [self.monthPickerView show];
@@ -199,6 +201,7 @@
     }
 }
 
+
 #pragma mark - XPGuildTimeMonthPickerViewDelegate
 - (void)datePicker:(XPGuildTimeMonthPickerView *)datePicker didCancel:(UIButton *)sender {
     [TTPopup dismiss];
@@ -209,9 +212,7 @@
     [self monthWithCurrentDate:date];
     self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:date];
     self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate];
-    [self.formatter setDateFormat:YMLocalizedString(@"PLTimeUtil3")];
-    NSString * currentDay = [self.formatter stringFromDate:date];
-    self.headerView.time = currentDay;
+    self.headerView.time = [NSString stringWithFormat:@"%@ %@ %@",self.pi_startTimeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsVC1"),self.pi_endTimeStr];
     [self headerRefresh];
 }
 
@@ -228,7 +229,7 @@
         self.headerView.time = [NSString stringWithFormat:@"%@ %@ %@",self.pi_startTimeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsVC1"),self.pi_endTimeStr];
     } else {
         self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:view.startDate];
-        self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:view.startDate];;
+        self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:view.endDate];;
         self.headerView.time = [NSString stringWithFormat:@"%@ %@ %@",self.pi_startTimeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsVC1"),self.pi_endTimeStr];
     }
     [self headerRefresh];

YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.h

@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong) UserInfoModel *userInfo;
 ///是否是修改密码
 @property (nonatomic,assign) BOOL isModifiPwd;
+@property(nonatomic,assign) BOOL isLogout;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.m

@@ -99,7 +99,25 @@
 #pragma mark - XPMineLoginPasswordProtocol
 - (void)setLoginPasswordSuccess {
     [self showSuccessToast:YMLocalizedString(@"XPMineLoginPasswordViewController0")];
+    self.userInfo.isBindPasswd = YES;
+    if(self.isLogout == YES){
+        // 返回设置页面
+       __block __kindof UIViewController *vc;
+        [self.navigationController.childViewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            if ([obj isKindOfClass:[XPMineSettingViewController class]]) {
+                vc = obj; // 导航控制器中有设置VC
+            }
+        }];
+
+        if ([self.navigationController.childViewControllers containsObject:vc]) {
+            [self.navigationController popToViewController:vc animated:YES];
+        } else {
+            [self.navigationController popViewControllerAnimated:YES];
+        }
+        return;
+    }
     [self.navigationController popViewControllerAnimated:YES];
+    
 }
 
 - (void)modifyLoginPasswordSuccess {

YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m

@@ -326,7 +326,6 @@
 #pragma mark - Event Response
 - (void)logoutButtonAction:(UIButton *)sender {
    id isSaveBindPwd = [[NSUserDefaults standardUserDefaults]valueForKey:@"kSaveBindPwd"];
-    
     if(self.userInfo.isBindPasswd == NO && isSaveBindPwd == nil){
         [[NSUserDefaults standardUserDefaults]setValue:@"1" forKey:@"kSaveBindPwd"];
         [[NSUserDefaults standardUserDefaults]synchronize];
@@ -334,6 +333,16 @@
         config.title = YMLocalizedString(@"XPMineSettingViewController9");
         config.message = YMLocalizedString(@"XPMineSettingViewController10");
         [TTPopup alertWithConfig:config confirmHandler:^{
+            
+            if (!self.userInfo.isBindPhone) {
+                XPLoginVerifBindPhoneViewController *vc = [[XPLoginVerifBindPhoneViewController alloc] init];
+                vc.bindingPhoneNumType =  XPBindingPhoneNumTypeNormal;
+                vc.userInfo = self.userInfo;
+                vc.isLogout = YES;
+                [self.navigationController pushViewController:vc animated:YES];
+                return;
+            }
+            
             XPMineLoginPasswordViewController *vc = [[XPMineLoginPasswordViewController alloc] init];
             vc.userInfo = self.userInfo;
             vc.isModifiPwd = NO;