Commit fd37c862 authored by zhangguangyi's avatar zhangguangyi

Merge branch 'master' of gitlab.huolea.com:lmi/dolphins

parents c2faa18f 088ef717
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
A94EF18C24C696F8009E5BD1 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A94EF18B24C696F7009E5BD1 /* libWeChatSDK.a */; }; A94EF18C24C696F8009E5BD1 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A94EF18B24C696F7009E5BD1 /* libWeChatSDK.a */; };
A95A97B024D1132A0035A684 /* ZJGuardCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A95A97AE24D1132A0035A684 /* ZJGuardCell.m */; };
A95A97B124D1132A0035A684 /* ZJGuardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A95A97AF24D1132A0035A684 /* ZJGuardCell.xib */; };
A95F5C9E248DE272001DB97E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A95F5C9D248DE272001DB97E /* Security.framework */; }; A95F5C9E248DE272001DB97E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A95F5C9D248DE272001DB97E /* Security.framework */; };
A95F5CBE248F2506001DB97E /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A95F5CBD248F2506001DB97E /* CoreTelephony.framework */; }; A95F5CBE248F2506001DB97E /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A95F5CBD248F2506001DB97E /* CoreTelephony.framework */; };
A95F5CC0248F6D25001DB97E /* libc++.1.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A95F5CBF248F6D25001DB97E /* libc++.1.tbd */; }; A95F5CC0248F6D25001DB97E /* libc++.1.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A95F5CBF248F6D25001DB97E /* libc++.1.tbd */; };
...@@ -172,6 +174,10 @@ ...@@ -172,6 +174,10 @@
A9C2BA3E24D039B500010EAE /* launch2@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9C2B99824D039B400010EAE /* launch2@3x.png */; }; A9C2BA3E24D039B500010EAE /* launch2@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9C2B99824D039B400010EAE /* launch2@3x.png */; };
A9C2BA3F24D039B500010EAE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B99924D039B400010EAE /* AppDelegate.m */; }; A9C2BA3F24D039B500010EAE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B99924D039B400010EAE /* AppDelegate.m */; };
A9C2BA4624D040FB00010EAE /* KeychainItemWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B8B524D039B400010EAE /* KeychainItemWrapper.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; A9C2BA4624D040FB00010EAE /* KeychainItemWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B8B524D039B400010EAE /* KeychainItemWrapper.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
A9C2BA4C24D0466800010EAE /* Guard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9C2BA4B24D0466800010EAE /* Guard.storyboard */; };
A9C2BA4F24D0469F00010EAE /* ZJGuardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2BA4E24D0469F00010EAE /* ZJGuardViewController.m */; };
A9C2BA5324D0470200010EAE /* ZJGuardCollectionHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2BA5124D0470200010EAE /* ZJGuardCollectionHeaderView.m */; };
A9C2BA5424D0470200010EAE /* ZJGuardCollectionHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9C2BA5224D0470200010EAE /* ZJGuardCollectionHeaderView.xib */; };
A9D46FB424B6E49400C23A0A /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A9D46FB324B6E49400C23A0A /* libsqlite3.tbd */; }; A9D46FB424B6E49400C23A0A /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A9D46FB324B6E49400C23A0A /* libsqlite3.tbd */; };
A9D46FB624B6E4A700C23A0A /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9D46FB524B6E4A700C23A0A /* SystemConfiguration.framework */; }; A9D46FB624B6E4A700C23A0A /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9D46FB524B6E4A700C23A0A /* SystemConfiguration.framework */; };
BF1FA706A93A962DE9172C98 /* Pods_Dolphins.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2414866F53D8404A69E9E0BA /* Pods_Dolphins.framework */; }; BF1FA706A93A962DE9172C98 /* Pods_Dolphins.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2414866F53D8404A69E9E0BA /* Pods_Dolphins.framework */; };
...@@ -190,6 +196,9 @@ ...@@ -190,6 +196,9 @@
686A7C942487644600C7200C /* 海豚守护.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "海豚守护.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 686A7C942487644600C7200C /* 海豚守护.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "海豚守护.app"; sourceTree = BUILT_PRODUCTS_DIR; };
7E14C5B082456C6EB743E9D7 /* Pods-Dolphins.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Dolphins.release.xcconfig"; path = "Target Support Files/Pods-Dolphins/Pods-Dolphins.release.xcconfig"; sourceTree = "<group>"; }; 7E14C5B082456C6EB743E9D7 /* Pods-Dolphins.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Dolphins.release.xcconfig"; path = "Target Support Files/Pods-Dolphins/Pods-Dolphins.release.xcconfig"; sourceTree = "<group>"; };
A94EF18B24C696F7009E5BD1 /* libWeChatSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libWeChatSDK.a; path = Pods/WechatOpenSDK/OpenSDK1.8.7.1/libWeChatSDK.a; sourceTree = "<group>"; }; A94EF18B24C696F7009E5BD1 /* libWeChatSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libWeChatSDK.a; path = Pods/WechatOpenSDK/OpenSDK1.8.7.1/libWeChatSDK.a; sourceTree = "<group>"; };
A95A97AD24D1132A0035A684 /* ZJGuardCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJGuardCell.h; sourceTree = "<group>"; };
A95A97AE24D1132A0035A684 /* ZJGuardCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJGuardCell.m; sourceTree = "<group>"; };
A95A97AF24D1132A0035A684 /* ZJGuardCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ZJGuardCell.xib; sourceTree = "<group>"; };
A95F5C9D248DE272001DB97E /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; A95F5C9D248DE272001DB97E /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
A95F5CBD248F2506001DB97E /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; A95F5CBD248F2506001DB97E /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
A95F5CBF248F6D25001DB97E /* libc++.1.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.1.tbd"; path = "usr/lib/libc++.1.tbd"; sourceTree = SDKROOT; }; A95F5CBF248F6D25001DB97E /* libc++.1.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.1.tbd"; path = "usr/lib/libc++.1.tbd"; sourceTree = SDKROOT; };
...@@ -482,6 +491,12 @@ ...@@ -482,6 +491,12 @@
A9C2BA4224D03D0100010EAE /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; A9C2BA4224D03D0100010EAE /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A9C2BA4424D03E0700010EAE /* Dolphins-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Dolphins-Bridging-Header.h"; sourceTree = "<group>"; }; A9C2BA4424D03E0700010EAE /* Dolphins-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Dolphins-Bridging-Header.h"; sourceTree = "<group>"; };
A9C2BA4524D03E9A00010EAE /* Dolphins-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Dolphins-Bridging-Header.h"; sourceTree = "<group>"; }; A9C2BA4524D03E9A00010EAE /* Dolphins-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Dolphins-Bridging-Header.h"; sourceTree = "<group>"; };
A9C2BA4B24D0466800010EAE /* Guard.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Guard.storyboard; sourceTree = "<group>"; };
A9C2BA4D24D0469F00010EAE /* ZJGuardViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJGuardViewController.h; sourceTree = "<group>"; };
A9C2BA4E24D0469F00010EAE /* ZJGuardViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJGuardViewController.m; sourceTree = "<group>"; };
A9C2BA5024D0470200010EAE /* ZJGuardCollectionHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJGuardCollectionHeaderView.h; sourceTree = "<group>"; };
A9C2BA5124D0470200010EAE /* ZJGuardCollectionHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJGuardCollectionHeaderView.m; sourceTree = "<group>"; };
A9C2BA5224D0470200010EAE /* ZJGuardCollectionHeaderView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ZJGuardCollectionHeaderView.xib; sourceTree = "<group>"; };
A9D46FB324B6E49400C23A0A /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; A9D46FB324B6E49400C23A0A /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
A9D46FB524B6E4A700C23A0A /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; A9D46FB524B6E4A700C23A0A /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
BFCEA59824D115950010B2F0 /* GYEmptyBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GYEmptyBaseView.h; sourceTree = "<group>"; }; BFCEA59824D115950010B2F0 /* GYEmptyBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GYEmptyBaseView.h; sourceTree = "<group>"; };
...@@ -1263,6 +1278,7 @@ ...@@ -1263,6 +1278,7 @@
A9C2BA4724D042E900010EAE /* Guard */ = { A9C2BA4724D042E900010EAE /* Guard */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A9C2BA4B24D0466800010EAE /* Guard.storyboard */,
A9C2BA4824D042E900010EAE /* Controller */, A9C2BA4824D042E900010EAE /* Controller */,
A9C2BA4924D042E900010EAE /* Model */, A9C2BA4924D042E900010EAE /* Model */,
A9C2BA4A24D042E900010EAE /* View */, A9C2BA4A24D042E900010EAE /* View */,
...@@ -1273,6 +1289,8 @@ ...@@ -1273,6 +1289,8 @@
A9C2BA4824D042E900010EAE /* Controller */ = { A9C2BA4824D042E900010EAE /* Controller */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A9C2BA4D24D0469F00010EAE /* ZJGuardViewController.h */,
A9C2BA4E24D0469F00010EAE /* ZJGuardViewController.m */,
); );
path = Controller; path = Controller;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1287,6 +1305,12 @@ ...@@ -1287,6 +1305,12 @@
A9C2BA4A24D042E900010EAE /* View */ = { A9C2BA4A24D042E900010EAE /* View */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A9C2BA5024D0470200010EAE /* ZJGuardCollectionHeaderView.h */,
A9C2BA5124D0470200010EAE /* ZJGuardCollectionHeaderView.m */,
A9C2BA5224D0470200010EAE /* ZJGuardCollectionHeaderView.xib */,
A95A97AD24D1132A0035A684 /* ZJGuardCell.h */,
A95A97AE24D1132A0035A684 /* ZJGuardCell.m */,
A95A97AF24D1132A0035A684 /* ZJGuardCell.xib */,
); );
path = View; path = View;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1423,6 +1447,7 @@ ...@@ -1423,6 +1447,7 @@
A9C2BA3924D039B500010EAE /* Assets.xcassets in Resources */, A9C2BA3924D039B500010EAE /* Assets.xcassets in Resources */,
A9C2B9F324D039B500010EAE /* ZJUserTrackTimeView.xib in Resources */, A9C2B9F324D039B500010EAE /* ZJUserTrackTimeView.xib in Resources */,
A9C2BA1C24D039B500010EAE /* ZJGoodsStyle2CollectionFooterView.xib in Resources */, A9C2BA1C24D039B500010EAE /* ZJGoodsStyle2CollectionFooterView.xib in Resources */,
A9C2BA4C24D0466800010EAE /* Guard.storyboard in Resources */,
A9C2B9D524D039B500010EAE /* MBProgressHUD.bundle in Resources */, A9C2B9D524D039B500010EAE /* MBProgressHUD.bundle in Resources */,
A9C2BA1624D039B500010EAE /* ZJLocationAttentionVC.xib in Resources */, A9C2BA1624D039B500010EAE /* ZJLocationAttentionVC.xib in Resources */,
A9C2BA3B24D039B500010EAE /* LaunchScreen.storyboard in Resources */, A9C2BA3B24D039B500010EAE /* LaunchScreen.storyboard in Resources */,
...@@ -1430,9 +1455,11 @@ ...@@ -1430,9 +1455,11 @@
A9C2B9F724D039B500010EAE /* ZJFriendListTableViewCell.xib in Resources */, A9C2B9F724D039B500010EAE /* ZJFriendListTableViewCell.xib in Resources */,
A9C2BA0C24D039B500010EAE /* Location.storyboard in Resources */, A9C2BA0C24D039B500010EAE /* Location.storyboard in Resources */,
A9C2BA1724D039B500010EAE /* Goods.storyboard in Resources */, A9C2BA1724D039B500010EAE /* Goods.storyboard in Resources */,
A95A97B124D1132A0035A684 /* ZJGuardCell.xib in Resources */,
A9C2B9A224D039B400010EAE /* LaunchScreenPlaceHolderView.xib in Resources */, A9C2B9A224D039B400010EAE /* LaunchScreenPlaceHolderView.xib in Resources */,
A9C2BA0A24D039B500010EAE /* ZJLocationAttentionCell.xib in Resources */, A9C2BA0A24D039B500010EAE /* ZJLocationAttentionCell.xib in Resources */,
A9C2BA3E24D039B500010EAE /* launch2@3x.png in Resources */, A9C2BA3E24D039B500010EAE /* launch2@3x.png in Resources */,
A9C2BA5424D0470200010EAE /* ZJGuardCollectionHeaderView.xib in Resources */,
A9C2B9E824D039B500010EAE /* ZJAlertView.xib in Resources */, A9C2B9E824D039B500010EAE /* ZJAlertView.xib in Resources */,
A9C2B9E724D039B500010EAE /* ZJLocationVC.xib in Resources */, A9C2B9E724D039B500010EAE /* ZJLocationVC.xib in Resources */,
A9C2B99E24D039B400010EAE /* launch1@2x.png in Resources */, A9C2B99E24D039B400010EAE /* launch1@2x.png in Resources */,
...@@ -1550,6 +1577,7 @@ ...@@ -1550,6 +1577,7 @@
A9C2BA0424D039B500010EAE /* ZJEmergencyContactCell.m in Sources */, A9C2BA0424D039B500010EAE /* ZJEmergencyContactCell.m in Sources */,
A9C2B9F224D039B500010EAE /* ZJMapTrackDatePickerView.m in Sources */, A9C2B9F224D039B500010EAE /* ZJMapTrackDatePickerView.m in Sources */,
A9C2BA0E24D039B500010EAE /* ZJLocationAttentionVC.swift in Sources */, A9C2BA0E24D039B500010EAE /* ZJLocationAttentionVC.swift in Sources */,
A9C2BA4F24D0469F00010EAE /* ZJGuardViewController.m in Sources */,
A9C2BA0524D039B500010EAE /* ZJUpdateNickNameView.m in Sources */, A9C2BA0524D039B500010EAE /* ZJUpdateNickNameView.m in Sources */,
A9C2B9F424D039B500010EAE /* ZJFriendListTableViewCell.m in Sources */, A9C2B9F424D039B500010EAE /* ZJFriendListTableViewCell.m in Sources */,
A9C2B9E924D039B500010EAE /* ZJAlertView.swift in Sources */, A9C2B9E924D039B500010EAE /* ZJAlertView.swift in Sources */,
...@@ -1607,6 +1635,7 @@ ...@@ -1607,6 +1635,7 @@
A9C2B9ED24D039B500010EAE /* ZJMapViewController.m in Sources */, A9C2B9ED24D039B500010EAE /* ZJMapViewController.m in Sources */,
A9C2BA1A24D039B500010EAE /* ZJGoodsViewController.m in Sources */, A9C2BA1A24D039B500010EAE /* ZJGoodsViewController.m in Sources */,
A9C2B9C524D039B500010EAE /* ZJDefaultTools.m in Sources */, A9C2B9C524D039B500010EAE /* ZJDefaultTools.m in Sources */,
A95A97B024D1132A0035A684 /* ZJGuardCell.m in Sources */,
A9C2BA0224D039B500010EAE /* ZJSettingCell.m in Sources */, A9C2BA0224D039B500010EAE /* ZJSettingCell.m in Sources */,
A9C2B9D124D039B500010EAE /* Data.m in Sources */, A9C2B9D124D039B500010EAE /* Data.m in Sources */,
A9C2B9A024D039B400010EAE /* GuideViewController.m in Sources */, A9C2B9A024D039B400010EAE /* GuideViewController.m in Sources */,
...@@ -1642,6 +1671,7 @@ ...@@ -1642,6 +1671,7 @@
A9C2BA2624D039B500010EAE /* ZJBaseViewController.m in Sources */, A9C2BA2624D039B500010EAE /* ZJBaseViewController.m in Sources */,
A9C2B9EE24D039B500010EAE /* ZJLocationModel.m in Sources */, A9C2B9EE24D039B500010EAE /* ZJLocationModel.m in Sources */,
A9C2BA0024D039B500010EAE /* ZJSelectEmergencyPersonCell.m in Sources */, A9C2BA0024D039B500010EAE /* ZJSelectEmergencyPersonCell.m in Sources */,
A9C2BA5324D0470200010EAE /* ZJGuardCollectionHeaderView.m in Sources */,
A9C2B9C224D039B500010EAE /* CollectionViewReusableViewType.swift in Sources */, A9C2B9C224D039B500010EAE /* CollectionViewReusableViewType.swift in Sources */,
A9C2B9B624D039B500010EAE /* UILabel+FontAppearance.m in Sources */, A9C2B9B624D039B500010EAE /* UILabel+FontAppearance.m in Sources */,
A9C2B9A424D039B400010EAE /* NSArray+Category.m in Sources */, A9C2B9A424D039B400010EAE /* NSArray+Category.m in Sources */,
......
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_pet_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guard_Safety_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guard_green_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guard_yellow_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guard_Orange_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guard_top_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_briefcase_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_activity_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_water_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_gift_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_flight_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_punch_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_cake_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_fitness_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_fruit_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_money_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_drug_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_vegetables_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_eat_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_game_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_bed_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guard_remind_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
//
// ZJGuardViewController.h
// Dolphins
//
// Created by 明津李 on 2020/7/28.
// Copyright © 2020 Company. All rights reserved.
//
#import "BaseViewController.h"
NS_ASSUME_NONNULL_BEGIN
@interface ZJGuardViewController : BaseViewController
@end
NS_ASSUME_NONNULL_END
//
// ZJGuardViewController.m
// Dolphins
//
// Created by 明津李 on 2020/7/28.
// Copyright © 2020 Company. All rights reserved.
//
#import "ZJGuardViewController.h"
#import "ZJGuardCollectionHeaderView.h"
#import "ZJGuardCell.h"
@interface ZJGuardViewController ()<UICollectionViewDelegate, UICollectionViewDataSource>
@property (nonatomic, strong) UICollectionView * collectView;
@property (nonatomic, strong) NSMutableArray * dataSource;
@end
@implementation ZJGuardViewController
- (void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated];
[self.navigationController setNavigationBarHidden:YES animated:YES];
}
- (void)viewDidLoad {
[super viewDidLoad];
_dataSource = [[NSMutableArray alloc] init];
_dataSource = @[@{@"title":@"多吃蔬菜", @"image":@"remind_cell_2_3"},
@{@"title":@"记得起床", @"image":@"remind_cell_3_2"},
@{@"title":@"多吃水果", @"image":@"remind_cell_2_0"},
@{@"title":@"多喝水", @"image":@"remind_cell_0_2"},
@{@"title":@"添加提醒", @"image":@"remind_cell_Add"}].mutableCopy;
[self setUI];
}
- (void)setUI{
self.view.backgroundColor = [UIColor whiteColor];
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc]init];
layout.minimumLineSpacing = 1.0;
layout.minimumInteritemSpacing = 1.0;
layout.sectionInset = UIEdgeInsetsMake(1.0, 1.0, 1.0, 1.0);
_collectView = [[UICollectionView alloc] initWithFrame:CGRectNull collectionViewLayout:layout];
_collectView.backgroundColor = self.view.backgroundColor;
_collectView.delegate = self;
_collectView.dataSource = self;
[self.view addSubview:_collectView];
[_collectView registerNib:[UINib nibWithNibName:@"ZJGuardCollectionHeaderView" bundle:nil] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"ZJGuardCollectionHeaderView"];
[_collectView registerNib:[UINib nibWithNibName:@"ZJGuardCell" bundle:nil] forCellWithReuseIdentifier:@"ZJGuardCell"];
// collectionView.register(UINib.init(nibName:"CRCallPhoneDisplayCell", bundle: nil), forCellWithReuseIdentifier: "CRCallPhoneDisplayCell")
[_collectView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.mas_equalTo(self.view);
}];
if (@available(iOS 11.0, *)) {
self.collectView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
} else {
self.automaticallyAdjustsScrollViewInsets = NO;
}
}
- (void)headerBtnClick:(UIButton *)sender{
switch (sender.tag-0x64) {
case 0:
break;
case 1:
break;
case 2:
break;
default:
break;
}
}
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
return _dataSource.count;
}
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
ZJGuardCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ZJGuardCell" forIndexPath:indexPath];
NSDictionary * dic = _dataSource[indexPath.item];
cell.iconImV.image = [UIImage imageNamed:[dic objectForKey:@"image"]];
cell.titleLab.text = [dic objectForKey:@"title"];
return cell;
}
- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath{
if (kind == UICollectionElementKindSectionHeader) {
ZJGuardCollectionHeaderView * header = [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifier:@"ZJGuardCollectionHeaderView" forIndexPath:indexPath];
header.backgroundColor = [UIColor whiteColor];
header.topConstrait.constant = StatusBarHeight+105*scale_w;
header.headerBtn_0.tag = 0x64+0;
header.headerBtn_1.tag = 0x64+1;
header.headerBtn_2.tag = 0x64+2;
[header.headerBtn_0 addTarget:self action:@selector(headerBtnClick:) forControlEvents:(UIControlEventTouchUpInside)];
[header.headerBtn_1 addTarget:self action:@selector(headerBtnClick:) forControlEvents:(UIControlEventTouchUpInside)];
[header.headerBtn_2 addTarget:self action:@selector(headerBtnClick:) forControlEvents:(UIControlEventTouchUpInside)];
return header;
}
return nil;
}
- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section{
return CGSizeMake(KScreenWidth, StatusBarHeight+(56+253+37)*scale_w);
}
- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
CGSize size = CGSizeMake((KScreenWidth-5)/4, 74*scale_w);
return size;
}
@end
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="pOX-1j-Bd6">
<objects>
<viewController id="ndR-PS-Mek" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="1RJ-Ec-3tn">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<viewLayoutGuide key="safeArea" id="xMl-qE-nPm"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="ln8-PG-iH1" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="14" y="106"/>
</scene>
</scenes>
</document>
//
// ZJGuardCell.h
// Dolphins
//
// Created by 明津李 on 2020/7/29.
// Copyright © 2020 Company. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface ZJGuardCell : UICollectionViewCell
@property (nonatomic, weak) IBOutlet UIImageView * iconImV;
@property (nonatomic, weak) IBOutlet UILabel * titleLab;
@end
NS_ASSUME_NONNULL_END
//
// ZJGuardCell.m
// Dolphins
//
// Created by 明津李 on 2020/7/29.
// Copyright © 2020 Company. All rights reserved.
//
#import "ZJGuardCell.h"
@implementation ZJGuardCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
@end
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ZJGuardCell" id="gTV-IL-0wX" customClass="ZJGuardCell">
<rect key="frame" x="0.0" y="0.0" width="305" height="180"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="305" height="180"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="remind_cell_Add" translatesAutoresizingMaskIntoConstraints="NO" id="wdg-vm-tUc">
<rect key="frame" x="132.5" y="56.5" width="40" height="40"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mve-uo-rrt">
<rect key="frame" x="138.5" y="104.5" width="28.5" height="13.5"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</view>
<constraints>
<constraint firstItem="wdg-vm-tUc" firstAttribute="centerY" secondItem="gTV-IL-0wX" secondAttribute="centerY" multiplier="0.85" id="JYa-hF-chD"/>
<constraint firstItem="mve-uo-rrt" firstAttribute="top" secondItem="wdg-vm-tUc" secondAttribute="bottom" constant="8" id="cd4-sm-ygU"/>
<constraint firstItem="wdg-vm-tUc" firstAttribute="centerX" secondItem="gTV-IL-0wX" secondAttribute="centerX" id="jbx-7c-Ys7"/>
<constraint firstItem="mve-uo-rrt" firstAttribute="centerX" secondItem="gTV-IL-0wX" secondAttribute="centerX" id="o7h-On-Wau"/>
</constraints>
<viewLayoutGuide key="safeArea" id="SEy-5g-ep8"/>
<size key="customSize" width="305" height="180"/>
<connections>
<outlet property="iconImV" destination="wdg-vm-tUc" id="65f-gD-wEJ"/>
<outlet property="titleLab" destination="mve-uo-rrt" id="jzF-Qq-Hwd"/>
</connections>
<point key="canvasLocation" x="322.46376811594206" y="138.61607142857142"/>
</collectionViewCell>
</objects>
<resources>
<image name="remind_cell_Add" width="40" height="40"/>
</resources>
</document>
//
// ZJGuardCollectionHeaderView.h
// Dolphins
//
// Created by 明津李 on 2020/7/28.
// Copyright © 2020 Company. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface ZJGuardCollectionHeaderView : UICollectionReusableView
@property (nonatomic, weak) IBOutlet UIImageView * bgImV;
@property (nonatomic, weak) IBOutlet UIButton * headerBtn_0;
@property (nonatomic, weak) IBOutlet UIButton * headerBtn_1;
@property (nonatomic, weak) IBOutlet UIButton * headerBtn_2;
@property (nonatomic, weak) IBOutlet NSLayoutConstraint * topConstrait;
@end
NS_ASSUME_NONNULL_END
//
// ZJGuardCollectionHeaderView.m
// Dolphins
//
// Created by 明津李 on 2020/7/28.
// Copyright © 2020 Company. All rights reserved.
//
#import "ZJGuardCollectionHeaderView.h"
@implementation ZJGuardCollectionHeaderView
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
@end
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ZJGuardCollectionHeaderView" id="U6b-Vx-4bR" customClass="ZJGuardCollectionHeaderView">
<rect key="frame" x="0.0" y="0.0" width="320" height="338"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="guard_header_top_bg" translatesAutoresizingMaskIntoConstraints="NO" id="p2h-ML-hpg">
<rect key="frame" x="0.0" y="0.0" width="320" height="125"/>
<constraints>
<constraint firstAttribute="height" constant="125" id="W97-DB-S2y"/>
</constraints>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="guard_header_bg" translatesAutoresizingMaskIntoConstraints="NO" id="na1-lw-t87">
<rect key="frame" x="8" y="81" width="304" height="214"/>
<constraints>
<constraint firstAttribute="width" secondItem="na1-lw-t87" secondAttribute="height" multiplier="359:253" id="gT6-P0-CE8"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="I8c-90-fll">
<rect key="frame" x="18.5" y="209.5" width="139" height="79"/>
<state key="normal" image="guard_header_btn_2"/>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="安全守护" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PSK-2C-NgN">
<rect key="frame" x="29" y="100" width="61.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="海豚守护" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mSJ-CT-Rso">
<rect key="frame" x="15" y="42.5" width="93.5" height="27.5"/>
<fontDescription key="fontDescription" type="system" pointSize="23"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yYb-ck-9YJ">
<rect key="frame" x="18.5" y="131" width="139" height="78.5"/>
<state key="normal" image="guard_header_btn_0"/>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UM7-bv-VyJ">
<rect key="frame" x="162.5" y="131" width="139" height="78.5"/>
<state key="normal" image="guard_header_btn_1"/>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="温馨提醒" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ht1-z1-rAt">
<rect key="frame" x="30" y="307" width="61.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="I8c-90-fll" firstAttribute="top" secondItem="yYb-ck-9YJ" secondAttribute="bottom" id="396-qc-M7R"/>
<constraint firstItem="UM7-bv-VyJ" firstAttribute="width" secondItem="yYb-ck-9YJ" secondAttribute="width" id="39D-QI-OEN"/>
<constraint firstItem="PSK-2C-NgN" firstAttribute="top" secondItem="na1-lw-t87" secondAttribute="top" constant="19" id="3qg-rN-vK1"/>
<constraint firstItem="UM7-bv-VyJ" firstAttribute="height" secondItem="yYb-ck-9YJ" secondAttribute="height" id="5XA-3B-ft3"/>
<constraint firstItem="I8c-90-fll" firstAttribute="height" secondItem="yYb-ck-9YJ" secondAttribute="height" id="7xb-Az-vKA"/>
<constraint firstItem="I8c-90-fll" firstAttribute="width" secondItem="yYb-ck-9YJ" secondAttribute="width" id="8Y0-hF-Lda"/>
<constraint firstItem="na1-lw-t87" firstAttribute="centerX" secondItem="9Gg-ye-v9C" secondAttribute="centerX" id="F8M-c5-my3"/>
<constraint firstItem="PSK-2C-NgN" firstAttribute="leading" secondItem="na1-lw-t87" secondAttribute="leading" constant="21" id="HDe-HJ-snO"/>
<constraint firstItem="p2h-ML-hpg" firstAttribute="leading" secondItem="9Gg-ye-v9C" secondAttribute="leading" id="MhM-fK-uJv"/>
<constraint firstItem="I8c-90-fll" firstAttribute="centerX" secondItem="yYb-ck-9YJ" secondAttribute="centerX" id="Rby-QL-B6c"/>
<constraint firstItem="UM7-bv-VyJ" firstAttribute="centerX" secondItem="na1-lw-t87" secondAttribute="centerX" multiplier="1.45" id="TcP-Lp-Lry"/>
<constraint firstItem="yYb-ck-9YJ" firstAttribute="centerX" secondItem="na1-lw-t87" secondAttribute="centerX" multiplier="0.55" id="Usp-Iz-9hh"/>
<constraint firstItem="Ht1-z1-rAt" firstAttribute="leading" secondItem="9Gg-ye-v9C" secondAttribute="leading" constant="30" id="Uxd-GC-e3P"/>
<constraint firstItem="yYb-ck-9YJ" firstAttribute="height" secondItem="na1-lw-t87" secondAttribute="height" multiplier="93:253" id="aR4-qA-EeV"/>
<constraint firstItem="yYb-ck-9YJ" firstAttribute="top" secondItem="p2h-ML-hpg" secondAttribute="bottom" constant="6" id="ef4-av-3ik"/>
<constraint firstItem="mSJ-CT-Rso" firstAttribute="centerY" secondItem="p2h-ML-hpg" secondAttribute="centerY" multiplier="0.9" id="fNi-ty-hXe"/>
<constraint firstItem="na1-lw-t87" firstAttribute="width" secondItem="U6b-Vx-4bR" secondAttribute="width" multiplier="375:395" id="i4h-2h-58D"/>
<constraint firstItem="9Gg-ye-v9C" firstAttribute="trailing" secondItem="p2h-ML-hpg" secondAttribute="trailing" id="iGD-XC-Hjg"/>
<constraint firstItem="mSJ-CT-Rso" firstAttribute="leading" secondItem="U6b-Vx-4bR" secondAttribute="leading" constant="15" id="ir7-P5-Cub"/>
<constraint firstItem="na1-lw-t87" firstAttribute="top" secondItem="p2h-ML-hpg" secondAttribute="bottom" constant="-44" id="ny6-uc-GIg"/>
<constraint firstItem="yYb-ck-9YJ" firstAttribute="width" secondItem="na1-lw-t87" secondAttribute="width" multiplier="164:359" id="oxy-nZ-nv4"/>
<constraint firstItem="Ht1-z1-rAt" firstAttribute="top" secondItem="na1-lw-t87" secondAttribute="bottom" constant="12" id="sP4-mK-aR0"/>
<constraint firstItem="UM7-bv-VyJ" firstAttribute="centerY" secondItem="yYb-ck-9YJ" secondAttribute="centerY" id="vhU-e9-gx2"/>
<constraint firstAttribute="top" secondItem="p2h-ML-hpg" secondAttribute="top" id="yP6-iw-Xd2"/>
</constraints>
<viewLayoutGuide key="safeArea" id="9Gg-ye-v9C"/>
<connections>
<outlet property="bgImV" destination="na1-lw-t87" id="5AB-77-XdY"/>
<outlet property="headerBtn_0" destination="yYb-ck-9YJ" id="PQ8-TG-I3k"/>
<outlet property="headerBtn_1" destination="UM7-bv-VyJ" id="AZc-S8-Ylx"/>
<outlet property="headerBtn_2" destination="I8c-90-fll" id="ojl-av-voW"/>
<outlet property="topConstrait" destination="W97-DB-S2y" id="8Ga-Pi-GCL"/>
</connections>
<point key="canvasLocation" x="137.68115942028987" y="68.973214285714278"/>
</collectionReusableView>
</objects>
<resources>
<image name="guard_header_bg" width="344.66665649414062" height="242.66667175292969"/>
<image name="guard_header_btn_0" width="157" height="89"/>
<image name="guard_header_btn_1" width="157" height="89"/>
<image name="guard_header_btn_2" width="157" height="89"/>
<image name="guard_header_top_bg" width="360" height="120"/>
</resources>
</document>
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#import "ZJMapStyle2ViewController.h" #import "ZJMapStyle2ViewController.h"
#import "Data.h" #import "Data.h"
#import "LaunchScreenPlaceHolderView.h" #import "LaunchScreenPlaceHolderView.h"
#import "ZJGuardViewController.h"
@interface BaseTabBarViewController () <UITabBarControllerDelegate> @interface BaseTabBarViewController () <UITabBarControllerDelegate>
...@@ -83,11 +84,17 @@ ...@@ -83,11 +84,17 @@
index:DYTTabBarIndexHome index:DYTTabBarIndexHome
viewController:care_style2 ? [[ZJCareStyle2ViewController alloc] init] : [[ZJCareViewController alloc] init]]; viewController:care_style2 ? [[ZJCareStyle2ViewController alloc] init] : [[ZJCareViewController alloc] init]];
BaseNavigationViewController *iHospNav = [self baseNavigationWithTtitle:@"" // BaseNavigationViewController *iHospNav = [self baseNavigationWithTtitle:@""
// image:nil
// selectedImage:nil
// index:DYTTabBarIndexIHOSP
// viewController:map_style2 ? [[ZJMapStyle2ViewController alloc] init] : [[ZJMapViewController alloc] init]];
BaseNavigationViewController * guardNav = [self baseNavigationWithTtitle:@""
image:nil image:nil
selectedImage:nil selectedImage:nil
index:DYTTabBarIndexIHOSP index:DYTTabBarIndexIHOSP
viewController:map_style2 ? [[ZJMapStyle2ViewController alloc] init] : [[ZJMapViewController alloc] init]]; viewController:[[ZJGuardViewController alloc] init]];
BaseNavigationViewController *mineNav = [self baseNavigationWithTtitle:@"我的" BaseNavigationViewController *mineNav = [self baseNavigationWithTtitle:@"我的"
image:[UIImage imageNamed:@"我的"] image:[UIImage imageNamed:@"我的"]
...@@ -95,7 +102,7 @@ ...@@ -95,7 +102,7 @@
index:DYTTabBarIndexMine index:DYTTabBarIndexMine
viewController:[[ZJMineViewController alloc] init]]; viewController:[[ZJMineViewController alloc] init]];
self.viewControllers = @[homeNav,iHospNav, mineNav]; self.viewControllers = @[homeNav,guardNav, mineNav];
[self.tabBar setBackgroundImage:[UIImage new]]; [self.tabBar setBackgroundImage:[UIImage new]];
[self.tabBar setShadowImage:[UIImage new]]; [self.tabBar setShadowImage:[UIImage new]];
......
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