nothing

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Controller/HomeViewController.m

@@ -915,7 +915,8 @@
     switch (type) {
         case HOMEHEADACTION_AUTH:
         {
-            [self toAuthDetail];
+            // 不弹窗
+//            [self toAuthDetail];
         }
             break;
         case HOMEHEADACTION_EDUCATION:

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/FreezeListViewController.m

@@ -29,6 +29,8 @@
 
 @property (nonatomic, strong) NSMutableArray *sortArray;
 
+@property (nonatomic, assign) NSInteger lastChooseIndex;
+
 @end
 
 @implementation FreezeListViewController
@@ -233,7 +235,8 @@
                 [nameArray addObject:[parm ks_stringValueForKey:@"name"]];
             }
             MJWeakSelf;
-            KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:0 sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+            KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:self.lastChooseIndex sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+                self.lastChooseIndex = chooseIndex;
                 if (chooseIndex == 0) {
                     weakSelf.headView.typeLabel.text = @"全部类型";
                     weakSelf.bizType = nil;
@@ -257,7 +260,12 @@
 }
 
 - (void)showPickerView {
-    KSFullDatePicker *pickerView = [[KSFullDatePicker alloc] initWithTitle:@"" date:[NSDate date] pickMode:KSDATEPICKER_MODE_YEAR_MONTH sureButtonColor:THEMECOLOR selectDateBlock:^(NSString *date) {
+    [self.dateFormatter setDateFormat:@"yyyy-MM"];
+    NSDate *preDate = [NSDate date];
+    if (![NSString isEmptyString:self.searchDate]) {
+        preDate = [self.dateFormatter dateFromString:self.searchDate];
+    }
+    KSFullDatePicker *pickerView = [[KSFullDatePicker alloc] initWithTitle:@"" date:preDate pickMode:KSDATEPICKER_MODE_YEAR_MONTH sureButtonColor:THEMECOLOR selectDateBlock:^(NSString *date) {
         self.searchDate = date;
         NSString *displayTime = [self getTimeDisplay:date];
         [self.headView.timeLabel setText:displayTime];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/MyIncomeViewController.m

@@ -35,7 +35,7 @@
 
 @property (nonatomic, strong) NSMutableArray *sortArray;
 
-
+@property (nonatomic, assign) NSInteger lastChooseIndex;
 @end
 
 @implementation MyIncomeViewController
@@ -254,7 +254,8 @@
                 [nameArray addObject:[parm ks_stringValueForKey:@"name"]];
             }
             MJWeakSelf;
-            KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:0 sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+            KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:self.lastChooseIndex sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+                self.lastChooseIndex = chooseIndex;
                 if (chooseIndex == 0) {
                     weakSelf.headView.typeLabel.text = @"全部收入";
                     weakSelf.bizType = nil;
@@ -297,7 +298,12 @@
 }
 
 - (void)showPickerView {
-    KSFullDatePicker *pickerView = [[KSFullDatePicker alloc] initWithTitle:@"" date:[NSDate date] pickMode:KSDATEPICKER_MODE_YEAR_MONTH sureButtonColor:THEMECOLOR selectDateBlock:^(NSString *date) {
+    [self.dateFormatter setDateFormat:@"yyyy-MM"];
+    NSDate *preDate = [NSDate date];
+    if (![NSString isEmptyString:self.searchDate]) {
+        preDate = [self.dateFormatter dateFromString:self.searchDate];
+    }
+    KSFullDatePicker *pickerView = [[KSFullDatePicker alloc] initWithTitle:@"" date:preDate pickMode:KSDATEPICKER_MODE_YEAR_MONTH sureButtonColor:THEMECOLOR selectDateBlock:^(NSString *date) {
         self.searchDate = date;
         NSString *displayTime = [self getTimeDisplay:date];
         [self.headView.timeLabel setText:displayTime];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/NoRecordViewController.m

@@ -30,6 +30,8 @@
 
 @property (nonatomic, strong) NSMutableArray *sortArray;
 
+@property (nonatomic, assign) NSInteger lastChooseIndex;
+
 @end
 
 @implementation NoRecordViewController
@@ -233,7 +235,8 @@
                 [nameArray addObject:[parm ks_stringValueForKey:@"name"]];
             }
             MJWeakSelf;
-            KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:0 sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+            KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:self.lastChooseIndex sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+                self.lastChooseIndex = chooseIndex;
                 if (chooseIndex == 0) {
                     weakSelf.headView.typeLabel.text = @"全部类型";
                     weakSelf.bizType = nil;
@@ -256,7 +259,12 @@
     }
 }
 - (void)showPickerView {
-    KSFullDatePicker *pickerView = [[KSFullDatePicker alloc] initWithTitle:@"" date:[NSDate date] pickMode:KSDATEPICKER_MODE_YEAR_MONTH sureButtonColor:THEMECOLOR selectDateBlock:^(NSString *date) {
+    [self.dateFormatter setDateFormat:@"yyyy-MM"];
+    NSDate *preDate = [NSDate date];
+    if (![NSString isEmptyString:self.searchDate]) {
+        preDate = [self.dateFormatter dateFromString:self.searchDate];
+    }
+    KSFullDatePicker *pickerView = [[KSFullDatePicker alloc] initWithTitle:@"" date:preDate pickMode:KSDATEPICKER_MODE_YEAR_MONTH sureButtonColor:THEMECOLOR selectDateBlock:^(NSString *date) {
         self.searchDate = date;
         NSString *displayTime = [self getTimeDisplay:date];
         [self.headView.timeLabel setText:displayTime];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeAlbumView.xib

@@ -32,7 +32,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门专辑" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A5i-dJ-9Mu">
-                    <rect key="frame" x="35" y="20" width="67.5" height="22"/>
+                    <rect key="frame" x="24" y="20" width="67.5" height="22"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="22" id="cYj-Mu-vFC"/>
                     </constraints>
@@ -68,7 +68,7 @@
                     </connections>
                 </button>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_left" translatesAutoresizingMaskIntoConstraints="NO" id="kHC-jW-zF2">
-                    <rect key="frame" x="25" y="23.5" width="4" height="15"/>
+                    <rect key="frame" x="14" y="23.5" width="4" height="15"/>
                 </imageView>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -89,7 +89,7 @@
                 <constraint firstItem="sK1-pz-8Kl" firstAttribute="trailing" secondItem="KTG-G7-svg" secondAttribute="trailing" constant="-5" id="qsa-r7-hcB"/>
                 <constraint firstItem="4Cx-dC-YoK" firstAttribute="leading" secondItem="KTG-G7-svg" secondAttribute="leading" constant="6" id="qsw-or-D3A"/>
                 <constraint firstItem="sK1-pz-8Kl" firstAttribute="leading" secondItem="4Cx-dC-YoK" secondAttribute="trailing" constant="3" id="rEO-qe-MxX"/>
-                <constraint firstItem="kHC-jW-zF2" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="25" id="vNa-KD-UdJ"/>
+                <constraint firstItem="kHC-jW-zF2" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="vNa-KD-UdJ"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeMusic/HomeHotMusicView.xib

@@ -26,11 +26,11 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门曲目" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ObF-3e-j29">
-                    <rect key="frame" x="24" y="20" width="64" height="24"/>
+                    <rect key="frame" x="24" y="20" width="67.5" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="24" id="cPc-Bd-itn"/>
                     </constraints>
-                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeNewHeadView.m

@@ -119,7 +119,7 @@
     else if ([infoMessage.entryStatus isEqualToString:@"DOING"]) { // 认证审核中
         self.authView.backgroundColor = HexRGB(0xEFFBF9);
         [self.authIcon setImage:[UIImage imageNamed:@"authing_icon"]];
-        self.authTitle.text = @"老师审核中";
+        self.authTitle.text = @"认证审核中";
         self.authTitle.textColor = THEMECOLOR;
         [self.nextImage setImage:[UIImage imageNamed:@"auth_next_green"]];
     }

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeNewMusic/HomeNewMusicView.xib

@@ -26,11 +26,11 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="最新曲目" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6CW-e0-al3">
-                    <rect key="frame" x="24" y="20" width="71.666666666666671" height="24"/>
+                    <rect key="frame" x="24" y="20" width="67.666666666666671" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="24" id="ykn-Z7-imu"/>
                     </constraints>
-                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
+                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Controller/InstrumentChooseViewController.m

@@ -191,15 +191,14 @@
 - (void)countMessageWithModel:(InstrumentMessageModel *)model indexPath:(NSIndexPath *)indexPath {
     if (self.isSingleChoose) { // 单选
         if (model.isChoose) {
-            if (self.chooseModel) {
-                self.chooseModel.isChoose = NO;
-            }
+            self.chooseModel = model;
+            self.chooseIndexPath = indexPath;
         }
         else {
-            model.isChoose = NO;
             self.chooseModel = nil;
             self.chooseIndexPath = nil;
         }
+        
         if (self.chooseIndexPath) {
             [self.collectionView reloadItemsAtIndexPaths:@[indexPath,self.chooseIndexPath]];
 
@@ -207,8 +206,6 @@
         else {
             [self.collectionView reloadItemsAtIndexPaths:@[indexPath]];
         }
-        self.chooseModel = model;
-        self.chooseIndexPath = indexPath;
     }
     else { // 多选
         if (model.isChoose) {

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/TenantMineHeadView.xib

@@ -35,7 +35,7 @@
                             </userDefinedRuntimeAttributes>
                         </imageView>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vFq-5f-Squ">
-                            <rect key="frame" x="87" y="40" width="10" height="18"/>
+                            <rect key="frame" x="87" y="47" width="10" height="18"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fa1-iw-aks">
                                     <rect key="frame" x="5" y="0.0" width="0.0" height="18"/>
@@ -65,9 +65,9 @@
                             </userDefinedRuntimeAttributes>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J7V-BY-Z3E">
-                            <rect key="frame" x="89" y="13" width="0.0" height="17"/>
+                            <rect key="frame" x="89" y="13" width="0.0" height="24"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="17" id="N8P-XB-sBW"/>
+                                <constraint firstAttribute="height" constant="24" id="N8P-XB-sBW"/>
                             </constraints>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
                             <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -81,14 +81,14 @@
                             </connections>
                         </button>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="QHb-w1-1yi">
-                            <rect key="frame" x="98" y="13.666666666666664" width="39" height="16"/>
+                            <rect key="frame" x="98" y="17" width="39" height="16"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="39" id="dmt-FK-O3O"/>
                                 <constraint firstAttribute="height" constant="16" id="oKJ-9H-jHo"/>
                             </constraints>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Pf0-fO-g6q">
-                            <rect key="frame" x="143" y="13.666666666666664" width="39" height="16"/>
+                            <rect key="frame" x="143" y="17" width="39" height="16"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="39" id="0jU-Yr-iab"/>
                                 <constraint firstAttribute="height" constant="16" id="WMh-DL-Rcf"/>