Skip to content

J
jyhAPP
Commit 76a85d49 authored by 吕繁刚's avatar 吕繁刚 💬
Browse files
Options

更新富贵钱包

parent 0741d284
Hide whitespace changes
Inline Side-by-side
Showing with 329 additions and 183 deletions
jyhApp.xcodeproj/project.pbxproj
View file @ 76a85d49
......@@ -1235,7 +1235,6 @@
8428A36021982FD4006D9B19 /* keyStringdef.h */,
8428A35C21941E4B006D9B19 /* UIStyledef.h */,
8428A35F21981064006D9B19 /* JYH_urlstring.h */,
843766822192E96F002C4FE3 /* 个人中心 */,
8409293721BAA6CA00415DCC /* BillNodataView.h */,
8409293821BAA6CA00415DCC /* BillNodataView.m */,
840C91BB21D47D5E00DE696C /* BillBakingView.h */,
......@@ -1272,6 +1271,7 @@
84DC4299225C417B00141E74 /* jyhApp.entitlements */,
8428A35B21941E09006D9B19 /* Others */,
8428A1F821941AA3006D9B19 /* Tools */,
843766822192E96F002C4FE3 /* 个人中心 */,
843766842192E96F002C4FE3 /* 登录 */,
8457310621A7FF4E00F64FE0 /* 实名认证 */,
843766812192E96F002C4FE3 /* 首页 */,
......@@ -1633,7 +1633,7 @@
CreatedOnToolsVersion = 10.1;
SystemCapabilities = {
com.apple.Push = {
enabled = 1;
enabled = 0;
};
};
};
......@@ -2134,7 +2134,6 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-1";
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_ENTITLEMENTS = jyhApp/jyhApp.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 6Y7DGFZ66R;
......@@ -2146,7 +2145,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.zh.jyhTest;
PRODUCT_BUNDLE_IDENTIFIER = com.jyh.zswallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.0;
......@@ -2161,7 +2160,6 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-1";
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_ENTITLEMENTS = jyhApp/jyhApp.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 6Y7DGFZ66R;
......@@ -2173,7 +2171,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.zh.jyhTest;
PRODUCT_BUNDLE_IDENTIFIER = com.jyh.zswallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.0;
......
jyhApp.xcworkspace/xcuserdata/admin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @ 76a85d49
......@@ -260,7 +260,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "jyhApp/还款处理/JYH_HuanKuanViewController.m"
timestampString = "576484947.839517"
timestampString = "579147052.429891"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1020"
......@@ -276,7 +276,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "jyhApp/还款处理/JYH_HuanKuanViewController.m"
timestampString = "576484947.839605"
timestampString = "579147052.430235"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1015"
......@@ -292,7 +292,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "jyhApp/还款处理/JYH_HuanKuanViewController.m"
timestampString = "576484947.839674"
timestampString = "579147052.430468"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1012"
......@@ -308,12 +308,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "jyhApp/首页/JYH_MainViewController.m"
timestampString = "575807199.216078"
timestampString = "579600720.074039"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1419"
endingLineNumber = "1419"
landmarkName = "-referUserInfo"
startingLineNumber = "1420"
endingLineNumber = "1420"
landmarkName = "-getBankcardInfo"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -435,13 +435,13 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "jyhApp/&#x5176;&#x4ed6;/AppDelegate.m"
timestampString = "577164446.922585"
filePath = "jyhApp/&#x5b9e;&#x540d;&#x8ba4;&#x8bc1;/JYH_RealnameApproveVC.m"
timestampString = "578890111.822275"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "206"
endingLineNumber = "206"
landmarkName = "-application:didRegisterForRemoteNotificationsWithDeviceToken:"
startingLineNumber = "397"
endingLineNumber = "397"
landmarkName = "-uploadCertFace"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -451,13 +451,13 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../jxhApp/jyhApp/&#x5b9e;&#x540d;&#x8ba4;&#x8bc1;/JYH_RealnameApproveVC.m"
timestampString = "583321305.591944"
filePath = "jyhApp/&#x5b9e;&#x540d;&#x8ba4;&#x8bc1;/JYH_RealnameApproveVC.m"
timestampString = "578890114.016338"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "523"
endingLineNumber = "523"
landmarkName = "-submitClick"
startingLineNumber = "399"
endingLineNumber = "399"
landmarkName = "-uploadCertFace"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -467,13 +467,13 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../jxhApp/jyhApp/&#x5b9e;&#x540d;&#x8ba4;&#x8bc1;/JYH_RealnameApproveVC.m"
timestampString = "583321305.592036"
filePath = "jyhApp/&#x9996;&#x9875;/JYH_MainViewController.m"
timestampString = "579600864.819648"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "537"
endingLineNumber = "537"
landmarkName = "-submitClick"
startingLineNumber = "143"
endingLineNumber = "143"
landmarkName = "-noLoginView"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -483,13 +483,13 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../jxhApp/jyhApp/&#x9996;&#x9875;/JYH_DepositCrashViewController.m"
timestampString = "583322425.386367"
filePath = "jyhApp/&#x9996;&#x9875;/JYH_MainViewController.m"
timestampString = "579600870.298303"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "386"
endingLineNumber = "386"
landmarkName = "-serviceFeeNetwork:"
startingLineNumber = "141"
endingLineNumber = "141"
landmarkName = "-noLoginView"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......
jyhApp/Assets.xcassets/AppIcon.appiconset/Contents.json
View file @ 76a85d49
......@@ -3,49 +3,49 @@
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "40.png",
"filename" : "20@2x.png",
"scale" : "2x"
},
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "60.png",
"filename" : "20@3x.png",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "58.png",
"filename" : "29@2x.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "87.png",
"filename" : "29@3x.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "80.png",
"filename" : "40@2x.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "120.png",
"filename" : "40@3x.png",
"scale" : "3x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "120-1.png",
"filename" : "60@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "180.png",
"filename" : "60@3x.png",
"scale" : "3x"
},
{
......
jyhApp/Assets.xcassets/LaunchImage-1.launchimage/Contents.json
View file @ 76a85d49
......@@ -4,7 +4,7 @@
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "2688h",
"filename" : "iPhone XR@3x.png",
"filename" : "1242X2688.png",
"minimum-system-version" : "12.0",
"orientation" : "portrait",
"scale" : "3x"
......@@ -13,7 +13,7 @@
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "1792h",
"filename" : "iPhone XR@2x.png",
"filename" : "828X1792.png",
"minimum-system-version" : "12.0",
"orientation" : "portrait",
"scale" : "2x"
......@@ -22,7 +22,7 @@
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "2436h",
"filename" : "iPhone XS@3x.png",
"filename" : "1125X2436.png",
"minimum-system-version" : "11.0",
"orientation" : "portrait",
"scale" : "3x"
......@@ -31,7 +31,7 @@
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "736h",
"filename" : "iPhone 8 Plus@3x.png",
"filename" : "1242X2208.png",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
"scale" : "3x"
......@@ -40,7 +40,7 @@
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "667h",
"filename" : "iPhone 8@2x.png",
"filename" : "750X1334.png",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
"scale" : "2x"
......@@ -48,6 +48,7 @@
{
"orientation" : "portrait",
"idiom" : "iphone",
"filename" : "640X960.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
......@@ -56,7 +57,7 @@
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "retina4",
"filename" : "iPhone SE@2x.png",
"filename" : "640X1136.png",
"minimum-system-version" : "7.0",
"orientation" : "portrait",
"scale" : "2x"
......
jyhApp/Assets.xcassets/个人中心/bankphotoImg.imageset/Contents.json 0 → 100644
View file @ 76a85d49
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "bankphotoImg@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "bankphotoImg@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
jyhApp/Assets.xcassets/个人中心/carmeraIcon.imageset/Contents.json 0 → 100644
View file @ 76a85d49
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "carmeraIcon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "carmeraIcon@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
jyhApp/Assets.xcassets/个人中心/deleteImagIcon.imageset/Contents.json 0 → 100644
View file @ 76a85d49
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "deleteImagIcon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "deleteImagIcon@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
jyhApp/Assets.xcassets/个人中心/ico_check_nomal.imageset/Contents.json 0 → 100644
View file @ 76a85d49
{
"images" : [
{
"idiom" : "universal",
"filename" : "ico_check_nomal.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ico_check_nomal@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ico_check_nomal@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
jyhApp/Assets.xcassets/个人中心/ico_check_select.imageset/Contents.json 0 → 100644
View file @ 76a85d49
{
"images" : [
{
"idiom" : "universal",
"filename" : "ico_check_select.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ico_check_select@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ico_check_select@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
jyhApp/Assets.xcassets/个人中心/mine_edu.imageset/Contents.json
View file @ 76a85d49
......@@ -2,7 +2,6 @@
"images" : [
{
"idiom" : "universal",
"filename" : "mine_edu.png",
"scale" : "1x"
},
{
......
jyhApp/Assets.xcassets/个人中心/mine_realname_down.imageset/Contents.json
View file @ 76a85d49
......@@ -2,7 +2,6 @@
"images" : [
{
"idiom" : "universal",
"filename" : "mine_realname_down@1x.png",
"scale" : "1x"
},
{
......
jyhApp/Assets.xcassets/还款/dakuaning.imageset/Contents.json 0 → 100644
View file @ 76a85d49
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "dakuaning@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "dakuaning@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
jyhApp/Assets.xcassets/首页/home_icon1.imageset/Contents.json
View file @ 76a85d49
......@@ -2,7 +2,6 @@
"images" : [
{
"idiom" : "universal",
"filename" : "home_icon1.png",
"scale" : "1x"
},
{
......
jyhApp/Assets.xcassets/首页/home_icon2.imageset/Contents.json
View file @ 76a85d49
......@@ -2,7 +2,6 @@
"images" : [
{
"idiom" : "universal",
"filename" : "home_icon2.png",
"scale" : "1x"
},
{
......
jyhApp/Assets.xcassets/首页/home_icon3.imageset/Contents.json
View file @ 76a85d49
......@@ -2,7 +2,6 @@
"images" : [
{
"idiom" : "universal",
"filename" : "home_icon3.png",
"scale" : "1x"
},
{
......
jyhApp/Assets.xcassets/首页/jiekuan_BG.imageset/Contents.json 0 → 100644
View file @ 76a85d49
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "jiekuan_BG@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "jiekuan_BG@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
jyhApp/Info.plist
View file @ 76a85d49
......@@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>zh_CN</string>
<key>CFBundleDisplayName</key>
<string>金银花推送测试</string>
<string>富贵钱包</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
......@@ -26,7 +26,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>0</string>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
......
jyhApp/Others/JYH_urlstring.h
View file @ 76a85d49
......@@ -15,27 +15,29 @@
#ifdef DEBUG
#define URL_ADDR_STRING @"https://snowtest.zhanhaijingji.cn/" //测试
//#define URL_ADDR_STRING @"https://snowtest.zhanhaijingji.cn/" //测试
//#define URL_ADDR_STRING @"http://112.124.193.150/" //测试
#define URL_ADDR_STRING @"https://snow.hongkekonggu.net/" // 正式
//#define URL_ADDR_STRING @"http://192.168.2.56:8087/" //测试
//测试环境
#define JYH_OSS_API_KEY @"LTAIPxixIUkcC5Tk"
#define JYH_OSS_SECRET @"4Pe09mzr1ZET3osGoqk5v2LqtpW9n4"
#define JYH_OSS_BUCKETNAME @"res-zhanhai-test"
#define JYH_OSS_API_KEY @"LTAIRXdYX2nhSc0m"
#define JYH_OSS_SECRET @"Rfh5laB1sVv6qDa7pGUSg8GVICD0vf"
#define JYH_OSS_BUCKETNAME @"zhangshang-prod"
#define JYH_OSS_ENDPOINT_WAI @"https://oss-cn-hangzhou.aliyuncs.com"
#else
#define URL_ADDR_STRING @"https://snow.zhanhaijingji.cn/" // 正式
#define URL_ADDR_STRING @"https://snow.hongkekonggu.net/" // 正式
// 生产环境
#define JYH_OSS_API_KEY @"LTAIrKpMEnGOFXON"
#define JYH_OSS_SECRET @"22usYrLBFGmwQg2d4w4J9Po6oDUwUT"
#define JYH_OSS_BUCKETNAME @"res-zhanhai-prod"
#define JYH_OSS_ENDPOINT_WAI @"https://oss-cn-hangzhou.aliyuncs.com"
#define JYH_OSS_API_KEY @"LTAIRXdYX2nhSc0m"
#define JYH_OSS_SECRET @"Rfh5laB1sVv6qDa7pGUSg8GVICD0vf"
#define JYH_OSS_BUCKETNAME @"zhangshang-prod"
#define JYH_OSS_ENDPOINT_WAI @"https://oss-cn-hangzhou.aliyuncs.com"
#endif
......@@ -112,10 +114,11 @@
https://m.zhanhaijingji.cn/public/agreement/regAgreement.html
https://m.zhanhaijingji.cn/public/agreement/loanAgreement.html
*/
#define USER_AGREEMENT_PROTOCOL @"https://m.zhanhaijingji.cn/public/jyh/regAgreement.html"
#define USER_AGREEMENT_PROTOCOL @"https://m.zhanhaijingji.cn/public/zsqb/regAgreement.html"
#define USER_LOANFEE_PROTOCOL @"https://m.zhanhaijingji.cn/public/agreement/loanFee.html"
#define USER_LOAN_AGREEMENT_PROTOCOL @"https://m.zhanhaijingji.cn/public/jyh/loanAgreement.html"
#define USER_DAIKOU_PROTOCOL @"https://m.zhanhaijingji.cn/public/jyh/withholdAgreement.html"
#define USER_LOAN_AGREEMENT_PROTOCOL @"https://m.zhanhaijingji.cn/public/zsqb/loanAgreement.html"
#define USER_DAIKOU_PROTOCOL @"https://m.zhanhaijingji.cn/public/zsqb/withholdAgreement.html"
......
jyhApp/Others/UIStyledef.h
View file @ 76a85d49
......@@ -104,9 +104,15 @@ blue:((float)(rgbValue & 0xFF)) / 255.0 alpha:1.0]
// 使用的主体颜色
#define JYH_NONMAL_COLOR_8700 [Tools createColorByHex:@"#FF8700"]
#define JYH_NONMAL_COLOR_8700 [Tools createColorByHex:@"#397BE6"]
#define JYH_NONMAL_ORANGE_COLOR [Tools createColorByHex:@"#F15A5B"]
#define JYH_BTN_COLOR1 [Tools createColorByHex:@"#0276FA"] //渐变颜色 1和2
#define JYH_BTN_COLOR2 [Tools createColorByHex:@"#0276FA"]
#define JYH_NONMAL_RED_COLOR [Tools createColorByHex:@"#EB4542"]
#define JYH_NONMAL_ORANGE_COLOR [Tools createColorByHex:@"#FF604F"]
//一般黑色字体
#define JYH_NONMAL_BLACK_COLOR [Tools createColorByHex:@"#1E1E1E"]
......@@ -114,13 +120,7 @@ blue:((float)(rgbValue & 0xFF)) / 255.0 alpha:1.0]
#define JYH_NONMAL_LINE_COLOR [Tools createColorByHex:@"#E9E9E9"]
#define JYH_NONMAL_GRAY_COLOR [Tools createColorByHex:@"#808080"]
#define JYH_GRAY_BTN_COLOR [Tools createColorByHex:@"#BEC2CC"]
......
jyhApp/Others/keyStringdef.h
View file @ 76a85d49
......@@ -86,7 +86,7 @@ bucketName: res-zhanhai-test
#define PGY_APP_KEY @"a471938dab9b0e418f102e2291a85f77"
//友盟 AppKey
#define UMENG_APP_KEY @"5c3edbe6b465f5de72000f7a"
#define UMENG_APP_KEY @"5d281f690cafb288ef00002b"
//极光推送appkey
#define JPUSH_APP_KEY @"10d9c6f271d2594c229bbaba"
......
jyhApp/Tools/CustomTools/Other/Tools.m
View file @ 76a85d49
......@@ -574,7 +574,7 @@
UIButton * button = [UIButton buttonWithType:UIButtonTypeCustom];
//渐变颜色
CAGradientLayer *gradientLayer = [CAGradientLayer layer];
gradientLayer.colors = @[(__bridge id)TCUIColorFromRGB(0xF7991C).CGColor, (__bridge id)TCUIColorFromRGB(0xFD6B00).CGColor];
gradientLayer.colors = @[(__bridge id)TCUIColorFromRGB(0x0276FA).CGColor, (__bridge id)TCUIColorFromRGB(0x346CFB).CGColor];
gradientLayer.locations = @[@0.3, @1.0];
gradientLayer.startPoint = CGPointMake(0, 0);
gradientLayer.endPoint = CGPointMake(1.0, 0);
......
jyhApp/jyhApp.entitlements
View file @ 76a85d49
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>development</string>
</dict>
<dict/>
</plist>
jyhApp/Others/个人中心/JYH_JiekuanOrdersViewController.m → jyhApp/个人中心/JYH_JiekuanOrdersViewController.m
View file @ 76a85d49
......@@ -199,7 +199,7 @@
make.height.mas_equalTo(labelHeight+1);
}];
UILabel * label3 = [UILabel labelWithTextColor:JYH_NONMAL_ORANGE_COLOR withTextAlignment:NSTextAlignmentLeft withText:@"如到期当日未还款，将按日收取逾期客户管理费。" withfont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE]];
UILabel * label3 = [UILabel labelWithTextColor:JYH_NONMAL_RED_COLOR withTextAlignment:NSTextAlignmentLeft withText:@"如到期当日未还款，将按日收取逾期客户管理费。" withfont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE]];
[self setLabelSpace:label3 withValue:label3.text withFont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE]];
CGFloat labelHeight2 = [self getSpaceLabelHeight:label3.text withFont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE] withWidth:WIDTH-100*Iphone6_WIDE_SCALE];
label3.numberOfLines = 0;
......
jyhApp/其他/AppDelegate.m
View file @ 76a85d49
......@@ -27,7 +27,7 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// sleep(2);
sleep(1);
//布局主视图
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
......@@ -69,7 +69,8 @@
UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:UIUserNotificationTypeBadge|UIUserNotificationTypeSound|UIUserNotificationTypeAlert categories:nil];
[application registerUserNotificationSettings:settings];
}
/*
// 推送相关
//notice: 3.0.0 及以后版本注册可以这样写，也可以继续用之前的注册方式
......@@ -114,6 +115,7 @@
// 极光推送登录成功后可以注册别名
// [defaultCenter addObserver:self selector:@selector(registerAlias:) name:kJPFNetworkDidLoginNotification object:nil];
*/
HomeTabBarVC * homeTabBC = [[HomeTabBarVC alloc] init];
self.window.rootViewController = homeTabBC;
......@@ -196,9 +198,6 @@
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}
// 推送代理方法
- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
......
jyhApp/其他/HomeTabBarVC.m
View file @ 76a85d49
......@@ -118,7 +118,7 @@
UIAlertController *alertController = [UIAlertController
alertControllerWithTitle:@"请先授权通讯录权限"
message:@"请在iPhone的\"设置-隐私-通讯录\"选项中,允许金银花访问你的通讯录"
message:@"请在iPhone的\"设置-隐私-通讯录\"选项中,允许掌上钱包访问你的通讯录"
preferredStyle: UIAlertControllerStyleAlert];
UIAlertAction *OKAction = [UIAlertAction actionWithTitle:@"好的" style:UIAlertActionStyleDefault handler:nil];
......
jyhApp/实名认证/JYH_IDInfoListViewController.m
View file @ 76a85d49
......@@ -155,7 +155,7 @@
[bottomView addGestureRecognizer:infoTap];
_submitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
_submitBtn.backgroundColor = [Tools createColorByHex:@"#FFD5B1"];
_submitBtn.backgroundColor = JYH_GRAY_BTN_COLOR;
[_submitBtn setTitle:@"提交" forState:UIControlStateNormal];
_submitBtn.enabled = NO;
_submitBtn.titleLabel.font = [UIFont systemFontOfSize:18];
......@@ -247,7 +247,7 @@
if ([resultDic[@"certFlag"] isEqualToString:@"YES"]){
weakself.realNameStatus = YES;
weakself.firstLab.text = @"已认证";
weakself.firstLab.textColor = [Tools createColorByHex:@"#00CBC8"];
weakself.firstLab.textColor = JYH_NONMAL_COLOR_8700;
weakself.firstImg.hidden = YES;
}else{
weakself.realNameStatus = NO;
......@@ -258,7 +258,7 @@
if ([resultDic[@"linkerFlag"] isEqualToString:@"YES"]){
weakself.userInfoStatus = YES;
weakself.secondLab.text = @"已认证";
weakself.secondLab.textColor = [Tools createColorByHex:@"#00CBC8"];
weakself.secondLab.textColor = JYH_NONMAL_COLOR_8700;
weakself.secondImg.hidden = YES;
}else{
weakself.userInfoStatus = NO;
......
jyhApp/实名认证/JYH_RealNameSuccessVC.m
View file @ 76a85d49
......@@ -74,7 +74,7 @@
UIButton * finishBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[finishBtn setTitle:@"完成" forState:UIControlStateNormal];
finishBtn.layer.cornerRadius = 22.0f;
finishBtn.backgroundColor = [Tools createColorByHex:@"#24BFF2"];
finishBtn.backgroundColor = JYH_NONMAL_COLOR_8700;
[finishBtn addTarget:self action:@selector(finishBtnClick) forControlEvents:UIControlEventTouchUpInside];
finishBtn.titleLabel.font = [UIFont systemFontOfSize:18];
[self.view addSubview:finishBtn];
......
jyhApp/实名认证/JYH_RealnameApproveVC.m
View file @ 76a85d49
......@@ -110,8 +110,8 @@
UILabel * label = [[UILabel alloc]init];
NSMutableAttributedString * str = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"上传清晰的身份证照片 (请横向拍摄)"]];
[str addAttribute:NSForegroundColorAttributeName value:[Tools createColorByHex:@"#808080"] range:NSMakeRange(0,10)]; //设置字体颜色
[str addAttribute:NSForegroundColorAttributeName value:[Tools createColorByHex:@"#BE987B"] range:NSMakeRange(10,8)];
[str addAttribute:NSForegroundColorAttributeName value:JYH_NONMAL_GRAY_COLOR range:NSMakeRange(0,10)]; //设置字体颜色
[str addAttribute:NSForegroundColorAttributeName value:JYH_NONMAL_COLOR_8700 range:NSMakeRange(10,8)];
label.attributedText = str;
label.font = [UIFont systemFontOfSize:12*Iphone6_WIDE_SCALE];
label.textAlignment = NSTextAlignmentLeft;
......@@ -247,7 +247,7 @@
make.size.mas_equalTo(CGSizeMake(200, 21*Iphone6_HEIGHT_SCALE));
}];
_submitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
_submitBtn.backgroundColor = [Tools createColorByHex:@"#FFD5B1"];
_submitBtn.backgroundColor = JYH_GRAY_BTN_COLOR;
[_submitBtn setTitle:@"提交" forState:UIControlStateNormal];
_submitBtn.enabled = NO;
_submitBtn.titleLabel.font = [UIFont systemFontOfSize:18];
......@@ -385,11 +385,11 @@
// weakself.idNumLab.textColor = [Tools createColorByHex:@"#1E1E1E"];
weakself.FaceSuccess = YES;
if (weakself.FaceSuccess && weakself.BackSuccess) {
weakself.submitBtn.backgroundColor = [Tools createColorByHex:@"#FF8700"];
weakself.submitBtn.backgroundColor = JYH_NONMAL_COLOR_8700;
weakself.submitBtn.enabled = YES;
[weakself.submitBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
}else{
weakself.submitBtn.backgroundColor = [Tools createColorByHex:@"#FFD5B1"];
weakself.submitBtn.backgroundColor = JYH_GRAY_BTN_COLOR;
weakself.submitBtn.enabled = NO;
// [weakself.submitBtn setTitleColor:[Tools createColorByHex:@"#B1B1BB"] forState:UIControlStateNormal];
}
......@@ -459,11 +459,11 @@
weakself.BackSuccess = YES;
dispatch_async(dispatch_get_main_queue(), ^{
if (weakself.FaceSuccess && weakself.BackSuccess) {
weakself.submitBtn.backgroundColor = [Tools createColorByHex:@"#FF8700"];
weakself.submitBtn.backgroundColor = JYH_NONMAL_COLOR_8700;
weakself.submitBtn.enabled = YES;
[weakself.submitBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
}else{
weakself.submitBtn.backgroundColor = [Tools createColorByHex:@"#FFD5B1"];
weakself.submitBtn.backgroundColor = JYH_GRAY_BTN_COLOR;
weakself.submitBtn.enabled = NO;
// [weakself.submitBtn setTitleColor:[Tools createColorByHex:@"#B1B1BB"] forState:UIControlStateNormal];
}
......@@ -573,7 +573,7 @@
make.size.mas_equalTo(CGSizeMake(130*Iphone6_WIDE_SCALE, 25*Iphone6_HEIGHT_SCALE));
}];
UILabel * label2 = [UILabel labelWithTextColor:[Tools createColorByHex:@"#808080"] withTextAlignment:NSTextAlignmentCenter withText:@"到期日期小于1个月" withfont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE]];
UILabel * label2 = [UILabel labelWithTextColor:JYH_NONMAL_GRAY_COLOR withTextAlignment:NSTextAlignmentCenter withText:@"到期日期小于1个月" withfont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE]];
label2.text = _cerAlertDateStr;
[_alertCertView addSubview:label2];
[label2 mas_makeConstraints:^(MASConstraintMaker *make) {
......@@ -583,7 +583,7 @@
make.height.mas_equalTo(20*Iphone6_HEIGHT_SCALE);
}];
UILabel * label3 = [UILabel labelWithTextColor:[Tools createColorByHex:@"#808080"] withTextAlignment:NSTextAlignmentCenter withText:@"请先办理最新身份证后再来认证" withfont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE]];
UILabel * label3 = [UILabel labelWithTextColor:JYH_NONMAL_GRAY_COLOR withTextAlignment:NSTextAlignmentCenter withText:@"请先办理最新身份证后再来认证" withfont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE]];
[_alertCertView addSubview:label3];
[label3 mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.alertCertView).offset(15*Iphone6_WIDE_SCALE);
......
jyhApp/实名认证/JYH_SetUserInfoViewController.m
View file @ 76a85d49
......@@ -64,7 +64,7 @@
_submitBtn.backgroundColor = JYH_NONMAL_COLOR_8700;
_submitBtn.enabled = YES;
}else{
_submitBtn.backgroundColor = [Tools createColorByHex:@"#FFD5B1"];
_submitBtn.backgroundColor = JYH_GRAY_BTN_COLOR;
_submitBtn.enabled = NO;
}
}
......@@ -279,7 +279,7 @@
}];
_submitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
_submitBtn.backgroundColor = [Tools createColorByHex:@"#FFD5B1"];
_submitBtn.backgroundColor = JYH_NONMAL_GRAY_COLOR;
[_submitBtn setTitle:@"提交" forState:UIControlStateNormal];
_submitBtn.enabled = NO;
_submitBtn.titleLabel.font = [UIFont systemFontOfSize:18];
......@@ -509,7 +509,7 @@
_submitBtn.backgroundColor = JYH_NONMAL_COLOR_8700;
_submitBtn.enabled = YES;
}else{
_submitBtn.backgroundColor = [Tools createColorByHex:@"#FFD5B1"];
_submitBtn.backgroundColor = JYH_GRAY_BTN_COLOR;
_submitBtn.enabled = NO;
}
}
......
jyhApp/实名认证/PhotoBrowser/ZLOnePhoto.m
View file @ 76a85d49
......@@ -61,7 +61,7 @@
[_vc presentViewController:_imgPickC animated:YES completion:nil];
}else{
//无相机访问权限
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在IPhone的“设置-隐私-相机”中允许金银花访问您的相机" preferredStyle:(UIAlertControllerStyleAlert)];
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在IPhone的“设置-隐私-相机”中允许掌上钱包访问您的相机" preferredStyle:(UIAlertControllerStyleAlert)];
UIAlertAction *okAction = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:nil];
......@@ -82,7 +82,7 @@
[_vc presentViewController:_imgPickC animated:YES completion:nil];
}else{
//无相册访问权限
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在IPhone的“设置-隐私-照片”中允许金银花访问您的照片" preferredStyle:(UIAlertControllerStyleAlert)];
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在IPhone的“设置-隐私-照片”中允许掌上钱包访问您的照片" preferredStyle:(UIAlertControllerStyleAlert)];
UIAlertAction *okAction = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:nil];
......
jyhApp/实名认证/PhotoBrowser/ZLPhotoActionSheet.m
View file @ 76a85d49
......@@ -497,7 +497,7 @@ static char RelatedKey;
//无相册访问权限
// ZLNoAuthorityViewController *nvc = [[ZLNoAuthorityViewController alloc] initWithNibName:@"ZLNoAuthorityViewController" bundle:kZLPhotoBrowserBundle];
// [self presentVC:nvc];
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在IPhone的“设置-隐私-照片”中允许金银花访问您的照片" preferredStyle:(UIAlertControllerStyleAlert)];
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在IPhone的“设置-隐私-照片”中允许掌上钱包访问您的照片" preferredStyle:(UIAlertControllerStyleAlert)];
UIAlertAction *okAction = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:nil];
......
jyhApp/登录/JYH_LoginViewController.m
View file @ 76a85d49
......@@ -86,8 +86,8 @@
logoImage.image = [UIImage imageNamed:@"loginLogo"];
[self.view addSubview:logoImage];
[logoImage mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(line1.mas_bottom).offset(40*Iphone6_HEIGHT_SCALE);
make.size.mas_equalTo(CGSizeMake(70*Iphone6_WIDE_SCALE, 50*Iphone6_HEIGHT_SCALE));
make.top.equalTo(line1.mas_bottom).offset(22*Iphone6_HEIGHT_SCALE);
make.size.mas_equalTo(CGSizeMake(91*Iphone6_WIDE_SCALE, 95*Iphone6_HEIGHT_SCALE));
make.centerX.equalTo(line1);
}];
......@@ -97,7 +97,7 @@
subTitle.font = [UIFont systemFontOfSize:16 weight:0.2];
[self.view addSubview:subTitle];
[subTitle mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(logoImage.mas_bottom).offset(40*Iphone6_HEIGHT_SCALE);
make.top.equalTo(logoImage.mas_bottom).offset(30*Iphone6_HEIGHT_SCALE);
make.size.mas_equalTo(CGSizeMake(150, 22));
make.centerX.equalTo(logoImage);
}];
......@@ -182,30 +182,31 @@
}];
_loginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_loginBtn setTitle:@"登录" forState:UIControlStateNormal];
_loginBtn.titleLabel.font = [UIFont systemFontOfSize:16*Iphone6_WIDE_SCALE];
_loginBtn = [UIButton buttonWithTitlefont:[UIFont systemFontOfSize:16*Iphone6_WIDE_SCALE weight:UIFontWeightRegular] withTitle:@"登录" withTitleColor:[UIColor whiteColor] withSuperview:self.view];
// [_loginBtn setTitle:@"登录" forState:UIControlStateNormal];
// _loginBtn.titleLabel.font = [UIFont systemFontOfSize:16*Iphone6_WIDE_SCALE];
// [_loginBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
[_loginBtn addTarget:self action:@selector(loginClick) forControlEvents:UIControlEventTouchUpInside];
//渐变颜色
CAGradientLayer *gradientLayer = [CAGradientLayer layer];
gradientLayer.colors = @[(__bridge id)TCUIColorFromRGB(0xF7991C).CGColor, (__bridge id)TCUIColorFromRGB(0xFD6B00).CGColor];
gradientLayer.locations = @[@0.3, @1.0];
gradientLayer.startPoint = CGPointMake(0, 0);
gradientLayer.endPoint = CGPointMake(1.0, 0);
gradientLayer.frame = CGRectMake(0, 0, 267*Iphone6_WIDE_SCALE, 40*Iphone6_HEIGHT_SCALE);
gradientLayer.cornerRadius = 4.0f;
[_loginBtn.layer addSublayer:gradientLayer];
CALayer *layer = [[CALayer alloc] init];
// layer.frame = CGRectMake(100, self.view.frame.size.height - 300, 100, 100);
layer.shadowOffset = CGSizeMake(0, 8);
layer.backgroundColor = [Tools createColorByHex:@"#00BBE0"].CGColor;
layer.shadowColor = [UIColor blackColor].CGColor;
layer.shadowOpacity = 0.6;
layer.cornerRadius = 4.0f;
[self.view.layer addSublayer:layer];
_loginBtn.layer.masksToBounds = YES;
_loginBtn.layer.cornerRadius = 4.0f;
// CAGradientLayer *gradientLayer = [CAGradientLayer layer];
// gradientLayer.colors = @[(__bridge id)TCUIColorFromRGB(0xF7991C).CGColor, (__bridge id)TCUIColorFromRGB(0xFD6B00).CGColor];
// gradientLayer.locations = @[@0.3, @1.0];
// gradientLayer.startPoint = CGPointMake(0, 0);
// gradientLayer.endPoint = CGPointMake(1.0, 0);
// gradientLayer.frame = CGRectMake(0, 0, 267*Iphone6_WIDE_SCALE, 40*Iphone6_HEIGHT_SCALE);
// gradientLayer.cornerRadius = 4.0f;
// [_loginBtn.layer addSublayer:gradientLayer];
//
// CALayer *layer = [[CALayer alloc] init];
//// layer.frame = CGRectMake(100, self.view.frame.size.height - 300, 100, 100);
// layer.shadowOffset = CGSizeMake(0, 8);
// layer.backgroundColor = [Tools createColorByHex:@"#00BBE0"].CGColor;
// layer.shadowColor = [UIColor blackColor].CGColor;
// layer.shadowOpacity = 0.6;
// layer.cornerRadius = 4.0f;
// [self.view.layer addSublayer:layer];
// _loginBtn.layer.masksToBounds = YES;
// _loginBtn.layer.cornerRadius = 4.0f;
[self.view addSubview:_loginBtn];
[_loginBtn mas_makeConstraints:^(MASConstraintMaker *make) {
......@@ -226,14 +227,14 @@
}];
UILabel * protocolLab = [[UILabel alloc]init];
protocolLab.text = @"选择即同意《金银花协议》";
protocolLab.text = @"选择即同意《掌上钱包协议》";
protocolLab.textColor = [Tools createColorByHex:@"#A2A2A2"];
protocolLab.userInteractionEnabled = YES;
protocolLab.font = [UIFont systemFontOfSize:12];
[self.view addSubview:protocolLab];
[protocolLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.view);
make.size.mas_equalTo(CGSizeMake(150, 17));
make.size.mas_equalTo(CGSizeMake(160*Iphone6_WIDE_SCALE, 17));
make.top.equalTo(self.loginBtn.mas_bottom).offset(11);
}];
UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(referProtocolClick)];
......@@ -262,7 +263,7 @@
-(void)referProtocolClick{
JYH_ProtocolWebviewVC * webview = [[JYH_ProtocolWebviewVC alloc]init];
webview.titleStr = @"金银花注册协议";
webview.titleStr = @"掌上钱包注册协议";
webview.urlStr = USER_AGREEMENT_PROTOCOL;
[self presentViewController:webview animated:NO completion:nil];
}
......
jyhApp/账单管理/JYH_BillViewController.m
View file @ 76a85d49
......@@ -249,7 +249,7 @@
[_jieqingBtn addTarget:self action:@selector(jieqingBtnClick) forControlEvents:UIControlEventTouchUpInside];
//渐变颜色
CAGradientLayer *gradientLayer = [CAGradientLayer layer];
gradientLayer.colors = @[(__bridge id)TCUIColorFromRGB(0xF7991C).CGColor, (__bridge id)TCUIColorFromRGB(0xFD6B00).CGColor];
gradientLayer.colors = @[(__bridge id)TCUIColorFromRGB(0x0276FA).CGColor, (__bridge id)TCUIColorFromRGB(0x346CFB).CGColor];
gradientLayer.locations = @[@0.3, @1.0];
gradientLayer.startPoint = CGPointMake(0, 0);
gradientLayer.endPoint = CGPointMake(1.0, 0);
......@@ -259,7 +259,7 @@
CALayer *layer = [[CALayer alloc] init];
layer.shadowOffset = CGSizeMake(0, 8);
layer.backgroundColor = [Tools createColorByHex:@"#F5A623"].CGColor;
layer.backgroundColor = JYH_NONMAL_COLOR_8700.CGColor;
layer.shadowColor = [UIColor blackColor].CGColor;
layer.shadowOpacity = 0.6;
layer.cornerRadius = 4.0f;
......@@ -355,7 +355,7 @@
cell.leftLabel.text = @"逾期天数";
if (_isOverdueStatus) {
cell.rightLabel.text = [NSString stringWithFormat:@"%@天",_overdueDataDic[@"overdueDays"]];
cell.rightLabel.textColor = JYH_NONMAL_ORANGE_COLOR;
cell.rightLabel.textColor = JYH_NONMAL_RED_COLOR;
}else{
cell.rightLabel.text = @"0天";
cell.rightLabel.textColor = JYH_NONMAL_GRAY_COLOR;
......@@ -365,7 +365,7 @@
cell.lineLabel.hidden = YES;
if (_isOverdueStatus) {
cell.rightLabel.text = [NSString stringWithFormat:@"%.2f元",[_overdueDataDic[@"remainAmt"] floatValue] ];
cell.rightLabel.textColor = JYH_NONMAL_ORANGE_COLOR;
cell.rightLabel.textColor = JYH_NONMAL_RED_COLOR;
}else{
cell.rightLabel.text = @"0元";
cell.rightLabel.textColor = JYH_NONMAL_GRAY_COLOR;
......@@ -471,7 +471,7 @@
make.height.mas_equalTo(labelHeight+1);
}];
UILabel * label3 = [UILabel labelWithTextColor:JYH_NONMAL_ORANGE_COLOR withTextAlignment:NSTextAlignmentLeft withText:@"如到期当日未还款，将按日收取逾期客户管理费。" withfont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE]];
UILabel * label3 = [UILabel labelWithTextColor:JYH_NONMAL_RED_COLOR withTextAlignment:NSTextAlignmentLeft withText:@"如到期当日未还款，将按日收取逾期客户管理费。" withfont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE]];
[self setLabelSpace:label3 withValue:label3.text withFont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE]];
CGFloat labelHeight2 = [self getSpaceLabelHeight:label3.text withFont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE] withWidth:WIDTH-100*Iphone6_WIDE_SCALE];
label3.numberOfLines = 0;
......@@ -715,10 +715,10 @@
_huankuanLab.text = @"逾期天数";
_huankuanDateLab.text = [NSString stringWithFormat:@"%@",_overdueDataDic[@"overdueDays"]];
_huankuanDateLab.textColor = JYH_NONMAL_ORANGE_COLOR;
_huankuanDateLab.textColor = JYH_NONMAL_RED_COLOR;
_juliHuankuanLab.text = @"逾期罚息(元)";
_juliHkDaysLab.text = [NSString stringWithFormat:@"%@",_overdueDataDic[@"remainAmt"]];
_juliHkDaysLab.textColor = JYH_NONMAL_ORANGE_COLOR;
_juliHkDaysLab.textColor = JYH_NONMAL_RED_COLOR;
_yinghuanLab.text = [NSString stringWithFormat:@"%.2f",[_overdueDataDic[@"overdueAmt"]floatValue]];
_jieqingAllMoneyStr = _yinghuanLab.text;
......
jyhApp/还款处理/JYH_HuanKuanViewController.m
View file @ 76a85d49
......@@ -158,7 +158,7 @@
}];
UIView * tipView = [[UIView alloc]init];
tipView.backgroundColor = [Tools createColorByHex:@"#F5E9E1"];
tipView.backgroundColor = [Tools createColorByHex:@"#CDD7F2"];
[self.view addSubview:tipView];
[tipView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(self.view);
......@@ -984,8 +984,6 @@
}
-(void)bankcardFKClick{
NSString * token = [[NSUserDefaults standardUserDefaults] objectForKey:JYH_USER_TOKEN];
AFHTTPSessionManager * manager = [[AFHTTPSessionManager alloc]init];
manager.requestSerializer = [AFJSONRequestSerializer serializer];
......
jyhApp/首页/JYH_DepositCrashViewController.m
View file @ 76a85d49
......@@ -16,7 +16,7 @@
@interface JYH_DepositCrashViewController () <UITextFieldDelegate>
@property (nonatomic,strong) UIView * topView;
@property (nonatomic,strong) UIImageView * topView;
@property (nonatomic,strong) UITextField * jiekuanMoneyTF;
@property (nonatomic,strong) UILabel * kejieLab;
......@@ -71,7 +71,7 @@
// NSString * str = [NSString stringWithFormat:@"%@",bankAcc];
if (bankAcc.length > 0) {
_rightImag3.hidden = YES;
_bankInfoLab.textColor = [Tools createColorByHex:@"#808080"];
_bankInfoLab.textColor = JYH_NONMAL_GRAY_COLOR;
_bankInfoLab.text = [NSString stringWithFormat:@"%@(%@)",bankName,bankAcc];
[_bankInfoLab mas_remakeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.view).offset(-15*Iphone6_WIDE_SCALE);
......@@ -129,14 +129,19 @@
make.size.mas_equalTo(CGSizeMake(44,44));
}];
_topView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, WIDTH, 146*Iphone6_HEIGHT_SCALE)];
CAGradientLayer *layer = [CAGradientLayer layer];
layer.startPoint = CGPointMake(0, 0);//（0，0）表示从左上角开始变化。默认值是(0.5,0.0)表示从x轴为中间，y为顶端的开始变化
layer.endPoint = CGPointMake(1, 0);//（1，1）表示到右下角变化结束。默认值是(0.5,1.0) 表示从x轴为中间，y为低端的结束变化
layer.colors = @[(__bridge id)TCUIColorFromRGB(0xF7991C).CGColor, (__bridge id)TCUIColorFromRGB(0xFD6B00).CGColor];
layer.locations = @[@0.3f,@1.0f];//渐变颜色的区间分布，locations的数组长度和color一致，这个值一般不用管它，默认是nil，会平均分布
layer.frame = CGRectMake(0, 0, WIDTH, 146*Iphone6_HEIGHT_SCALE);
[self.topView.layer addSublayer:layer];
// _topView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, WIDTH, 146*Iphone6_HEIGHT_SCALE)];
// CAGradientLayer *layer = [CAGradientLayer layer];
// layer.startPoint = CGPointMake(0, 0);//（0，0）表示从左上角开始变化。默认值是(0.5,0.0)表示从x轴为中间，y为顶端的开始变化
// layer.endPoint = CGPointMake(1, 0);//（1，1）表示到右下角变化结束。默认值是(0.5,1.0) 表示从x轴为中间，y为低端的结束变化
// layer.colors = @[(__bridge id)TCUIColorFromRGB(0xF7991C).CGColor, (__bridge id)TCUIColorFromRGB(0xFD6B00).CGColor];
// layer.locations = @[@0.3f,@1.0f];//渐变颜色的区间分布，locations的数组长度和color一致，这个值一般不用管它，默认是nil，会平均分布
// layer.frame = CGRectMake(0, 0, WIDTH, 146*Iphone6_HEIGHT_SCALE);
// [self.topView.layer addSublayer:layer];
_topView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, WIDTH, 146*Iphone6_HEIGHT_SCALE)];
_topView.backgroundColor = JYH_NONMAL_COLOR_8700;
_topView.userInteractionEnabled = YES;
_topView.image = [UIImage imageNamed:@"jiekuan_BG"];
[self.view addSubview:_topView];
[_topView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(titleLab.mas_bottom).offset(12);
......@@ -330,8 +335,8 @@
label11.font = [UIFont systemFontOfSize:12*Iphone6_WIDE_SCALE];
label11.textAlignment = NSTextAlignmentCenter;
NSMutableAttributedString * str = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"提交申请即代表您同意《借款协议》"]];
[str addAttribute:NSForegroundColorAttributeName value:[Tools createColorByHex:@"#808080"] range:NSMakeRange(0,10)]; //设置字体颜色
[str addAttribute:NSForegroundColorAttributeName value:[Tools createColorByHex:@"#FF604F"] range:NSMakeRange(10,6)];
[str addAttribute:NSForegroundColorAttributeName value:JYH_NONMAL_GRAY_COLOR range:NSMakeRange(0,10)]; //设置字体颜色
[str addAttribute:NSForegroundColorAttributeName value:JYH_NONMAL_COLOR_8700 range:NSMakeRange(10,6)];
label11.attributedText = str;
[self.view addSubview:label11];
[label11 mas_makeConstraints:^(MASConstraintMaker *make) {
......@@ -463,7 +468,7 @@
make.height.mas_equalTo(labelHeight+1);
}];
UILabel * label3 = [UILabel labelWithTextColor:JYH_NONMAL_ORANGE_COLOR withTextAlignment:NSTextAlignmentLeft withText:@"如到期当日未还款，将按日收取逾期客户管理费。" withfont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE]];
UILabel * label3 = [UILabel labelWithTextColor:JYH_NONMAL_RED_COLOR withTextAlignment:NSTextAlignmentLeft withText:@"如到期当日未还款，将按日收取逾期客户管理费。" withfont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE]];
[self setLabelSpace:label3 withValue:label3.text withFont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE]];
CGFloat labelHeight2 = [self getSpaceLabelHeight:label3.text withFont:[UIFont systemFontOfSize:15*Iphone6_WIDE_SCALE] withWidth:WIDTH-100*Iphone6_WIDE_SCALE];
label3.numberOfLines = 0;
......
jyhApp/首页/JYH_MainViewController.m
View file @ 76a85d49
......@@ -131,22 +131,8 @@
}
// 获取地理位置
// locationGPS *loc = [locationGPS sharedlocationGPS];
// [loc getAuthorization];//授权
// [loc startLocation];//开始定位
//
// loc.locationCompleteBlock = ^(double longitude, double latitude) {
// //反地理编码
// LocationManager *locManager = [[LocationManager alloc] init];
// [locManager reverseGeocodeWithlatitude:latitude longitude:longitude success:^(NSString *address) {
// UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"提示" message:address delegate:self cancelButtonTitle:@"确定" otherButtonTitles:nil, nil];
// [alert show];
// } failure:^{
//
// }];
// };
}
-(void)noLoginView{
UIView * notestView = [self.scrollview viewWithTag:OPERATE_SUBVIEW_NOTEST_VIEW_TAG];
UIView * testfailedView = [self.scrollview viewWithTag:OPERATE_SUBVIEW_TESTFILED_VIEW_TAG];
......@@ -182,7 +168,7 @@
}];
UILabel * titleLab = [[UILabel alloc]init];
titleLab.text = @"金银花";
titleLab.text = @"掌上钱包";
titleLab.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
titleLab.textColor = [Tools createColorByHex:@"#1E1E1E"];
titleLab.textAlignment = NSTextAlignmentCenter;
......@@ -398,7 +384,7 @@
make.centerX.equalTo(backgroundView);
}];
UILabel * moneyLab = [UILabel labelWithTextColor:JYH_NONMAL_ORANGE_COLOR withTextAlignment:NSTextAlignmentCenter withText:@"您提交的资料不符合本平台借款条件" withfont:[UIFont systemFontOfSize:12*Iphone6_WIDE_SCALE]];
UILabel * moneyLab = [UILabel labelWithTextColor:JYH_NONMAL_RED_COLOR withTextAlignment:NSTextAlignmentCenter withText:@"您提交的资料不符合本平台借款条件" withfont:[UIFont systemFontOfSize:12*Iphone6_WIDE_SCALE]];
[backgroundView addSubview:moneyLab];
[moneyLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(unhappyImage.mas_bottom).offset(35*Iphone6_HEIGHT_SCALE);
......@@ -438,7 +424,7 @@
UIButton * button = [UIButton buttonWithType:UIButtonTypeCustom];
[button addTarget:self action:@selector(buttonClick:) forControlEvents:UIControlEventTouchUpInside];
button.backgroundColor = [Tools createColorByHex:@"#FFD5B1"];
button.backgroundColor = JYH_GRAY_BTN_COLOR;
button.userInteractionEnabled = NO;
button.layer.cornerRadius = 4.0f;
[button setTitle:@"立即借款" forState:UIControlStateNormal];
......@@ -655,7 +641,7 @@
UIButton * button = [UIButton buttonWithType:UIButtonTypeCustom];
[button addTarget:self action:@selector(buttonClick:) forControlEvents:UIControlEventTouchUpInside];
button.backgroundColor = [Tools createColorByHex:@"#FFD5B1"];
button.backgroundColor = JYH_GRAY_BTN_COLOR;
button.userInteractionEnabled = NO;
button.layer.cornerRadius = 4.0f;
[button setTitle:@"立即借款" forState:UIControlStateNormal];
......@@ -752,7 +738,7 @@
UIButton * button = [UIButton buttonWithType:UIButtonTypeCustom];
[button addTarget:self action:@selector(buttonClick:) forControlEvents:UIControlEventTouchUpInside];
button.backgroundColor = [Tools createColorByHex:@"#FFD5B1"];
button.backgroundColor = JYH_GRAY_BTN_COLOR;
button.userInteractionEnabled = NO;
button.layer.cornerRadius = 4.0f;
[button setTitle:@"还款处理中" forState:UIControlStateNormal];
......@@ -999,7 +985,7 @@
make.size.mas_equalTo(CGSizeMake(55*Iphone6_WIDE_SCALE, 17*Iphone6_HEIGHT_SCALE));
make.left.equalTo(backgroundView).offset(54*Iphone6_WIDE_SCALE);
}];
_yuqiDaysLab = [UILabel labelWithTextColor:JYH_NONMAL_ORANGE_COLOR withTextAlignment:NSTextAlignmentCenter withText:@"1天" withfont:[UIFont systemFontOfSize:16*Iphone6_WIDE_SCALE]];
_yuqiDaysLab = [UILabel labelWithTextColor:JYH_NONMAL_RED_COLOR withTextAlignment:NSTextAlignmentCenter withText:@"1天" withfont:[UIFont systemFontOfSize:16*Iphone6_WIDE_SCALE]];
[backgroundView addSubview:_yuqiDaysLab];
[_yuqiDaysLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(Label.mas_bottom).offset(6*Iphone6_HEIGHT_SCALE);
......@@ -1023,7 +1009,7 @@
make.size.mas_equalTo(CGSizeMake(70*Iphone6_WIDE_SCALE, 17*Iphone6_HEIGHT_SCALE));
make.right.equalTo(backgroundView).offset(-44*Iphone6_WIDE_SCALE);
}];
_yuqiFaxiLab = [UILabel labelWithTextColor:JYH_NONMAL_ORANGE_COLOR withTextAlignment:NSTextAlignmentCenter withText:@"20.00" withfont:[UIFont systemFontOfSize:16*Iphone6_WIDE_SCALE]];
_yuqiFaxiLab = [UILabel labelWithTextColor:JYH_NONMAL_RED_COLOR withTextAlignment:NSTextAlignmentCenter withText:@"20.00" withfont:[UIFont systemFontOfSize:16*Iphone6_WIDE_SCALE]];
[backgroundView addSubview:_yuqiFaxiLab];
[_yuqiFaxiLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(Label2.mas_bottom).offset(6*Iphone6_HEIGHT_SCALE);
......@@ -1589,8 +1575,8 @@
string = [string stringByReplacingOccurrencesOfString:@" " withString:@""];
// NSLog(@"姓名=%@, 电话号码是=%@", nameStr, string);
// contactDict = @{@"linkerName":nameStr,@"linkerCell":string};
contactDict = @{nameStr:string};
contactDict = @{@"linkerName":nameStr,@"linkerCell":string};
// contactDict = @{nameStr:string};
// NSLog(@"***%@ ***",contactDict);
[weakSelf.contactAllArray addObject:contactDict];
}
......@@ -1608,7 +1594,7 @@
UIAlertController *alertController = [UIAlertController
alertControllerWithTitle:@"请先授权通讯录权限"
message:@"请在iPhone的\"设置-隐私-通讯录\"选项中,允许金银花访问你的通讯录"
message:@"请在iPhone的\"设置-隐私-通讯录\"选项中,允许掌上钱包访问你的通讯录"
preferredStyle: UIAlertControllerStyleAlert];
UIAlertAction *OKAction = [UIAlertAction actionWithTitle:@"好的" style:UIAlertActionStyleDefault handler:nil];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment