diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage/Cells/HomeCollectionViewCell.xib b/Meterage/Cells/HomeCollectionViewCell.xib new file mode 100644 index 0000000..59d64b8 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.xib @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage/Cells/HomeCollectionViewCell.xib b/Meterage/Cells/HomeCollectionViewCell.xib new file mode 100644 index 0000000..59d64b8 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.xib @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift index 25c5049..b7e8a74 100644 --- a/Meterage/Cells/MineTableViewCell.swift +++ b/Meterage/Cells/MineTableViewCell.swift @@ -9,8 +9,8 @@ class MineTableViewCell: UITableViewCell { - @IBOutlet var leftImageView: UIImageView! - @IBOutlet var titleLableView: UILabel! + @IBOutlet weak var leftImageView: UIImageView! + @IBOutlet weak var titleLableView: UILabel! override func awakeFromNib() { super.awakeFromNib() diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage/Cells/HomeCollectionViewCell.xib b/Meterage/Cells/HomeCollectionViewCell.xib new file mode 100644 index 0000000..59d64b8 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.xib @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift index 25c5049..b7e8a74 100644 --- a/Meterage/Cells/MineTableViewCell.swift +++ b/Meterage/Cells/MineTableViewCell.swift @@ -9,8 +9,8 @@ class MineTableViewCell: UITableViewCell { - @IBOutlet var leftImageView: UIImageView! - @IBOutlet var titleLableView: UILabel! + @IBOutlet weak var leftImageView: UIImageView! + @IBOutlet weak var titleLableView: UILabel! override func awakeFromNib() { super.awakeFromNib() diff --git a/Meterage/Cells/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib index 9be9303..e0ae92a 100644 --- a/Meterage/Cells/MineTableViewCell.xib +++ b/Meterage/Cells/MineTableViewCell.xib @@ -18,11 +18,11 @@ - + - - + + diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage/Cells/HomeCollectionViewCell.xib b/Meterage/Cells/HomeCollectionViewCell.xib new file mode 100644 index 0000000..59d64b8 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.xib @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift index 25c5049..b7e8a74 100644 --- a/Meterage/Cells/MineTableViewCell.swift +++ b/Meterage/Cells/MineTableViewCell.swift @@ -9,8 +9,8 @@ class MineTableViewCell: UITableViewCell { - @IBOutlet var leftImageView: UIImageView! - @IBOutlet var titleLableView: UILabel! + @IBOutlet weak var leftImageView: UIImageView! + @IBOutlet weak var titleLableView: UILabel! override func awakeFromNib() { super.awakeFromNib() diff --git a/Meterage/Cells/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib index 9be9303..e0ae92a 100644 --- a/Meterage/Cells/MineTableViewCell.xib +++ b/Meterage/Cells/MineTableViewCell.xib @@ -18,11 +18,11 @@ - + - - + + diff --git a/Meterage/Cells/ReminderTableViewCell.swift b/Meterage/Cells/ReminderTableViewCell.swift new file mode 100644 index 0000000..3d82bea --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.swift @@ -0,0 +1,27 @@ +// +// ReminderTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class ReminderTableViewCell: UITableViewCell { + + @IBOutlet weak var reminderProcessView: UILabel! + @IBOutlet weak var reminderTitleView: UILabel! + @IBOutlet weak var reminderTimeView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage/Cells/HomeCollectionViewCell.xib b/Meterage/Cells/HomeCollectionViewCell.xib new file mode 100644 index 0000000..59d64b8 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.xib @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift index 25c5049..b7e8a74 100644 --- a/Meterage/Cells/MineTableViewCell.swift +++ b/Meterage/Cells/MineTableViewCell.swift @@ -9,8 +9,8 @@ class MineTableViewCell: UITableViewCell { - @IBOutlet var leftImageView: UIImageView! - @IBOutlet var titleLableView: UILabel! + @IBOutlet weak var leftImageView: UIImageView! + @IBOutlet weak var titleLableView: UILabel! override func awakeFromNib() { super.awakeFromNib() diff --git a/Meterage/Cells/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib index 9be9303..e0ae92a 100644 --- a/Meterage/Cells/MineTableViewCell.xib +++ b/Meterage/Cells/MineTableViewCell.xib @@ -18,11 +18,11 @@ - + - - + + diff --git a/Meterage/Cells/ReminderTableViewCell.swift b/Meterage/Cells/ReminderTableViewCell.swift new file mode 100644 index 0000000..3d82bea --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.swift @@ -0,0 +1,27 @@ +// +// ReminderTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class ReminderTableViewCell: UITableViewCell { + + @IBOutlet weak var reminderProcessView: UILabel! + @IBOutlet weak var reminderTitleView: UILabel! + @IBOutlet weak var reminderTimeView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Meterage/Cells/ReminderTableViewCell.xib b/Meterage/Cells/ReminderTableViewCell.xib new file mode 100644 index 0000000..5448d23 --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.xib @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage/Cells/HomeCollectionViewCell.xib b/Meterage/Cells/HomeCollectionViewCell.xib new file mode 100644 index 0000000..59d64b8 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.xib @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift index 25c5049..b7e8a74 100644 --- a/Meterage/Cells/MineTableViewCell.swift +++ b/Meterage/Cells/MineTableViewCell.swift @@ -9,8 +9,8 @@ class MineTableViewCell: UITableViewCell { - @IBOutlet var leftImageView: UIImageView! - @IBOutlet var titleLableView: UILabel! + @IBOutlet weak var leftImageView: UIImageView! + @IBOutlet weak var titleLableView: UILabel! override func awakeFromNib() { super.awakeFromNib() diff --git a/Meterage/Cells/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib index 9be9303..e0ae92a 100644 --- a/Meterage/Cells/MineTableViewCell.xib +++ b/Meterage/Cells/MineTableViewCell.xib @@ -18,11 +18,11 @@ - + - - + + diff --git a/Meterage/Cells/ReminderTableViewCell.swift b/Meterage/Cells/ReminderTableViewCell.swift new file mode 100644 index 0000000..3d82bea --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.swift @@ -0,0 +1,27 @@ +// +// ReminderTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class ReminderTableViewCell: UITableViewCell { + + @IBOutlet weak var reminderProcessView: UILabel! + @IBOutlet weak var reminderTitleView: UILabel! + @IBOutlet weak var reminderTimeView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Meterage/Cells/ReminderTableViewCell.xib b/Meterage/Cells/ReminderTableViewCell.xib new file mode 100644 index 0000000..5448d23 --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.xib @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index e64c479..40536fe 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -24,7 +24,7 @@ public class var gray: UIColor { UIColor(hex: "#808080") } - public class var colorText: UIColor { + public class var mainTextColor: UIColor { UIColor(hex: "#555555") } public class var hintColor: UIColor { diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage/Cells/HomeCollectionViewCell.xib b/Meterage/Cells/HomeCollectionViewCell.xib new file mode 100644 index 0000000..59d64b8 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.xib @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift index 25c5049..b7e8a74 100644 --- a/Meterage/Cells/MineTableViewCell.swift +++ b/Meterage/Cells/MineTableViewCell.swift @@ -9,8 +9,8 @@ class MineTableViewCell: UITableViewCell { - @IBOutlet var leftImageView: UIImageView! - @IBOutlet var titleLableView: UILabel! + @IBOutlet weak var leftImageView: UIImageView! + @IBOutlet weak var titleLableView: UILabel! override func awakeFromNib() { super.awakeFromNib() diff --git a/Meterage/Cells/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib index 9be9303..e0ae92a 100644 --- a/Meterage/Cells/MineTableViewCell.xib +++ b/Meterage/Cells/MineTableViewCell.xib @@ -18,11 +18,11 @@ - + - - + + diff --git a/Meterage/Cells/ReminderTableViewCell.swift b/Meterage/Cells/ReminderTableViewCell.swift new file mode 100644 index 0000000..3d82bea --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.swift @@ -0,0 +1,27 @@ +// +// ReminderTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class ReminderTableViewCell: UITableViewCell { + + @IBOutlet weak var reminderProcessView: UILabel! + @IBOutlet weak var reminderTitleView: UILabel! + @IBOutlet weak var reminderTimeView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Meterage/Cells/ReminderTableViewCell.xib b/Meterage/Cells/ReminderTableViewCell.xib new file mode 100644 index 0000000..5448d23 --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.xib @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index e64c479..40536fe 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -24,7 +24,7 @@ public class var gray: UIColor { UIColor(hex: "#808080") } - public class var colorText: UIColor { + public class var mainTextColor: UIColor { UIColor(hex: "#555555") } public class var hintColor: UIColor { diff --git a/Meterage/Utils/Constant.swift b/Meterage/Utils/Constant.swift index 1977402..a39de1a 100644 --- a/Meterage/Utils/Constant.swift +++ b/Meterage/Utils/Constant.swift @@ -20,6 +20,7 @@ let MINE_TITLE_ARRAY = ["账户信息", "我的收藏", "推送设置", "隐私设置", "使用帮助", "版本更新", "关于APP", "意见反馈"] let MINE_IMAGE_ARRAY = ["account", "collection", "push_setting", "privacy_setting", "help", "update", "about", "feed_back"] +let HOME_FUNC_OPERATE = ["仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测"] public enum Constant: String { // 网络请求相关的地址 diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage/Cells/HomeCollectionViewCell.xib b/Meterage/Cells/HomeCollectionViewCell.xib new file mode 100644 index 0000000..59d64b8 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.xib @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift index 25c5049..b7e8a74 100644 --- a/Meterage/Cells/MineTableViewCell.swift +++ b/Meterage/Cells/MineTableViewCell.swift @@ -9,8 +9,8 @@ class MineTableViewCell: UITableViewCell { - @IBOutlet var leftImageView: UIImageView! - @IBOutlet var titleLableView: UILabel! + @IBOutlet weak var leftImageView: UIImageView! + @IBOutlet weak var titleLableView: UILabel! override func awakeFromNib() { super.awakeFromNib() diff --git a/Meterage/Cells/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib index 9be9303..e0ae92a 100644 --- a/Meterage/Cells/MineTableViewCell.xib +++ b/Meterage/Cells/MineTableViewCell.xib @@ -18,11 +18,11 @@ - + - - + + diff --git a/Meterage/Cells/ReminderTableViewCell.swift b/Meterage/Cells/ReminderTableViewCell.swift new file mode 100644 index 0000000..3d82bea --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.swift @@ -0,0 +1,27 @@ +// +// ReminderTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class ReminderTableViewCell: UITableViewCell { + + @IBOutlet weak var reminderProcessView: UILabel! + @IBOutlet weak var reminderTitleView: UILabel! + @IBOutlet weak var reminderTimeView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Meterage/Cells/ReminderTableViewCell.xib b/Meterage/Cells/ReminderTableViewCell.xib new file mode 100644 index 0000000..5448d23 --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.xib @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index e64c479..40536fe 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -24,7 +24,7 @@ public class var gray: UIColor { UIColor(hex: "#808080") } - public class var colorText: UIColor { + public class var mainTextColor: UIColor { UIColor(hex: "#555555") } public class var hintColor: UIColor { diff --git a/Meterage/Utils/Constant.swift b/Meterage/Utils/Constant.swift index 1977402..a39de1a 100644 --- a/Meterage/Utils/Constant.swift +++ b/Meterage/Utils/Constant.swift @@ -20,6 +20,7 @@ let MINE_TITLE_ARRAY = ["账户信息", "我的收藏", "推送设置", "隐私设置", "使用帮助", "版本更新", "关于APP", "意见反馈"] let MINE_IMAGE_ARRAY = ["account", "collection", "push_setting", "privacy_setting", "help", "update", "about", "feed_back"] +let HOME_FUNC_OPERATE = ["仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测"] public enum Constant: String { // 网络请求相关的地址 diff --git a/Meterage/ViewControllers/Guide/GuideViewController.swift b/Meterage/ViewControllers/Guide/GuideViewController.swift index 4d20747..a51ce28 100644 --- a/Meterage/ViewControllers/Guide/GuideViewController.swift +++ b/Meterage/ViewControllers/Guide/GuideViewController.swift @@ -10,7 +10,7 @@ class GuideViewController: UIViewController { - @IBOutlet var skipButton: UIButton! + @IBOutlet weak var skipButton: UIButton! private var timer: Timer? private var countSeconds = 3 diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage/Cells/HomeCollectionViewCell.xib b/Meterage/Cells/HomeCollectionViewCell.xib new file mode 100644 index 0000000..59d64b8 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.xib @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift index 25c5049..b7e8a74 100644 --- a/Meterage/Cells/MineTableViewCell.swift +++ b/Meterage/Cells/MineTableViewCell.swift @@ -9,8 +9,8 @@ class MineTableViewCell: UITableViewCell { - @IBOutlet var leftImageView: UIImageView! - @IBOutlet var titleLableView: UILabel! + @IBOutlet weak var leftImageView: UIImageView! + @IBOutlet weak var titleLableView: UILabel! override func awakeFromNib() { super.awakeFromNib() diff --git a/Meterage/Cells/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib index 9be9303..e0ae92a 100644 --- a/Meterage/Cells/MineTableViewCell.xib +++ b/Meterage/Cells/MineTableViewCell.xib @@ -18,11 +18,11 @@ - + - - + + diff --git a/Meterage/Cells/ReminderTableViewCell.swift b/Meterage/Cells/ReminderTableViewCell.swift new file mode 100644 index 0000000..3d82bea --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.swift @@ -0,0 +1,27 @@ +// +// ReminderTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class ReminderTableViewCell: UITableViewCell { + + @IBOutlet weak var reminderProcessView: UILabel! + @IBOutlet weak var reminderTitleView: UILabel! + @IBOutlet weak var reminderTimeView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Meterage/Cells/ReminderTableViewCell.xib b/Meterage/Cells/ReminderTableViewCell.xib new file mode 100644 index 0000000..5448d23 --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.xib @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index e64c479..40536fe 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -24,7 +24,7 @@ public class var gray: UIColor { UIColor(hex: "#808080") } - public class var colorText: UIColor { + public class var mainTextColor: UIColor { UIColor(hex: "#555555") } public class var hintColor: UIColor { diff --git a/Meterage/Utils/Constant.swift b/Meterage/Utils/Constant.swift index 1977402..a39de1a 100644 --- a/Meterage/Utils/Constant.swift +++ b/Meterage/Utils/Constant.swift @@ -20,6 +20,7 @@ let MINE_TITLE_ARRAY = ["账户信息", "我的收藏", "推送设置", "隐私设置", "使用帮助", "版本更新", "关于APP", "意见反馈"] let MINE_IMAGE_ARRAY = ["account", "collection", "push_setting", "privacy_setting", "help", "update", "about", "feed_back"] +let HOME_FUNC_OPERATE = ["仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测"] public enum Constant: String { // 网络请求相关的地址 diff --git a/Meterage/ViewControllers/Guide/GuideViewController.swift b/Meterage/ViewControllers/Guide/GuideViewController.swift index 4d20747..a51ce28 100644 --- a/Meterage/ViewControllers/Guide/GuideViewController.swift +++ b/Meterage/ViewControllers/Guide/GuideViewController.swift @@ -10,7 +10,7 @@ class GuideViewController: UIViewController { - @IBOutlet var skipButton: UIButton! + @IBOutlet weak var skipButton: UIButton! private var timer: Timer? private var countSeconds = 3 diff --git a/Meterage/ViewControllers/Home/HomePageViewController.swift b/Meterage/ViewControllers/Home/HomePageViewController.swift index b5802aa..4248f4c 100644 --- a/Meterage/ViewControllers/Home/HomePageViewController.swift +++ b/Meterage/ViewControllers/Home/HomePageViewController.swift @@ -5,25 +5,171 @@ // Created by 203 on 2023/2/1. // +import Alamofire +import DefaultsKit +import SnapKit +import SwiftyJSON import UIKit +import IQKeyboardManagerSwift -class HomePageViewController: UIViewController { +class HomePageViewController: UIViewController, UICollectionViewDelegate, UICollectionViewDataSource, UITableViewDelegate, UITableViewDataSource { + @IBOutlet weak var searchBorderView: UIView! + @IBOutlet weak var inputTextView: UITextField! + @IBOutlet weak var noticeCountView: UILabel! + @IBOutlet weak var noticeLayout: UIView! + @IBOutlet weak var noticeContentView: UILabel! + @IBOutlet weak var noticeTimeView: UILabel! + @IBOutlet weak var reminderContentView: UIView! + @IBOutlet weak var reminderTableView: UITableView! + + private var collectionView: UICollectionView! + + private let keyboardManager = IQKeyboardManager.shared + private let defaults = Defaults.shared override func viewDidLoad() { super.viewDidLoad() - + keyboardManager.enable = true + keyboardManager.keyboardDistanceFromTextField = 30 + keyboardManager.shouldResignOnTouchOutside = true + keyboardManager.toolbarDoneBarButtonItemText = "完成" + // 首页 Tab页不显示导航标题 + navigationController?.setNavigationBarHidden(true, animated: false) // Do any additional setup after loading the view. + + /// 顶部搜索栏 + searchBorderView.layer.borderColor = UIColor.mainThemeColor.cgColor + searchBorderView.layer.borderWidth = 1 + searchBorderView.layer.cornerRadius = 17.5 + searchBorderView.layer.masksToBounds = true + + noticeCountView.layer.cornerRadius = 7 + noticeCountView.layer.masksToBounds = true + + // 数据请求 + let token = defaults.get(for: tokenKey) ?? "" + let baseURL = defaults.get(for: serverConfigKey)! + let noticeListURL = baseURL + Constant.noticeList.rawValue + let paramDic: [String: Any] = ["noticeNo": "", "noticeTitle": "", "noticePublisher": "", "noticeStartTime": "", "noticeEndTime": "", "limit": 20, "offset": 1] + Alamofire.request(HttpRequestCreator.shared.createPostRequest(url: noticeListURL, dic: paramDic, token: token)).responseJSON { [self] response in + switch response.result { + case let .success(value): + let notice = NoticeListModel(respJson: JSON(value)).data + if notice.total > 9 { + noticeCountView.text = "9+" + } else { + noticeCountView.text = String(notice.total) + } + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "请求失败，请检查网络") + } + } + + /// 九宫格 + let layout = UICollectionViewFlowLayout() + // 宽高 + layout.itemSize = CGSize(width: SCREEN_WIDTH / 6, height: CGFloat(5) + SCREEN_WIDTH / 6) + collectionView = UICollectionView(frame: view.bounds, collectionViewLayout: layout) + collectionView.register(UINib(nibName: "HomeCollectionViewCell", bundle: nil), forCellWithReuseIdentifier: "homeCollectionViewCell") + collectionView.delegate = self + collectionView.dataSource = self + collectionView.backgroundColor = .clear + collectionView.isScrollEnabled = false + view.addSubview(collectionView) + // 计算View高度 + let viewHeight = 3 * Int(layout.itemSize.height) + // 动态布局 + collectionView.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(viewHeight) + // 距离searchBorderView底部10 + make.top.equalTo(searchBorderView.snp.bottom).offset(10) + } + + /// 滚动消息条 + noticeLayout.layer.cornerRadius = 7 + noticeLayout.layer.masksToBounds = true + noticeLayout.backgroundColor = .white + view.addSubview(noticeLayout) + noticeLayout.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(BUTTON_HEIGHT) + // 距离searchBorderView底部10 + make.top.equalTo(collectionView.snp.bottom).offset(15) + } + + /// 下部待办列表 + reminderContentView.layer.cornerRadius = 7 + reminderContentView.layer.masksToBounds = true + reminderContentView.backgroundColor = .white + view.addSubview(reminderContentView) + // 计算View高度 + let reminderViewHeight = SCREEN_HEIGHT - searchBorderView.bounds.height - CGFloat(viewHeight) - noticeLayout.bounds.height - 3.5 * (navigationController?.navigationBar.frame.size.height)! - CGFloat(10) + reminderContentView.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(reminderViewHeight) + make.top.equalTo(noticeLayout.snp.bottom).offset(10) + } + + reminderTableView.register(UINib(nibName: "ReminderTableViewCell", bundle: nil), forCellReuseIdentifier: "reminderTableViewCell") + reminderTableView.delegate = self + reminderTableView.dataSource = self + reminderTableView.separatorColor = .hintColor + reminderTableView.backgroundColor = .clear + reminderTableView.tableFooterView = UIView(frame: CGRect.zero) } - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. + /// UICollectionView + // 显示多少个Item + func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + HOME_FUNC_OPERATE.count } - */ + // 每个cell显示的内容 + func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + let cell: HomeCollectionViewCell = collectionView.dequeueReusableCell(withReuseIdentifier: "homeCollectionViewCell", for: indexPath) as! HomeCollectionViewCell +// cell.funcImageView.image = UIImage(named: MINE_IMAGE_ARRAY[indexPath.row]) + cell.funcTitleView.text = HOME_FUNC_OPERATE[indexPath.row] + return cell + } + + /// UITableView + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 45 + } + + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + REMINDER_PROCESS_ARRAY.count + } + + private let REMINDER_PROCESS_ARRAY = ["审批", "提醒", "审批", "校准", "校准", "校准", "校准", "校准"] + private let REMINDER_TITLE_ARRAY = ["计量检定合同", "万用表校准", "计量检定合同", "万用表校准", "万用表校准", "万用表校准", "万用表校准", "万用表校准"] + private let REMINDER_TIME_ARRAY = ["3小时前", "13小时前", "23小时前", "6-11", "6-11", "6-11", "6-11", "6-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: ReminderTableViewCell = tableView.dequeueReusableCell(withIdentifier: "reminderTableViewCell", for: indexPath) as! ReminderTableViewCell + cell.reminderProcessView.text = REMINDER_PROCESS_ARRAY[indexPath.row] + cell.reminderTitleView.text = REMINDER_TITLE_ARRAY[indexPath.row] + cell.reminderTimeView.text = REMINDER_TIME_ARRAY[indexPath.row] +// if(){ +// cell.reminderStateView +// }else{ +// cell.reminderStateView +// } + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage/Cells/HomeCollectionViewCell.xib b/Meterage/Cells/HomeCollectionViewCell.xib new file mode 100644 index 0000000..59d64b8 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.xib @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift index 25c5049..b7e8a74 100644 --- a/Meterage/Cells/MineTableViewCell.swift +++ b/Meterage/Cells/MineTableViewCell.swift @@ -9,8 +9,8 @@ class MineTableViewCell: UITableViewCell { - @IBOutlet var leftImageView: UIImageView! - @IBOutlet var titleLableView: UILabel! + @IBOutlet weak var leftImageView: UIImageView! + @IBOutlet weak var titleLableView: UILabel! override func awakeFromNib() { super.awakeFromNib() diff --git a/Meterage/Cells/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib index 9be9303..e0ae92a 100644 --- a/Meterage/Cells/MineTableViewCell.xib +++ b/Meterage/Cells/MineTableViewCell.xib @@ -18,11 +18,11 @@ - + - - + + diff --git a/Meterage/Cells/ReminderTableViewCell.swift b/Meterage/Cells/ReminderTableViewCell.swift new file mode 100644 index 0000000..3d82bea --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.swift @@ -0,0 +1,27 @@ +// +// ReminderTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class ReminderTableViewCell: UITableViewCell { + + @IBOutlet weak var reminderProcessView: UILabel! + @IBOutlet weak var reminderTitleView: UILabel! + @IBOutlet weak var reminderTimeView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Meterage/Cells/ReminderTableViewCell.xib b/Meterage/Cells/ReminderTableViewCell.xib new file mode 100644 index 0000000..5448d23 --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.xib @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index e64c479..40536fe 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -24,7 +24,7 @@ public class var gray: UIColor { UIColor(hex: "#808080") } - public class var colorText: UIColor { + public class var mainTextColor: UIColor { UIColor(hex: "#555555") } public class var hintColor: UIColor { diff --git a/Meterage/Utils/Constant.swift b/Meterage/Utils/Constant.swift index 1977402..a39de1a 100644 --- a/Meterage/Utils/Constant.swift +++ b/Meterage/Utils/Constant.swift @@ -20,6 +20,7 @@ let MINE_TITLE_ARRAY = ["账户信息", "我的收藏", "推送设置", "隐私设置", "使用帮助", "版本更新", "关于APP", "意见反馈"] let MINE_IMAGE_ARRAY = ["account", "collection", "push_setting", "privacy_setting", "help", "update", "about", "feed_back"] +let HOME_FUNC_OPERATE = ["仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测"] public enum Constant: String { // 网络请求相关的地址 diff --git a/Meterage/ViewControllers/Guide/GuideViewController.swift b/Meterage/ViewControllers/Guide/GuideViewController.swift index 4d20747..a51ce28 100644 --- a/Meterage/ViewControllers/Guide/GuideViewController.swift +++ b/Meterage/ViewControllers/Guide/GuideViewController.swift @@ -10,7 +10,7 @@ class GuideViewController: UIViewController { - @IBOutlet var skipButton: UIButton! + @IBOutlet weak var skipButton: UIButton! private var timer: Timer? private var countSeconds = 3 diff --git a/Meterage/ViewControllers/Home/HomePageViewController.swift b/Meterage/ViewControllers/Home/HomePageViewController.swift index b5802aa..4248f4c 100644 --- a/Meterage/ViewControllers/Home/HomePageViewController.swift +++ b/Meterage/ViewControllers/Home/HomePageViewController.swift @@ -5,25 +5,171 @@ // Created by 203 on 2023/2/1. // +import Alamofire +import DefaultsKit +import SnapKit +import SwiftyJSON import UIKit +import IQKeyboardManagerSwift -class HomePageViewController: UIViewController { +class HomePageViewController: UIViewController, UICollectionViewDelegate, UICollectionViewDataSource, UITableViewDelegate, UITableViewDataSource { + @IBOutlet weak var searchBorderView: UIView! + @IBOutlet weak var inputTextView: UITextField! + @IBOutlet weak var noticeCountView: UILabel! + @IBOutlet weak var noticeLayout: UIView! + @IBOutlet weak var noticeContentView: UILabel! + @IBOutlet weak var noticeTimeView: UILabel! + @IBOutlet weak var reminderContentView: UIView! + @IBOutlet weak var reminderTableView: UITableView! + + private var collectionView: UICollectionView! + + private let keyboardManager = IQKeyboardManager.shared + private let defaults = Defaults.shared override func viewDidLoad() { super.viewDidLoad() - + keyboardManager.enable = true + keyboardManager.keyboardDistanceFromTextField = 30 + keyboardManager.shouldResignOnTouchOutside = true + keyboardManager.toolbarDoneBarButtonItemText = "完成" + // 首页 Tab页不显示导航标题 + navigationController?.setNavigationBarHidden(true, animated: false) // Do any additional setup after loading the view. + + /// 顶部搜索栏 + searchBorderView.layer.borderColor = UIColor.mainThemeColor.cgColor + searchBorderView.layer.borderWidth = 1 + searchBorderView.layer.cornerRadius = 17.5 + searchBorderView.layer.masksToBounds = true + + noticeCountView.layer.cornerRadius = 7 + noticeCountView.layer.masksToBounds = true + + // 数据请求 + let token = defaults.get(for: tokenKey) ?? "" + let baseURL = defaults.get(for: serverConfigKey)! + let noticeListURL = baseURL + Constant.noticeList.rawValue + let paramDic: [String: Any] = ["noticeNo": "", "noticeTitle": "", "noticePublisher": "", "noticeStartTime": "", "noticeEndTime": "", "limit": 20, "offset": 1] + Alamofire.request(HttpRequestCreator.shared.createPostRequest(url: noticeListURL, dic: paramDic, token: token)).responseJSON { [self] response in + switch response.result { + case let .success(value): + let notice = NoticeListModel(respJson: JSON(value)).data + if notice.total > 9 { + noticeCountView.text = "9+" + } else { + noticeCountView.text = String(notice.total) + } + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "请求失败，请检查网络") + } + } + + /// 九宫格 + let layout = UICollectionViewFlowLayout() + // 宽高 + layout.itemSize = CGSize(width: SCREEN_WIDTH / 6, height: CGFloat(5) + SCREEN_WIDTH / 6) + collectionView = UICollectionView(frame: view.bounds, collectionViewLayout: layout) + collectionView.register(UINib(nibName: "HomeCollectionViewCell", bundle: nil), forCellWithReuseIdentifier: "homeCollectionViewCell") + collectionView.delegate = self + collectionView.dataSource = self + collectionView.backgroundColor = .clear + collectionView.isScrollEnabled = false + view.addSubview(collectionView) + // 计算View高度 + let viewHeight = 3 * Int(layout.itemSize.height) + // 动态布局 + collectionView.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(viewHeight) + // 距离searchBorderView底部10 + make.top.equalTo(searchBorderView.snp.bottom).offset(10) + } + + /// 滚动消息条 + noticeLayout.layer.cornerRadius = 7 + noticeLayout.layer.masksToBounds = true + noticeLayout.backgroundColor = .white + view.addSubview(noticeLayout) + noticeLayout.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(BUTTON_HEIGHT) + // 距离searchBorderView底部10 + make.top.equalTo(collectionView.snp.bottom).offset(15) + } + + /// 下部待办列表 + reminderContentView.layer.cornerRadius = 7 + reminderContentView.layer.masksToBounds = true + reminderContentView.backgroundColor = .white + view.addSubview(reminderContentView) + // 计算View高度 + let reminderViewHeight = SCREEN_HEIGHT - searchBorderView.bounds.height - CGFloat(viewHeight) - noticeLayout.bounds.height - 3.5 * (navigationController?.navigationBar.frame.size.height)! - CGFloat(10) + reminderContentView.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(reminderViewHeight) + make.top.equalTo(noticeLayout.snp.bottom).offset(10) + } + + reminderTableView.register(UINib(nibName: "ReminderTableViewCell", bundle: nil), forCellReuseIdentifier: "reminderTableViewCell") + reminderTableView.delegate = self + reminderTableView.dataSource = self + reminderTableView.separatorColor = .hintColor + reminderTableView.backgroundColor = .clear + reminderTableView.tableFooterView = UIView(frame: CGRect.zero) } - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. + /// UICollectionView + // 显示多少个Item + func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + HOME_FUNC_OPERATE.count } - */ + // 每个cell显示的内容 + func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + let cell: HomeCollectionViewCell = collectionView.dequeueReusableCell(withReuseIdentifier: "homeCollectionViewCell", for: indexPath) as! HomeCollectionViewCell +// cell.funcImageView.image = UIImage(named: MINE_IMAGE_ARRAY[indexPath.row]) + cell.funcTitleView.text = HOME_FUNC_OPERATE[indexPath.row] + return cell + } + + /// UITableView + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 45 + } + + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + REMINDER_PROCESS_ARRAY.count + } + + private let REMINDER_PROCESS_ARRAY = ["审批", "提醒", "审批", "校准", "校准", "校准", "校准", "校准"] + private let REMINDER_TITLE_ARRAY = ["计量检定合同", "万用表校准", "计量检定合同", "万用表校准", "万用表校准", "万用表校准", "万用表校准", "万用表校准"] + private let REMINDER_TIME_ARRAY = ["3小时前", "13小时前", "23小时前", "6-11", "6-11", "6-11", "6-11", "6-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: ReminderTableViewCell = tableView.dequeueReusableCell(withIdentifier: "reminderTableViewCell", for: indexPath) as! ReminderTableViewCell + cell.reminderProcessView.text = REMINDER_PROCESS_ARRAY[indexPath.row] + cell.reminderTitleView.text = REMINDER_TITLE_ARRAY[indexPath.row] + cell.reminderTimeView.text = REMINDER_TIME_ARRAY[indexPath.row] +// if(){ +// cell.reminderStateView +// }else{ +// cell.reminderStateView +// } + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Home/HomePageViewController.xib b/Meterage/ViewControllers/Home/HomePageViewController.xib index be63e74..fc37ab1 100644 --- a/Meterage/ViewControllers/Home/HomePageViewController.xib +++ b/Meterage/ViewControllers/Home/HomePageViewController.xib @@ -1,22 +1,175 @@ - - + + + - + + + - + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage/Cells/HomeCollectionViewCell.xib b/Meterage/Cells/HomeCollectionViewCell.xib new file mode 100644 index 0000000..59d64b8 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.xib @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift index 25c5049..b7e8a74 100644 --- a/Meterage/Cells/MineTableViewCell.swift +++ b/Meterage/Cells/MineTableViewCell.swift @@ -9,8 +9,8 @@ class MineTableViewCell: UITableViewCell { - @IBOutlet var leftImageView: UIImageView! - @IBOutlet var titleLableView: UILabel! + @IBOutlet weak var leftImageView: UIImageView! + @IBOutlet weak var titleLableView: UILabel! override func awakeFromNib() { super.awakeFromNib() diff --git a/Meterage/Cells/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib index 9be9303..e0ae92a 100644 --- a/Meterage/Cells/MineTableViewCell.xib +++ b/Meterage/Cells/MineTableViewCell.xib @@ -18,11 +18,11 @@ - + - - + + diff --git a/Meterage/Cells/ReminderTableViewCell.swift b/Meterage/Cells/ReminderTableViewCell.swift new file mode 100644 index 0000000..3d82bea --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.swift @@ -0,0 +1,27 @@ +// +// ReminderTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class ReminderTableViewCell: UITableViewCell { + + @IBOutlet weak var reminderProcessView: UILabel! + @IBOutlet weak var reminderTitleView: UILabel! + @IBOutlet weak var reminderTimeView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Meterage/Cells/ReminderTableViewCell.xib b/Meterage/Cells/ReminderTableViewCell.xib new file mode 100644 index 0000000..5448d23 --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.xib @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index e64c479..40536fe 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -24,7 +24,7 @@ public class var gray: UIColor { UIColor(hex: "#808080") } - public class var colorText: UIColor { + public class var mainTextColor: UIColor { UIColor(hex: "#555555") } public class var hintColor: UIColor { diff --git a/Meterage/Utils/Constant.swift b/Meterage/Utils/Constant.swift index 1977402..a39de1a 100644 --- a/Meterage/Utils/Constant.swift +++ b/Meterage/Utils/Constant.swift @@ -20,6 +20,7 @@ let MINE_TITLE_ARRAY = ["账户信息", "我的收藏", "推送设置", "隐私设置", "使用帮助", "版本更新", "关于APP", "意见反馈"] let MINE_IMAGE_ARRAY = ["account", "collection", "push_setting", "privacy_setting", "help", "update", "about", "feed_back"] +let HOME_FUNC_OPERATE = ["仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测"] public enum Constant: String { // 网络请求相关的地址 diff --git a/Meterage/ViewControllers/Guide/GuideViewController.swift b/Meterage/ViewControllers/Guide/GuideViewController.swift index 4d20747..a51ce28 100644 --- a/Meterage/ViewControllers/Guide/GuideViewController.swift +++ b/Meterage/ViewControllers/Guide/GuideViewController.swift @@ -10,7 +10,7 @@ class GuideViewController: UIViewController { - @IBOutlet var skipButton: UIButton! + @IBOutlet weak var skipButton: UIButton! private var timer: Timer? private var countSeconds = 3 diff --git a/Meterage/ViewControllers/Home/HomePageViewController.swift b/Meterage/ViewControllers/Home/HomePageViewController.swift index b5802aa..4248f4c 100644 --- a/Meterage/ViewControllers/Home/HomePageViewController.swift +++ b/Meterage/ViewControllers/Home/HomePageViewController.swift @@ -5,25 +5,171 @@ // Created by 203 on 2023/2/1. // +import Alamofire +import DefaultsKit +import SnapKit +import SwiftyJSON import UIKit +import IQKeyboardManagerSwift -class HomePageViewController: UIViewController { +class HomePageViewController: UIViewController, UICollectionViewDelegate, UICollectionViewDataSource, UITableViewDelegate, UITableViewDataSource { + @IBOutlet weak var searchBorderView: UIView! + @IBOutlet weak var inputTextView: UITextField! + @IBOutlet weak var noticeCountView: UILabel! + @IBOutlet weak var noticeLayout: UIView! + @IBOutlet weak var noticeContentView: UILabel! + @IBOutlet weak var noticeTimeView: UILabel! + @IBOutlet weak var reminderContentView: UIView! + @IBOutlet weak var reminderTableView: UITableView! + + private var collectionView: UICollectionView! + + private let keyboardManager = IQKeyboardManager.shared + private let defaults = Defaults.shared override func viewDidLoad() { super.viewDidLoad() - + keyboardManager.enable = true + keyboardManager.keyboardDistanceFromTextField = 30 + keyboardManager.shouldResignOnTouchOutside = true + keyboardManager.toolbarDoneBarButtonItemText = "完成" + // 首页 Tab页不显示导航标题 + navigationController?.setNavigationBarHidden(true, animated: false) // Do any additional setup after loading the view. + + /// 顶部搜索栏 + searchBorderView.layer.borderColor = UIColor.mainThemeColor.cgColor + searchBorderView.layer.borderWidth = 1 + searchBorderView.layer.cornerRadius = 17.5 + searchBorderView.layer.masksToBounds = true + + noticeCountView.layer.cornerRadius = 7 + noticeCountView.layer.masksToBounds = true + + // 数据请求 + let token = defaults.get(for: tokenKey) ?? "" + let baseURL = defaults.get(for: serverConfigKey)! + let noticeListURL = baseURL + Constant.noticeList.rawValue + let paramDic: [String: Any] = ["noticeNo": "", "noticeTitle": "", "noticePublisher": "", "noticeStartTime": "", "noticeEndTime": "", "limit": 20, "offset": 1] + Alamofire.request(HttpRequestCreator.shared.createPostRequest(url: noticeListURL, dic: paramDic, token: token)).responseJSON { [self] response in + switch response.result { + case let .success(value): + let notice = NoticeListModel(respJson: JSON(value)).data + if notice.total > 9 { + noticeCountView.text = "9+" + } else { + noticeCountView.text = String(notice.total) + } + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "请求失败，请检查网络") + } + } + + /// 九宫格 + let layout = UICollectionViewFlowLayout() + // 宽高 + layout.itemSize = CGSize(width: SCREEN_WIDTH / 6, height: CGFloat(5) + SCREEN_WIDTH / 6) + collectionView = UICollectionView(frame: view.bounds, collectionViewLayout: layout) + collectionView.register(UINib(nibName: "HomeCollectionViewCell", bundle: nil), forCellWithReuseIdentifier: "homeCollectionViewCell") + collectionView.delegate = self + collectionView.dataSource = self + collectionView.backgroundColor = .clear + collectionView.isScrollEnabled = false + view.addSubview(collectionView) + // 计算View高度 + let viewHeight = 3 * Int(layout.itemSize.height) + // 动态布局 + collectionView.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(viewHeight) + // 距离searchBorderView底部10 + make.top.equalTo(searchBorderView.snp.bottom).offset(10) + } + + /// 滚动消息条 + noticeLayout.layer.cornerRadius = 7 + noticeLayout.layer.masksToBounds = true + noticeLayout.backgroundColor = .white + view.addSubview(noticeLayout) + noticeLayout.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(BUTTON_HEIGHT) + // 距离searchBorderView底部10 + make.top.equalTo(collectionView.snp.bottom).offset(15) + } + + /// 下部待办列表 + reminderContentView.layer.cornerRadius = 7 + reminderContentView.layer.masksToBounds = true + reminderContentView.backgroundColor = .white + view.addSubview(reminderContentView) + // 计算View高度 + let reminderViewHeight = SCREEN_HEIGHT - searchBorderView.bounds.height - CGFloat(viewHeight) - noticeLayout.bounds.height - 3.5 * (navigationController?.navigationBar.frame.size.height)! - CGFloat(10) + reminderContentView.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(reminderViewHeight) + make.top.equalTo(noticeLayout.snp.bottom).offset(10) + } + + reminderTableView.register(UINib(nibName: "ReminderTableViewCell", bundle: nil), forCellReuseIdentifier: "reminderTableViewCell") + reminderTableView.delegate = self + reminderTableView.dataSource = self + reminderTableView.separatorColor = .hintColor + reminderTableView.backgroundColor = .clear + reminderTableView.tableFooterView = UIView(frame: CGRect.zero) } - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. + /// UICollectionView + // 显示多少个Item + func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + HOME_FUNC_OPERATE.count } - */ + // 每个cell显示的内容 + func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + let cell: HomeCollectionViewCell = collectionView.dequeueReusableCell(withReuseIdentifier: "homeCollectionViewCell", for: indexPath) as! HomeCollectionViewCell +// cell.funcImageView.image = UIImage(named: MINE_IMAGE_ARRAY[indexPath.row]) + cell.funcTitleView.text = HOME_FUNC_OPERATE[indexPath.row] + return cell + } + + /// UITableView + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 45 + } + + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + REMINDER_PROCESS_ARRAY.count + } + + private let REMINDER_PROCESS_ARRAY = ["审批", "提醒", "审批", "校准", "校准", "校准", "校准", "校准"] + private let REMINDER_TITLE_ARRAY = ["计量检定合同", "万用表校准", "计量检定合同", "万用表校准", "万用表校准", "万用表校准", "万用表校准", "万用表校准"] + private let REMINDER_TIME_ARRAY = ["3小时前", "13小时前", "23小时前", "6-11", "6-11", "6-11", "6-11", "6-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: ReminderTableViewCell = tableView.dequeueReusableCell(withIdentifier: "reminderTableViewCell", for: indexPath) as! ReminderTableViewCell + cell.reminderProcessView.text = REMINDER_PROCESS_ARRAY[indexPath.row] + cell.reminderTitleView.text = REMINDER_TITLE_ARRAY[indexPath.row] + cell.reminderTimeView.text = REMINDER_TIME_ARRAY[indexPath.row] +// if(){ +// cell.reminderStateView +// }else{ +// cell.reminderStateView +// } + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Home/HomePageViewController.xib b/Meterage/ViewControllers/Home/HomePageViewController.xib index be63e74..fc37ab1 100644 --- a/Meterage/ViewControllers/Home/HomePageViewController.xib +++ b/Meterage/ViewControllers/Home/HomePageViewController.xib @@ -1,22 +1,175 @@ - - + + + - + + + - + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/ViewControllers/Login/LoginViewController.swift b/Meterage/ViewControllers/Login/LoginViewController.swift index 6fb915f..d66d593 100644 --- a/Meterage/ViewControllers/Login/LoginViewController.swift +++ b/Meterage/ViewControllers/Login/LoginViewController.swift @@ -15,10 +15,10 @@ private let keyboardManager = IQKeyboardManager.shared private let defaults = Defaults.shared - @IBOutlet var textLabel: UILabel! - @IBOutlet var loginButton: UIButton! - @IBOutlet var userNameView: UITextField! - @IBOutlet var passwordView: UITextField! + @IBOutlet weak var textLabel: UILabel! + @IBOutlet weak var loginButton: UIButton! + @IBOutlet weak var userNameView: UITextField! + @IBOutlet weak var passwordView: UITextField! override func viewDidLoad() { super.viewDidLoad() @@ -80,7 +80,7 @@ if loginModel.code == 200 { // 将token存起来 defaults.set(loginModel.data!.token, for: tokenKey) - + // 进入主页 AppCoordinator.shared.setTabBarViewController() } else { diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage/Cells/HomeCollectionViewCell.xib b/Meterage/Cells/HomeCollectionViewCell.xib new file mode 100644 index 0000000..59d64b8 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.xib @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift index 25c5049..b7e8a74 100644 --- a/Meterage/Cells/MineTableViewCell.swift +++ b/Meterage/Cells/MineTableViewCell.swift @@ -9,8 +9,8 @@ class MineTableViewCell: UITableViewCell { - @IBOutlet var leftImageView: UIImageView! - @IBOutlet var titleLableView: UILabel! + @IBOutlet weak var leftImageView: UIImageView! + @IBOutlet weak var titleLableView: UILabel! override func awakeFromNib() { super.awakeFromNib() diff --git a/Meterage/Cells/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib index 9be9303..e0ae92a 100644 --- a/Meterage/Cells/MineTableViewCell.xib +++ b/Meterage/Cells/MineTableViewCell.xib @@ -18,11 +18,11 @@ - + - - + + diff --git a/Meterage/Cells/ReminderTableViewCell.swift b/Meterage/Cells/ReminderTableViewCell.swift new file mode 100644 index 0000000..3d82bea --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.swift @@ -0,0 +1,27 @@ +// +// ReminderTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class ReminderTableViewCell: UITableViewCell { + + @IBOutlet weak var reminderProcessView: UILabel! + @IBOutlet weak var reminderTitleView: UILabel! + @IBOutlet weak var reminderTimeView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Meterage/Cells/ReminderTableViewCell.xib b/Meterage/Cells/ReminderTableViewCell.xib new file mode 100644 index 0000000..5448d23 --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.xib @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index e64c479..40536fe 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -24,7 +24,7 @@ public class var gray: UIColor { UIColor(hex: "#808080") } - public class var colorText: UIColor { + public class var mainTextColor: UIColor { UIColor(hex: "#555555") } public class var hintColor: UIColor { diff --git a/Meterage/Utils/Constant.swift b/Meterage/Utils/Constant.swift index 1977402..a39de1a 100644 --- a/Meterage/Utils/Constant.swift +++ b/Meterage/Utils/Constant.swift @@ -20,6 +20,7 @@ let MINE_TITLE_ARRAY = ["账户信息", "我的收藏", "推送设置", "隐私设置", "使用帮助", "版本更新", "关于APP", "意见反馈"] let MINE_IMAGE_ARRAY = ["account", "collection", "push_setting", "privacy_setting", "help", "update", "about", "feed_back"] +let HOME_FUNC_OPERATE = ["仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测"] public enum Constant: String { // 网络请求相关的地址 diff --git a/Meterage/ViewControllers/Guide/GuideViewController.swift b/Meterage/ViewControllers/Guide/GuideViewController.swift index 4d20747..a51ce28 100644 --- a/Meterage/ViewControllers/Guide/GuideViewController.swift +++ b/Meterage/ViewControllers/Guide/GuideViewController.swift @@ -10,7 +10,7 @@ class GuideViewController: UIViewController { - @IBOutlet var skipButton: UIButton! + @IBOutlet weak var skipButton: UIButton! private var timer: Timer? private var countSeconds = 3 diff --git a/Meterage/ViewControllers/Home/HomePageViewController.swift b/Meterage/ViewControllers/Home/HomePageViewController.swift index b5802aa..4248f4c 100644 --- a/Meterage/ViewControllers/Home/HomePageViewController.swift +++ b/Meterage/ViewControllers/Home/HomePageViewController.swift @@ -5,25 +5,171 @@ // Created by 203 on 2023/2/1. // +import Alamofire +import DefaultsKit +import SnapKit +import SwiftyJSON import UIKit +import IQKeyboardManagerSwift -class HomePageViewController: UIViewController { +class HomePageViewController: UIViewController, UICollectionViewDelegate, UICollectionViewDataSource, UITableViewDelegate, UITableViewDataSource { + @IBOutlet weak var searchBorderView: UIView! + @IBOutlet weak var inputTextView: UITextField! + @IBOutlet weak var noticeCountView: UILabel! + @IBOutlet weak var noticeLayout: UIView! + @IBOutlet weak var noticeContentView: UILabel! + @IBOutlet weak var noticeTimeView: UILabel! + @IBOutlet weak var reminderContentView: UIView! + @IBOutlet weak var reminderTableView: UITableView! + + private var collectionView: UICollectionView! + + private let keyboardManager = IQKeyboardManager.shared + private let defaults = Defaults.shared override func viewDidLoad() { super.viewDidLoad() - + keyboardManager.enable = true + keyboardManager.keyboardDistanceFromTextField = 30 + keyboardManager.shouldResignOnTouchOutside = true + keyboardManager.toolbarDoneBarButtonItemText = "完成" + // 首页 Tab页不显示导航标题 + navigationController?.setNavigationBarHidden(true, animated: false) // Do any additional setup after loading the view. + + /// 顶部搜索栏 + searchBorderView.layer.borderColor = UIColor.mainThemeColor.cgColor + searchBorderView.layer.borderWidth = 1 + searchBorderView.layer.cornerRadius = 17.5 + searchBorderView.layer.masksToBounds = true + + noticeCountView.layer.cornerRadius = 7 + noticeCountView.layer.masksToBounds = true + + // 数据请求 + let token = defaults.get(for: tokenKey) ?? "" + let baseURL = defaults.get(for: serverConfigKey)! + let noticeListURL = baseURL + Constant.noticeList.rawValue + let paramDic: [String: Any] = ["noticeNo": "", "noticeTitle": "", "noticePublisher": "", "noticeStartTime": "", "noticeEndTime": "", "limit": 20, "offset": 1] + Alamofire.request(HttpRequestCreator.shared.createPostRequest(url: noticeListURL, dic: paramDic, token: token)).responseJSON { [self] response in + switch response.result { + case let .success(value): + let notice = NoticeListModel(respJson: JSON(value)).data + if notice.total > 9 { + noticeCountView.text = "9+" + } else { + noticeCountView.text = String(notice.total) + } + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "请求失败，请检查网络") + } + } + + /// 九宫格 + let layout = UICollectionViewFlowLayout() + // 宽高 + layout.itemSize = CGSize(width: SCREEN_WIDTH / 6, height: CGFloat(5) + SCREEN_WIDTH / 6) + collectionView = UICollectionView(frame: view.bounds, collectionViewLayout: layout) + collectionView.register(UINib(nibName: "HomeCollectionViewCell", bundle: nil), forCellWithReuseIdentifier: "homeCollectionViewCell") + collectionView.delegate = self + collectionView.dataSource = self + collectionView.backgroundColor = .clear + collectionView.isScrollEnabled = false + view.addSubview(collectionView) + // 计算View高度 + let viewHeight = 3 * Int(layout.itemSize.height) + // 动态布局 + collectionView.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(viewHeight) + // 距离searchBorderView底部10 + make.top.equalTo(searchBorderView.snp.bottom).offset(10) + } + + /// 滚动消息条 + noticeLayout.layer.cornerRadius = 7 + noticeLayout.layer.masksToBounds = true + noticeLayout.backgroundColor = .white + view.addSubview(noticeLayout) + noticeLayout.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(BUTTON_HEIGHT) + // 距离searchBorderView底部10 + make.top.equalTo(collectionView.snp.bottom).offset(15) + } + + /// 下部待办列表 + reminderContentView.layer.cornerRadius = 7 + reminderContentView.layer.masksToBounds = true + reminderContentView.backgroundColor = .white + view.addSubview(reminderContentView) + // 计算View高度 + let reminderViewHeight = SCREEN_HEIGHT - searchBorderView.bounds.height - CGFloat(viewHeight) - noticeLayout.bounds.height - 3.5 * (navigationController?.navigationBar.frame.size.height)! - CGFloat(10) + reminderContentView.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(reminderViewHeight) + make.top.equalTo(noticeLayout.snp.bottom).offset(10) + } + + reminderTableView.register(UINib(nibName: "ReminderTableViewCell", bundle: nil), forCellReuseIdentifier: "reminderTableViewCell") + reminderTableView.delegate = self + reminderTableView.dataSource = self + reminderTableView.separatorColor = .hintColor + reminderTableView.backgroundColor = .clear + reminderTableView.tableFooterView = UIView(frame: CGRect.zero) } - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. + /// UICollectionView + // 显示多少个Item + func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + HOME_FUNC_OPERATE.count } - */ + // 每个cell显示的内容 + func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + let cell: HomeCollectionViewCell = collectionView.dequeueReusableCell(withReuseIdentifier: "homeCollectionViewCell", for: indexPath) as! HomeCollectionViewCell +// cell.funcImageView.image = UIImage(named: MINE_IMAGE_ARRAY[indexPath.row]) + cell.funcTitleView.text = HOME_FUNC_OPERATE[indexPath.row] + return cell + } + + /// UITableView + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 45 + } + + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + REMINDER_PROCESS_ARRAY.count + } + + private let REMINDER_PROCESS_ARRAY = ["审批", "提醒", "审批", "校准", "校准", "校准", "校准", "校准"] + private let REMINDER_TITLE_ARRAY = ["计量检定合同", "万用表校准", "计量检定合同", "万用表校准", "万用表校准", "万用表校准", "万用表校准", "万用表校准"] + private let REMINDER_TIME_ARRAY = ["3小时前", "13小时前", "23小时前", "6-11", "6-11", "6-11", "6-11", "6-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: ReminderTableViewCell = tableView.dequeueReusableCell(withIdentifier: "reminderTableViewCell", for: indexPath) as! ReminderTableViewCell + cell.reminderProcessView.text = REMINDER_PROCESS_ARRAY[indexPath.row] + cell.reminderTitleView.text = REMINDER_TITLE_ARRAY[indexPath.row] + cell.reminderTimeView.text = REMINDER_TIME_ARRAY[indexPath.row] +// if(){ +// cell.reminderStateView +// }else{ +// cell.reminderStateView +// } + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Home/HomePageViewController.xib b/Meterage/ViewControllers/Home/HomePageViewController.xib index be63e74..fc37ab1 100644 --- a/Meterage/ViewControllers/Home/HomePageViewController.xib +++ b/Meterage/ViewControllers/Home/HomePageViewController.xib @@ -1,22 +1,175 @@ - - + + + - + + + - + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/ViewControllers/Login/LoginViewController.swift b/Meterage/ViewControllers/Login/LoginViewController.swift index 6fb915f..d66d593 100644 --- a/Meterage/ViewControllers/Login/LoginViewController.swift +++ b/Meterage/ViewControllers/Login/LoginViewController.swift @@ -15,10 +15,10 @@ private let keyboardManager = IQKeyboardManager.shared private let defaults = Defaults.shared - @IBOutlet var textLabel: UILabel! - @IBOutlet var loginButton: UIButton! - @IBOutlet var userNameView: UITextField! - @IBOutlet var passwordView: UITextField! + @IBOutlet weak var textLabel: UILabel! + @IBOutlet weak var loginButton: UIButton! + @IBOutlet weak var userNameView: UITextField! + @IBOutlet weak var passwordView: UITextField! override func viewDidLoad() { super.viewDidLoad() @@ -80,7 +80,7 @@ if loginModel.code == 200 { // 将token存起来 defaults.set(loginModel.data!.token, for: tokenKey) - + // 进入主页 AppCoordinator.shared.setTabBarViewController() } else { diff --git a/Meterage/ViewControllers/Mine/MineViewController.swift b/Meterage/ViewControllers/Mine/MineViewController.swift index 348b278..e9ca570 100644 --- a/Meterage/ViewControllers/Mine/MineViewController.swift +++ b/Meterage/ViewControllers/Mine/MineViewController.swift @@ -10,13 +10,13 @@ import DefaultsKit import SwiftyJSON -class MineViewController: UIViewController { +class MineViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { - @IBOutlet var userAvatarView: UIImageView! - @IBOutlet var userNameView: UILabel! - @IBOutlet var userDeptView: UILabel! - @IBOutlet var noticeCountView: UILabel! - @IBOutlet var tableView: UITableView! + @IBOutlet weak var userAvatarView: UIImageView! + @IBOutlet weak var userNameView: UILabel! + @IBOutlet weak var userDeptView: UILabel! + @IBOutlet weak var noticeCountView: UILabel! + @IBOutlet weak var tableView: UITableView! private let defaults = Defaults.shared @@ -36,6 +36,7 @@ tableView.register(UINib(nibName: "MineTableViewCell", bundle: nil), forCellReuseIdentifier: "mineTableViewCell") tableView.dataSource = self tableView.delegate = self + tableView.separatorColor = .hintColor tableView.tableFooterView = UIView(frame: CGRect.zero) //数据请求 @@ -72,9 +73,7 @@ } } } -} -extension MineViewController: UITableViewDelegate { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { 60 } @@ -100,9 +99,7 @@ // break // } } -} -extension MineViewController: UITableViewDataSource { func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { MINE_TITLE_ARRAY.count } diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 4741d3f..f1ffedf 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */; }; 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BF9E434C439573438A46 /* Dictionary.swift */; }; 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */; }; + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */; }; + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */; }; + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */; }; + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */; }; 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */; }; 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */; }; 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */; }; @@ -44,6 +48,10 @@ 2CD9BE79AFCDD9AB8BD068B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2CD9BF0F698CD6765DFD72B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2CD9BF9E434C439573438A46 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = ""; }; + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCollectionViewCell.xib; sourceTree = ""; }; + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReminderTableViewCell.swift; sourceTree = ""; }; + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReminderTableViewCell.xib; sourceTree = ""; }; 65AEA683298A5F9500B8FF09 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = ""; }; 65AEA68E298A632B00B8FF09 /* HomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageViewController.swift; sourceTree = ""; }; 65AEA68F298A632B00B8FF09 /* HomePageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomePageViewController.xib; sourceTree = ""; }; @@ -230,6 +238,10 @@ children = ( 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + 6531D7C4298CB45500C4B343 /* HomeCollectionViewCell.swift */, + 6531D7C5298CB45500C4B343 /* HomeCollectionViewCell.xib */, + 65A55E1F298D00BE00093341 /* ReminderTableViewCell.swift */, + 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -290,7 +302,9 @@ 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, + 6531D7C7298CB45500C4B343 /* HomeCollectionViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, + 65A55E22298D00BE00093341 /* ReminderTableViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, @@ -387,8 +401,10 @@ 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, + 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, + 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 27d6baf..9abdbfd 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/Contents.json b/Meterage/Assets.xcassets/overtime.imageset/Contents.json new file mode 100644 index 0000000..8f46376 --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overtime@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overtime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overtime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png new file mode 100644 index 0000000..228f82f --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png new file mode 100644 index 0000000..f9157de --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png new file mode 100644 index 0000000..75fd3aa --- /dev/null +++ b/Meterage/Assets.xcassets/overtime.imageset/overtime@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/Contents.json b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json new file mode 100644 index 0000000..1ecb142 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "qr_code@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qr_code@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qr_code@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png new file mode 100644 index 0000000..9d51367 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png new file mode 100644 index 0000000..57ab57b --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png new file mode 100644 index 0000000..393fa73 --- /dev/null +++ b/Meterage/Assets.xcassets/qr_code.imageset/qr_code@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/Contents.json b/Meterage/Assets.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000..1958603 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "search@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/search.imageset/search@1x.png b/Meterage/Assets.xcassets/search.imageset/search@1x.png new file mode 100644 index 0000000..db7d538 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@2x.png b/Meterage/Assets.xcassets/search.imageset/search@2x.png new file mode 100644 index 0000000..805b219 --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/search.imageset/search@3x.png b/Meterage/Assets.xcassets/search.imageset/search@3x.png new file mode 100644 index 0000000..b8ccc5f --- /dev/null +++ b/Meterage/Assets.xcassets/search.imageset/search@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/Contents.json b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json new file mode 100644 index 0000000..83987d1 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_sample@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_sample@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_sample@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png new file mode 100644 index 0000000..068d096 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png new file mode 100644 index 0000000..e042099 --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png new file mode 100644 index 0000000..4e0b9dc --- /dev/null +++ b/Meterage/Assets.xcassets/total_sample.imageset/total_sample@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/Contents.json b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json new file mode 100644 index 0000000..bad670d --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "total_verify@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "total_verify@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "total_verify@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png new file mode 100644 index 0000000..f767e5b --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png new file mode 100644 index 0000000..55c82fe --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png new file mode 100644 index 0000000..d209e15 --- /dev/null +++ b/Meterage/Assets.xcassets/total_verify.imageset/total_verify@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/Contents.json b/Meterage/Assets.xcassets/verified.imageset/Contents.json new file mode 100644 index 0000000..a83acb9 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "verified@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "verified@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "verified@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@1x.png b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png new file mode 100644 index 0000000..ba290c5 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@2x.png b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png new file mode 100644 index 0000000..d5ed826 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/verified.imageset/verified@3x.png b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png new file mode 100644 index 0000000..78f8024 --- /dev/null +++ b/Meterage/Assets.xcassets/verified.imageset/verified@3x.png Binary files differ diff --git a/Meterage/Cells/HomeCollectionViewCell.swift b/Meterage/Cells/HomeCollectionViewCell.swift new file mode 100644 index 0000000..1e90c13 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.swift @@ -0,0 +1,20 @@ +// +// HomeCollectionViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class HomeCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var funcImageView: UIImageView! + @IBOutlet weak var funcTitleView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + +} diff --git a/Meterage/Cells/HomeCollectionViewCell.xib b/Meterage/Cells/HomeCollectionViewCell.xib new file mode 100644 index 0000000..59d64b8 --- /dev/null +++ b/Meterage/Cells/HomeCollectionViewCell.xib @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift index 25c5049..b7e8a74 100644 --- a/Meterage/Cells/MineTableViewCell.swift +++ b/Meterage/Cells/MineTableViewCell.swift @@ -9,8 +9,8 @@ class MineTableViewCell: UITableViewCell { - @IBOutlet var leftImageView: UIImageView! - @IBOutlet var titleLableView: UILabel! + @IBOutlet weak var leftImageView: UIImageView! + @IBOutlet weak var titleLableView: UILabel! override func awakeFromNib() { super.awakeFromNib() diff --git a/Meterage/Cells/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib index 9be9303..e0ae92a 100644 --- a/Meterage/Cells/MineTableViewCell.xib +++ b/Meterage/Cells/MineTableViewCell.xib @@ -18,11 +18,11 @@ - + - - + + diff --git a/Meterage/Cells/ReminderTableViewCell.swift b/Meterage/Cells/ReminderTableViewCell.swift new file mode 100644 index 0000000..3d82bea --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.swift @@ -0,0 +1,27 @@ +// +// ReminderTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/3. +// + +import UIKit + +class ReminderTableViewCell: UITableViewCell { + + @IBOutlet weak var reminderProcessView: UILabel! + @IBOutlet weak var reminderTitleView: UILabel! + @IBOutlet weak var reminderTimeView: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Meterage/Cells/ReminderTableViewCell.xib b/Meterage/Cells/ReminderTableViewCell.xib new file mode 100644 index 0000000..5448d23 --- /dev/null +++ b/Meterage/Cells/ReminderTableViewCell.xib @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index e64c479..40536fe 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -24,7 +24,7 @@ public class var gray: UIColor { UIColor(hex: "#808080") } - public class var colorText: UIColor { + public class var mainTextColor: UIColor { UIColor(hex: "#555555") } public class var hintColor: UIColor { diff --git a/Meterage/Utils/Constant.swift b/Meterage/Utils/Constant.swift index 1977402..a39de1a 100644 --- a/Meterage/Utils/Constant.swift +++ b/Meterage/Utils/Constant.swift @@ -20,6 +20,7 @@ let MINE_TITLE_ARRAY = ["账户信息", "我的收藏", "推送设置", "隐私设置", "使用帮助", "版本更新", "关于APP", "意见反馈"] let MINE_IMAGE_ARRAY = ["account", "collection", "push_setting", "privacy_setting", "help", "update", "about", "feed_back"] +let HOME_FUNC_OPERATE = ["仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测"] public enum Constant: String { // 网络请求相关的地址 diff --git a/Meterage/ViewControllers/Guide/GuideViewController.swift b/Meterage/ViewControllers/Guide/GuideViewController.swift index 4d20747..a51ce28 100644 --- a/Meterage/ViewControllers/Guide/GuideViewController.swift +++ b/Meterage/ViewControllers/Guide/GuideViewController.swift @@ -10,7 +10,7 @@ class GuideViewController: UIViewController { - @IBOutlet var skipButton: UIButton! + @IBOutlet weak var skipButton: UIButton! private var timer: Timer? private var countSeconds = 3 diff --git a/Meterage/ViewControllers/Home/HomePageViewController.swift b/Meterage/ViewControllers/Home/HomePageViewController.swift index b5802aa..4248f4c 100644 --- a/Meterage/ViewControllers/Home/HomePageViewController.swift +++ b/Meterage/ViewControllers/Home/HomePageViewController.swift @@ -5,25 +5,171 @@ // Created by 203 on 2023/2/1. // +import Alamofire +import DefaultsKit +import SnapKit +import SwiftyJSON import UIKit +import IQKeyboardManagerSwift -class HomePageViewController: UIViewController { +class HomePageViewController: UIViewController, UICollectionViewDelegate, UICollectionViewDataSource, UITableViewDelegate, UITableViewDataSource { + @IBOutlet weak var searchBorderView: UIView! + @IBOutlet weak var inputTextView: UITextField! + @IBOutlet weak var noticeCountView: UILabel! + @IBOutlet weak var noticeLayout: UIView! + @IBOutlet weak var noticeContentView: UILabel! + @IBOutlet weak var noticeTimeView: UILabel! + @IBOutlet weak var reminderContentView: UIView! + @IBOutlet weak var reminderTableView: UITableView! + + private var collectionView: UICollectionView! + + private let keyboardManager = IQKeyboardManager.shared + private let defaults = Defaults.shared override func viewDidLoad() { super.viewDidLoad() - + keyboardManager.enable = true + keyboardManager.keyboardDistanceFromTextField = 30 + keyboardManager.shouldResignOnTouchOutside = true + keyboardManager.toolbarDoneBarButtonItemText = "完成" + // 首页 Tab页不显示导航标题 + navigationController?.setNavigationBarHidden(true, animated: false) // Do any additional setup after loading the view. + + /// 顶部搜索栏 + searchBorderView.layer.borderColor = UIColor.mainThemeColor.cgColor + searchBorderView.layer.borderWidth = 1 + searchBorderView.layer.cornerRadius = 17.5 + searchBorderView.layer.masksToBounds = true + + noticeCountView.layer.cornerRadius = 7 + noticeCountView.layer.masksToBounds = true + + // 数据请求 + let token = defaults.get(for: tokenKey) ?? "" + let baseURL = defaults.get(for: serverConfigKey)! + let noticeListURL = baseURL + Constant.noticeList.rawValue + let paramDic: [String: Any] = ["noticeNo": "", "noticeTitle": "", "noticePublisher": "", "noticeStartTime": "", "noticeEndTime": "", "limit": 20, "offset": 1] + Alamofire.request(HttpRequestCreator.shared.createPostRequest(url: noticeListURL, dic: paramDic, token: token)).responseJSON { [self] response in + switch response.result { + case let .success(value): + let notice = NoticeListModel(respJson: JSON(value)).data + if notice.total > 9 { + noticeCountView.text = "9+" + } else { + noticeCountView.text = String(notice.total) + } + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "请求失败，请检查网络") + } + } + + /// 九宫格 + let layout = UICollectionViewFlowLayout() + // 宽高 + layout.itemSize = CGSize(width: SCREEN_WIDTH / 6, height: CGFloat(5) + SCREEN_WIDTH / 6) + collectionView = UICollectionView(frame: view.bounds, collectionViewLayout: layout) + collectionView.register(UINib(nibName: "HomeCollectionViewCell", bundle: nil), forCellWithReuseIdentifier: "homeCollectionViewCell") + collectionView.delegate = self + collectionView.dataSource = self + collectionView.backgroundColor = .clear + collectionView.isScrollEnabled = false + view.addSubview(collectionView) + // 计算View高度 + let viewHeight = 3 * Int(layout.itemSize.height) + // 动态布局 + collectionView.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(viewHeight) + // 距离searchBorderView底部10 + make.top.equalTo(searchBorderView.snp.bottom).offset(10) + } + + /// 滚动消息条 + noticeLayout.layer.cornerRadius = 7 + noticeLayout.layer.masksToBounds = true + noticeLayout.backgroundColor = .white + view.addSubview(noticeLayout) + noticeLayout.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(BUTTON_HEIGHT) + // 距离searchBorderView底部10 + make.top.equalTo(collectionView.snp.bottom).offset(15) + } + + /// 下部待办列表 + reminderContentView.layer.cornerRadius = 7 + reminderContentView.layer.masksToBounds = true + reminderContentView.backgroundColor = .white + view.addSubview(reminderContentView) + // 计算View高度 + let reminderViewHeight = SCREEN_HEIGHT - searchBorderView.bounds.height - CGFloat(viewHeight) - noticeLayout.bounds.height - 3.5 * (navigationController?.navigationBar.frame.size.height)! - CGFloat(10) + reminderContentView.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(SCREEN_WIDTH - 20) + make.height.equalTo(reminderViewHeight) + make.top.equalTo(noticeLayout.snp.bottom).offset(10) + } + + reminderTableView.register(UINib(nibName: "ReminderTableViewCell", bundle: nil), forCellReuseIdentifier: "reminderTableViewCell") + reminderTableView.delegate = self + reminderTableView.dataSource = self + reminderTableView.separatorColor = .hintColor + reminderTableView.backgroundColor = .clear + reminderTableView.tableFooterView = UIView(frame: CGRect.zero) } - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. + /// UICollectionView + // 显示多少个Item + func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + HOME_FUNC_OPERATE.count } - */ + // 每个cell显示的内容 + func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + let cell: HomeCollectionViewCell = collectionView.dequeueReusableCell(withReuseIdentifier: "homeCollectionViewCell", for: indexPath) as! HomeCollectionViewCell +// cell.funcImageView.image = UIImage(named: MINE_IMAGE_ARRAY[indexPath.row]) + cell.funcTitleView.text = HOME_FUNC_OPERATE[indexPath.row] + return cell + } + + /// UITableView + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 45 + } + + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + REMINDER_PROCESS_ARRAY.count + } + + private let REMINDER_PROCESS_ARRAY = ["审批", "提醒", "审批", "校准", "校准", "校准", "校准", "校准"] + private let REMINDER_TITLE_ARRAY = ["计量检定合同", "万用表校准", "计量检定合同", "万用表校准", "万用表校准", "万用表校准", "万用表校准", "万用表校准"] + private let REMINDER_TIME_ARRAY = ["3小时前", "13小时前", "23小时前", "6-11", "6-11", "6-11", "6-11", "6-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: ReminderTableViewCell = tableView.dequeueReusableCell(withIdentifier: "reminderTableViewCell", for: indexPath) as! ReminderTableViewCell + cell.reminderProcessView.text = REMINDER_PROCESS_ARRAY[indexPath.row] + cell.reminderTitleView.text = REMINDER_TITLE_ARRAY[indexPath.row] + cell.reminderTimeView.text = REMINDER_TIME_ARRAY[indexPath.row] +// if(){ +// cell.reminderStateView +// }else{ +// cell.reminderStateView +// } + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Home/HomePageViewController.xib b/Meterage/ViewControllers/Home/HomePageViewController.xib index be63e74..fc37ab1 100644 --- a/Meterage/ViewControllers/Home/HomePageViewController.xib +++ b/Meterage/ViewControllers/Home/HomePageViewController.xib @@ -1,22 +1,175 @@ - - + + + - + + + - + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/ViewControllers/Login/LoginViewController.swift b/Meterage/ViewControllers/Login/LoginViewController.swift index 6fb915f..d66d593 100644 --- a/Meterage/ViewControllers/Login/LoginViewController.swift +++ b/Meterage/ViewControllers/Login/LoginViewController.swift @@ -15,10 +15,10 @@ private let keyboardManager = IQKeyboardManager.shared private let defaults = Defaults.shared - @IBOutlet var textLabel: UILabel! - @IBOutlet var loginButton: UIButton! - @IBOutlet var userNameView: UITextField! - @IBOutlet var passwordView: UITextField! + @IBOutlet weak var textLabel: UILabel! + @IBOutlet weak var loginButton: UIButton! + @IBOutlet weak var userNameView: UITextField! + @IBOutlet weak var passwordView: UITextField! override func viewDidLoad() { super.viewDidLoad() @@ -80,7 +80,7 @@ if loginModel.code == 200 { // 将token存起来 defaults.set(loginModel.data!.token, for: tokenKey) - + // 进入主页 AppCoordinator.shared.setTabBarViewController() } else { diff --git a/Meterage/ViewControllers/Mine/MineViewController.swift b/Meterage/ViewControllers/Mine/MineViewController.swift index 348b278..e9ca570 100644 --- a/Meterage/ViewControllers/Mine/MineViewController.swift +++ b/Meterage/ViewControllers/Mine/MineViewController.swift @@ -10,13 +10,13 @@ import DefaultsKit import SwiftyJSON -class MineViewController: UIViewController { +class MineViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { - @IBOutlet var userAvatarView: UIImageView! - @IBOutlet var userNameView: UILabel! - @IBOutlet var userDeptView: UILabel! - @IBOutlet var noticeCountView: UILabel! - @IBOutlet var tableView: UITableView! + @IBOutlet weak var userAvatarView: UIImageView! + @IBOutlet weak var userNameView: UILabel! + @IBOutlet weak var userDeptView: UILabel! + @IBOutlet weak var noticeCountView: UILabel! + @IBOutlet weak var tableView: UITableView! private let defaults = Defaults.shared @@ -36,6 +36,7 @@ tableView.register(UINib(nibName: "MineTableViewCell", bundle: nil), forCellReuseIdentifier: "mineTableViewCell") tableView.dataSource = self tableView.delegate = self + tableView.separatorColor = .hintColor tableView.tableFooterView = UIView(frame: CGRect.zero) //数据请求 @@ -72,9 +73,7 @@ } } } -} -extension MineViewController: UITableViewDelegate { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { 60 } @@ -100,9 +99,7 @@ // break // } } -} -extension MineViewController: UITableViewDataSource { func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { MINE_TITLE_ARRAY.count } diff --git a/Meterage/ViewControllers/Mine/MineViewController.xib b/Meterage/ViewControllers/Mine/MineViewController.xib index 0500a07..09c76b0 100644 --- a/Meterage/ViewControllers/Mine/MineViewController.xib +++ b/Meterage/ViewControllers/Mine/MineViewController.xib @@ -31,14 +31,14 @@ - - -