diff --git a/keyBoard/Assets.xcassets/Home/home_bar_underline.imageset/Contents.json b/keyBoard/Assets.xcassets/Home/home_bar_underline.imageset/Contents.json index d3f2079..e7680c9 100644 --- a/keyBoard/Assets.xcassets/Home/home_bar_underline.imageset/Contents.json +++ b/keyBoard/Assets.xcassets/Home/home_bar_underline.imageset/Contents.json @@ -1,7 +1,6 @@ { "images" : [ { - "filename" : "home_bar_underline.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/keyBoard/Assets.xcassets/Home/home_bar_underline.imageset/home_bar_underline.png b/keyBoard/Assets.xcassets/Home/home_bar_underline.imageset/home_bar_underline.png deleted file mode 100644 index 3658ff5..0000000 Binary files a/keyBoard/Assets.xcassets/Home/home_bar_underline.imageset/home_bar_underline.png and /dev/null differ diff --git a/keyBoard/Assets.xcassets/Home/home_down_arrow.imageset/Contents.json b/keyBoard/Assets.xcassets/Home/home_down_arrow.imageset/Contents.json index d5f9251..74f39a0 100644 --- a/keyBoard/Assets.xcassets/Home/home_down_arrow.imageset/Contents.json +++ b/keyBoard/Assets.xcassets/Home/home_down_arrow.imageset/Contents.json @@ -1,15 +1,16 @@ { "images" : [ { - "filename" : "home_down_arrow.png", "idiom" : "universal", "scale" : "1x" }, { + "filename" : "home_down_arrow 1.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "home_down_arrow 2.png", "idiom" : "universal", "scale" : "3x" } diff --git a/keyBoard/Assets.xcassets/Home/home_down_arrow.imageset/home_down_arrow.png b/keyBoard/Assets.xcassets/Home/home_down_arrow.imageset/home_down_arrow 1.png similarity index 100% rename from keyBoard/Assets.xcassets/Home/home_down_arrow.imageset/home_down_arrow.png rename to keyBoard/Assets.xcassets/Home/home_down_arrow.imageset/home_down_arrow 1.png diff --git a/keyBoard/Assets.xcassets/Home/home_down_arrow.imageset/home_down_arrow 2.png b/keyBoard/Assets.xcassets/Home/home_down_arrow.imageset/home_down_arrow 2.png new file mode 100644 index 0000000..60c653c Binary files /dev/null and b/keyBoard/Assets.xcassets/Home/home_down_arrow.imageset/home_down_arrow 2.png differ diff --git a/keyBoard/Assets.xcassets/Home/home_left_bg.imageset/Contents.json b/keyBoard/Assets.xcassets/Home/home_left_bg.imageset/Contents.json index 9a26c26..bcd7482 100644 --- a/keyBoard/Assets.xcassets/Home/home_left_bg.imageset/Contents.json +++ b/keyBoard/Assets.xcassets/Home/home_left_bg.imageset/Contents.json @@ -1,15 +1,16 @@ { "images" : [ { - "filename" : "home_left_bg.png", "idiom" : "universal", "scale" : "1x" }, { + "filename" : "home_left_bg 1.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "home_left_bg 2.png", "idiom" : "universal", "scale" : "3x" } diff --git a/keyBoard/Assets.xcassets/Home/home_left_bg.imageset/home_left_bg.png b/keyBoard/Assets.xcassets/Home/home_left_bg.imageset/home_left_bg 1.png similarity index 100% rename from keyBoard/Assets.xcassets/Home/home_left_bg.imageset/home_left_bg.png rename to keyBoard/Assets.xcassets/Home/home_left_bg.imageset/home_left_bg 1.png diff --git a/keyBoard/Assets.xcassets/Home/home_left_bg.imageset/home_left_bg 2.png b/keyBoard/Assets.xcassets/Home/home_left_bg.imageset/home_left_bg 2.png new file mode 100644 index 0000000..9d3ddc8 Binary files /dev/null and b/keyBoard/Assets.xcassets/Home/home_left_bg.imageset/home_left_bg 2.png differ diff --git a/keyBoard/Assets.xcassets/Home/home_right_bg.imageset/Contents.json b/keyBoard/Assets.xcassets/Home/home_right_bg.imageset/Contents.json index 88d79a3..e64eb3f 100644 --- a/keyBoard/Assets.xcassets/Home/home_right_bg.imageset/Contents.json +++ b/keyBoard/Assets.xcassets/Home/home_right_bg.imageset/Contents.json @@ -1,15 +1,16 @@ { "images" : [ { - "filename" : "home_right_bg.png", "idiom" : "universal", "scale" : "1x" }, { + "filename" : "home_right_bg 1.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "home_right_bg 2.png", "idiom" : "universal", "scale" : "3x" } diff --git a/keyBoard/Assets.xcassets/Home/home_right_bg.imageset/home_right_bg.png b/keyBoard/Assets.xcassets/Home/home_right_bg.imageset/home_right_bg 1.png similarity index 100% rename from keyBoard/Assets.xcassets/Home/home_right_bg.imageset/home_right_bg.png rename to keyBoard/Assets.xcassets/Home/home_right_bg.imageset/home_right_bg 1.png diff --git a/keyBoard/Assets.xcassets/Home/home_right_bg.imageset/home_right_bg 2.png b/keyBoard/Assets.xcassets/Home/home_right_bg.imageset/home_right_bg 2.png new file mode 100644 index 0000000..4972b28 Binary files /dev/null and b/keyBoard/Assets.xcassets/Home/home_right_bg.imageset/home_right_bg 2.png differ diff --git a/keyBoard/Assets.xcassets/Home/home_up_arrow.imageset/Contents.json b/keyBoard/Assets.xcassets/Home/home_up_arrow.imageset/Contents.json index 9e7d2e1..f37b26a 100644 --- a/keyBoard/Assets.xcassets/Home/home_up_arrow.imageset/Contents.json +++ b/keyBoard/Assets.xcassets/Home/home_up_arrow.imageset/Contents.json @@ -1,15 +1,16 @@ { "images" : [ { - "filename" : "home_up_arrow.png", "idiom" : "universal", "scale" : "1x" }, { + "filename" : "home_up_arrow 1.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "home_up_arrow 2.png", "idiom" : "universal", "scale" : "3x" } diff --git a/keyBoard/Assets.xcassets/Home/home_up_arrow.imageset/home_up_arrow.png b/keyBoard/Assets.xcassets/Home/home_up_arrow.imageset/home_up_arrow 1.png similarity index 100% rename from keyBoard/Assets.xcassets/Home/home_up_arrow.imageset/home_up_arrow.png rename to keyBoard/Assets.xcassets/Home/home_up_arrow.imageset/home_up_arrow 1.png diff --git a/keyBoard/Assets.xcassets/Home/home_up_arrow.imageset/home_up_arrow 2.png b/keyBoard/Assets.xcassets/Home/home_up_arrow.imageset/home_up_arrow 2.png new file mode 100644 index 0000000..6076766 Binary files /dev/null and b/keyBoard/Assets.xcassets/Home/home_up_arrow.imageset/home_up_arrow 2.png differ diff --git a/keyBoard/Assets.xcassets/My/my_bg_icon.imageset/Contents.json b/keyBoard/Assets.xcassets/My/my_bg_icon.imageset/Contents.json index 4ad7125..a2d443a 100644 --- a/keyBoard/Assets.xcassets/My/my_bg_icon.imageset/Contents.json +++ b/keyBoard/Assets.xcassets/My/my_bg_icon.imageset/Contents.json @@ -1,7 +1,6 @@ { "images" : [ { - "filename" : "my_bg_icon.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/keyBoard/Assets.xcassets/My/my_bg_icon.imageset/my_bg_icon.png b/keyBoard/Assets.xcassets/My/my_bg_icon.imageset/my_bg_icon.png deleted file mode 100644 index defa1d2..0000000 Binary files a/keyBoard/Assets.xcassets/My/my_bg_icon.imageset/my_bg_icon.png and /dev/null differ diff --git a/keyBoard/Class/Home/VC/HomeRankVC.h b/keyBoard/Class/Home/VC/HomeRankVC.h index c9a3963..2e81a51 100644 --- a/keyBoard/Class/Home/VC/HomeRankVC.h +++ b/keyBoard/Class/Home/VC/HomeRankVC.h @@ -10,7 +10,7 @@ #import "JXCategoryListContainerView.h" NS_ASSUME_NONNULL_BEGIN -@interface HomeRankVC : BaseViewController +@interface HomeRankVC : UIViewController // 列表 @property (nonatomic, strong) UICollectionView *collectionView; @end diff --git a/keyBoard/Class/Home/VC/HomeRankVC.m b/keyBoard/Class/Home/VC/HomeRankVC.m index 19733bb..3fa2921 100644 --- a/keyBoard/Class/Home/VC/HomeRankVC.m +++ b/keyBoard/Class/Home/VC/HomeRankVC.m @@ -22,6 +22,7 @@ - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view. + self.view.backgroundColor = [UIColor clearColor]; self.titles = @[@"螃蟹啊斯柯达积分卡", @"小龙虾", @"苹果", @"胡萝卜", @"葡萄", @"西瓜"]; [self.view addSubview:self.myCategoryView]; [self.view addSubview:self.listContainerView];