Browse Source

替换趣纠课旧图片

Steven 3 months ago
parent
commit
452e90987b
13 changed files with 33 additions and 10 deletions
  1. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/Income/income_accompany.imageset/income_accompany@2x.png
  2. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/Income/income_accompany.imageset/income_accompany@3x.png
  3. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/Income/income_vip.imageset/Contents.json
  4. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/Income/income_vip.imageset/income_vip@2x.png
  5. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/Income/income_vip.imageset/income_vip@3x.png
  6. 2 2
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/Contents.json
  7. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/income_accompany@2x.png
  8. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/income_accompany@3x.png
  9. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/notifer_accompany@2x.png
  10. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/notifer_accompany@3x.png
  11. 1 2
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/View/MyIncomeListCell.m
  12. 7 6
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageLiveCourse/MineLiveCourseGroupCell.m
  13. 1 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageLiveCourse/MineLiveCourseGroupCell.xib

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/Income/income_accompany.imageset/income_accompany@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/Income/income_accompany.imageset/income_accompany@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/Income/income_vip.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "income_vip@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "income_vip@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/Income/income_vip.imageset/income_vip@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/Income/income_vip.imageset/income_vip@3x.png


+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "notifer_accompany@2x.png",
+      "filename" : "income_accompany@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "notifer_accompany@3x.png",
+      "filename" : "income_accompany@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/income_accompany@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/income_accompany@3x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/notifer_accompany@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/notifer_accompany@3x.png


+ 1 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/View/MyIncomeListCell.m

@@ -69,8 +69,7 @@
         self.courseTime.text = createTime;
     }
     else if ([sourceModel.bizType isEqualToString:@"VIP"]) { // VIP定制
-#warning 需要更换图片
-        [self.courseTypeImage setImage:[UIImage imageNamed:@"income_accompany"]];
+        [self.courseTypeImage setImage:[UIImage imageNamed:@"income_vip"]];
     }
     else if ([sourceModel.bizType isEqualToString:@"PRACTICE"]) { // 其他
         [self.courseTypeImage setImage:[UIImage imageNamed:@"income_accompany"]];

+ 7 - 6
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageLiveCourse/MineLiveCourseGroupCell.m

@@ -15,6 +15,7 @@
 @property (weak, nonatomic) IBOutlet UIImageView *coverImage;
 @property (weak, nonatomic) IBOutlet UILabel *courseName;
 
+@property (weak, nonatomic) IBOutlet UIView *orderUserBg;
 @property (weak, nonatomic) IBOutlet UILabel *orderUser;
 @property (weak, nonatomic) IBOutlet UILabel *courseTime;
 @property (weak, nonatomic) IBOutlet UILabel *tagLabel;
@@ -86,7 +87,7 @@
             self.statusView.backgroundColor = HexRGB(0xd5fff7);
             self.statusLabel.textColor = HexRGB(0x2dc7aa);
             self.statusLabel.text = @"进行中";
-            self.orderUser.hidden = NO;
+            self.orderUserBg.hidden = NO;
             self.statusView.hidden = NO;
         }
             break;
@@ -95,7 +96,7 @@
             self.statusView.backgroundColor = HexRGB(0xFFEEE3);
             self.statusLabel.textColor = HexRGB(0xFF4E19);
             self.statusLabel.text = @"未上架";
-            self.orderUser.hidden = YES;
+            self.orderUserBg.hidden = YES;
         }
             break;
         case COURSERSTATUS_APPLY:
@@ -103,7 +104,7 @@
             self.statusView.backgroundColor = HexRGB(0xFFE7E7);
             self.statusLabel.textColor = HexRGB(0xFF1919);
             self.statusLabel.text = @"销售中";
-            self.orderUser.hidden = NO;
+            self.orderUserBg.hidden = NO;
         }
             break;
         case COURSERSTATUS_COMPLETE:
@@ -111,7 +112,7 @@
             self.statusView.backgroundColor = HexRGB(0xDEF2FF);
             self.statusLabel.textColor = HexRGB(0x008AE0);
             self.statusLabel.text = @"已完成";
-            self.orderUser.hidden = NO;
+            self.orderUserBg.hidden = NO;
             
         }
             break;
@@ -120,7 +121,7 @@
             self.statusView.backgroundColor = HexRGB(0xF0F0F0);
             self.statusLabel.textColor = HexRGB(0x666666);
             self.statusLabel.text = @"已取消";
-            self.orderUser.hidden = NO;
+            self.orderUserBg.hidden = NO;
         }
             break;
         case COURSERSTATUS_OUTSALE:
@@ -128,7 +129,7 @@
             self.statusView.backgroundColor = HexRGB(0xF0F0F0);
             self.statusLabel.textColor = HexRGB(0x666666);
             self.statusLabel.text = @"已下架";
-            self.orderUser.hidden = NO;
+            self.orderUserBg.hidden = NO;
         }
             break;
         default:

+ 1 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageLiveCourse/MineLiveCourseGroupCell.xib

@@ -219,6 +219,7 @@
                 <outlet property="courseTime" destination="L1q-Ls-jli" id="fAL-cW-y0a"/>
                 <outlet property="coverImage" destination="vAB-E9-FHQ" id="r8q-zR-NKF"/>
                 <outlet property="orderUser" destination="Jy4-WH-Grt" id="Yfb-dR-Ai8"/>
+                <outlet property="orderUserBg" destination="L2D-Md-biT" id="Qq3-QN-7Bz"/>
                 <outlet property="priceLabel" destination="6cN-Qs-aEM" id="KDy-ya-8bS"/>
                 <outlet property="statusLabel" destination="o0s-oa-65j" id="cXG-m7-vo5"/>
                 <outlet property="statusView" destination="yTY-zb-NMC" id="ghW-PV-chX"/>