diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 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 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/Contents.json b/Meterage/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..c2050a7 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "update@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "update@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "update@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/Contents.json b/Meterage/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..c2050a7 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "update@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "update@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "update@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/update.imageset/update@1x.png b/Meterage/Assets.xcassets/update.imageset/update@1x.png new file mode 100644 index 0000000..3d6d015 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@1x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/Contents.json b/Meterage/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..c2050a7 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "update@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "update@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "update@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/update.imageset/update@1x.png b/Meterage/Assets.xcassets/update.imageset/update@1x.png new file mode 100644 index 0000000..3d6d015 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@2x.png b/Meterage/Assets.xcassets/update.imageset/update@2x.png new file mode 100644 index 0000000..3e03f0a --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@2x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/Contents.json b/Meterage/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..c2050a7 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "update@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "update@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "update@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/update.imageset/update@1x.png b/Meterage/Assets.xcassets/update.imageset/update@1x.png new file mode 100644 index 0000000..3d6d015 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@2x.png b/Meterage/Assets.xcassets/update.imageset/update@2x.png new file mode 100644 index 0000000..3e03f0a --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@3x.png b/Meterage/Assets.xcassets/update.imageset/update@3x.png new file mode 100644 index 0000000..1b946a1 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@3x.png Binary files differ diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/Contents.json b/Meterage/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..c2050a7 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "update@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "update@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "update@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/update.imageset/update@1x.png b/Meterage/Assets.xcassets/update.imageset/update@1x.png new file mode 100644 index 0000000..3d6d015 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@2x.png b/Meterage/Assets.xcassets/update.imageset/update@2x.png new file mode 100644 index 0000000..3e03f0a --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@3x.png b/Meterage/Assets.xcassets/update.imageset/update@3x.png new file mode 100644 index 0000000..1b946a1 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@3x.png Binary files differ diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift new file mode 100644 index 0000000..25c5049 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.swift @@ -0,0 +1,26 @@ +// +// MineTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import UIKit + +class MineTableViewCell: UITableViewCell { + + @IBOutlet var leftImageView: UIImageView! + @IBOutlet var titleLableView: 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 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/Contents.json b/Meterage/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..c2050a7 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "update@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "update@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "update@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/update.imageset/update@1x.png b/Meterage/Assets.xcassets/update.imageset/update@1x.png new file mode 100644 index 0000000..3d6d015 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@2x.png b/Meterage/Assets.xcassets/update.imageset/update@2x.png new file mode 100644 index 0000000..3e03f0a --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@3x.png b/Meterage/Assets.xcassets/update.imageset/update@3x.png new file mode 100644 index 0000000..1b946a1 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@3x.png Binary files differ diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift new file mode 100644 index 0000000..25c5049 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.swift @@ -0,0 +1,26 @@ +// +// MineTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import UIKit + +class MineTableViewCell: UITableViewCell { + + @IBOutlet var leftImageView: UIImageView! + @IBOutlet var titleLableView: 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/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib new file mode 100644 index 0000000..9be9303 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.xib @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/Contents.json b/Meterage/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..c2050a7 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "update@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "update@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "update@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/update.imageset/update@1x.png b/Meterage/Assets.xcassets/update.imageset/update@1x.png new file mode 100644 index 0000000..3d6d015 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@2x.png b/Meterage/Assets.xcassets/update.imageset/update@2x.png new file mode 100644 index 0000000..3e03f0a --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@3x.png b/Meterage/Assets.xcassets/update.imageset/update@3x.png new file mode 100644 index 0000000..1b946a1 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@3x.png Binary files differ diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift new file mode 100644 index 0000000..25c5049 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.swift @@ -0,0 +1,26 @@ +// +// MineTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import UIKit + +class MineTableViewCell: UITableViewCell { + + @IBOutlet var leftImageView: UIImageView! + @IBOutlet var titleLableView: 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/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib new file mode 100644 index 0000000..9be9303 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.xib @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index 2996d38..e64c479 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -27,4 +27,7 @@ public class var colorText: UIColor { UIColor(hex: "#555555") } + public class var hintColor: UIColor { + UIColor(hex: "#E6E6E6") + } } diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/Contents.json b/Meterage/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..c2050a7 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "update@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "update@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "update@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/update.imageset/update@1x.png b/Meterage/Assets.xcassets/update.imageset/update@1x.png new file mode 100644 index 0000000..3d6d015 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@2x.png b/Meterage/Assets.xcassets/update.imageset/update@2x.png new file mode 100644 index 0000000..3e03f0a --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@3x.png b/Meterage/Assets.xcassets/update.imageset/update@3x.png new file mode 100644 index 0000000..1b946a1 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@3x.png Binary files differ diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift new file mode 100644 index 0000000..25c5049 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.swift @@ -0,0 +1,26 @@ +// +// MineTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import UIKit + +class MineTableViewCell: UITableViewCell { + + @IBOutlet var leftImageView: UIImageView! + @IBOutlet var titleLableView: 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/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib new file mode 100644 index 0000000..9be9303 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.xib @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index 2996d38..e64c479 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -27,4 +27,7 @@ public class var colorText: UIColor { UIColor(hex: "#555555") } + public class var hintColor: UIColor { + UIColor(hex: "#E6E6E6") + } } diff --git a/Meterage/Model/UserInfoModel.swift b/Meterage/Model/UserInfoModel.swift new file mode 100644 index 0000000..3377b40 --- /dev/null +++ b/Meterage/Model/UserInfoModel.swift @@ -0,0 +1,77 @@ +// +// UserInfoModel.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import Foundation +import SwiftyJSON + +struct UserInfoModel { + var code: Int + var success: Bool + var message: String + var data: UserModel + + init(respJson: JSON) { + code = respJson["code"].intValue + success = respJson["success"].boolValue + message = respJson["message"].stringValue + data = UserModel(respJson: respJson["data"]) + } +} + +struct UserModel { + var account: String? + var appId: String? + var attr1: String? + var avatar: String? + var bizData:String? + var dataScope: NSArray? + var deptId: String? + var deptName: String? + var devices: NSArray? + var id: String? + var ipAddr: String? + var isAppLogin: Bool? + var name: String? + var phone: String? + var resourceUrls: NSArray? + var roleIds: NSArray? + var roleNames: NSArray? + var roleTips: NSArray? + var scopeType: String? + var syncId: String? + var syncName: String? + var sysData:String? + var tenantId: String? + var userUniqueId: String? + + init(respJson: JSON) { + account = respJson["account"].stringValue + appId = respJson["appId"].stringValue + attr1 = respJson["attr1"].stringValue + avatar = respJson["avatar"].stringValue + bizData = respJson["bizData"].stringValue + dataScope = respJson["dataScope"].arrayObject as NSArray? + deptId = respJson["deptId"].stringValue + deptName = respJson["deptName"].stringValue + devices = respJson["devices"].arrayObject as NSArray? + id = respJson["id"].stringValue + ipAddr = respJson["ipAddr"].stringValue + isAppLogin = respJson["isAppLogin"].boolValue + name = respJson["name"].stringValue + phone = respJson["phone"].stringValue + resourceUrls = respJson["resourceUrls"].arrayObject as NSArray? + roleIds = respJson["roleIds"].arrayObject as NSArray? + roleNames = respJson["roleNames"].arrayObject as NSArray? + roleTips = respJson["roleTips"].arrayObject as NSArray? + scopeType = respJson["scopeType"].stringValue + syncId = respJson["syncId"].stringValue + syncName = respJson["syncName"].stringValue + sysData = respJson["sysData"].stringValue + tenantId = respJson["tenantId"].stringValue + userUniqueId = respJson["userUniqueId"].stringValue + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/Contents.json b/Meterage/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..c2050a7 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "update@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "update@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "update@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/update.imageset/update@1x.png b/Meterage/Assets.xcassets/update.imageset/update@1x.png new file mode 100644 index 0000000..3d6d015 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@2x.png b/Meterage/Assets.xcassets/update.imageset/update@2x.png new file mode 100644 index 0000000..3e03f0a --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@3x.png b/Meterage/Assets.xcassets/update.imageset/update@3x.png new file mode 100644 index 0000000..1b946a1 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@3x.png Binary files differ diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift new file mode 100644 index 0000000..25c5049 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.swift @@ -0,0 +1,26 @@ +// +// MineTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import UIKit + +class MineTableViewCell: UITableViewCell { + + @IBOutlet var leftImageView: UIImageView! + @IBOutlet var titleLableView: 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/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib new file mode 100644 index 0000000..9be9303 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.xib @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index 2996d38..e64c479 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -27,4 +27,7 @@ public class var colorText: UIColor { UIColor(hex: "#555555") } + public class var hintColor: UIColor { + UIColor(hex: "#E6E6E6") + } } diff --git a/Meterage/Model/UserInfoModel.swift b/Meterage/Model/UserInfoModel.swift new file mode 100644 index 0000000..3377b40 --- /dev/null +++ b/Meterage/Model/UserInfoModel.swift @@ -0,0 +1,77 @@ +// +// UserInfoModel.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import Foundation +import SwiftyJSON + +struct UserInfoModel { + var code: Int + var success: Bool + var message: String + var data: UserModel + + init(respJson: JSON) { + code = respJson["code"].intValue + success = respJson["success"].boolValue + message = respJson["message"].stringValue + data = UserModel(respJson: respJson["data"]) + } +} + +struct UserModel { + var account: String? + var appId: String? + var attr1: String? + var avatar: String? + var bizData:String? + var dataScope: NSArray? + var deptId: String? + var deptName: String? + var devices: NSArray? + var id: String? + var ipAddr: String? + var isAppLogin: Bool? + var name: String? + var phone: String? + var resourceUrls: NSArray? + var roleIds: NSArray? + var roleNames: NSArray? + var roleTips: NSArray? + var scopeType: String? + var syncId: String? + var syncName: String? + var sysData:String? + var tenantId: String? + var userUniqueId: String? + + init(respJson: JSON) { + account = respJson["account"].stringValue + appId = respJson["appId"].stringValue + attr1 = respJson["attr1"].stringValue + avatar = respJson["avatar"].stringValue + bizData = respJson["bizData"].stringValue + dataScope = respJson["dataScope"].arrayObject as NSArray? + deptId = respJson["deptId"].stringValue + deptName = respJson["deptName"].stringValue + devices = respJson["devices"].arrayObject as NSArray? + id = respJson["id"].stringValue + ipAddr = respJson["ipAddr"].stringValue + isAppLogin = respJson["isAppLogin"].boolValue + name = respJson["name"].stringValue + phone = respJson["phone"].stringValue + resourceUrls = respJson["resourceUrls"].arrayObject as NSArray? + roleIds = respJson["roleIds"].arrayObject as NSArray? + roleNames = respJson["roleNames"].arrayObject as NSArray? + roleTips = respJson["roleTips"].arrayObject as NSArray? + scopeType = respJson["scopeType"].stringValue + syncId = respJson["syncId"].stringValue + syncName = respJson["syncName"].stringValue + sysData = respJson["sysData"].stringValue + tenantId = respJson["tenantId"].stringValue + userUniqueId = respJson["userUniqueId"].stringValue + } +} diff --git a/Meterage/Utils/Constant.swift b/Meterage/Utils/Constant.swift index e1f40f5..74529c9 100644 --- a/Meterage/Utils/Constant.swift +++ b/Meterage/Utils/Constant.swift @@ -18,8 +18,12 @@ let passwordKey = Key("Password") let tokenKey = Key("Token") +let MINE_TITLE_ARRAY = ["账户信息", "我的收藏", "推送设置", "隐私设置", "使用帮助", "版本更新", "关于APP", "意见反馈"] +let MINE_IMAGE_ARRAY = ["account","collection","push_setting","privacy_setting","help","update","about","feed_back"] + public enum Constant: String { // 网络请求相关的地址 case baseConfig = "/sys/config/baseConfig" case login = "/sys/user/login" + case userInfo = "/sys/user/info" } diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/Contents.json b/Meterage/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..c2050a7 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "update@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "update@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "update@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/update.imageset/update@1x.png b/Meterage/Assets.xcassets/update.imageset/update@1x.png new file mode 100644 index 0000000..3d6d015 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@2x.png b/Meterage/Assets.xcassets/update.imageset/update@2x.png new file mode 100644 index 0000000..3e03f0a --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@3x.png b/Meterage/Assets.xcassets/update.imageset/update@3x.png new file mode 100644 index 0000000..1b946a1 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@3x.png Binary files differ diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift new file mode 100644 index 0000000..25c5049 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.swift @@ -0,0 +1,26 @@ +// +// MineTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import UIKit + +class MineTableViewCell: UITableViewCell { + + @IBOutlet var leftImageView: UIImageView! + @IBOutlet var titleLableView: 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/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib new file mode 100644 index 0000000..9be9303 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.xib @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index 2996d38..e64c479 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -27,4 +27,7 @@ public class var colorText: UIColor { UIColor(hex: "#555555") } + public class var hintColor: UIColor { + UIColor(hex: "#E6E6E6") + } } diff --git a/Meterage/Model/UserInfoModel.swift b/Meterage/Model/UserInfoModel.swift new file mode 100644 index 0000000..3377b40 --- /dev/null +++ b/Meterage/Model/UserInfoModel.swift @@ -0,0 +1,77 @@ +// +// UserInfoModel.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import Foundation +import SwiftyJSON + +struct UserInfoModel { + var code: Int + var success: Bool + var message: String + var data: UserModel + + init(respJson: JSON) { + code = respJson["code"].intValue + success = respJson["success"].boolValue + message = respJson["message"].stringValue + data = UserModel(respJson: respJson["data"]) + } +} + +struct UserModel { + var account: String? + var appId: String? + var attr1: String? + var avatar: String? + var bizData:String? + var dataScope: NSArray? + var deptId: String? + var deptName: String? + var devices: NSArray? + var id: String? + var ipAddr: String? + var isAppLogin: Bool? + var name: String? + var phone: String? + var resourceUrls: NSArray? + var roleIds: NSArray? + var roleNames: NSArray? + var roleTips: NSArray? + var scopeType: String? + var syncId: String? + var syncName: String? + var sysData:String? + var tenantId: String? + var userUniqueId: String? + + init(respJson: JSON) { + account = respJson["account"].stringValue + appId = respJson["appId"].stringValue + attr1 = respJson["attr1"].stringValue + avatar = respJson["avatar"].stringValue + bizData = respJson["bizData"].stringValue + dataScope = respJson["dataScope"].arrayObject as NSArray? + deptId = respJson["deptId"].stringValue + deptName = respJson["deptName"].stringValue + devices = respJson["devices"].arrayObject as NSArray? + id = respJson["id"].stringValue + ipAddr = respJson["ipAddr"].stringValue + isAppLogin = respJson["isAppLogin"].boolValue + name = respJson["name"].stringValue + phone = respJson["phone"].stringValue + resourceUrls = respJson["resourceUrls"].arrayObject as NSArray? + roleIds = respJson["roleIds"].arrayObject as NSArray? + roleNames = respJson["roleNames"].arrayObject as NSArray? + roleTips = respJson["roleTips"].arrayObject as NSArray? + scopeType = respJson["scopeType"].stringValue + syncId = respJson["syncId"].stringValue + syncName = respJson["syncName"].stringValue + sysData = respJson["sysData"].stringValue + tenantId = respJson["tenantId"].stringValue + userUniqueId = respJson["userUniqueId"].stringValue + } +} diff --git a/Meterage/Utils/Constant.swift b/Meterage/Utils/Constant.swift index e1f40f5..74529c9 100644 --- a/Meterage/Utils/Constant.swift +++ b/Meterage/Utils/Constant.swift @@ -18,8 +18,12 @@ let passwordKey = Key("Password") let tokenKey = Key("Token") +let MINE_TITLE_ARRAY = ["账户信息", "我的收藏", "推送设置", "隐私设置", "使用帮助", "版本更新", "关于APP", "意见反馈"] +let MINE_IMAGE_ARRAY = ["account","collection","push_setting","privacy_setting","help","update","about","feed_back"] + public enum Constant: String { // 网络请求相关的地址 case baseConfig = "/sys/config/baseConfig" case login = "/sys/user/login" + case userInfo = "/sys/user/info" } diff --git a/Meterage/Utils/HttpRequestCreator.swift b/Meterage/Utils/HttpRequestCreator.swift index c329214..af67151 100644 --- a/Meterage/Utils/HttpRequestCreator.swift +++ b/Meterage/Utils/HttpRequestCreator.swift @@ -11,7 +11,7 @@ public static var shared = HttpRequestCreator() - func create(url: String, dic: Dictionary) -> URLRequest { + func createPostRequest(url: String, dic: Dictionary) -> URLRequest { var request = URLRequest.init(url: URL.init(string: url)!) let parameters = dic.toJsonString() @@ -22,4 +22,16 @@ return request } -} \ No newline at end of file + + func createGetRequest(url: String, dic: Dictionary) -> URLRequest { + var request = URLRequest.init(url: URL.init(string: url)!) + let parameters = dic.toJsonString() + + request.httpBody = parameters!.data(using: .utf8) + request.httpMethod = "GET" + request.timeoutInterval = 30 + request.addValue("application/json;charset=UTF-8", forHTTPHeaderField: "Content-Type") + + return request + } +} diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/Contents.json b/Meterage/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..c2050a7 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "update@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "update@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "update@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/update.imageset/update@1x.png b/Meterage/Assets.xcassets/update.imageset/update@1x.png new file mode 100644 index 0000000..3d6d015 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@2x.png b/Meterage/Assets.xcassets/update.imageset/update@2x.png new file mode 100644 index 0000000..3e03f0a --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@3x.png b/Meterage/Assets.xcassets/update.imageset/update@3x.png new file mode 100644 index 0000000..1b946a1 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@3x.png Binary files differ diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift new file mode 100644 index 0000000..25c5049 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.swift @@ -0,0 +1,26 @@ +// +// MineTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import UIKit + +class MineTableViewCell: UITableViewCell { + + @IBOutlet var leftImageView: UIImageView! + @IBOutlet var titleLableView: 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/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib new file mode 100644 index 0000000..9be9303 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.xib @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index 2996d38..e64c479 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -27,4 +27,7 @@ public class var colorText: UIColor { UIColor(hex: "#555555") } + public class var hintColor: UIColor { + UIColor(hex: "#E6E6E6") + } } diff --git a/Meterage/Model/UserInfoModel.swift b/Meterage/Model/UserInfoModel.swift new file mode 100644 index 0000000..3377b40 --- /dev/null +++ b/Meterage/Model/UserInfoModel.swift @@ -0,0 +1,77 @@ +// +// UserInfoModel.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import Foundation +import SwiftyJSON + +struct UserInfoModel { + var code: Int + var success: Bool + var message: String + var data: UserModel + + init(respJson: JSON) { + code = respJson["code"].intValue + success = respJson["success"].boolValue + message = respJson["message"].stringValue + data = UserModel(respJson: respJson["data"]) + } +} + +struct UserModel { + var account: String? + var appId: String? + var attr1: String? + var avatar: String? + var bizData:String? + var dataScope: NSArray? + var deptId: String? + var deptName: String? + var devices: NSArray? + var id: String? + var ipAddr: String? + var isAppLogin: Bool? + var name: String? + var phone: String? + var resourceUrls: NSArray? + var roleIds: NSArray? + var roleNames: NSArray? + var roleTips: NSArray? + var scopeType: String? + var syncId: String? + var syncName: String? + var sysData:String? + var tenantId: String? + var userUniqueId: String? + + init(respJson: JSON) { + account = respJson["account"].stringValue + appId = respJson["appId"].stringValue + attr1 = respJson["attr1"].stringValue + avatar = respJson["avatar"].stringValue + bizData = respJson["bizData"].stringValue + dataScope = respJson["dataScope"].arrayObject as NSArray? + deptId = respJson["deptId"].stringValue + deptName = respJson["deptName"].stringValue + devices = respJson["devices"].arrayObject as NSArray? + id = respJson["id"].stringValue + ipAddr = respJson["ipAddr"].stringValue + isAppLogin = respJson["isAppLogin"].boolValue + name = respJson["name"].stringValue + phone = respJson["phone"].stringValue + resourceUrls = respJson["resourceUrls"].arrayObject as NSArray? + roleIds = respJson["roleIds"].arrayObject as NSArray? + roleNames = respJson["roleNames"].arrayObject as NSArray? + roleTips = respJson["roleTips"].arrayObject as NSArray? + scopeType = respJson["scopeType"].stringValue + syncId = respJson["syncId"].stringValue + syncName = respJson["syncName"].stringValue + sysData = respJson["sysData"].stringValue + tenantId = respJson["tenantId"].stringValue + userUniqueId = respJson["userUniqueId"].stringValue + } +} diff --git a/Meterage/Utils/Constant.swift b/Meterage/Utils/Constant.swift index e1f40f5..74529c9 100644 --- a/Meterage/Utils/Constant.swift +++ b/Meterage/Utils/Constant.swift @@ -18,8 +18,12 @@ let passwordKey = Key("Password") let tokenKey = Key("Token") +let MINE_TITLE_ARRAY = ["账户信息", "我的收藏", "推送设置", "隐私设置", "使用帮助", "版本更新", "关于APP", "意见反馈"] +let MINE_IMAGE_ARRAY = ["account","collection","push_setting","privacy_setting","help","update","about","feed_back"] + public enum Constant: String { // 网络请求相关的地址 case baseConfig = "/sys/config/baseConfig" case login = "/sys/user/login" + case userInfo = "/sys/user/info" } diff --git a/Meterage/Utils/HttpRequestCreator.swift b/Meterage/Utils/HttpRequestCreator.swift index c329214..af67151 100644 --- a/Meterage/Utils/HttpRequestCreator.swift +++ b/Meterage/Utils/HttpRequestCreator.swift @@ -11,7 +11,7 @@ public static var shared = HttpRequestCreator() - func create(url: String, dic: Dictionary) -> URLRequest { + func createPostRequest(url: String, dic: Dictionary) -> URLRequest { var request = URLRequest.init(url: URL.init(string: url)!) let parameters = dic.toJsonString() @@ -22,4 +22,16 @@ return request } -} \ No newline at end of file + + func createGetRequest(url: String, dic: Dictionary) -> URLRequest { + var request = URLRequest.init(url: URL.init(string: url)!) + let parameters = dic.toJsonString() + + request.httpBody = parameters!.data(using: .utf8) + request.httpMethod = "GET" + request.timeoutInterval = 30 + request.addValue("application/json;charset=UTF-8", forHTTPHeaderField: "Content-Type") + + return request + } +} diff --git a/Meterage/ViewControllers/Login/LoginViewController.swift b/Meterage/ViewControllers/Login/LoginViewController.swift index 17a45af..6fb915f 100644 --- a/Meterage/ViewControllers/Login/LoginViewController.swift +++ b/Meterage/ViewControllers/Login/LoginViewController.swift @@ -73,7 +73,7 @@ let loginURL = baseURL + Constant.login.rawValue let paramDic = ["sid": configModel.data.sid, "username": userName!, "password": pwdWithKey] - Alamofire.request(HttpRequestCreator.shared.create(url: loginURL, dic: paramDic)).responseJSON { [self] response in + Alamofire.request(HttpRequestCreator.shared.createPostRequest(url: loginURL, dic: paramDic)).responseJSON { [self] response in switch response.result { case let .success(value): let loginModel = LoginResultModel(respJson: JSON(value)) diff --git a/Meterage.xcodeproj/project.pbxproj b/Meterage.xcodeproj/project.pbxproj index 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/Contents.json b/Meterage/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..c2050a7 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "update@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "update@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "update@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/update.imageset/update@1x.png b/Meterage/Assets.xcassets/update.imageset/update@1x.png new file mode 100644 index 0000000..3d6d015 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@2x.png b/Meterage/Assets.xcassets/update.imageset/update@2x.png new file mode 100644 index 0000000..3e03f0a --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@3x.png b/Meterage/Assets.xcassets/update.imageset/update@3x.png new file mode 100644 index 0000000..1b946a1 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@3x.png Binary files differ diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift new file mode 100644 index 0000000..25c5049 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.swift @@ -0,0 +1,26 @@ +// +// MineTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import UIKit + +class MineTableViewCell: UITableViewCell { + + @IBOutlet var leftImageView: UIImageView! + @IBOutlet var titleLableView: 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/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib new file mode 100644 index 0000000..9be9303 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.xib @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index 2996d38..e64c479 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -27,4 +27,7 @@ public class var colorText: UIColor { UIColor(hex: "#555555") } + public class var hintColor: UIColor { + UIColor(hex: "#E6E6E6") + } } diff --git a/Meterage/Model/UserInfoModel.swift b/Meterage/Model/UserInfoModel.swift new file mode 100644 index 0000000..3377b40 --- /dev/null +++ b/Meterage/Model/UserInfoModel.swift @@ -0,0 +1,77 @@ +// +// UserInfoModel.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import Foundation +import SwiftyJSON + +struct UserInfoModel { + var code: Int + var success: Bool + var message: String + var data: UserModel + + init(respJson: JSON) { + code = respJson["code"].intValue + success = respJson["success"].boolValue + message = respJson["message"].stringValue + data = UserModel(respJson: respJson["data"]) + } +} + +struct UserModel { + var account: String? + var appId: String? + var attr1: String? + var avatar: String? + var bizData:String? + var dataScope: NSArray? + var deptId: String? + var deptName: String? + var devices: NSArray? + var id: String? + var ipAddr: String? + var isAppLogin: Bool? + var name: String? + var phone: String? + var resourceUrls: NSArray? + var roleIds: NSArray? + var roleNames: NSArray? + var roleTips: NSArray? + var scopeType: String? + var syncId: String? + var syncName: String? + var sysData:String? + var tenantId: String? + var userUniqueId: String? + + init(respJson: JSON) { + account = respJson["account"].stringValue + appId = respJson["appId"].stringValue + attr1 = respJson["attr1"].stringValue + avatar = respJson["avatar"].stringValue + bizData = respJson["bizData"].stringValue + dataScope = respJson["dataScope"].arrayObject as NSArray? + deptId = respJson["deptId"].stringValue + deptName = respJson["deptName"].stringValue + devices = respJson["devices"].arrayObject as NSArray? + id = respJson["id"].stringValue + ipAddr = respJson["ipAddr"].stringValue + isAppLogin = respJson["isAppLogin"].boolValue + name = respJson["name"].stringValue + phone = respJson["phone"].stringValue + resourceUrls = respJson["resourceUrls"].arrayObject as NSArray? + roleIds = respJson["roleIds"].arrayObject as NSArray? + roleNames = respJson["roleNames"].arrayObject as NSArray? + roleTips = respJson["roleTips"].arrayObject as NSArray? + scopeType = respJson["scopeType"].stringValue + syncId = respJson["syncId"].stringValue + syncName = respJson["syncName"].stringValue + sysData = respJson["sysData"].stringValue + tenantId = respJson["tenantId"].stringValue + userUniqueId = respJson["userUniqueId"].stringValue + } +} diff --git a/Meterage/Utils/Constant.swift b/Meterage/Utils/Constant.swift index e1f40f5..74529c9 100644 --- a/Meterage/Utils/Constant.swift +++ b/Meterage/Utils/Constant.swift @@ -18,8 +18,12 @@ let passwordKey = Key("Password") let tokenKey = Key("Token") +let MINE_TITLE_ARRAY = ["账户信息", "我的收藏", "推送设置", "隐私设置", "使用帮助", "版本更新", "关于APP", "意见反馈"] +let MINE_IMAGE_ARRAY = ["account","collection","push_setting","privacy_setting","help","update","about","feed_back"] + public enum Constant: String { // 网络请求相关的地址 case baseConfig = "/sys/config/baseConfig" case login = "/sys/user/login" + case userInfo = "/sys/user/info" } diff --git a/Meterage/Utils/HttpRequestCreator.swift b/Meterage/Utils/HttpRequestCreator.swift index c329214..af67151 100644 --- a/Meterage/Utils/HttpRequestCreator.swift +++ b/Meterage/Utils/HttpRequestCreator.swift @@ -11,7 +11,7 @@ public static var shared = HttpRequestCreator() - func create(url: String, dic: Dictionary) -> URLRequest { + func createPostRequest(url: String, dic: Dictionary) -> URLRequest { var request = URLRequest.init(url: URL.init(string: url)!) let parameters = dic.toJsonString() @@ -22,4 +22,16 @@ return request } -} \ No newline at end of file + + func createGetRequest(url: String, dic: Dictionary) -> URLRequest { + var request = URLRequest.init(url: URL.init(string: url)!) + let parameters = dic.toJsonString() + + request.httpBody = parameters!.data(using: .utf8) + request.httpMethod = "GET" + request.timeoutInterval = 30 + request.addValue("application/json;charset=UTF-8", forHTTPHeaderField: "Content-Type") + + return request + } +} diff --git a/Meterage/ViewControllers/Login/LoginViewController.swift b/Meterage/ViewControllers/Login/LoginViewController.swift index 17a45af..6fb915f 100644 --- a/Meterage/ViewControllers/Login/LoginViewController.swift +++ b/Meterage/ViewControllers/Login/LoginViewController.swift @@ -73,7 +73,7 @@ let loginURL = baseURL + Constant.login.rawValue let paramDic = ["sid": configModel.data.sid, "username": userName!, "password": pwdWithKey] - Alamofire.request(HttpRequestCreator.shared.create(url: loginURL, dic: paramDic)).responseJSON { [self] response in + Alamofire.request(HttpRequestCreator.shared.createPostRequest(url: loginURL, dic: paramDic)).responseJSON { [self] response in switch response.result { case let .success(value): let loginModel = LoginResultModel(respJson: JSON(value)) diff --git a/Meterage/ViewControllers/Mine/MineViewController.swift b/Meterage/ViewControllers/Mine/MineViewController.swift index 14384b0..9eeb06b 100644 --- a/Meterage/ViewControllers/Mine/MineViewController.swift +++ b/Meterage/ViewControllers/Mine/MineViewController.swift @@ -5,25 +5,97 @@ // Created by 203 on 2023/2/1. // +import Alamofire import UIKit +import DefaultsKit +import SwiftyJSON class MineViewController: UIViewController { + @IBOutlet var userAvatarView: UIImageView! + @IBOutlet var userNameView: UILabel! + @IBOutlet var userDeptView: UILabel! + @IBOutlet var tableView: UITableView! + + private let defaults = Defaults.shared + override func viewDidLoad() { super.viewDidLoad() - + // 我的 Tab页不显示导航标题 + navigationController?.setNavigationBarHidden(true, animated: false) // Do any additional setup after loading the view. + userAvatarView.layer.cornerRadius = 40 + userAvatarView.layer.masksToBounds = true + userAvatarView.layer.borderColor = UIColor.white.cgColor + userAvatarView.layer.borderWidth = 1 + + tableView.register(UINib(nibName: "MineTableViewCell", bundle: nil), forCellReuseIdentifier: "mineTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.tableFooterView = UIView(frame: CGRect.zero) + + //数据请求 + let baseURL = defaults.get(for: serverConfigKey)! + let userInfoURL = baseURL + Constant.userInfo.rawValue + + let token = defaults.get(for: tokenKey) ?? "" + let account = defaults.get(for: userNameKey) ?? "" + + Alamofire.request(userInfoURL, method: .get, parameters: ["account": account], headers: ["token": token]).responseJSON { [self] response in + switch response.result { + case let .success(value): + let user = UserInfoModel(respJson: JSON(value)).data + userNameView.text = user.name + userDeptView.text = user.deptName + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "请求失败，请检查网络") + } + } + } +} + +extension MineViewController: UITableViewDelegate { + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 60 } - - /* - // 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, didSelectRowAt indexPath: IndexPath) { + print("点击了\(MINE_TITLE_ARRAY[indexPath.row])") +// switch indexPath.row { +// case 0: +// let loginModeController = LoginModeViewController() +// // 由底部带有item的页面跳转之后隐藏底部bar +// loginModeController.hidesBottomBarWhenPushed = true +// navigationController?.pushViewController(loginModeController, animated: true) +// break +// case 1: +// print("导出数据") +// break +// case 2: +// print("导入数据") +// break +// case 3: +// break +// default: +// break +// } } - */ +} +extension MineViewController: UITableViewDataSource { + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + MINE_TITLE_ARRAY.count + } + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: MineTableViewCell = tableView.dequeueReusableCell(withIdentifier: "mineTableViewCell", for: indexPath) as! MineTableViewCell + cell.leftImageView.image = UIImage(named: MINE_IMAGE_ARRAY[indexPath.row]) + cell.titleLableView.text = MINE_TITLE_ARRAY[indexPath.row] + 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 92e7143..e623c43 100644 --- a/Meterage.xcodeproj/project.pbxproj +++ b/Meterage.xcodeproj/project.pbxproj @@ -30,6 +30,9 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */; }; 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */; }; 65AEA6B6298B655E00B8FF09 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AEA6B5298B655E00B8FF09 /* String.swift */; }; + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */; }; + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */; }; + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF61D5298BD40900F99671 /* UserInfoModel.swift */; }; 709532624A2602F10DBAE7B8 /* Pods_Meterage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */; }; /* End PBXBuildFile section */ @@ -59,6 +62,9 @@ 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseConfigModel.swift; sourceTree = ""; }; 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResultModel.swift; sourceTree = ""; }; 65AEA6B5298B655E00B8FF09 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineTableViewCell.swift; sourceTree = ""; }; + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineTableViewCell.xib; sourceTree = ""; }; + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoModel.swift; sourceTree = ""; }; 669B71ABD27BC5FCF49723E9 /* Pods-Meterage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.debug.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.debug.xcconfig"; sourceTree = ""; }; 6CBB43485F5EC2EA4CB19DE8 /* Pods-Meterage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Meterage.release.xcconfig"; path = "Target Support Files/Pods-Meterage/Pods-Meterage.release.xcconfig"; sourceTree = ""; }; D57EFAA58CD68AF05AD79419 /* Pods_Meterage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Meterage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -95,6 +101,7 @@ 2CD9B3CCE520A689E073AA57 /* Meterage */ = { isa = PBXGroup; children = ( + 65BF61D0298BC08600F99671 /* Cells */, 65AEA6AA298B603700B8FF09 /* Utils */, 65AEA6A2298A651900B8FF09 /* Model */, 65AEA69F298A64DF00B8FF09 /* Extensions */, @@ -190,6 +197,7 @@ 65AEA6A3298A652700B8FF09 /* MenuItemModel.swift */, 65AEA6B1298B642400B8FF09 /* BaseConfigModel.swift */, 65AEA6B3298B64DC00B8FF09 /* LoginResultModel.swift */, + 65BF61D5298BD40900F99671 /* UserInfoModel.swift */, ); path = Model; sourceTree = ""; @@ -214,6 +222,15 @@ path = Utils; sourceTree = ""; }; + 65BF61D0298BC08600F99671 /* Cells */ = { + isa = PBXGroup; + children = ( + 65BF61D1298BC0A900F99671 /* MineTableViewCell.swift */, + 65BF61D2298BC0A900F99671 /* MineTableViewCell.xib */, + ); + path = Cells; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -269,6 +286,7 @@ files = ( 65AEA695298A633E00B8FF09 /* SamplePageViewController.xib in Resources */, 65AEA6A9298A69D500B8FF09 /* GuideViewController.xib in Resources */, + 65BF61D4298BC0A900F99671 /* MineTableViewCell.xib in Resources */, 65AEA691298A632B00B8FF09 /* HomePageViewController.xib in Resources */, 2CD9B5D17F91A33743878C1A /* Assets.xcassets in Resources */, 65AEA69E298A649F00B8FF09 /* LoginViewController.xib in Resources */, @@ -358,6 +376,7 @@ 65AEA6B2298B642400B8FF09 /* BaseConfigModel.swift in Sources */, 65AEA6A8298A69D500B8FF09 /* GuideViewController.swift in Sources */, 65AEA684298A5F9500B8FF09 /* AppCoordinator.swift in Sources */, + 65BF61D3298BC0A900F99671 /* MineTableViewCell.swift in Sources */, 65AEA6B4298B64DC00B8FF09 /* LoginResultModel.swift in Sources */, 65AEA6A4298A652700B8FF09 /* MenuItemModel.swift in Sources */, 2CD9B9317E39E14700E7C9C2 /* AppDelegate.swift in Sources */, @@ -369,6 +388,7 @@ 65AEA698298A634D00B8FF09 /* MineViewController.swift in Sources */, 2CD9B8A8FED825F0E1B79C36 /* Dictionary.swift in Sources */, 2CD9B472817F36562709487F /* HttpRequestCreator.swift in Sources */, + 65BF61D6298BD40900F99671 /* UserInfoModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,7 +461,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; @@ -528,7 +548,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.xz.Meterage; diff --git a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 84e7dde..bc7f411 100644 --- a/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/Meterage.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/Contents.json b/Meterage/Assets.xcassets/about.imageset/Contents.json new file mode 100644 index 0000000..2b91fad --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "about@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "about@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "about@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/about.imageset/about@1x.png b/Meterage/Assets.xcassets/about.imageset/about@1x.png new file mode 100644 index 0000000..d1264c2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@2x.png b/Meterage/Assets.xcassets/about.imageset/about@2x.png new file mode 100644 index 0000000..a185ff2 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/about.imageset/about@3x.png b/Meterage/Assets.xcassets/about.imageset/about@3x.png new file mode 100644 index 0000000..6792177 --- /dev/null +++ b/Meterage/Assets.xcassets/about.imageset/about@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/Contents.json b/Meterage/Assets.xcassets/account.imageset/Contents.json new file mode 100644 index 0000000..5dc1c69 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "account@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "account@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "account@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/account.imageset/account@1x.png b/Meterage/Assets.xcassets/account.imageset/account@1x.png new file mode 100644 index 0000000..9f146f7 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@2x.png b/Meterage/Assets.xcassets/account.imageset/account@2x.png new file mode 100644 index 0000000..8693c67 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/account.imageset/account@3x.png b/Meterage/Assets.xcassets/account.imageset/account@3x.png new file mode 100644 index 0000000..8ebe8a8 --- /dev/null +++ b/Meterage/Assets.xcassets/account.imageset/account@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/Contents.json b/Meterage/Assets.xcassets/collection.imageset/Contents.json new file mode 100644 index 0000000..4f2cba1 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collection@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collection@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collection@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@1x.png b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png new file mode 100644 index 0000000..1119436 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@2x.png b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png new file mode 100644 index 0000000..00c56c5 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/collection.imageset/collection@3x.png b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png new file mode 100644 index 0000000..afb1365 --- /dev/null +++ b/Meterage/Assets.xcassets/collection.imageset/collection@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/Contents.json b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json new file mode 100644 index 0000000..7ecd328 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feed_back@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feed_back@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feed_back@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png new file mode 100644 index 0000000..4c8a4d1 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png new file mode 100644 index 0000000..fcaa49c --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png new file mode 100644 index 0000000..0943cb0 --- /dev/null +++ b/Meterage/Assets.xcassets/feed_back.imageset/feed_back@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/Contents.json b/Meterage/Assets.xcassets/help.imageset/Contents.json new file mode 100644 index 0000000..0b8e79c --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "help@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "help@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "help@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/help.imageset/help@1x.png b/Meterage/Assets.xcassets/help.imageset/help@1x.png new file mode 100644 index 0000000..f665aad --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@2x.png b/Meterage/Assets.xcassets/help.imageset/help@2x.png new file mode 100644 index 0000000..cc48a0e --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/help.imageset/help@3x.png b/Meterage/Assets.xcassets/help.imageset/help@3x.png new file mode 100644 index 0000000..c0642a8 --- /dev/null +++ b/Meterage/Assets.xcassets/help.imageset/help@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json new file mode 100644 index 0000000..9b3734a --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png new file mode 100644 index 0000000..73751a3 --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png new file mode 100644 index 0000000..67258ed --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png new file mode 100644 index 0000000..8e3defb --- /dev/null +++ b/Meterage/Assets.xcassets/privacy_setting.imageset/privacy_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/Contents.json b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json new file mode 100644 index 0000000..a0a4ea7 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "push_setting@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "push_setting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "push_setting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png new file mode 100644 index 0000000..f385af5 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png new file mode 100644 index 0000000..ddda9f1 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png new file mode 100644 index 0000000..1568c43 --- /dev/null +++ b/Meterage/Assets.xcassets/push_setting.imageset/push_setting@3x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/Contents.json b/Meterage/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..c2050a7 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "update@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "update@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "update@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meterage/Assets.xcassets/update.imageset/update@1x.png b/Meterage/Assets.xcassets/update.imageset/update@1x.png new file mode 100644 index 0000000..3d6d015 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@1x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@2x.png b/Meterage/Assets.xcassets/update.imageset/update@2x.png new file mode 100644 index 0000000..3e03f0a --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@2x.png Binary files differ diff --git a/Meterage/Assets.xcassets/update.imageset/update@3x.png b/Meterage/Assets.xcassets/update.imageset/update@3x.png new file mode 100644 index 0000000..1b946a1 --- /dev/null +++ b/Meterage/Assets.xcassets/update.imageset/update@3x.png Binary files differ diff --git a/Meterage/Cells/MineTableViewCell.swift b/Meterage/Cells/MineTableViewCell.swift new file mode 100644 index 0000000..25c5049 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.swift @@ -0,0 +1,26 @@ +// +// MineTableViewCell.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import UIKit + +class MineTableViewCell: UITableViewCell { + + @IBOutlet var leftImageView: UIImageView! + @IBOutlet var titleLableView: 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/MineTableViewCell.xib b/Meterage/Cells/MineTableViewCell.xib new file mode 100644 index 0000000..9be9303 --- /dev/null +++ b/Meterage/Cells/MineTableViewCell.xib @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Meterage/Extensions/UIColor.swift b/Meterage/Extensions/UIColor.swift index 2996d38..e64c479 100644 --- a/Meterage/Extensions/UIColor.swift +++ b/Meterage/Extensions/UIColor.swift @@ -27,4 +27,7 @@ public class var colorText: UIColor { UIColor(hex: "#555555") } + public class var hintColor: UIColor { + UIColor(hex: "#E6E6E6") + } } diff --git a/Meterage/Model/UserInfoModel.swift b/Meterage/Model/UserInfoModel.swift new file mode 100644 index 0000000..3377b40 --- /dev/null +++ b/Meterage/Model/UserInfoModel.swift @@ -0,0 +1,77 @@ +// +// UserInfoModel.swift +// Meterage +// +// Created by 203 on 2023/2/2. +// + +import Foundation +import SwiftyJSON + +struct UserInfoModel { + var code: Int + var success: Bool + var message: String + var data: UserModel + + init(respJson: JSON) { + code = respJson["code"].intValue + success = respJson["success"].boolValue + message = respJson["message"].stringValue + data = UserModel(respJson: respJson["data"]) + } +} + +struct UserModel { + var account: String? + var appId: String? + var attr1: String? + var avatar: String? + var bizData:String? + var dataScope: NSArray? + var deptId: String? + var deptName: String? + var devices: NSArray? + var id: String? + var ipAddr: String? + var isAppLogin: Bool? + var name: String? + var phone: String? + var resourceUrls: NSArray? + var roleIds: NSArray? + var roleNames: NSArray? + var roleTips: NSArray? + var scopeType: String? + var syncId: String? + var syncName: String? + var sysData:String? + var tenantId: String? + var userUniqueId: String? + + init(respJson: JSON) { + account = respJson["account"].stringValue + appId = respJson["appId"].stringValue + attr1 = respJson["attr1"].stringValue + avatar = respJson["avatar"].stringValue + bizData = respJson["bizData"].stringValue + dataScope = respJson["dataScope"].arrayObject as NSArray? + deptId = respJson["deptId"].stringValue + deptName = respJson["deptName"].stringValue + devices = respJson["devices"].arrayObject as NSArray? + id = respJson["id"].stringValue + ipAddr = respJson["ipAddr"].stringValue + isAppLogin = respJson["isAppLogin"].boolValue + name = respJson["name"].stringValue + phone = respJson["phone"].stringValue + resourceUrls = respJson["resourceUrls"].arrayObject as NSArray? + roleIds = respJson["roleIds"].arrayObject as NSArray? + roleNames = respJson["roleNames"].arrayObject as NSArray? + roleTips = respJson["roleTips"].arrayObject as NSArray? + scopeType = respJson["scopeType"].stringValue + syncId = respJson["syncId"].stringValue + syncName = respJson["syncName"].stringValue + sysData = respJson["sysData"].stringValue + tenantId = respJson["tenantId"].stringValue + userUniqueId = respJson["userUniqueId"].stringValue + } +} diff --git a/Meterage/Utils/Constant.swift b/Meterage/Utils/Constant.swift index e1f40f5..74529c9 100644 --- a/Meterage/Utils/Constant.swift +++ b/Meterage/Utils/Constant.swift @@ -18,8 +18,12 @@ let passwordKey = Key("Password") let tokenKey = Key("Token") +let MINE_TITLE_ARRAY = ["账户信息", "我的收藏", "推送设置", "隐私设置", "使用帮助", "版本更新", "关于APP", "意见反馈"] +let MINE_IMAGE_ARRAY = ["account","collection","push_setting","privacy_setting","help","update","about","feed_back"] + public enum Constant: String { // 网络请求相关的地址 case baseConfig = "/sys/config/baseConfig" case login = "/sys/user/login" + case userInfo = "/sys/user/info" } diff --git a/Meterage/Utils/HttpRequestCreator.swift b/Meterage/Utils/HttpRequestCreator.swift index c329214..af67151 100644 --- a/Meterage/Utils/HttpRequestCreator.swift +++ b/Meterage/Utils/HttpRequestCreator.swift @@ -11,7 +11,7 @@ public static var shared = HttpRequestCreator() - func create(url: String, dic: Dictionary) -> URLRequest { + func createPostRequest(url: String, dic: Dictionary) -> URLRequest { var request = URLRequest.init(url: URL.init(string: url)!) let parameters = dic.toJsonString() @@ -22,4 +22,16 @@ return request } -} \ No newline at end of file + + func createGetRequest(url: String, dic: Dictionary) -> URLRequest { + var request = URLRequest.init(url: URL.init(string: url)!) + let parameters = dic.toJsonString() + + request.httpBody = parameters!.data(using: .utf8) + request.httpMethod = "GET" + request.timeoutInterval = 30 + request.addValue("application/json;charset=UTF-8", forHTTPHeaderField: "Content-Type") + + return request + } +} diff --git a/Meterage/ViewControllers/Login/LoginViewController.swift b/Meterage/ViewControllers/Login/LoginViewController.swift index 17a45af..6fb915f 100644 --- a/Meterage/ViewControllers/Login/LoginViewController.swift +++ b/Meterage/ViewControllers/Login/LoginViewController.swift @@ -73,7 +73,7 @@ let loginURL = baseURL + Constant.login.rawValue let paramDic = ["sid": configModel.data.sid, "username": userName!, "password": pwdWithKey] - Alamofire.request(HttpRequestCreator.shared.create(url: loginURL, dic: paramDic)).responseJSON { [self] response in + Alamofire.request(HttpRequestCreator.shared.createPostRequest(url: loginURL, dic: paramDic)).responseJSON { [self] response in switch response.result { case let .success(value): let loginModel = LoginResultModel(respJson: JSON(value)) diff --git a/Meterage/ViewControllers/Mine/MineViewController.swift b/Meterage/ViewControllers/Mine/MineViewController.swift index 14384b0..9eeb06b 100644 --- a/Meterage/ViewControllers/Mine/MineViewController.swift +++ b/Meterage/ViewControllers/Mine/MineViewController.swift @@ -5,25 +5,97 @@ // Created by 203 on 2023/2/1. // +import Alamofire import UIKit +import DefaultsKit +import SwiftyJSON class MineViewController: UIViewController { + @IBOutlet var userAvatarView: UIImageView! + @IBOutlet var userNameView: UILabel! + @IBOutlet var userDeptView: UILabel! + @IBOutlet var tableView: UITableView! + + private let defaults = Defaults.shared + override func viewDidLoad() { super.viewDidLoad() - + // 我的 Tab页不显示导航标题 + navigationController?.setNavigationBarHidden(true, animated: false) // Do any additional setup after loading the view. + userAvatarView.layer.cornerRadius = 40 + userAvatarView.layer.masksToBounds = true + userAvatarView.layer.borderColor = UIColor.white.cgColor + userAvatarView.layer.borderWidth = 1 + + tableView.register(UINib(nibName: "MineTableViewCell", bundle: nil), forCellReuseIdentifier: "mineTableViewCell") + tableView.dataSource = self + tableView.delegate = self + tableView.tableFooterView = UIView(frame: CGRect.zero) + + //数据请求 + let baseURL = defaults.get(for: serverConfigKey)! + let userInfoURL = baseURL + Constant.userInfo.rawValue + + let token = defaults.get(for: tokenKey) ?? "" + let account = defaults.get(for: userNameKey) ?? "" + + Alamofire.request(userInfoURL, method: .get, parameters: ["account": account], headers: ["token": token]).responseJSON { [self] response in + switch response.result { + case let .success(value): + let user = UserInfoModel(respJson: JSON(value)).data + userNameView.text = user.name + userDeptView.text = user.deptName + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "请求失败，请检查网络") + } + } + } +} + +extension MineViewController: UITableViewDelegate { + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + 60 } - - /* - // 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, didSelectRowAt indexPath: IndexPath) { + print("点击了\(MINE_TITLE_ARRAY[indexPath.row])") +// switch indexPath.row { +// case 0: +// let loginModeController = LoginModeViewController() +// // 由底部带有item的页面跳转之后隐藏底部bar +// loginModeController.hidesBottomBarWhenPushed = true +// navigationController?.pushViewController(loginModeController, animated: true) +// break +// case 1: +// print("导出数据") +// break +// case 2: +// print("导入数据") +// break +// case 3: +// break +// default: +// break +// } } - */ +} +extension MineViewController: UITableViewDataSource { + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + MINE_TITLE_ARRAY.count + } + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: MineTableViewCell = tableView.dequeueReusableCell(withIdentifier: "mineTableViewCell", for: indexPath) as! MineTableViewCell + cell.leftImageView.image = UIImage(named: MINE_IMAGE_ARRAY[indexPath.row]) + cell.titleLableView.text = MINE_TITLE_ARRAY[indexPath.row] + cell.selectionStyle = .none + return cell + } + + func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { + + } } diff --git a/Meterage/ViewControllers/Mine/MineViewController.xib b/Meterage/ViewControllers/Mine/MineViewController.xib index 914cebe..e109b5b 100644 --- a/Meterage/ViewControllers/Mine/MineViewController.xib +++ b/Meterage/ViewControllers/Mine/MineViewController.xib @@ -1,22 +1,86 @@ - - + + + - + + + - + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +