diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 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 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Cells/FutureTaskTableViewCell.swift b/Meterage/Cells/FutureTaskTableViewCell.swift new file mode 100644 index 0000000..6da809a --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// FutureTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class FutureTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var currentPositionView: UILabel! + @IBOutlet weak var estimateDateView: 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 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Cells/FutureTaskTableViewCell.swift b/Meterage/Cells/FutureTaskTableViewCell.swift new file mode 100644 index 0000000..6da809a --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// FutureTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class FutureTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var currentPositionView: UILabel! + @IBOutlet weak var estimateDateView: 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/FutureTaskTableViewCell.xib b/Meterage/Cells/FutureTaskTableViewCell.xib new file mode 100644 index 0000000..d4ce489 --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.xib @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Cells/FutureTaskTableViewCell.swift b/Meterage/Cells/FutureTaskTableViewCell.swift new file mode 100644 index 0000000..6da809a --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// FutureTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class FutureTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var currentPositionView: UILabel! + @IBOutlet weak var estimateDateView: 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/FutureTaskTableViewCell.xib b/Meterage/Cells/FutureTaskTableViewCell.xib new file mode 100644 index 0000000..d4ce489 --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.xib @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/TotalTaskTableViewCell.swift b/Meterage/Cells/TotalTaskTableViewCell.swift new file mode 100644 index 0000000..b85751f --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.swift @@ -0,0 +1,26 @@ +// +// TotalTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class TotalTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var cellTitleView: UILabel! + @IBOutlet weak var cellDateView: 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 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Cells/FutureTaskTableViewCell.swift b/Meterage/Cells/FutureTaskTableViewCell.swift new file mode 100644 index 0000000..6da809a --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// FutureTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class FutureTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var currentPositionView: UILabel! + @IBOutlet weak var estimateDateView: 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/FutureTaskTableViewCell.xib b/Meterage/Cells/FutureTaskTableViewCell.xib new file mode 100644 index 0000000..d4ce489 --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.xib @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/TotalTaskTableViewCell.swift b/Meterage/Cells/TotalTaskTableViewCell.swift new file mode 100644 index 0000000..b85751f --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.swift @@ -0,0 +1,26 @@ +// +// TotalTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class TotalTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var cellTitleView: UILabel! + @IBOutlet weak var cellDateView: 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/TotalTaskTableViewCell.xib b/Meterage/Cells/TotalTaskTableViewCell.xib new file mode 100644 index 0000000..14846b1 --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.xib @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Cells/FutureTaskTableViewCell.swift b/Meterage/Cells/FutureTaskTableViewCell.swift new file mode 100644 index 0000000..6da809a --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// FutureTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class FutureTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var currentPositionView: UILabel! + @IBOutlet weak var estimateDateView: 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/FutureTaskTableViewCell.xib b/Meterage/Cells/FutureTaskTableViewCell.xib new file mode 100644 index 0000000..d4ce489 --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.xib @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/TotalTaskTableViewCell.swift b/Meterage/Cells/TotalTaskTableViewCell.swift new file mode 100644 index 0000000..b85751f --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.swift @@ -0,0 +1,26 @@ +// +// TotalTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class TotalTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var cellTitleView: UILabel! + @IBOutlet weak var cellDateView: 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/TotalTaskTableViewCell.xib b/Meterage/Cells/TotalTaskTableViewCell.xib new file mode 100644 index 0000000..14846b1 --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.xib @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/UnderTaskTableViewCell.swift b/Meterage/Cells/UnderTaskTableViewCell.swift new file mode 100644 index 0000000..b45ee7e --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// UnderTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class UnderTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var taskQrCodeView: UIImageView! + @IBOutlet weak var taskPositionView: 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 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Cells/FutureTaskTableViewCell.swift b/Meterage/Cells/FutureTaskTableViewCell.swift new file mode 100644 index 0000000..6da809a --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// FutureTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class FutureTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var currentPositionView: UILabel! + @IBOutlet weak var estimateDateView: 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/FutureTaskTableViewCell.xib b/Meterage/Cells/FutureTaskTableViewCell.xib new file mode 100644 index 0000000..d4ce489 --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.xib @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/TotalTaskTableViewCell.swift b/Meterage/Cells/TotalTaskTableViewCell.swift new file mode 100644 index 0000000..b85751f --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.swift @@ -0,0 +1,26 @@ +// +// TotalTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class TotalTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var cellTitleView: UILabel! + @IBOutlet weak var cellDateView: 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/TotalTaskTableViewCell.xib b/Meterage/Cells/TotalTaskTableViewCell.xib new file mode 100644 index 0000000..14846b1 --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.xib @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/UnderTaskTableViewCell.swift b/Meterage/Cells/UnderTaskTableViewCell.swift new file mode 100644 index 0000000..b45ee7e --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// UnderTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class UnderTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var taskQrCodeView: UIImageView! + @IBOutlet weak var taskPositionView: 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/UnderTaskTableViewCell.xib b/Meterage/Cells/UnderTaskTableViewCell.xib new file mode 100644 index 0000000..e22052b --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.xib @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Cells/FutureTaskTableViewCell.swift b/Meterage/Cells/FutureTaskTableViewCell.swift new file mode 100644 index 0000000..6da809a --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// FutureTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class FutureTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var currentPositionView: UILabel! + @IBOutlet weak var estimateDateView: 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/FutureTaskTableViewCell.xib b/Meterage/Cells/FutureTaskTableViewCell.xib new file mode 100644 index 0000000..d4ce489 --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.xib @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/TotalTaskTableViewCell.swift b/Meterage/Cells/TotalTaskTableViewCell.swift new file mode 100644 index 0000000..b85751f --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.swift @@ -0,0 +1,26 @@ +// +// TotalTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class TotalTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var cellTitleView: UILabel! + @IBOutlet weak var cellDateView: 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/TotalTaskTableViewCell.xib b/Meterage/Cells/TotalTaskTableViewCell.xib new file mode 100644 index 0000000..14846b1 --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.xib @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/UnderTaskTableViewCell.swift b/Meterage/Cells/UnderTaskTableViewCell.swift new file mode 100644 index 0000000..b45ee7e --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// UnderTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class UnderTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var taskQrCodeView: UIImageView! + @IBOutlet weak var taskPositionView: 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/UnderTaskTableViewCell.xib b/Meterage/Cells/UnderTaskTableViewCell.xib new file mode 100644 index 0000000..e22052b --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.xib @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift index 32e330f..41bf90e 100644 --- a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift +++ b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift @@ -7,23 +7,49 @@ import UIKit -class FutureTaskViewController: UIViewController { +class FutureTaskViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { + + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + tableView.register(UINib(nibName: "FutureTaskTableViewCell", bundle: nil), forCellReuseIdentifier: "futureTaskTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.separatorColor = .hintColor + tableView.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. + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 95 } - */ + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + FUTURE_TASK_TITLE_ARRAY.count + } + + private let FUTURE_TASK_TITLE_ARRAY = ["万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828"] + private let FUTURE_TASK_POSITION_ARRAY = ["AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室"] + private let FUTURE_TASK_DATE_ARRAY = ["2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: FutureTaskTableViewCell = tableView.dequeueReusableCell(withIdentifier: "futureTaskTableViewCell", for: indexPath) as! FutureTaskTableViewCell + cell.taskTitleView.text = FUTURE_TASK_TITLE_ARRAY[indexPath.row] + cell.currentPositionView.text = FUTURE_TASK_POSITION_ARRAY[indexPath.row] + cell.estimateDateView.text = FUTURE_TASK_DATE_ARRAY[indexPath.row] + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 10, 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 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Cells/FutureTaskTableViewCell.swift b/Meterage/Cells/FutureTaskTableViewCell.swift new file mode 100644 index 0000000..6da809a --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// FutureTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class FutureTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var currentPositionView: UILabel! + @IBOutlet weak var estimateDateView: 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/FutureTaskTableViewCell.xib b/Meterage/Cells/FutureTaskTableViewCell.xib new file mode 100644 index 0000000..d4ce489 --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.xib @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/TotalTaskTableViewCell.swift b/Meterage/Cells/TotalTaskTableViewCell.swift new file mode 100644 index 0000000..b85751f --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.swift @@ -0,0 +1,26 @@ +// +// TotalTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class TotalTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var cellTitleView: UILabel! + @IBOutlet weak var cellDateView: 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/TotalTaskTableViewCell.xib b/Meterage/Cells/TotalTaskTableViewCell.xib new file mode 100644 index 0000000..14846b1 --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.xib @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/UnderTaskTableViewCell.swift b/Meterage/Cells/UnderTaskTableViewCell.swift new file mode 100644 index 0000000..b45ee7e --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// UnderTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class UnderTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var taskQrCodeView: UIImageView! + @IBOutlet weak var taskPositionView: 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/UnderTaskTableViewCell.xib b/Meterage/Cells/UnderTaskTableViewCell.xib new file mode 100644 index 0000000..e22052b --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.xib @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift index 32e330f..41bf90e 100644 --- a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift +++ b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift @@ -7,23 +7,49 @@ import UIKit -class FutureTaskViewController: UIViewController { +class FutureTaskViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { + + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + tableView.register(UINib(nibName: "FutureTaskTableViewCell", bundle: nil), forCellReuseIdentifier: "futureTaskTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.separatorColor = .hintColor + tableView.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. + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 95 } - */ + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + FUTURE_TASK_TITLE_ARRAY.count + } + + private let FUTURE_TASK_TITLE_ARRAY = ["万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828"] + private let FUTURE_TASK_POSITION_ARRAY = ["AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室"] + private let FUTURE_TASK_DATE_ARRAY = ["2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: FutureTaskTableViewCell = tableView.dequeueReusableCell(withIdentifier: "futureTaskTableViewCell", for: indexPath) as! FutureTaskTableViewCell + cell.taskTitleView.text = FUTURE_TASK_TITLE_ARRAY[indexPath.row] + cell.currentPositionView.text = FUTURE_TASK_POSITION_ARRAY[indexPath.row] + cell.estimateDateView.text = FUTURE_TASK_DATE_ARRAY[indexPath.row] + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Sample/FutureTaskViewController.xib b/Meterage/ViewControllers/Sample/FutureTaskViewController.xib index de82b56..709a285 100644 --- a/Meterage/ViewControllers/Sample/FutureTaskViewController.xib +++ b/Meterage/ViewControllers/Sample/FutureTaskViewController.xib @@ -1,6 +1,6 @@ - + @@ -11,21 +11,34 @@ + - + + + + + + + - + + + + + + + - - + + diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Cells/FutureTaskTableViewCell.swift b/Meterage/Cells/FutureTaskTableViewCell.swift new file mode 100644 index 0000000..6da809a --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// FutureTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class FutureTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var currentPositionView: UILabel! + @IBOutlet weak var estimateDateView: 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/FutureTaskTableViewCell.xib b/Meterage/Cells/FutureTaskTableViewCell.xib new file mode 100644 index 0000000..d4ce489 --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.xib @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/TotalTaskTableViewCell.swift b/Meterage/Cells/TotalTaskTableViewCell.swift new file mode 100644 index 0000000..b85751f --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.swift @@ -0,0 +1,26 @@ +// +// TotalTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class TotalTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var cellTitleView: UILabel! + @IBOutlet weak var cellDateView: 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/TotalTaskTableViewCell.xib b/Meterage/Cells/TotalTaskTableViewCell.xib new file mode 100644 index 0000000..14846b1 --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.xib @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/UnderTaskTableViewCell.swift b/Meterage/Cells/UnderTaskTableViewCell.swift new file mode 100644 index 0000000..b45ee7e --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// UnderTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class UnderTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var taskQrCodeView: UIImageView! + @IBOutlet weak var taskPositionView: 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/UnderTaskTableViewCell.xib b/Meterage/Cells/UnderTaskTableViewCell.xib new file mode 100644 index 0000000..e22052b --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.xib @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift index 32e330f..41bf90e 100644 --- a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift +++ b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift @@ -7,23 +7,49 @@ import UIKit -class FutureTaskViewController: UIViewController { +class FutureTaskViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { + + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + tableView.register(UINib(nibName: "FutureTaskTableViewCell", bundle: nil), forCellReuseIdentifier: "futureTaskTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.separatorColor = .hintColor + tableView.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. + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 95 } - */ + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + FUTURE_TASK_TITLE_ARRAY.count + } + + private let FUTURE_TASK_TITLE_ARRAY = ["万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828"] + private let FUTURE_TASK_POSITION_ARRAY = ["AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室"] + private let FUTURE_TASK_DATE_ARRAY = ["2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: FutureTaskTableViewCell = tableView.dequeueReusableCell(withIdentifier: "futureTaskTableViewCell", for: indexPath) as! FutureTaskTableViewCell + cell.taskTitleView.text = FUTURE_TASK_TITLE_ARRAY[indexPath.row] + cell.currentPositionView.text = FUTURE_TASK_POSITION_ARRAY[indexPath.row] + cell.estimateDateView.text = FUTURE_TASK_DATE_ARRAY[indexPath.row] + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Sample/FutureTaskViewController.xib b/Meterage/ViewControllers/Sample/FutureTaskViewController.xib index de82b56..709a285 100644 --- a/Meterage/ViewControllers/Sample/FutureTaskViewController.xib +++ b/Meterage/ViewControllers/Sample/FutureTaskViewController.xib @@ -1,6 +1,6 @@ - + @@ -11,21 +11,34 @@ + - + + + + + + + - + + + + + + + - - + + diff --git a/Meterage/ViewControllers/Sample/SamplePageViewController.swift b/Meterage/ViewControllers/Sample/SamplePageViewController.swift index 597ece0..8543325 100644 --- a/Meterage/ViewControllers/Sample/SamplePageViewController.swift +++ b/Meterage/ViewControllers/Sample/SamplePageViewController.swift @@ -60,6 +60,8 @@ } // 定义一个视图用于存放具体显示的内容 segmentView = UIScrollView() + segmentView.layer.cornerRadius = 7 + segmentView.layer.masksToBounds = true segmentView.delegate = self view.addSubview(segmentView) diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Cells/FutureTaskTableViewCell.swift b/Meterage/Cells/FutureTaskTableViewCell.swift new file mode 100644 index 0000000..6da809a --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// FutureTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class FutureTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var currentPositionView: UILabel! + @IBOutlet weak var estimateDateView: 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/FutureTaskTableViewCell.xib b/Meterage/Cells/FutureTaskTableViewCell.xib new file mode 100644 index 0000000..d4ce489 --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.xib @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/TotalTaskTableViewCell.swift b/Meterage/Cells/TotalTaskTableViewCell.swift new file mode 100644 index 0000000..b85751f --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.swift @@ -0,0 +1,26 @@ +// +// TotalTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class TotalTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var cellTitleView: UILabel! + @IBOutlet weak var cellDateView: 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/TotalTaskTableViewCell.xib b/Meterage/Cells/TotalTaskTableViewCell.xib new file mode 100644 index 0000000..14846b1 --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.xib @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/UnderTaskTableViewCell.swift b/Meterage/Cells/UnderTaskTableViewCell.swift new file mode 100644 index 0000000..b45ee7e --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// UnderTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class UnderTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var taskQrCodeView: UIImageView! + @IBOutlet weak var taskPositionView: 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/UnderTaskTableViewCell.xib b/Meterage/Cells/UnderTaskTableViewCell.xib new file mode 100644 index 0000000..e22052b --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.xib @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift index 32e330f..41bf90e 100644 --- a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift +++ b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift @@ -7,23 +7,49 @@ import UIKit -class FutureTaskViewController: UIViewController { +class FutureTaskViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { + + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + tableView.register(UINib(nibName: "FutureTaskTableViewCell", bundle: nil), forCellReuseIdentifier: "futureTaskTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.separatorColor = .hintColor + tableView.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. + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 95 } - */ + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + FUTURE_TASK_TITLE_ARRAY.count + } + + private let FUTURE_TASK_TITLE_ARRAY = ["万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828"] + private let FUTURE_TASK_POSITION_ARRAY = ["AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室"] + private let FUTURE_TASK_DATE_ARRAY = ["2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: FutureTaskTableViewCell = tableView.dequeueReusableCell(withIdentifier: "futureTaskTableViewCell", for: indexPath) as! FutureTaskTableViewCell + cell.taskTitleView.text = FUTURE_TASK_TITLE_ARRAY[indexPath.row] + cell.currentPositionView.text = FUTURE_TASK_POSITION_ARRAY[indexPath.row] + cell.estimateDateView.text = FUTURE_TASK_DATE_ARRAY[indexPath.row] + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Sample/FutureTaskViewController.xib b/Meterage/ViewControllers/Sample/FutureTaskViewController.xib index de82b56..709a285 100644 --- a/Meterage/ViewControllers/Sample/FutureTaskViewController.xib +++ b/Meterage/ViewControllers/Sample/FutureTaskViewController.xib @@ -1,6 +1,6 @@ - + @@ -11,21 +11,34 @@ + - + + + + + + + - + + + + + + + - - + + diff --git a/Meterage/ViewControllers/Sample/SamplePageViewController.swift b/Meterage/ViewControllers/Sample/SamplePageViewController.swift index 597ece0..8543325 100644 --- a/Meterage/ViewControllers/Sample/SamplePageViewController.swift +++ b/Meterage/ViewControllers/Sample/SamplePageViewController.swift @@ -60,6 +60,8 @@ } // 定义一个视图用于存放具体显示的内容 segmentView = UIScrollView() + segmentView.layer.cornerRadius = 7 + segmentView.layer.masksToBounds = true segmentView.delegate = self view.addSubview(segmentView) diff --git a/Meterage/ViewControllers/Sample/TotalTaskViewController.swift b/Meterage/ViewControllers/Sample/TotalTaskViewController.swift index 814646c..4791f93 100644 --- a/Meterage/ViewControllers/Sample/TotalTaskViewController.swift +++ b/Meterage/ViewControllers/Sample/TotalTaskViewController.swift @@ -7,23 +7,47 @@ import UIKit -class TotalTaskViewController: UIViewController { +class TotalTaskViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { + + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + tableView.register(UINib(nibName: "TotalTaskTableViewCell", bundle: nil), forCellReuseIdentifier: "totalTaskTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.separatorColor = .hintColor + tableView.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. + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 60 } - */ + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + TOTAL_TASK_TITLE_ARRAY.count + } + + private let TOTAL_TASK_TITLE_ARRAY = ["万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828"] + private let TOTAL_TASK_DATE_ARRAY = ["有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: TotalTaskTableViewCell = tableView.dequeueReusableCell(withIdentifier: "totalTaskTableViewCell", for: indexPath) as! TotalTaskTableViewCell + cell.cellTitleView.text = TOTAL_TASK_TITLE_ARRAY[indexPath.row] + cell.cellDateView.text = TOTAL_TASK_DATE_ARRAY[indexPath.row] + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 10, 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 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Cells/FutureTaskTableViewCell.swift b/Meterage/Cells/FutureTaskTableViewCell.swift new file mode 100644 index 0000000..6da809a --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// FutureTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class FutureTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var currentPositionView: UILabel! + @IBOutlet weak var estimateDateView: 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/FutureTaskTableViewCell.xib b/Meterage/Cells/FutureTaskTableViewCell.xib new file mode 100644 index 0000000..d4ce489 --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.xib @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/TotalTaskTableViewCell.swift b/Meterage/Cells/TotalTaskTableViewCell.swift new file mode 100644 index 0000000..b85751f --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.swift @@ -0,0 +1,26 @@ +// +// TotalTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class TotalTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var cellTitleView: UILabel! + @IBOutlet weak var cellDateView: 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/TotalTaskTableViewCell.xib b/Meterage/Cells/TotalTaskTableViewCell.xib new file mode 100644 index 0000000..14846b1 --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.xib @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/UnderTaskTableViewCell.swift b/Meterage/Cells/UnderTaskTableViewCell.swift new file mode 100644 index 0000000..b45ee7e --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// UnderTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class UnderTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var taskQrCodeView: UIImageView! + @IBOutlet weak var taskPositionView: 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/UnderTaskTableViewCell.xib b/Meterage/Cells/UnderTaskTableViewCell.xib new file mode 100644 index 0000000..e22052b --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.xib @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift index 32e330f..41bf90e 100644 --- a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift +++ b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift @@ -7,23 +7,49 @@ import UIKit -class FutureTaskViewController: UIViewController { +class FutureTaskViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { + + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + tableView.register(UINib(nibName: "FutureTaskTableViewCell", bundle: nil), forCellReuseIdentifier: "futureTaskTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.separatorColor = .hintColor + tableView.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. + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 95 } - */ + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + FUTURE_TASK_TITLE_ARRAY.count + } + + private let FUTURE_TASK_TITLE_ARRAY = ["万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828"] + private let FUTURE_TASK_POSITION_ARRAY = ["AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室"] + private let FUTURE_TASK_DATE_ARRAY = ["2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: FutureTaskTableViewCell = tableView.dequeueReusableCell(withIdentifier: "futureTaskTableViewCell", for: indexPath) as! FutureTaskTableViewCell + cell.taskTitleView.text = FUTURE_TASK_TITLE_ARRAY[indexPath.row] + cell.currentPositionView.text = FUTURE_TASK_POSITION_ARRAY[indexPath.row] + cell.estimateDateView.text = FUTURE_TASK_DATE_ARRAY[indexPath.row] + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Sample/FutureTaskViewController.xib b/Meterage/ViewControllers/Sample/FutureTaskViewController.xib index de82b56..709a285 100644 --- a/Meterage/ViewControllers/Sample/FutureTaskViewController.xib +++ b/Meterage/ViewControllers/Sample/FutureTaskViewController.xib @@ -1,6 +1,6 @@ - + @@ -11,21 +11,34 @@ + - + + + + + + + - + + + + + + + - - + + diff --git a/Meterage/ViewControllers/Sample/SamplePageViewController.swift b/Meterage/ViewControllers/Sample/SamplePageViewController.swift index 597ece0..8543325 100644 --- a/Meterage/ViewControllers/Sample/SamplePageViewController.swift +++ b/Meterage/ViewControllers/Sample/SamplePageViewController.swift @@ -60,6 +60,8 @@ } // 定义一个视图用于存放具体显示的内容 segmentView = UIScrollView() + segmentView.layer.cornerRadius = 7 + segmentView.layer.masksToBounds = true segmentView.delegate = self view.addSubview(segmentView) diff --git a/Meterage/ViewControllers/Sample/TotalTaskViewController.swift b/Meterage/ViewControllers/Sample/TotalTaskViewController.swift index 814646c..4791f93 100644 --- a/Meterage/ViewControllers/Sample/TotalTaskViewController.swift +++ b/Meterage/ViewControllers/Sample/TotalTaskViewController.swift @@ -7,23 +7,47 @@ import UIKit -class TotalTaskViewController: UIViewController { +class TotalTaskViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { + + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + tableView.register(UINib(nibName: "TotalTaskTableViewCell", bundle: nil), forCellReuseIdentifier: "totalTaskTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.separatorColor = .hintColor + tableView.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. + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 60 } - */ + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + TOTAL_TASK_TITLE_ARRAY.count + } + + private let TOTAL_TASK_TITLE_ARRAY = ["万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828"] + private let TOTAL_TASK_DATE_ARRAY = ["有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: TotalTaskTableViewCell = tableView.dequeueReusableCell(withIdentifier: "totalTaskTableViewCell", for: indexPath) as! TotalTaskTableViewCell + cell.cellTitleView.text = TOTAL_TASK_TITLE_ARRAY[indexPath.row] + cell.cellDateView.text = TOTAL_TASK_DATE_ARRAY[indexPath.row] + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Sample/TotalTaskViewController.xib b/Meterage/ViewControllers/Sample/TotalTaskViewController.xib index ce3915a..413c5c0 100644 --- a/Meterage/ViewControllers/Sample/TotalTaskViewController.xib +++ b/Meterage/ViewControllers/Sample/TotalTaskViewController.xib @@ -1,22 +1,44 @@ - - + + + - + + + - + + - + - + + + + + + + + + + + + + + + + + + + diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Cells/FutureTaskTableViewCell.swift b/Meterage/Cells/FutureTaskTableViewCell.swift new file mode 100644 index 0000000..6da809a --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// FutureTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class FutureTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var currentPositionView: UILabel! + @IBOutlet weak var estimateDateView: 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/FutureTaskTableViewCell.xib b/Meterage/Cells/FutureTaskTableViewCell.xib new file mode 100644 index 0000000..d4ce489 --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.xib @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/TotalTaskTableViewCell.swift b/Meterage/Cells/TotalTaskTableViewCell.swift new file mode 100644 index 0000000..b85751f --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.swift @@ -0,0 +1,26 @@ +// +// TotalTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class TotalTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var cellTitleView: UILabel! + @IBOutlet weak var cellDateView: 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/TotalTaskTableViewCell.xib b/Meterage/Cells/TotalTaskTableViewCell.xib new file mode 100644 index 0000000..14846b1 --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.xib @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/UnderTaskTableViewCell.swift b/Meterage/Cells/UnderTaskTableViewCell.swift new file mode 100644 index 0000000..b45ee7e --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// UnderTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class UnderTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var taskQrCodeView: UIImageView! + @IBOutlet weak var taskPositionView: 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/UnderTaskTableViewCell.xib b/Meterage/Cells/UnderTaskTableViewCell.xib new file mode 100644 index 0000000..e22052b --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.xib @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift index 32e330f..41bf90e 100644 --- a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift +++ b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift @@ -7,23 +7,49 @@ import UIKit -class FutureTaskViewController: UIViewController { +class FutureTaskViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { + + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + tableView.register(UINib(nibName: "FutureTaskTableViewCell", bundle: nil), forCellReuseIdentifier: "futureTaskTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.separatorColor = .hintColor + tableView.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. + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 95 } - */ + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + FUTURE_TASK_TITLE_ARRAY.count + } + + private let FUTURE_TASK_TITLE_ARRAY = ["万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828"] + private let FUTURE_TASK_POSITION_ARRAY = ["AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室"] + private let FUTURE_TASK_DATE_ARRAY = ["2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: FutureTaskTableViewCell = tableView.dequeueReusableCell(withIdentifier: "futureTaskTableViewCell", for: indexPath) as! FutureTaskTableViewCell + cell.taskTitleView.text = FUTURE_TASK_TITLE_ARRAY[indexPath.row] + cell.currentPositionView.text = FUTURE_TASK_POSITION_ARRAY[indexPath.row] + cell.estimateDateView.text = FUTURE_TASK_DATE_ARRAY[indexPath.row] + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Sample/FutureTaskViewController.xib b/Meterage/ViewControllers/Sample/FutureTaskViewController.xib index de82b56..709a285 100644 --- a/Meterage/ViewControllers/Sample/FutureTaskViewController.xib +++ b/Meterage/ViewControllers/Sample/FutureTaskViewController.xib @@ -1,6 +1,6 @@ - + @@ -11,21 +11,34 @@ + - + + + + + + + - + + + + + + + - - + + diff --git a/Meterage/ViewControllers/Sample/SamplePageViewController.swift b/Meterage/ViewControllers/Sample/SamplePageViewController.swift index 597ece0..8543325 100644 --- a/Meterage/ViewControllers/Sample/SamplePageViewController.swift +++ b/Meterage/ViewControllers/Sample/SamplePageViewController.swift @@ -60,6 +60,8 @@ } // 定义一个视图用于存放具体显示的内容 segmentView = UIScrollView() + segmentView.layer.cornerRadius = 7 + segmentView.layer.masksToBounds = true segmentView.delegate = self view.addSubview(segmentView) diff --git a/Meterage/ViewControllers/Sample/TotalTaskViewController.swift b/Meterage/ViewControllers/Sample/TotalTaskViewController.swift index 814646c..4791f93 100644 --- a/Meterage/ViewControllers/Sample/TotalTaskViewController.swift +++ b/Meterage/ViewControllers/Sample/TotalTaskViewController.swift @@ -7,23 +7,47 @@ import UIKit -class TotalTaskViewController: UIViewController { +class TotalTaskViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { + + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + tableView.register(UINib(nibName: "TotalTaskTableViewCell", bundle: nil), forCellReuseIdentifier: "totalTaskTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.separatorColor = .hintColor + tableView.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. + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 60 } - */ + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + TOTAL_TASK_TITLE_ARRAY.count + } + + private let TOTAL_TASK_TITLE_ARRAY = ["万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828"] + private let TOTAL_TASK_DATE_ARRAY = ["有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: TotalTaskTableViewCell = tableView.dequeueReusableCell(withIdentifier: "totalTaskTableViewCell", for: indexPath) as! TotalTaskTableViewCell + cell.cellTitleView.text = TOTAL_TASK_TITLE_ARRAY[indexPath.row] + cell.cellDateView.text = TOTAL_TASK_DATE_ARRAY[indexPath.row] + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Sample/TotalTaskViewController.xib b/Meterage/ViewControllers/Sample/TotalTaskViewController.xib index ce3915a..413c5c0 100644 --- a/Meterage/ViewControllers/Sample/TotalTaskViewController.xib +++ b/Meterage/ViewControllers/Sample/TotalTaskViewController.xib @@ -1,22 +1,44 @@ - - + + + - + + + - + + - + - + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/ViewControllers/Sample/UnderTaskViewController.swift b/Meterage/ViewControllers/Sample/UnderTaskViewController.swift index 86f3918..5cb44e2 100644 --- a/Meterage/ViewControllers/Sample/UnderTaskViewController.swift +++ b/Meterage/ViewControllers/Sample/UnderTaskViewController.swift @@ -7,23 +7,49 @@ import UIKit -class UnderTaskViewController: UIViewController { +class UnderTaskViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { + + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + tableView.register(UINib(nibName: "UnderTaskTableViewCell", bundle: nil), forCellReuseIdentifier: "underTaskTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.separatorColor = .hintColor + tableView.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. + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 80 } - */ + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + UNDER_TASK_TITLE_ARRAY.count + } + + private let UNDER_TASK_TITLE_ARRAY = ["万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828"] + private let UNDER_TASK_POSITION_ARRAY = ["AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室"] + private let UNDER_TASK_PERSON_ARRAY = ["王小波", "王小波", "王小波", "王小波", "王小波", "王小波", "王小波"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: UnderTaskTableViewCell = tableView.dequeueReusableCell(withIdentifier: "underTaskTableViewCell", for: indexPath) as! UnderTaskTableViewCell + cell.taskTitleView.text = UNDER_TASK_TITLE_ARRAY[indexPath.row] +// cell.taskQrCodeView.text = + cell.taskPositionView.text = UNDER_TASK_POSITION_ARRAY[indexPath.row] + "---" + UNDER_TASK_PERSON_ARRAY[indexPath.row] + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 10, 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 64e4235..0d132e9 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -24,6 +24,12 @@ 65A55E31298D17AD00093341 /* TotalTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */; }; 65A55E32298D17AD00093341 /* TotalTaskViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */; }; 65A55E34298D2BE900093341 /* DeviceSizeUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */; }; + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */; }; + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */; }; + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */; }; + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */; }; + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */; }; + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A55E3E2990972800093341 /* UnderTaskTableViewCell.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 */; }; @@ -70,6 +76,12 @@ 65A55E2F298D17AD00093341 /* TotalTaskViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskViewController.swift; sourceTree = ""; }; 65A55E30298D17AD00093341 /* TotalTaskViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskViewController.xib; sourceTree = ""; }; 65A55E33298D2BE900093341 /* DeviceSizeUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSizeUtil.swift; sourceTree = ""; }; + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TotalTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FutureTaskTableViewCell.xib; sourceTree = ""; }; + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderTaskTableViewCell.swift; sourceTree = ""; }; + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnderTaskTableViewCell.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 = ""; }; @@ -269,6 +281,12 @@ 65A55E20298D00BE00093341 /* ReminderTableViewCell.xib */, 65A55E23298D0A2000093341 /* SampleCollectionViewCell.swift */, 65A55E24298D0A2000093341 /* SampleCollectionViewCell.xib */, + 65A55E35299089CA00093341 /* TotalTaskTableViewCell.swift */, + 65A55E36299089CA00093341 /* TotalTaskTableViewCell.xib */, + 65A55E3929908EEC00093341 /* FutureTaskTableViewCell.swift */, + 65A55E3A29908EEC00093341 /* FutureTaskTableViewCell.xib */, + 65A55E3D2990972800093341 /* UnderTaskTableViewCell.swift */, + 65A55E3E2990972800093341 /* UnderTaskTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -338,7 +356,10 @@ 65A55E26298D0A2000093341 /* SampleCollectionViewCell.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, + 65A55E3C29908EEC00093341 /* FutureTaskTableViewCell.xib in Resources */, 65AEA699298A634D00B8FF09 /* MineViewController.xib in Resources */, + 65A55E38299089CA00093341 /* TotalTaskTableViewCell.xib in Resources */, + 65A55E402990972800093341 /* UnderTaskTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -427,16 +448,19 @@ 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, 65A55E2D298D17A100093341 /* FutureTaskViewController.swift in Sources */, 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, + 65A55E3F2990972800093341 /* UnderTaskTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65A55E25298D0A2000093341 /* SampleCollectionViewCell.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, + 65A55E37299089CA00093341 /* TotalTaskTableViewCell.swift in Sources */, 65AEA690298A632B00B8FF09 /* HomePageViewController.swift in Sources */, 65AEA6B0298B62D900B8FF09 /* LoadingHub.swift in Sources */, 65AEA6AC298B613400B8FF09 /* Constant.swift in Sources */, 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */, 6531D7C6298CB45500C4B343 /* HomeCollectionViewCell.swift in Sources */, 65A55E29298D179300093341 /* UnderTaskViewController.swift in Sources */, + 65A55E3B29908EEC00093341 /* FutureTaskTableViewCell.swift in Sources */, 65AEA694298A633E00B8FF09 /* SamplePageViewController.swift in Sources */, 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 65A55E21298D00BE00093341 /* ReminderTableViewCell.swift in Sources */, diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 6305059..2f04b04 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Cells/FutureTaskTableViewCell.swift b/Meterage/Cells/FutureTaskTableViewCell.swift new file mode 100644 index 0000000..6da809a --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// FutureTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class FutureTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var currentPositionView: UILabel! + @IBOutlet weak var estimateDateView: 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/FutureTaskTableViewCell.xib b/Meterage/Cells/FutureTaskTableViewCell.xib new file mode 100644 index 0000000..d4ce489 --- /dev/null +++ b/Meterage/Cells/FutureTaskTableViewCell.xib @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/TotalTaskTableViewCell.swift b/Meterage/Cells/TotalTaskTableViewCell.swift new file mode 100644 index 0000000..b85751f --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.swift @@ -0,0 +1,26 @@ +// +// TotalTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class TotalTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var cellTitleView: UILabel! + @IBOutlet weak var cellDateView: 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/TotalTaskTableViewCell.xib b/Meterage/Cells/TotalTaskTableViewCell.xib new file mode 100644 index 0000000..14846b1 --- /dev/null +++ b/Meterage/Cells/TotalTaskTableViewCell.xib @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Cells/UnderTaskTableViewCell.swift b/Meterage/Cells/UnderTaskTableViewCell.swift new file mode 100644 index 0000000..b45ee7e --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.swift @@ -0,0 +1,27 @@ +// +// UnderTaskTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/6. +// + +import UIKit + +class UnderTaskTableViewCell: UITableViewCell { + + @IBOutlet weak var taskTitleView: UILabel! + @IBOutlet weak var taskQrCodeView: UIImageView! + @IBOutlet weak var taskPositionView: 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/UnderTaskTableViewCell.xib b/Meterage/Cells/UnderTaskTableViewCell.xib new file mode 100644 index 0000000..e22052b --- /dev/null +++ b/Meterage/Cells/UnderTaskTableViewCell.xib @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift index 32e330f..41bf90e 100644 --- a/Meterage/ViewControllers/Sample/FutureTaskViewController.swift +++ b/Meterage/ViewControllers/Sample/FutureTaskViewController.swift @@ -7,23 +7,49 @@ import UIKit -class FutureTaskViewController: UIViewController { +class FutureTaskViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { + + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + tableView.register(UINib(nibName: "FutureTaskTableViewCell", bundle: nil), forCellReuseIdentifier: "futureTaskTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.separatorColor = .hintColor + tableView.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. + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 95 } - */ + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + FUTURE_TASK_TITLE_ARRAY.count + } + + private let FUTURE_TASK_TITLE_ARRAY = ["万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828"] + private let FUTURE_TASK_POSITION_ARRAY = ["AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室"] + private let FUTURE_TASK_DATE_ARRAY = ["2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11", "2021-11-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: FutureTaskTableViewCell = tableView.dequeueReusableCell(withIdentifier: "futureTaskTableViewCell", for: indexPath) as! FutureTaskTableViewCell + cell.taskTitleView.text = FUTURE_TASK_TITLE_ARRAY[indexPath.row] + cell.currentPositionView.text = FUTURE_TASK_POSITION_ARRAY[indexPath.row] + cell.estimateDateView.text = FUTURE_TASK_DATE_ARRAY[indexPath.row] + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Sample/FutureTaskViewController.xib b/Meterage/ViewControllers/Sample/FutureTaskViewController.xib index de82b56..709a285 100644 --- a/Meterage/ViewControllers/Sample/FutureTaskViewController.xib +++ b/Meterage/ViewControllers/Sample/FutureTaskViewController.xib @@ -1,6 +1,6 @@ - + @@ -11,21 +11,34 @@ + - + + + + + + + - + + + + + + + - - + + diff --git a/Meterage/ViewControllers/Sample/SamplePageViewController.swift b/Meterage/ViewControllers/Sample/SamplePageViewController.swift index 597ece0..8543325 100644 --- a/Meterage/ViewControllers/Sample/SamplePageViewController.swift +++ b/Meterage/ViewControllers/Sample/SamplePageViewController.swift @@ -60,6 +60,8 @@ } // 定义一个视图用于存放具体显示的内容 segmentView = UIScrollView() + segmentView.layer.cornerRadius = 7 + segmentView.layer.masksToBounds = true segmentView.delegate = self view.addSubview(segmentView) diff --git a/Meterage/ViewControllers/Sample/TotalTaskViewController.swift b/Meterage/ViewControllers/Sample/TotalTaskViewController.swift index 814646c..4791f93 100644 --- a/Meterage/ViewControllers/Sample/TotalTaskViewController.swift +++ b/Meterage/ViewControllers/Sample/TotalTaskViewController.swift @@ -7,23 +7,47 @@ import UIKit -class TotalTaskViewController: UIViewController { +class TotalTaskViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { + + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + tableView.register(UINib(nibName: "TotalTaskTableViewCell", bundle: nil), forCellReuseIdentifier: "totalTaskTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.separatorColor = .hintColor + tableView.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. + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 60 } - */ + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + TOTAL_TASK_TITLE_ARRAY.count + } + + private let TOTAL_TASK_TITLE_ARRAY = ["万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828"] + private let TOTAL_TASK_DATE_ARRAY = ["有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11", "有效期 2021-11-11"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: TotalTaskTableViewCell = tableView.dequeueReusableCell(withIdentifier: "totalTaskTableViewCell", for: indexPath) as! TotalTaskTableViewCell + cell.cellTitleView.text = TOTAL_TASK_TITLE_ARRAY[indexPath.row] + cell.cellDateView.text = TOTAL_TASK_DATE_ARRAY[indexPath.row] + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Sample/TotalTaskViewController.xib b/Meterage/ViewControllers/Sample/TotalTaskViewController.xib index ce3915a..413c5c0 100644 --- a/Meterage/ViewControllers/Sample/TotalTaskViewController.xib +++ b/Meterage/ViewControllers/Sample/TotalTaskViewController.xib @@ -1,22 +1,44 @@ - - + + + - + + + - + + - + - + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/ViewControllers/Sample/UnderTaskViewController.swift b/Meterage/ViewControllers/Sample/UnderTaskViewController.swift index 86f3918..5cb44e2 100644 --- a/Meterage/ViewControllers/Sample/UnderTaskViewController.swift +++ b/Meterage/ViewControllers/Sample/UnderTaskViewController.swift @@ -7,23 +7,49 @@ import UIKit -class UnderTaskViewController: UIViewController { +class UnderTaskViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { + + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + tableView.register(UINib(nibName: "UnderTaskTableViewCell", bundle: nil), forCellReuseIdentifier: "underTaskTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.separatorColor = .hintColor + tableView.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. + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 80 } - */ + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + UNDER_TASK_TITLE_ARRAY.count + } + + private let UNDER_TASK_TITLE_ARRAY = ["万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828", "万用表 S82828828"] + private let UNDER_TASK_POSITION_ARRAY = ["AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室", "AAAA实验室"] + private let UNDER_TASK_PERSON_ARRAY = ["王小波", "王小波", "王小波", "王小波", "王小波", "王小波", "王小波"] + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: UnderTaskTableViewCell = tableView.dequeueReusableCell(withIdentifier: "underTaskTableViewCell", for: indexPath) as! UnderTaskTableViewCell + cell.taskTitleView.text = UNDER_TASK_TITLE_ARRAY[indexPath.row] +// cell.taskQrCodeView.text = + cell.taskPositionView.text = UNDER_TASK_POSITION_ARRAY[indexPath.row] + "---" + UNDER_TASK_PERSON_ARRAY[indexPath.row] + //设置分割线上下左右边距 + cell.separatorInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0) + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Sample/UnderTaskViewController.xib b/Meterage/ViewControllers/Sample/UnderTaskViewController.xib index f8e7b9e..d51dab5 100644 --- a/Meterage/ViewControllers/Sample/UnderTaskViewController.xib +++ b/Meterage/ViewControllers/Sample/UnderTaskViewController.xib @@ -1,6 +1,6 @@ - + @@ -11,21 +11,34 @@ + - + + + + + + + - + + + + + + + - - + +