diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_diamonds_arrow.imageset/exchange_diamonds_arrow@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_diamonds_arrow.imageset/exchange_diamonds_arrow@2x.png deleted file mode 100644 index b7ac3dc4..00000000 Binary files a/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_diamonds_arrow.imageset/exchange_diamonds_arrow@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_diamonds_arrow.imageset/exchange_diamonds_arrow@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_diamonds_arrow.imageset/exchange_diamonds_arrow@3x.png deleted file mode 100644 index b1a013b0..00000000 Binary files a/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_diamonds_arrow.imageset/exchange_diamonds_arrow@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_diamonds_arrow.imageset/Contents.json b/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_new_diamonds_icon.imageset/Contents.json similarity index 71% rename from YuMi/Assets.xcassets/jm/IncomeRecord/exchange_diamonds_arrow.imageset/Contents.json rename to YuMi/Assets.xcassets/jm/IncomeRecord/exchange_new_diamonds_icon.imageset/Contents.json index c8c7d883..319510c8 100644 --- a/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_diamonds_arrow.imageset/Contents.json +++ b/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_new_diamonds_icon.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "exchange_diamonds_arrow@2x.png", + "filename" : "exchange_diamonds_icon@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "exchange_diamonds_arrow@3x.png", + "filename" : "exchange_diamonds_icon@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_new_diamonds_icon.imageset/exchange_diamonds_icon@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_new_diamonds_icon.imageset/exchange_diamonds_icon@2x.png new file mode 100644 index 00000000..c27144b5 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_new_diamonds_icon.imageset/exchange_diamonds_icon@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_new_diamonds_icon.imageset/exchange_diamonds_icon@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_new_diamonds_icon.imageset/exchange_diamonds_icon@3x.png new file mode 100644 index 00000000..fe20555d Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/exchange_new_diamonds_icon.imageset/exchange_diamonds_icon@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_1.imageset/income_record_arrow_1@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_1.imageset/income_record_arrow_1@2x.png index e3111b16..50400965 100644 Binary files a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_1.imageset/income_record_arrow_1@2x.png and b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_1.imageset/income_record_arrow_1@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_1.imageset/income_record_arrow_1@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_1.imageset/income_record_arrow_1@3x.png index 21c6a997..6fb16172 100644 Binary files a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_1.imageset/income_record_arrow_1@3x.png and b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_1.imageset/income_record_arrow_1@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_2.imageset/income_record_arrow_2@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_2.imageset/income_record_arrow_2@2x.png index 35bbec42..13e92e51 100644 Binary files a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_2.imageset/income_record_arrow_2@2x.png and b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_2.imageset/income_record_arrow_2@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_2.imageset/income_record_arrow_2@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_2.imageset/income_record_arrow_2@3x.png index 886a53df..f82533ee 100644 Binary files a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_2.imageset/income_record_arrow_2@3x.png and b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_arrow_2.imageset/income_record_arrow_2@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_diamond_bg.imageset/income_record_diamond_bg@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_diamond_bg.imageset/income_record_diamond_bg@2x.png index b73a21fe..ecd1dc7f 100644 Binary files a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_diamond_bg.imageset/income_record_diamond_bg@2x.png and b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_diamond_bg.imageset/income_record_diamond_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_diamond_bg.imageset/income_record_diamond_bg@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_diamond_bg.imageset/income_record_diamond_bg@3x.png index 692d4159..fd408a8e 100644 Binary files a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_diamond_bg.imageset/income_record_diamond_bg@3x.png and b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_diamond_bg.imageset/income_record_diamond_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_gold_bg.imageset/income_record_gold_bg@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_gold_bg.imageset/income_record_gold_bg@2x.png index 3d8e4e76..864f9ac0 100644 Binary files a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_gold_bg.imageset/income_record_gold_bg@2x.png and b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_gold_bg.imageset/income_record_gold_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_gold_bg.imageset/income_record_gold_bg@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_gold_bg.imageset/income_record_gold_bg@3x.png index f8357c05..e17921a3 100644 Binary files a/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_gold_bg.imageset/income_record_gold_bg@3x.png and b/YuMi/Assets.xcassets/jm/IncomeRecord/income_record_gold_bg.imageset/income_record_gold_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/mine_recharge_balance_bg.imageset/Contents.json b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_coin_icon.imageset/Contents.json similarity index 71% rename from YuMi/Assets.xcassets/jm/mine_recharge_balance_bg.imageset/Contents.json rename to YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_coin_icon.imageset/Contents.json index 9b66e4aa..53c8baca 100644 --- a/YuMi/Assets.xcassets/jm/mine_recharge_balance_bg.imageset/Contents.json +++ b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_coin_icon.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "mine_recharge_balance_bg@2x.png", + "filename" : "ms_exchange_coin_icon@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "mine_recharge_balance_bg@3x.png", + "filename" : "ms_exchange_coin_icon@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_coin_icon.imageset/ms_exchange_coin_icon@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_coin_icon.imageset/ms_exchange_coin_icon@2x.png new file mode 100644 index 00000000..056dacb1 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_coin_icon.imageset/ms_exchange_coin_icon@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_coin_icon.imageset/ms_exchange_coin_icon@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_coin_icon.imageset/ms_exchange_coin_icon@3x.png new file mode 100644 index 00000000..d95628a1 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_coin_icon.imageset/ms_exchange_coin_icon@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_coin_bg.imageset/Contents.json b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_coin_bg.imageset/Contents.json new file mode 100644 index 00000000..45f9adde --- /dev/null +++ b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_coin_bg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_exchange_diamonds_coin_bg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_exchange_diamonds_coin_bg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_coin_bg.imageset/ms_exchange_diamonds_coin_bg@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_coin_bg.imageset/ms_exchange_diamonds_coin_bg@2x.png new file mode 100644 index 00000000..d71fa7c9 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_coin_bg.imageset/ms_exchange_diamonds_coin_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_coin_bg.imageset/ms_exchange_diamonds_coin_bg@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_coin_bg.imageset/ms_exchange_diamonds_coin_bg@3x.png new file mode 100644 index 00000000..a2c6a0a0 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_coin_bg.imageset/ms_exchange_diamonds_coin_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_diamonds_bg.imageset/Contents.json b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_diamonds_bg.imageset/Contents.json new file mode 100644 index 00000000..d0c0454f --- /dev/null +++ b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_diamonds_bg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_exchange_diamonds_diamonds_bg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_exchange_diamonds_diamonds_bg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_diamonds_bg.imageset/ms_exchange_diamonds_diamonds_bg@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_diamonds_bg.imageset/ms_exchange_diamonds_diamonds_bg@2x.png new file mode 100644 index 00000000..e27bcd5e Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_diamonds_bg.imageset/ms_exchange_diamonds_diamonds_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_diamonds_bg.imageset/ms_exchange_diamonds_diamonds_bg@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_diamonds_bg.imageset/ms_exchange_diamonds_diamonds_bg@3x.png new file mode 100644 index 00000000..ed3b044c Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_diamonds_bg.imageset/ms_exchange_diamonds_diamonds_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_record_coin.imageset/Contents.json b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_record_coin.imageset/Contents.json new file mode 100644 index 00000000..69c60b88 --- /dev/null +++ b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_record_coin.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_income_record_coin@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_income_record_coin@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_record_coin.imageset/ms_income_record_coin@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_record_coin.imageset/ms_income_record_coin@2x.png new file mode 100644 index 00000000..8208b44b Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_record_coin.imageset/ms_income_record_coin@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_record_coin.imageset/ms_income_record_coin@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_record_coin.imageset/ms_income_record_coin@3x.png new file mode 100644 index 00000000..11559a05 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_record_coin.imageset/ms_income_record_coin@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_recorddiamond.imageset/Contents.json b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_recorddiamond.imageset/Contents.json new file mode 100644 index 00000000..3116d0b8 --- /dev/null +++ b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_recorddiamond.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_income_recorddiamond@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_income_recorddiamond@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_recorddiamond.imageset/ms_income_recorddiamond@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_recorddiamond.imageset/ms_income_recorddiamond@2x.png new file mode 100644 index 00000000..1d1b3ccf Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_recorddiamond.imageset/ms_income_recorddiamond@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_recorddiamond.imageset/ms_income_recorddiamond@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_recorddiamond.imageset/ms_income_recorddiamond@3x.png new file mode 100644 index 00000000..cbb010f6 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_recorddiamond.imageset/ms_income_recorddiamond@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_coin_bg.imageset/Contents.json b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_coin_bg.imageset/Contents.json new file mode 100644 index 00000000..fb67e800 --- /dev/null +++ b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_coin_bg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_mine_coin_bg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_mine_coin_bg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_coin_bg.imageset/ms_mine_coin_bg@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_coin_bg.imageset/ms_mine_coin_bg@2x.png new file mode 100644 index 00000000..0aa6b3a6 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_coin_bg.imageset/ms_mine_coin_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_coin_bg.imageset/ms_mine_coin_bg@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_coin_bg.imageset/ms_mine_coin_bg@3x.png new file mode 100644 index 00000000..38d5be46 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_coin_bg.imageset/ms_mine_coin_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_diamond_bg.imageset/Contents.json b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_diamond_bg.imageset/Contents.json new file mode 100644 index 00000000..73355f51 --- /dev/null +++ b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_diamond_bg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_mine_diamond_bg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_mine_diamond_bg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_diamond_bg.imageset/ms_mine_diamond_bg@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_diamond_bg.imageset/ms_mine_diamond_bg@2x.png new file mode 100644 index 00000000..7a5a5d46 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_diamond_bg.imageset/ms_mine_diamond_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_diamond_bg.imageset/ms_mine_diamond_bg@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_diamond_bg.imageset/ms_mine_diamond_bg@3x.png new file mode 100644 index 00000000..061fb32f Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_diamond_bg.imageset/ms_mine_diamond_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_top_bg.imageset/Contents.json b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_top_bg.imageset/Contents.json new file mode 100644 index 00000000..b9ecc376 --- /dev/null +++ b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_top_bg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_mine_top_bg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_mine_top_bg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_top_bg.imageset/ms_mine_top_bg@2x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_top_bg.imageset/ms_mine_top_bg@2x.png new file mode 100644 index 00000000..b8e67a68 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_top_bg.imageset/ms_mine_top_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_top_bg.imageset/ms_mine_top_bg@3x.png b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_top_bg.imageset/ms_mine_top_bg@3x.png new file mode 100644 index 00000000..276b5065 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_top_bg.imageset/ms_mine_top_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/mine_head_account_bg.imageset/mine_head_account_bg@2x.png b/YuMi/Assets.xcassets/jm/mine_head_account_bg.imageset/mine_head_account_bg@2x.png index e0a82832..9886ad54 100644 Binary files a/YuMi/Assets.xcassets/jm/mine_head_account_bg.imageset/mine_head_account_bg@2x.png and b/YuMi/Assets.xcassets/jm/mine_head_account_bg.imageset/mine_head_account_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/mine_head_account_bg.imageset/mine_head_account_bg@3x.png b/YuMi/Assets.xcassets/jm/mine_head_account_bg.imageset/mine_head_account_bg@3x.png index 6a1ba26c..8f87ef3e 100644 Binary files a/YuMi/Assets.xcassets/jm/mine_head_account_bg.imageset/mine_head_account_bg@3x.png and b/YuMi/Assets.xcassets/jm/mine_head_account_bg.imageset/mine_head_account_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/mine_recharge_balance_bg.imageset/mine_recharge_balance_bg@2x.png b/YuMi/Assets.xcassets/jm/mine_recharge_balance_bg.imageset/mine_recharge_balance_bg@2x.png deleted file mode 100644 index 9923b312..00000000 Binary files a/YuMi/Assets.xcassets/jm/mine_recharge_balance_bg.imageset/mine_recharge_balance_bg@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/jm/mine_recharge_balance_bg.imageset/mine_recharge_balance_bg@3x.png b/YuMi/Assets.xcassets/jm/mine_recharge_balance_bg.imageset/mine_recharge_balance_bg@3x.png deleted file mode 100644 index 396c6073..00000000 Binary files a/YuMi/Assets.xcassets/jm/mine_recharge_balance_bg.imageset/mine_recharge_balance_bg@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/ms_mine_recharge_coin.imageset/Contents.json b/YuMi/Assets.xcassets/yna/ms_mine_recharge_coin.imageset/Contents.json new file mode 100644 index 00000000..3d844960 --- /dev/null +++ b/YuMi/Assets.xcassets/yna/ms_mine_recharge_coin.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_mine_recharge_coin@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_mine_recharge_coin@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/yna/ms_mine_recharge_coin.imageset/ms_mine_recharge_coin@2x.png b/YuMi/Assets.xcassets/yna/ms_mine_recharge_coin.imageset/ms_mine_recharge_coin@2x.png new file mode 100644 index 00000000..da2d6478 Binary files /dev/null and b/YuMi/Assets.xcassets/yna/ms_mine_recharge_coin.imageset/ms_mine_recharge_coin@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/ms_mine_recharge_coin.imageset/ms_mine_recharge_coin@3x.png b/YuMi/Assets.xcassets/yna/ms_mine_recharge_coin.imageset/ms_mine_recharge_coin@3x.png new file mode 100644 index 00000000..c1a76b35 Binary files /dev/null and b/YuMi/Assets.xcassets/yna/ms_mine_recharge_coin.imageset/ms_mine_recharge_coin@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/room_info_back.imageset/room_info_back@2x.png b/YuMi/Assets.xcassets/yna/room_info_back.imageset/room_info_back@2x.png index 9ab1aaf0..e768090c 100644 Binary files a/YuMi/Assets.xcassets/yna/room_info_back.imageset/room_info_back@2x.png and b/YuMi/Assets.xcassets/yna/room_info_back.imageset/room_info_back@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/room_info_back.imageset/room_info_back@3x.png b/YuMi/Assets.xcassets/yna/room_info_back.imageset/room_info_back@3x.png index 9e10372b..d29a990e 100644 Binary files a/YuMi/Assets.xcassets/yna/room_info_back.imageset/room_info_back@3x.png and b/YuMi/Assets.xcassets/yna/room_info_back.imageset/room_info_back@3x.png differ diff --git a/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.m b/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.m index 7a9e7fe5..0303b801 100644 --- a/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.m +++ b/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.m @@ -14,8 +14,7 @@ @property (nonatomic,strong) UILabel *titleView; ///我的房间 @property (nonatomic,strong) XPMinePersonalCenterItemView *myRoomView; -///收益记录 -@property (nonatomic,strong) XPMinePersonalCenterItemView *earningsRecordView; + ///赠送钻石 @property (nonatomic,strong) XPMinePersonalCenterItemView *giveDiamondView; @@ -40,7 +39,7 @@ [self.contentView addSubview:self.bgView]; [self.bgView addSubview:self.titleView]; [self.bgView addSubview:self.myRoomView]; - [self.bgView addSubview:self.earningsRecordView]; + [self.bgView addSubview:self.giveDiamondView]; self.giveDiamondView.hidden = YES; } @@ -61,42 +60,20 @@ make.height.equalTo(@38); make.top.mas_equalTo(44); }]; - [self.earningsRecordView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.height.width.equalTo(self.myRoomView); - make.trailing.mas_equalTo(-35); - }]; + [self.giveDiamondView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.height.width.equalTo(self.myRoomView); - make.trailing.mas_equalTo(0); + make.trailing.mas_equalTo(-kGetScaleWidth(35)); }]; } -(void)setIsHaveGiveDiamond:(BOOL)isHaveGiveDiamond{ _isHaveGiveDiamond = isHaveGiveDiamond; self.myRoomView.isHaveGiveDiamond = _isHaveGiveDiamond; - self.earningsRecordView.isHaveGiveDiamond = _isHaveGiveDiamond; self.giveDiamondView.isHaveGiveDiamond = _isHaveGiveDiamond; - CGFloat width = (KScreenWidth - 30) / 3; - if(_isHaveGiveDiamond == YES){ - self.giveDiamondView.hidden = NO; - [self.myRoomView mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.width.mas_greaterThanOrEqualTo(width); - make.height.equalTo(@68); - }]; - [self.earningsRecordView mas_updateConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-width); - }]; - return; - } - self.giveDiamondView.hidden = YES; - [self.myRoomView mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(35); - make.width.mas_greaterThanOrEqualTo(104); - make.height.equalTo(@38); - }]; - [self.earningsRecordView mas_updateConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-35); - }]; + self.giveDiamondView.hidden = !_isHaveGiveDiamond; + + + } -(void)clickMyRoomAction{ @@ -144,16 +121,7 @@ } return _myRoomView; } --(XPMinePersonalCenterItemView *)earningsRecordView{ - if(!_earningsRecordView){ - _earningsRecordView = [[XPMinePersonalCenterItemView alloc]initWithFrame:CGRectZero]; - [_earningsRecordView setTitle:YMLocalizedString(@"XPMinePersonalCenterCell2")]; - [_earningsRecordView setImage:@"mine_earnings_record"]; - UITapGestureRecognizer *earningsRecordTap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickEarningsRecordAction)]; - [_earningsRecordView addGestureRecognizer:earningsRecordTap]; - } - return _earningsRecordView; -} + - (XPMinePersonalCenterItemView *)giveDiamondView{ if (!_giveDiamondView){ _giveDiamondView = [[XPMinePersonalCenterItemView alloc]initWithFrame:CGRectZero]; diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.h b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.h index 85a2f42a..1e86cd12 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.h +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.h @@ -10,7 +10,7 @@ @protocol XPExchangeDiamondsVCDelegate --(void)confirmExchangeDiamondsWithDiamondSuccess:(NSString *)diamond gold:(NSString *)gold; +-(void)confirmExchangeDiamondsWithDiamondSuccess:(NSString *_Nullable)diamond gold:(NSString *_Nonnull)gold; @end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.m index 92fef6a1..c9dc1352 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.m @@ -23,6 +23,11 @@ @property (nonatomic,strong) XPExchangeDiamondsView *exchangeView; @property (nonatomic,copy) NSString *diamond; @property (nonatomic,copy) NSString *gold; +@property(nonatomic,strong) UIImageView *bgImageView; +/// 返回 +@property (nonatomic,strong) UIButton *backBtn; +/// 标题 +@property (nonatomic,strong) UILabel *titleLabel; @end @implementation XPExchangeDiamondsVC @@ -63,7 +68,7 @@ [self.presenter confirmExchangeDiamondWithGoldNum:self.gold diamondNum:self.diamond currency:@"1"]; } #pragma mark - XPExchangeDiamondsViewDelegate --(void)confirmExchangeDiamondsWithDiamond:(NSString *)diamond gold:(NSString *)gold currency:(NSString *)currency{ +-(void)confirmExchangeDiamondsWithDiamond:(NSString *)diamond gold:(NSString *)gold{ self.diamond = diamond; self.gold = [NSString stringWithFormat:@"%.0f",ceilf(diamond.doubleValue / self.model.rate)]; XPMineConfirmGiveDiamondView *confirmView = [[XPMineConfirmGiveDiamondView alloc]initWithFrame:CGRectZero]; @@ -73,17 +78,41 @@ confirmView.delegate = self; [TTPopup popupView:confirmView style:TTPopupStyleAlert]; } +- (BOOL)isHiddenNavBar { + return YES; +} #pragma mark - Private Method - (void)initSubViews { self.title = YMLocalizedString(@"XPExchangeDiamondsView0"); + [self.view addSubview:self.bgImageView]; + [self.view addSubview:self.backBtn]; + [self.view addSubview:self.titleLabel]; [self.view addSubview:self.exchangeView]; } - (void)initSubViewConstraints { - [self.exchangeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.view); + [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.trailing.top.equalTo(self.view); }]; + [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(kStatusBarHeight); + make.height.mas_equalTo(44); + make.centerX.mas_equalTo(self.view); + }]; + [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.mas_equalTo(0); + make.top.mas_equalTo(kStatusBarHeight); + make.width.height.mas_equalTo(44); + }]; + [self.exchangeView mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.trailing.bottom.equalTo(self.view); + make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(48)); + }]; +} +/// 返回 +- (void)backBtnAction { + [self.navigationController popViewControllerAnimated:YES]; } #pragma mark -懒加载 - (XPExchangeDiamondsView *)exchangeView{ @@ -93,6 +122,31 @@ } return _exchangeView; } +- (UIImageView *)bgImageView{ + if(!_bgImageView){ + _bgImageView = [UIImageView new]; + _bgImageView.contentMode = UIViewContentModeScaleToFill; + _bgImageView.image = kImage(@"ms_mine_diamond_bg"); + } + return _bgImageView; +} +- (UIButton *)backBtn { + if (!_backBtn) { + _backBtn = [UIButton buttonWithType:UIButtonTypeCustom]; + [_backBtn setImage:[[UIImage imageNamed:@"room_info_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; + [_backBtn addTarget:self action:@selector(backBtnAction) forControlEvents:UIControlEventTouchUpInside]; + } + return _backBtn; +} +- (UILabel *)titleLabel { + if (!_titleLabel) { + _titleLabel = [[UILabel alloc] init]; + _titleLabel.text = YMLocalizedString(@"XPIncomeRecordVC1"); + _titleLabel.textColor = UIColor.blackColor; + _titleLabel.font = kFontBold(16); + } + return _titleLabel; +} @end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.h b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.h index e71d863b..13a642cc 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.h +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.h @@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN @protocol XPExchangeDiamondsViewDelegate --(void)confirmExchangeDiamondsWithDiamond:(NSString *)diamond gold:(NSString *)gold currency:(NSString *)currency; +-(void)confirmExchangeDiamondsWithDiamond:(NSString *)diamond gold:(NSString *)gold ; @end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m index 11ca1100..8dede07c 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m @@ -20,6 +20,7 @@ ///钻石数 @property (nonatomic,copy) NSString *diamondNum; @property (nonatomic,assign) IncomeRecordViewType chooseType; + @end @implementation XPExchangeDiamondsView @@ -35,6 +36,9 @@ #pragma mark - Private Method - (void)initSubViews { self.backgroundColor = [UIColor clearColor]; + + + [self addSubview:self.myGoldView]; [self addSubview:self.myDiamondsView]; [self addSubview:self.confirmBtn]; @@ -76,22 +80,27 @@ } - (void)initSubViewConstraints { - [self.myGoldView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(15)); + [self.myDiamondsView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(kGetScaleWidth(0)); make.leading.mas_equalTo(kGetScaleWidth(15)); make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(116)); + make.height.mas_equalTo(kGetScaleWidth(72)); }]; - [self.myDiamondsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.height.equalTo(self.myGoldView); - make.top.equalTo(self.myGoldView.mas_bottom); + [self.myGoldView mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.width.height.equalTo(self.myDiamondsView); + make.top.equalTo(self.myDiamondsView.mas_bottom).mas_offset(kGetScaleWidth(28)); }]; + [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(296)); - make.width.mas_equalTo(kGetScaleWidth(345)); - make.height.mas_equalTo(kGetScaleWidth(46)); + make.top.equalTo(self.myGoldView.mas_bottom).mas_offset(kGetScaleWidth(33)); + make.width.mas_equalTo(kGetScaleWidth(303)); + make.height.mas_equalTo(kGetScaleWidth(48)); make.centerX.equalTo(self); }]; +} +/// 返回 +- (void)backBtnAction { + } -(void)setModel:(XPExchangeDiamondsModel *)model{ _model = model; @@ -99,7 +108,7 @@ _myDiamondsView.model = _model; } -(void)confirmAction{ - if( self.model.golds < self.goldNum.doubleValue){ + if( self.model.diamonds < self.diamondNum.doubleValue){ [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPExchangeDiamondsView2")]; return; } @@ -113,15 +122,16 @@ } [self.myGoldView resignResponder]; [self.myDiamondsView resignResponder]; - if(self.delegate && [self.delegate respondsToSelector:@selector(confirmExchangeDiamondsWithDiamond:gold:currency:)]){ - [self.delegate confirmExchangeDiamondsWithDiamond:self.diamondNum gold:self.goldNum currency:self.chooseType == IncomeRecord_Diamond ? @"1" : @"3"]; + if(self.delegate && [self.delegate respondsToSelector:@selector(confirmExchangeDiamondsWithDiamond:gold:)]){ + [self.delegate confirmExchangeDiamondsWithDiamond:self.diamondNum gold:self.goldNum]; } } #pragma mark -懒加载 + - (XPExchangeDiamondsItemView *)myGoldView{ if (!_myGoldView){ _myGoldView = [[XPExchangeDiamondsItemView alloc]initWithFrame:CGRectZero type:IncomeRecord_Gold]; - [_myGoldView setCornerWithLeftTopCorner:kGetScaleWidth(14) rightTopCorner:kGetScaleWidth(14) bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(kGetScaleWidth(345), kGetScaleWidth(116))]; + } return _myGoldView; } @@ -129,18 +139,18 @@ -(XPExchangeDiamondsItemView *)myDiamondsView{ if (!_myDiamondsView){ _myDiamondsView = [[XPExchangeDiamondsItemView alloc]initWithFrame:CGRectZero type:IncomeRecord_Diamond]; - [_myDiamondsView setCornerWithLeftTopCorner:0 rightTopCorner:0 bottomLeftCorner:kGetScaleWidth(14) bottomRightCorner:kGetScaleWidth(14) size:CGSizeMake(kGetScaleWidth(345), kGetScaleWidth(116))]; + } return _myDiamondsView; } -(UIButton *)confirmBtn{ if (!_confirmBtn){ - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(345), kGetScaleWidth(46))]; + UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(345), kGetScaleWidth(48))]; _confirmBtn = [UIButton buttonWithType:UIButtonTypeCustom]; [_confirmBtn setTitle:YMLocalizedString(@"XPExchangeDiamondsView1") forState:UIControlStateNormal]; - _confirmBtn.titleLabel.font = [UIFont systemFontOfSize:16]; + _confirmBtn.titleLabel.font = kFontHeavy(16); [_confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _confirmBtn.layer.cornerRadius = kGetScaleWidth(23); + _confirmBtn.layer.cornerRadius = kGetScaleWidth(24); _confirmBtn.layer.masksToBounds = YES; _confirmBtn.enabled = NO; [_confirmBtn setBackgroundImage:image forState:UIControlStateNormal]; @@ -162,8 +172,7 @@ @property (nonatomic,strong) UIButton *iconView; ///兑换数量 @property (nonatomic,strong) XPTextField *numberView; -///箭头 -@property (nonatomic,strong) UIButton *arrowView; + @property (nonatomic,assign) IncomeRecordViewType type; @end @@ -182,61 +191,59 @@ #pragma mark - Private Method - (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; + self.backgroundColor = [UIColor clearColor]; [self addSubview:self.titleNumView]; [self addSubview:self.bgImageView]; - [self addSubview:self.arrowView]; + [self.bgImageView addSubview:self.iconView]; [self.bgImageView addSubview:self.numberView]; } - (void)initSubViewConstraints { [self.titleNumView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.mas_equalTo(kGetScaleWidth(15)); - make.top.mas_equalTo(kGetScaleWidth(16)); - make.height.mas_equalTo(kGetScaleWidth(20)); - make.trailing.mas_equalTo(-kGetScaleWidth(73)); - }]; - [self.arrowView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(30)); - make.height.mas_equalTo(kGetScaleWidth(30)); - make.trailing.mas_equalTo(-kGetScaleWidth(38)); - make.centerY.equalTo(self.titleNumView); + make.top.mas_equalTo(kGetScaleWidth(0)); + make.height.mas_equalTo(kGetScaleWidth(14)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); }]; + [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(14)); - make.trailing.mas_equalTo(-kGetScaleWidth(14)); - make.top.mas_equalTo(kGetScaleWidth(48)); - make.height.mas_equalTo(kGetScaleWidth(52)); + make.leading.mas_equalTo(kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); + make.top.equalTo(self.titleNumView.mas_bottom).mas_offset(kGetScaleWidth(10)); + make.height.mas_equalTo(kGetScaleWidth(48)); }]; [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(40)); - make.height.mas_equalTo(kGetScaleWidth(40)); - make.leading.mas_equalTo(kGetScaleWidth(10)); + make.width.mas_equalTo(kGetScaleWidth(28)); + make.height.mas_equalTo(kGetScaleWidth(28)); + make.leading.mas_equalTo(kGetScaleWidth(9)); make.centerY.equalTo(self.bgImageView); }]; [self.numberView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.equalTo(self.bgImageView); make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.leading.equalTo(self.iconView.mas_trailing).mas_offset(5); + make.leading.equalTo(self.iconView.mas_trailing).mas_offset(8); }]; } #pragma mark - 赋值 -(void)setModel:(XPExchangeDiamondsModel *)model{ _model = model; - if(self.type == IncomeRecord_Diamond){ - _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView0"),@(_model.diamonds)]; + if(self.type == IncomeRecord_Gold){ + _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView0"),@(_model.golds)]; NSString *diamondNum = [NSString stringWithFormat:@"%ld",_model.minDiamonds];; NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc]initWithString:diamondNum attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16 weight:UIFontWeightMedium],NSForegroundColorAttributeName:UIColorFromRGB(0xACB8D9)}]; _numberView.attributedPlaceholder = attStr; - UIImage *image = [UIImage imageNamed:@"exchange_gold_icon"]; + UIImage *image = [UIImage imageNamed:@"ms_exchange_coin_icon"]; [_iconView setImage:image forState:UIControlStateNormal]; + + + }else{ NSString *goldNum = [NSString stringWithFormat:@"%.0f",ceilf(_model.minDiamonds / _model.rate)]; NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc]initWithString:goldNum attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16 weight:UIFontWeightMedium],NSForegroundColorAttributeName:UIColorFromRGB(0xACB8D9)}]; _numberView.attributedPlaceholder = attStr; - _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView1"),_model.golds]; - UIImage *image = [UIImage imageNamed:@"exchange_diamonds_icon"]; + _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView1"),_model.diamonds]; + UIImage *image = [UIImage imageNamed:@"exchange_new_diamonds_icon"]; [_iconView setImage:image forState:UIControlStateNormal]; } @@ -263,7 +270,7 @@ } NSInteger count = textField.text.integerValue; - if(self.type == IncomeRecord_Diamond){ + if(self.type == IncomeRecord_Gold){ NSString *goldNum = [NSString stringWithFormat:@"%.0f",ceilf(count / _model.rate)]; if(self.inputCounthandle){ self.inputCounthandle(goldNum, textField.text); @@ -281,9 +288,9 @@ - (UILabel *)titleNumView { if (!_titleNumView) { _titleNumView = [[UILabel alloc] init]; - _titleNumView.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _titleNumView.textColor =[DJDKMIMOMColor inputTextColor]; - NSString *title = self.type == IncomeRecord_Diamond ? YMLocalizedString(@"XPExchangeDiamondsItemView0"): YMLocalizedString(@"XPExchangeDiamondsItemView1"); + _titleNumView.font = kFontBold(15); + _titleNumView.textColor = UIColorFromRGB(0x00223D); + NSString *title = self.type == IncomeRecord_Gold ? YMLocalizedString(@"XPExchangeDiamondsItemView0"): YMLocalizedString(@"XPExchangeDiamondsItemView1"); _titleNumView.text = [NSString stringWithFormat:title,@"0"]; } return _titleNumView; @@ -293,11 +300,10 @@ if (!_bgImageView){ _bgImageView = [UIImageView new]; if(self.type == IncomeRecord_Gold){ - _bgImageView.image = [UIImage gradientColorImageFromColors:@[ UIColorFromRGB(0xDCE6FD),UIColorFromRGB(0xD8E3FE)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(317), kGetScaleWidth(52))]; + _bgImageView.image = kImage(@"ms_exchange_diamonds_coin_bg"); }else{ - _bgImageView.image = [UIImage gradientColorImageFromColors:@[ UIColorFromRGB(0xFEECD2),UIColorFromRGB(0xFFDE90)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(317), kGetScaleWidth(52))]; + _bgImageView.image = kImage(@"ms_exchange_diamonds_diamonds_bg"); } - [_bgImageView setCornerWithLeftTopCorner:kGetScaleWidth(8) rightTopCorner:kGetScaleWidth(8) bottomLeftCorner:kGetScaleWidth(8) bottomRightCorner:kGetScaleWidth(8) size:CGSizeMake(kGetScaleWidth(317), kGetScaleWidth(52))]; _bgImageView.userInteractionEnabled = YES; } @@ -305,11 +311,8 @@ } -(UIButton *)iconView{ if (!_iconView){ - UIImage *image = self.type == IncomeRecord_Diamond ? [UIImage imageNamed:@"exchange_gold_icon"] : [UIImage imageNamed:@"exchange_diamonds_icon"]; + UIImage *image = self.type == IncomeRecord_Gold ? [UIImage imageNamed:@"ms_exchange_coin_icon"] : [UIImage imageNamed:@"exchange_new_diamonds_icon"]; _iconView = [UIButton buttonWithType:UIButtonTypeCustom]; - _iconView.backgroundColor = [UIColor whiteColor]; - _iconView.layer.cornerRadius = kGetScaleWidth(20); - _iconView.layer.masksToBounds = YES; [_iconView setImage:image forState:UIControlStateNormal]; } return _iconView; @@ -320,22 +323,15 @@ _numberView = [[XPTextField alloc]initWithFrame:CGRectZero]; _numberView.keyboardType = UIKeyboardTypeNumberPad; _numberView.isValidation = YES; - NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc]initWithString:@"0" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16 weight:UIFontWeightMedium],NSForegroundColorAttributeName:UIColorFromRGB(0xACB8D9)}]; + NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc]initWithString:@"0" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16 weight:UIFontWeightMedium],NSForegroundColorAttributeName:[UIColor colorWithWhite:1 alpha:0.6]}]; _numberView.attributedPlaceholder = attStr; - _numberView.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _numberView.textColor = [DJDKMIMOMColor inputTextColor]; - _numberView.textAlignment = NSTextAlignmentRight; + _numberView.font = kFontMedium(15); + _numberView.textColor = [UIColor whiteColor]; +// _numberView.textAlignment = NSTextAlignmentRight; [_numberView addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; } return _numberView; } --(UIButton *)arrowView{ - if (!_arrowView){ - _arrowView = [UIButton new]; - [_arrowView setImage:[UIImage imageNamed:@"exchange_diamonds_arrow"] forState:UIControlStateNormal]; - _arrowView.hidden = self.type == IncomeRecord_Gold; - } - return _arrowView; -} + @end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m index a5bc09d0..bedb3783 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m @@ -22,14 +22,27 @@ ///tool #import "AccountInfoStorage.h" #import "YUMIHtmlUrl.h" - -@interface XPIncomeRecordVC () +#import +#import +#import +@interface XPIncomeRecordVC () ///钻石 @property (nonatomic,strong) XPIncomeRecordView *diamondView; ///金币 @property (nonatomic,strong) XPIncomeRecordView *goldView; ///model @property (nonatomic,strong) XPIncomeRecordModel *recordModel; +///分页标题 +@property (nonatomic, strong) NSArray *titles; +///分页控件 +@property (nonatomic, strong) JXCategoryTitleView *titleView; +///分页lineView +@property (nonatomic, strong) JXCategoryListContainerView *pi_containerView; +@property(nonatomic,strong) UIImageView *bgImageView; +/// 返回 +@property (nonatomic,strong) UIButton *backBtn; +/// 标题 +@property (nonatomic,strong) UILabel *titleLabel; @end @implementation XPIncomeRecordVC @@ -45,26 +58,64 @@ [self.presenter requestQueryWithRoomType]; } +- (BOOL)isHiddenNavBar { + return YES; +} + #pragma mark - Private Method - (void)initSubViews { self.view.backgroundColor = [UIColor whiteColor]; self.title = YMLocalizedString(@"XPIncomeRecordVC0"); - [self.view addSubview:self.diamondView]; - [self.view addSubview:self.goldView]; - self.goldView.isClanPresident = YES; + [self.view addSubview:self.bgImageView]; + [self.view addSubview:self.backBtn]; + [self.view addSubview:self.titleLabel]; + + [self.view addSubview:self.titleView]; + [self.view addSubview:self.pi_containerView]; + } - (void)initSubViewConstraints { - [self.diamondView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(18)); - make.leading.trailing.equalTo(self.view).inset(kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(144)); + [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.trailing.top.equalTo(self.view); }]; - [self.goldView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.diamondView); - make.top.equalTo(self.diamondView.mas_bottom).mas_offset(kGetScaleWidth(20)); - make.height.mas_equalTo( kGetScaleWidth(144)); + [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(kStatusBarHeight); + make.height.mas_equalTo(44); + make.centerX.mas_equalTo(self.view); }]; + [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.mas_equalTo(0); + make.top.mas_equalTo(kStatusBarHeight); + make.width.height.mas_equalTo(44); + }]; + [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(33)); + make.width.mas_equalTo(KScreenWidth); + make.height.mas_equalTo(kGetScaleWidth(30)); + + }]; + + [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.trailing.bottom.mas_equalTo(self.view); + make.top.mas_equalTo(self.titleView.mas_bottom).offset(19); + }]; +} +#pragma mark - JXCategoryViewDelegate +- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { + return self.titles.count; +} + +- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { + if (index == 0) { + return self.goldView; + } else { + return self.diamondView; + } +} +- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index{ + self.bgImageView.image = index == 0 ? kImage(@"ms_mine_top_bg"):kImage(@"ms_mine_diamond_bg"); + self.titleView.titleColor = index == 0 ? UIColorFromRGB(0xA88238):UIColorFromRGB(0x7E8373); } #pragma mark - XPExchangeDiamondsVCDelegate -(void)confirmExchangeDiamondsWithDiamondSuccess:(NSString *)diamond gold:(NSString *)gold{ @@ -138,21 +189,28 @@ default: { -// NSString * myUid = [AccountInfoStorage instance].getUid; -// if(![self.clanInfo.clan.elderUid isEqualToString:myUid]){ + XPWebViewController * webVC =[[XPWebViewController alloc] init]; webVC.url = URLWithType(kGoldEarningsRecord); [self.navigationController pushViewController:webVC animated:YES]; -// return; -// -// } -// XPIncomeRecordGoldDetailsVC *goldDetailVC = [XPIncomeRecordGoldDetailsVC new]; -// [self.navigationController pushViewController:goldDetailVC animated:YES]; + break; } } } +/// 返回 +- (void)backBtnAction { + [self.navigationController popViewControllerAnimated:YES]; +} #pragma mark -懒加载 +- (UIImageView *)bgImageView{ + if(!_bgImageView){ + _bgImageView = [UIImageView new]; + _bgImageView.contentMode = UIViewContentModeScaleToFill; + _bgImageView.image = kImage(@"ms_mine_top_bg"); + } + return _bgImageView; +} - (XPIncomeRecordView *)diamondView{ if (!_diamondView){ _diamondView = [[XPIncomeRecordView alloc]initWithFrame:CGRectZero type:IncomeRecord_Diamond]; @@ -167,6 +225,65 @@ } return _goldView; } +- (JXCategoryTitleView *)titleView { + if (!_titleView) { + _titleView = [[JXCategoryTitleView alloc] init]; + _titleView.delegate = self; + _titleView.titles = self.titles; + _titleView.backgroundColor = [UIColor clearColor]; + _titleView.titleColor = UIColorFromRGB(0xA88238); + _titleView.titleSelectedColor = UIColorFromRGB(0x4E390A); + _titleView.titleFont = kFontBold(16); + _titleView.titleSelectedFont = kFontHeavy(16); + _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; + _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; + _titleView.defaultSelectedIndex = 0; + _titleView.listContainer = self.pi_containerView; + + JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; + lineView.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(11), kGetScaleWidth(3)); + lineView.verticalMargin = 0; + lineView.backgroundColor = UIColorFromRGB(0xAA7400); + lineView.layer.masksToBounds = YES; + lineView.layer.cornerRadius = kGetScaleWidth(3)/2; + _titleView.indicators = @[lineView]; + } + return _titleView; +} + +- (NSArray *)titles{ + if(!_titles){ + _titles = @[YMLocalizedString(@"XPIncomeRecordView4"),YMLocalizedString(@"XPIncomeRecordView5")]; + } + return _titles; +} +- (JXCategoryListContainerView *)pi_containerView { + if (!_pi_containerView) { + _pi_containerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; + _pi_containerView.defaultSelectedIndex = 0; + _pi_containerView.scrollView.tag = 1009; + } + return _pi_containerView; +} +- (UIButton *)backBtn { + if (!_backBtn) { + _backBtn = [UIButton buttonWithType:UIButtonTypeCustom]; + [_backBtn setImage:[[UIImage imageNamed:@"room_info_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; + [_backBtn addTarget:self action:@selector(backBtnAction) forControlEvents:UIControlEventTouchUpInside]; + } + return _backBtn; +} + +- (UILabel *)titleLabel { + if (!_titleLabel) { + _titleLabel = [[UILabel alloc] init]; + _titleLabel.text = YMLocalizedString(@"XPIncomeRecordVC1"); + _titleLabel.textColor = UIColor.blackColor; + _titleLabel.font = kFontBold(16); + } + return _titleLabel; +} + /* #pragma mark - Navigation diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.h b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.h index 47eeafc5..b1572ab8 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.h +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.h @@ -6,12 +6,13 @@ // #import - +#import NS_ASSUME_NONNULL_BEGIN typedef enum : NSUInteger { + IncomeRecord_Gold,///金币 IncomeRecord_Diamond,///钻石 - IncomeRecord_Gold///金币 + } IncomeRecordViewType; typedef enum : NSUInteger { @@ -28,7 +29,7 @@ typedef enum : NSUInteger { @end -@interface XPIncomeRecordView : UIView +@interface XPIncomeRecordView : UIView @property (nonatomic,copy) NSString *number; @property (nonatomic,assign) BOOL isClanPresident; @property (nonatomic,weak) id delegate; diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m index c1826ee1..5b7a4f30 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m @@ -11,19 +11,19 @@ /// 背景 @property (nonatomic,strong) UIImageView *bgImageView; +@property(nonatomic,strong) UIImageView *coinView; ///标题 @property (nonatomic,strong) UILabel *titleView; ///明细 @property (nonatomic,strong) UIButton *detailView; +@property(nonatomic,strong) UIButton *detailArrowView; ///数量 @property (nonatomic,strong) UILabel *numberView; -///点击btn容器 -@property (nonatomic,strong) UIStackView *btnStackView; -///充值 -@property (nonatomic,strong) UIButton *payBtn; + + ///兑换 -@property (nonatomic,strong) UIButton *exchangeBtn; +@property (nonatomic,strong) UIButton *clickBtn; @property (nonatomic,assign) IncomeRecordViewType type; @end @@ -38,64 +38,70 @@ } return self; } - +#pragma mark - JXCategoryListContentViewDelegate +- (UIView *)listView { + return self; +} #pragma mark - Private Method - (void)initSubViews { [self addSubview:self.bgImageView]; + [self addSubview:self.clickBtn]; + [self.bgImageView addSubview:self.coinView]; [self.bgImageView addSubview:self.titleView]; + [self.bgImageView addSubview:self.detailArrowView]; [self.bgImageView addSubview:self.detailView]; [self.bgImageView addSubview:self.numberView]; - [self.bgImageView addSubview:self.btnStackView]; - [self.btnStackView addArrangedSubview:self.payBtn]; - [self.btnStackView addArrangedSubview:self.exchangeBtn]; + } - (void)initSubViewConstraints { [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); + make.top.mas_equalTo(kGetScaleWidth(0)); + make.width.mas_equalTo(kGetScaleWidth(339)); + make.height.mas_equalTo(kGetScaleWidth(118)); + make.centerX.equalTo(self); + }]; + [self.coinView mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.mas_equalTo(kGetScaleWidth(47)); + make.leading.mas_equalTo(kGetScaleWidth(15)); + make.centerY.equalTo(self.bgImageView); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(17)); - make.leading.mas_equalTo(kGetScaleWidth(20)); - make.height.mas_equalTo(kGetScaleWidth(20)); + make.top.mas_equalTo(kGetScaleWidth(36)); + make.leading.mas_equalTo(kGetScaleWidth(68)); + + }]; + [self.detailArrowView mas_makeConstraints:^(MASConstraintMaker *make) { + make.trailing.mas_equalTo(-kGetScaleWidth(20)); + make.width.mas_equalTo(kGetScaleWidth(4.5)); + make.height.mas_equalTo(kGetScaleWidth(8)); + make.top.mas_equalTo(kGetScaleWidth(38)); }]; [self.detailView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(20)); - make.height.mas_equalTo(kGetScaleWidth(18)); - make.width.mas_equalTo(kGetScaleWidth(45)); - make.centerY.equalTo(self.titleView); + make.trailing.mas_equalTo(-kGetScaleWidth(27)); + make.height.mas_equalTo(kGetScaleWidth(12)); + make.centerY.equalTo(self.detailArrowView); }]; [self.numberView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.equalTo(self.titleView); - make.top.mas_equalTo(kGetScaleWidth(49)); - make.height.mas_equalTo(kGetScaleWidth(20)); - make.trailing.mas_equalTo(-kGetScaleWidth(20)); + make.top.mas_equalTo(kGetScaleWidth(61)); }]; - [self.btnStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.bgImageView).inset(kGetScaleWidth(20)); - make.height.mas_equalTo(kGetScaleWidth(40)); - make.top.mas_equalTo(kGetScaleWidth(86)); - }]; - [self.payBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(40)); - }]; - [self.exchangeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(40)); + [self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.mas_equalTo(kGetScaleWidth(303)); + make.height.mas_equalTo(kGetScaleWidth(48)); + make.top.equalTo(self.bgImageView.mas_bottom).mas_offset(kGetScaleWidth(46)); + make.centerX.equalTo(self); }]; } -(void)setNumber:(NSString *)number{ _number = number; _numberView.text = _number; } --(void)setIsClanPresident:(BOOL)isClanPresident{ - _isClanPresident = isClanPresident; -// _exchangeBtn.hidden = _isClanPresident; -// _detailView.hidden = !_isClanPresident; -} + #pragma mark - btnClick -(void)clickDetailViewAction{ - if(self.type == IncomeRecord_Diamond){ + if(self.type == IncomeRecord_Gold){ [self clickDiamondDetailAction]; return; } @@ -107,10 +113,10 @@ [self.delegate clickHandleWithType:ClickType_Diamond_Detail]; } } -///钻石充值 --(void)clickDiamondPayAction{ + +-(void)clickBtnAction{ if(self.delegate && [self.delegate respondsToSelector:@selector(clickHandleWithType:)]){ - [self.delegate clickHandleWithType:ClickType_Diamond_Pay]; + [self.delegate clickHandleWithType:self.type == IncomeRecord_Gold ? ClickType_Diamond_Pay : ClickType_Gold_Exchangel]; } } ///金币明细 @@ -119,12 +125,7 @@ [self.delegate clickHandleWithType:ClickType_Gold_Detail]; } } -///金币兑换 --(void)clickGoldExchangelAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(clickHandleWithType:)]){ - [self.delegate clickHandleWithType:ClickType_Gold_Exchangel]; - } -} + #pragma mark - 懒加载 - (UIImageView *)bgImageView{ @@ -132,19 +133,23 @@ _bgImageView = [UIImageView new]; _bgImageView.userInteractionEnabled = YES; _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - _bgImageView.layer.cornerRadius = 10.f; - _bgImageView.clipsToBounds = YES; - _bgImageView.image = self.type == IncomeRecord_Diamond ? [UIImage imageNamed:@"income_record_gold_bg"]:[UIImage imageNamed:@"income_record_diamond_bg"]; + _bgImageView.image = self.type == IncomeRecord_Gold ? [UIImage imageNamed:@"income_record_gold_bg"]:[UIImage imageNamed:@"income_record_diamond_bg"]; } return _bgImageView; } - +- (UIImageView *)coinView{ + if(!_coinView){ + _coinView = [UIImageView new]; + _coinView.image = self.type == IncomeRecord_Gold ? [UIImage imageNamed:@"ms_income_record_coin"]:[UIImage imageNamed:@"ms_income_recorddiamond"]; + } + return _coinView; +} - (UILabel *)titleView { if (!_titleView) { _titleView = [[UILabel alloc] init]; - _titleView.font = [UIFont systemFontOfSize:20 weight:UIFontWeightMedium]; - _titleView.textColor = self.type == IncomeRecord_Diamond ? UIColorFromRGB(0x1B1558) : UIColorFromRGB(0x572714); - _titleView.text = self.type == IncomeRecord_Diamond ? YMLocalizedString(@"XPIncomeRecordView4"):YMLocalizedString(@"XPIncomeRecordView5"); + _titleView.font = kFontBold(15); + _titleView.textColor = self.type == IncomeRecord_Gold ? UIColorFromRGB(0x9F4805) : UIColorFromRGB(0xffffff); + _titleView.text = self.type == IncomeRecord_Gold ? YMLocalizedString(@"XPIncomeRecordView4"):YMLocalizedString(@"XPIncomeRecordView5"); } return _titleView; } @@ -153,68 +158,47 @@ if (!_detailView){ _detailView = [UIButton new]; [_detailView setTitle:YMLocalizedString(@"XPIncomeRecordView0") forState:UIControlStateNormal]; - [_detailView setTitleColor:self.type == IncomeRecord_Diamond ? UIColorFromRGB(0x1B1558):UIColorFromRGB(0x582815) forState:UIControlStateNormal]; + [_detailView setTitleColor:self.type == IncomeRecord_Gold ? UIColorFromRGB(0xB38C3F):UIColorFromRGB(0x737D83) forState:UIControlStateNormal]; _detailView.titleLabel.font = [UIFont systemFontOfSize:13]; - CGFloat width = [[NSBundle getLanguageText]hasPrefix:@"zh"] ? 40 : 50; - _detailView.imageEdgeInsets = UIEdgeInsetsMake(0, kGetScaleWidth(width), 0, 0); - _detailView.titleEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0); - [_detailView setImage:self.type == IncomeRecord_Diamond ? [[UIImage imageNamed:@"income_record_arrow_1"]ms_SetImageForRTL]: [[UIImage imageNamed:@"income_record_arrow_2"]ms_SetImageForRTL] forState:UIControlStateNormal]; + [_detailView addTarget:self action:@selector(clickDetailViewAction) forControlEvents:UIControlEventTouchUpInside]; } return _detailView; } - +- (UIButton *)detailArrowView{ + if(!_detailArrowView){ + _detailArrowView = [UIButton new]; + [_detailArrowView setBackgroundImage:self.type == IncomeRecord_Gold ? [[UIImage imageNamed:@"income_record_arrow_1"]ms_SetImageForRTL]: [[UIImage imageNamed:@"income_record_arrow_2"]ms_SetImageForRTL] forState:UIControlStateNormal]; + [_detailArrowView setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; + [_detailArrowView addTarget:self action:@selector(clickDetailViewAction) forControlEvents:UIControlEventTouchUpInside]; + } + return _detailArrowView; +} - (UILabel *)numberView { if (!_numberView) { _numberView = [[UILabel alloc] init]; - _numberView.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - _numberView.textColor = self.type == IncomeRecord_Diamond ? UIColorFromRGB(0x1B1558) : UIColorFromRGB(0x572714); + _numberView.font = kFontHeavy(24); + _numberView.textColor = self.type == IncomeRecord_Gold ? UIColorFromRGB(0xFFFBD5) : UIColorFromRGB(0xFFFBD5); _numberView.text = @"0"; } return _numberView; } -- (UIStackView *)btnStackView{ - if (!_btnStackView){ - _btnStackView = [[UIStackView alloc] init]; - _btnStackView.axis = UILayoutConstraintAxisHorizontal; - _btnStackView.distribution = UIStackViewDistributionFillEqually; - _btnStackView.alignment = UIStackViewAlignmentFill; - _btnStackView.spacing = kGetScaleWidth(13); +- (UIButton *)clickBtn{ + if(!_clickBtn){ + _clickBtn = [UIButton new]; + UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x70E9FF),UIColorFromRGB(0xAE87FF),UIColorFromRGB(0xFF5CE1)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(303), kGetScaleWidth(48))]; + [_clickBtn setBackgroundImage:image forState:UIControlStateNormal]; + [_clickBtn setTitle:self.type == IncomeRecord_Gold ? YMLocalizedString(@"XPIncomeRecordView1") : YMLocalizedString(@"XPTreasureFairyShopingExchangeCell1") forState:UIControlStateNormal]; + [_clickBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + _clickBtn.titleLabel.font = kFontHeavy(16); + [_clickBtn addTarget:self action:@selector(clickBtnAction) forControlEvents:UIControlEventTouchUpInside]; + _clickBtn.layer.cornerRadius = kGetScaleWidth(48)/2; + _clickBtn.layer.masksToBounds = YES; } - return _btnStackView; -} -- (UIButton *)payBtn{ - if (!_payBtn){ - _payBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_payBtn setTitle:YMLocalizedString(@"XPIncomeRecordView1") forState:UIControlStateNormal]; - - - _payBtn.hidden = self.type == IncomeRecord_Gold; - [_payBtn setTitleColor:UIColorFromRGB(0x93570B) forState:UIControlStateNormal]; - _payBtn.layer.cornerRadius = kGetScaleWidth(20); - _payBtn.layer.masksToBounds = YES; - _payBtn.layer.borderWidth = 1; - _payBtn.layer.borderColor = UIColorFromRGB(0x93570B).CGColor; - [_payBtn addTarget:self action:@selector(clickDiamondPayAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _payBtn; + return _clickBtn; } --(UIButton *)exchangeBtn{ - if (!_exchangeBtn){ - _exchangeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_exchangeBtn setTitle:YMLocalizedString(@"XPIncomeRecordView2") forState:UIControlStateNormal]; - _exchangeBtn.backgroundColor = UIColorFromRGB(0xB1BFFA); - [_exchangeBtn setTitleColor:UIColorFromRGB(0x130C4F) forState:UIControlStateNormal]; - _exchangeBtn.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _exchangeBtn.layer.masksToBounds = YES; - _exchangeBtn.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _exchangeBtn.hidden = self.type == IncomeRecord_Diamond; - _exchangeBtn.layer.cornerRadius = kGetScaleWidth(20); - [_exchangeBtn addTarget:self action:@selector(clickGoldExchangelAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _exchangeBtn; -} + @end diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeCollectionViewCell.m b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeCollectionViewCell.m index b4ae50a5..08d1b204 100644 --- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeCollectionViewCell.m @@ -15,8 +15,7 @@ /// 背景 @property (nonatomic, strong) UIView *bgView; -/// 选中背景 -@property (nonatomic, strong) UIView *selectedBgView; +@property(nonatomic,strong) UIView *bgPriceView; /// 价格 @property (nonatomic, strong) UILabel *priceLabel; /// 💎 @@ -38,33 +37,34 @@ - (void)createUI { [self.contentView addSubview:self.bgView]; - [self.bgView addSubview:self.selectedBgView]; - [self.bgView addSubview:self.priceLabel]; + [self.bgView addSubview:self.bgPriceView]; + [self.bgPriceView addSubview:self.priceLabel]; [self.bgView addSubview:self.iconImageView]; [self.bgView addSubview:self.numLabel]; [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(16)); - make.top.mas_equalTo(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(60)); + make.edges.equalTo(self.contentView); }]; - [self.selectedBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.bgView); - }]; + [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.bgView); - make.width.height.mas_equalTo(kGetScaleWidth(24)); - make.leading.mas_equalTo(kGetScaleWidth(18)); - }]; - [self.priceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(18)); - make.centerY.equalTo(self.bgView); + make.top.mas_equalTo(kGetScaleWidth(13)); + make.width.mas_equalTo(kGetScaleWidth(55)); + make.height.mas_equalTo(kGetScaleWidth(48)); + make.centerX.equalTo(self.bgView); }]; [self.numLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.bgView); - make.leading.equalTo(self.iconImageView.mas_trailing).mas_offset(kGetScaleWidth(5)); + make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(0)); + make.top.mas_equalTo(kGetScaleWidth(66)); }]; + [self.bgPriceView mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.trailing.bottom.equalTo(self.bgView); + make.height.mas_equalTo(kGetScaleWidth(26)); + }]; + [self.priceLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self.bgPriceView); + }]; + } @@ -80,7 +80,7 @@ - (void)setSelectedStyle:(BOOL)selectedStyle { _selectedStyle = selectedStyle; - self.selectedBgView.hidden = !selectedStyle; + _bgView.layer.borderWidth = _selectedStyle ? 1 : 0; } #pragma mark - 懒加载 @@ -88,34 +88,29 @@ - (UIView *)bgView { if (!_bgView) { _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = UIColorFromRGB(0xF0F5F6); - _bgView.layer.cornerRadius = kGetScaleWidth(13); + _bgView.backgroundColor = UIColorFromRGB(0xF3F0E6); + _bgView.layer.cornerRadius = kGetScaleWidth(9); _bgView.layer.masksToBounds = YES; + _bgView.layer.borderColor = UIColorFromRGB(0xFFB05E).CGColor; + } return _bgView; } -- (UIView *)selectedBgView { - if (!_selectedBgView) { - _selectedBgView = [[UIView alloc] init]; - UIImage *bgImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xE6FDFF),UIColorFromRGB(0xFAEDFF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(343), kGetScaleWidth(60))]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x13E2F5),UIColorFromRGB(0x9DB4FF),UIColorFromRGB(0xCC67FF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(344), kGetScaleWidth(60))]; - _selectedBgView.backgroundColor = [UIColor colorWithPatternImage:bgImage]; - _selectedBgView.layer.cornerRadius = kGetScaleWidth(13); - _selectedBgView.layer.masksToBounds = YES; - _selectedBgView.layer.borderColor = [UIColor colorWithPatternImage:image].CGColor; - _selectedBgView.layer.borderWidth = 1; - _selectedBgView.hidden = YES; +- (UIView *)bgPriceView{ + if(!_bgPriceView){ + _bgPriceView = [UIView new]; + _bgPriceView.backgroundColor = UIColorFromRGB(0xFFF09C); } - return _selectedBgView; + return _bgPriceView; } - (UILabel *)priceLabel { if (!_priceLabel) { _priceLabel = [[UILabel alloc] init]; - _priceLabel.textColor = UIColorFromRGB(0x1F1B4F); - _priceLabel.font = kFontMedium(18); - + _priceLabel.textColor = UIColorFromRGB(0x513C0B); + _priceLabel.font = kFontBold(12); + _priceLabel.textAlignment = NSTextAlignmentCenter; } return _priceLabel; } @@ -124,7 +119,7 @@ if (!_iconImageView) { _iconImageView = [[UIImageView alloc] init]; _iconImageView.contentMode = UIViewContentModeScaleAspectFit; - _iconImageView.image = [UIImage imageNamed:@"exchange_gold_icon"]; + _iconImageView.image = [UIImage imageNamed:@"ms_mine_recharge_coin"]; } return _iconImageView; } @@ -132,8 +127,8 @@ - (UILabel *)numLabel { if (!_numLabel) { _numLabel = [[UILabel alloc] init]; - _numLabel.textColor = UIColorFromRGB(0x1F1B4F); - _numLabel.font = kFontBold(20); + _numLabel.textColor = UIColorFromRGB(0x8A4B00); + _numLabel.font = kFontBold(15); _numLabel.textAlignment = NSTextAlignmentCenter; } return _numLabel; diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeaderView.m b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeaderView.m index 959196f6..903304c5 100644 --- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeaderView.m +++ b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeaderView.m @@ -21,8 +21,7 @@ @property (nonatomic, strong) UILabel *balanceTextLabel; /// 余额 @property (nonatomic, strong) UILabel *balanceLabel; -/// 💎 -@property (nonatomic, strong) UIImageView *iconImageView; + @end @@ -39,7 +38,7 @@ - (void)createUI { [self addSubview:self.bgImageView]; [self.bgImageView addSubview:self.balanceBgVeiw]; - [self.balanceBgVeiw addSubview:self.iconImageView]; + [self.balanceBgVeiw addSubview:self.balanceTextLabel]; [self.balanceBgVeiw addSubview:self.balanceLabel]; @@ -47,27 +46,21 @@ make.edges.equalTo(self); }]; [self.balanceBgVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(343)); - make.height.mas_equalTo(kGetScaleWidth(86)); + make.width.mas_equalTo(kGetScaleWidth(339)); + make.height.mas_equalTo(kGetScaleWidth(118)); make.centerX.equalTo(self.bgImageView); - make.bottom.mas_equalTo(-kGetScaleWidth(22)); + make.bottom.mas_equalTo(-kGetScaleWidth(0)); }]; [self.balanceTextLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.balanceBgVeiw).mas_offset(kGetScaleWidth(13)); - make.top.mas_equalTo(kGetScaleWidth(14)); + make.leading.mas_equalTo(kGetScaleWidth(33)); + make.top.mas_equalTo(kGetScaleWidth(36)); make.height.mas_equalTo(kGetScaleWidth(14)); }]; - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(21)); - make.trailing.equalTo(self.balanceTextLabel.mas_leading).mas_offset(-kGetScaleWidth(5)); - make.centerY.equalTo(self.balanceTextLabel); - - }]; + [self.balanceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-kGetScaleWidth(14)); - make.centerX.equalTo(self.balanceBgVeiw); - make.leading.trailing.equalTo(self.balanceBgVeiw).inset(kGetScaleWidth(10)); + make.top.equalTo(self.balanceTextLabel.mas_bottom).mas_offset(kGetScaleWidth(10)); + make.leading.mas_equalTo(kGetScaleWidth(33)); }]; } @@ -83,23 +76,23 @@ - (UIImageView *)bgImageView { if (!_bgImageView) { _bgImageView = [[UIImageView alloc] init]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x13E2F5),UIColorFromRGB(0x9DB4FF),UIColorFromRGB(0xCC67FF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth, kGetScaleWidth(123))]; - _bgImageView.image = image; + + _bgImageView.image = kImage(@"ms_mine_top_bg"); } return _bgImageView; } - (UIImageView *)balanceBgVeiw{ if(!_balanceBgVeiw){ _balanceBgVeiw = [UIImageView new]; - _balanceBgVeiw.image = kImage(@"mine_recharge_balance_bg"); + _balanceBgVeiw.image = kImage(@"ms_mine_coin_bg"); } return _balanceBgVeiw; } - (UILabel *)balanceTextLabel { if (!_balanceTextLabel) { _balanceTextLabel = [[UILabel alloc] init]; - _balanceTextLabel.textColor = UIColorFromRGB(0x333333); - _balanceTextLabel.font = kFontRegular(14); + _balanceTextLabel.textColor = UIColorFromRGB(0x9F4805); + _balanceTextLabel.font = kFontBold(15); _balanceTextLabel.text = YMLocalizedString(@"XPIAPRechargeHeaderView0"); } return _balanceTextLabel; @@ -108,21 +101,14 @@ - (UILabel *)balanceLabel { if (!_balanceLabel) { _balanceLabel = [[UILabel alloc] init]; - _balanceLabel.textColor = UIColorFromRGB(0x1F1B4F); - _balanceLabel.font = kFontMedium(32); + _balanceLabel.textColor = UIColorFromRGB(0xFFFBD5); + _balanceLabel.font = kFontBold(24); _balanceLabel.textAlignment = NSTextAlignmentCenter; _balanceLabel.text = @"0"; _balanceLabel.adjustsFontSizeToFitWidth = YES; } return _balanceLabel; } -- (UIImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[UIImageView alloc] init]; - _iconImageView.contentMode = UIViewContentModeScaleAspectFit; - _iconImageView.image = [UIImage imageNamed:@"exchange_gold_icon"]; - } - return _iconImageView; -} + @end diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m index 5d1e6172..0df52627 100644 --- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m +++ b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m @@ -64,8 +64,7 @@ /// 订单编号 @property (nonatomic,copy) NSString *orderId; -//////充值banner位 -@property(nonatomic,copy) NSArray *bannerList; + @end @@ -94,7 +93,7 @@ [self initHttpData]; } - (void)createUI { - self.view.backgroundColor = [UIColor whiteColor]; + self.view.backgroundColor = UIColorFromRGB(0xF4F5FA); [self.view addSubview:self.headerView]; [self.view addSubview:self.collectionView]; @@ -105,7 +104,7 @@ [self.stackView addArrangedSubview:self.agreeLabel]; [self.stackView addArrangedSubview:self.protcoloButton]; - CGFloat height = kGetScaleWidth(123)+kNavigationHeight; + CGFloat height = kGetScaleWidth(236); [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.trailing.top.mas_equalTo(0); make.height.mas_equalTo(height); @@ -125,7 +124,7 @@ }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.headerView.mas_bottom).mas_offset(-kGetScaleWidth(22)); + make.top.mas_equalTo(self.headerView.mas_bottom).mas_offset(kGetScaleWidth(21)); make.leading.trailing.mas_equalTo(0); make.bottom.equalTo(self.rechargeBtn.mas_top).mas_offset(-kGetScaleWidth(10)); }]; @@ -170,7 +169,7 @@ [self showSuccessToast:YMLocalizedString(@"XPIAPRechargeViewController11")]; return; } - NSInteger index = self.bannerList.count > 0 ? self.selectedIndex.row - 1 : self.selectedIndex.row; + NSInteger index = self.selectedIndex.row; if(index < self.dataSource.count){ RechargeListModel *model = [self.dataSource safeObjectAtIndex1:index]; if (model.chargeProdId) { @@ -206,12 +205,9 @@ [self.presenter getUserWalletInfo]; } - (void)getBannerListSuccessWithList:(NSArray *)list{ - self.bannerList = list; - if(self.bannerList.count > 0){ - self.selectedIndex = [NSIndexPath indexPathForRow:1 inSection:0]; - }else{ - self.selectedIndex = [NSIndexPath indexPathForRow:0 inSection:0]; - } + + self.selectedIndex = [NSIndexPath indexPathForRow:0 inSection:0]; + [self.collectionView reloadData]; } ///批量验证 @@ -435,41 +431,31 @@ #pragma mark - UICollectionViewDelegate - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - if(self.bannerList.count > 0){ - return self.dataSource.count + 1; - } + return self.dataSource.count; } - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{ - return self.bannerList.count > 0 && indexPath.row == 0 ? CGSizeMake(KScreenWidth, kGetScaleWidth(114)) : CGSizeMake(KScreenWidth, kGetScaleWidth(80)); + return CGSizeMake(kGetScaleWidth(108), kGetScaleWidth(121)); } - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - if(indexPath.row == 0 && self.bannerList.count > 0){ - XPIAPRechargeHeadCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPIAPRechargeHeadCell class]) forIndexPath:indexPath]; - cell.bannerList = self.bannerList; - cell.delegate = self; - return cell; - } + XPIAPRechargeCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass(XPIAPRechargeCollectionViewCell.self) forIndexPath:indexPath]; - NSInteger count = self.bannerList.count > 0 ? indexPath.item - 1 : indexPath.item; + NSInteger count = indexPath.item; cell.rechargeModel = [self.dataSource safeObjectAtIndex1:count]; cell.selectedStyle = self.selectedIndex.item == indexPath.item; return cell; } - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - if(indexPath.row == 0 && self.bannerList.count > 0)return; + self.selectedIndex = indexPath; [collectionView reloadData]; } #pragma mark - XPIAPRechargeHeadCellDelegate - (void)xpIAPRechargeHeadCell:(XPIAPRechargeHeadCell *)cycleScrollView didSelectItemAtIndex:(NSInteger)index{ - RechargeListModel *bannerModel = [self.bannerList safeObjectAtIndex1:index]; - XPWebViewController * webVC= [[XPWebViewController alloc] init]; - webVC.url = bannerModel.linkUrl; - [self.navigationController pushViewController:webVC animated:YES]; + } #pragma mark - 懒加载 @@ -477,12 +463,12 @@ if (!_collectionView) { MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; layout.scrollDirection = UICollectionViewScrollDirectionVertical; - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = 0; - layout.sectionInset = UIEdgeInsetsMake(kGetScaleWidth(16), 0, kGetScaleWidth(16), 0); + layout.minimumLineSpacing = kGetScaleWidth(8); + layout.minimumInteritemSpacing = kGetScaleWidth(8); + layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(17), 0, kGetScaleWidth(17)); _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.backgroundColor = UIColor.whiteColor; + _collectionView.backgroundColor = UIColor.clearColor; _collectionView.alwaysBounceVertical = YES; [_collectionView registerClass:[XPIAPRechargeCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass(XPIAPRechargeCollectionViewCell.self)]; [_collectionView registerClass:[XPIAPRechargeHeadCell class] forCellWithReuseIdentifier:NSStringFromClass(XPIAPRechargeHeadCell.self)]; @@ -490,8 +476,7 @@ _collectionView.delegate = self; _collectionView.dataSource = self; _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - _collectionView.layer.cornerRadius = kGetScaleWidth(16); - _collectionView.layer.masksToBounds = YES; + // _collectionView.contentInset = UIEdgeInsetsMake(kHeaderViewHeight, 0, 0, 0); } @@ -566,8 +551,8 @@ if (!_titleLabel) { _titleLabel = [[UILabel alloc] init]; _titleLabel.text = YMLocalizedString(@"XPIAPRechargeViewController6"); - _titleLabel.textColor = UIColor.whiteColor; - _titleLabel.font = kFontSemibold(17); + _titleLabel.textColor = UIColor.blackColor; + _titleLabel.font = kFontBold(16); } return _titleLabel; } diff --git a/YuMi/Modules/YMMine/View/XPMineViewController.m b/YuMi/Modules/YMMine/View/XPMineViewController.m index a927922c..def445fb 100644 --- a/YuMi/Modules/YMMine/View/XPMineViewController.m +++ b/YuMi/Modules/YMMine/View/XPMineViewController.m @@ -455,11 +455,9 @@ UIKIT_EXTERN NSString *kRequestRicket; } ///点击充值 -(void)pushThirdPartyPayVC{ - XPIAPRechargeViewController * webVC =[[XPIAPRechargeViewController alloc] init]; - webVC.type = @"4"; - [self.navigationController pushViewController:webVC animated:YES]; + [self pushEarningsRecordVC]; } -///点击收益记录 +///点击钱包 -(void)pushEarningsRecordVC{ XPIncomeRecordVC *incomeRecordVC = [XPIncomeRecordVC new]; diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index 6eff6076..85e658e8 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -278,8 +278,8 @@ "XPIncomeRecordVC0"="سجل الإيرادات"; -"XPExchangeDiamondsItemView0"="عملاتي: %@"; -"XPExchangeDiamondsItemView1"="الماس الخاص بي: %.2f"; +"XPExchangeDiamondsItemView0"="عملاتي: %.2"; +"XPExchangeDiamondsItemView1"="الماس الخاص بي: %@"; "XPExchangeDiamondsView1"="تأكيد التبادل"; @@ -3150,7 +3150,7 @@ ineHeadView12" = "الحمل"; "XPMineGiveDiamondDetailsVC1" = "نقود"; "XPMineGiveDiamondDetailsVC2"="الهدايا"; "XPIncomeRecordView2" = "تبادل العملات الذهبية"; -"XPExchangeDiamondsItemView0" = "نقودي: %@"; + "XPExchangeDiamondsView3" = "على الأقل يجب تحويل %ld نقود"; ///XPMineGiveDiamondDetailsCell diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index 3ae5fee1..9a5efac1 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -2613,7 +2613,7 @@ "XPIncomeRecordView4"="金币"; "XPIncomeRecordView5"="钻石"; -"XPIncomeRecordVC0"="收益记录"; + "XPExchangeDiamondsItemView0"="我的金币：%@"; "XPExchangeDiamondsItemView1"="我的钻石：%.2f"; @@ -3266,3 +3266,6 @@ ///MSRoomSetingBackdropCell "MSRoomSetingBackdropCell0"="使用中"; "MSRoomSetingBackdropCell1"="确认选择这张图片作为房间主题吗？"; +//"XPIncomeRecordVC" +"XPIncomeRecordVC0"="收益记录"; +"XPIncomeRecordVC1"="钱包";