Forráskód Böngészése

增加选择设备页面及相关数据模型和接口,目前接口尚未调通

Kevin 1 éve
szülő
commit
97dc62d22b
41 módosított fájl, 1299 hozzáadás és 1836 törlés
  1. 1 0
      Podfile
  2. 5 1
      Podfile.lock
  3. BIN
      Pods/.DS_Store
  4. 5 1
      Pods/Manifest.lock
  5. 895 845
      Pods/Pods.xcodeproj/project.pbxproj
  6. 0 58
      Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/AFNetworking.xcscheme
  7. 0 58
      Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/FDFullscreenPopGesture.xcscheme
  8. 0 58
      Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/FMDB.xcscheme
  9. 0 58
      Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/MJExtension.xcscheme
  10. 0 58
      Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/MJRefresh.xcscheme
  11. 0 58
      Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/MMKV.xcscheme
  12. 0 58
      Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/MMKVCore.xcscheme
  13. 0 58
      Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/Masonry.xcscheme
  14. 0 58
      Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/Pods-Temperature.xcscheme
  15. 0 58
      Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/SDWebImage.xcscheme
  16. 0 58
      Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/SVProgressHUD.xcscheme
  17. 0 66
      Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/xcschememanagement.plist
  18. 26 0
      Pods/Target Support Files/Pods-Temperature/Pods-Temperature-acknowledgements.markdown
  19. 32 0
      Pods/Target Support Files/Pods-Temperature/Pods-Temperature-acknowledgements.plist
  20. 2 1
      Pods/Target Support Files/Pods-Temperature/Pods-Temperature-frameworks-Debug-input-files.xcfilelist
  21. 2 1
      Pods/Target Support Files/Pods-Temperature/Pods-Temperature-frameworks-Debug-output-files.xcfilelist
  22. 2 1
      Pods/Target Support Files/Pods-Temperature/Pods-Temperature-frameworks-Release-input-files.xcfilelist
  23. 2 1
      Pods/Target Support Files/Pods-Temperature/Pods-Temperature-frameworks-Release-output-files.xcfilelist
  24. 2 0
      Pods/Target Support Files/Pods-Temperature/Pods-Temperature-frameworks.sh
  25. 4 4
      Pods/Target Support Files/Pods-Temperature/Pods-Temperature.debug.xcconfig
  26. 4 4
      Pods/Target Support Files/Pods-Temperature/Pods-Temperature.release.xcconfig
  27. 18 0
      Temperature.xcodeproj/project.pbxproj
  28. 0 5
      Temperature.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
  29. BIN
      Temperature.xcworkspace/xcuserdata/sam.xcuserdatad/UserInterfaceState.xcuserstate
  30. 0 14
      Temperature.xcworkspace/xcuserdata/sam.xcuserdatad/WorkspaceSettings.xcsettings
  31. 0 248
      Temperature.xcworkspace/xcuserdata/sam.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  32. 16 0
      Temperature/ControlModule/Home/Controller/RDSSelectDeviceMainVC.h
  33. 136 0
      Temperature/ControlModule/Home/Controller/RDSSelectDeviceMainVC.m
  34. 18 0
      Temperature/ControlModule/Home/Controller/RDSSelectDeviceSubVC.h
  35. 49 0
      Temperature/ControlModule/Home/Controller/RDSSelectDeviceSubVC.m
  36. 27 0
      Temperature/ControlModule/Home/Model/RDSDeviceTypeModel.h
  37. 20 0
      Temperature/ControlModule/Home/Model/RDSDeviceTypeModel.m
  38. 10 3
      Temperature/ControlModule/Home/View/RDSRoomCell.m
  39. 7 3
      Temperature/ControlModule/Room/Controller/RDSRoomVC.m
  40. 3 0
      Temperature/NetWork/RDSDemoApiHelper.h
  41. 13 0
      Temperature/NetWork/RDSDemoApiHelper.m

+ 1 - 0
Podfile

@@ -25,6 +25,7 @@ pod 'MJExtension'
 pod 'Masonry'
 pod 'FDFullscreenPopGesture'   #全屏侧滑返回
 pod 'MMKV'
+pod 'TYPagerController'
 
 end
 

+ 5 - 1
Podfile.lock

@@ -28,6 +28,7 @@ PODS:
     - SDWebImage/Core (= 5.17.0)
   - SDWebImage/Core (5.17.0)
   - SVProgressHUD (2.2.5)
+  - TYPagerController (2.1.2)
 
 DEPENDENCIES:
   - AFNetworking
@@ -39,6 +40,7 @@ DEPENDENCIES:
   - MMKV
   - SDWebImage
   - SVProgressHUD
+  - TYPagerController
 
 SPEC REPOS:
   trunk:
@@ -52,6 +54,7 @@ SPEC REPOS:
     - MMKVCore
     - SDWebImage
     - SVProgressHUD
+    - TYPagerController
 
 SPEC CHECKSUMS:
   AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
@@ -64,7 +67,8 @@ SPEC CHECKSUMS:
   MMKVCore: e50135dbd33235b6ab390635991bab437ab873c0
   SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
+  TYPagerController: 262556ecef99986d26ed77fb1288a198ed42f4af
 
-PODFILE CHECKSUM: f431c30b6a399a5b12b65d3398c428de7bdc256e
+PODFILE CHECKSUM: e9f5334d2f48eff5ab9b395b38e9cee0a773a62b
 
 COCOAPODS: 1.12.1

BIN
Pods/.DS_Store


+ 5 - 1
Pods/Manifest.lock

@@ -28,6 +28,7 @@ PODS:
     - SDWebImage/Core (= 5.17.0)
   - SDWebImage/Core (5.17.0)
   - SVProgressHUD (2.2.5)
+  - TYPagerController (2.1.2)
 
 DEPENDENCIES:
   - AFNetworking
@@ -39,6 +40,7 @@ DEPENDENCIES:
   - MMKV
   - SDWebImage
   - SVProgressHUD
+  - TYPagerController
 
 SPEC REPOS:
   trunk:
@@ -52,6 +54,7 @@ SPEC REPOS:
     - MMKVCore
     - SDWebImage
     - SVProgressHUD
+    - TYPagerController
 
 SPEC CHECKSUMS:
   AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
@@ -64,7 +67,8 @@ SPEC CHECKSUMS:
   MMKVCore: e50135dbd33235b6ab390635991bab437ab873c0
   SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
+  TYPagerController: 262556ecef99986d26ed77fb1288a198ed42f4af
 
-PODFILE CHECKSUM: f431c30b6a399a5b12b65d3398c428de7bdc256e
+PODFILE CHECKSUM: e9f5334d2f48eff5ab9b395b38e9cee0a773a62b
 
 COCOAPODS: 1.12.1

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 895 - 845
Pods/Pods.xcodeproj/project.pbxproj


+ 0 - 58
Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/AFNetworking.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1240"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0130B3724283586C0E9D2A112D4F2AA1"
-               BuildableName = "AFNetworking.framework"
-               BlueprintName = "AFNetworking"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 58
Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/FDFullscreenPopGesture.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1240"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8FE0EB310F454719A11FBFEAAC09FE3E"
-               BuildableName = "FDFullscreenPopGesture.framework"
-               BlueprintName = "FDFullscreenPopGesture"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 58
Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/FMDB.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1240"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8592E0E389D40AC17881400ADC67ABC0"
-               BuildableName = "FMDB.framework"
-               BlueprintName = "FMDB"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 58
Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/MJExtension.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1240"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4D3BA58D0583DF37575CACAB3DDADC85"
-               BuildableName = "MJExtension.framework"
-               BlueprintName = "MJExtension"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 58
Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/MJRefresh.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1240"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6868056D761E163D10FDAF8CF1C4D9B8"
-               BuildableName = "MJRefresh.framework"
-               BlueprintName = "MJRefresh"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 58
Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/MMKV.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1240"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "91A6826828CB9FCD0169A7547E8A79EA"
-               BuildableName = "MMKV.framework"
-               BlueprintName = "MMKV"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 58
Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/MMKVCore.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1240"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AC8AE887C706A43711D115E69B9D988A"
-               BuildableName = "MMKVCore.framework"
-               BlueprintName = "MMKVCore"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 58
Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/Masonry.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1240"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "55AF53E6C77A10ED4985E04D74A8878E"
-               BuildableName = "Masonry.framework"
-               BlueprintName = "Masonry"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 58
Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/Pods-Temperature.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1240"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4C1E008E0B2E8C4507108136146C15E4"
-               BuildableName = "Pods_Temperature.framework"
-               BlueprintName = "Pods-Temperature"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 58
Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/SDWebImage.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1240"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3847153A6E5EEFB86565BA840768F429"
-               BuildableName = "SDWebImage.framework"
-               BlueprintName = "SDWebImage"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 58
Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/SVProgressHUD.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1240"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "1C8D67D8B72D6BA42CCEDB648537A340"
-               BuildableName = "SVProgressHUD.framework"
-               BlueprintName = "SVProgressHUD"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 66
Pods/Pods.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>AFNetworking.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-		</dict>
-		<key>FDFullscreenPopGesture.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-		</dict>
-		<key>FMDB.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-		</dict>
-		<key>MJExtension.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-		</dict>
-		<key>MJRefresh.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-		</dict>
-		<key>MMKV.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-		</dict>
-		<key>MMKVCore.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-		</dict>
-		<key>Masonry.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-		</dict>
-		<key>Pods-Temperature.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-		</dict>
-		<key>SDWebImage.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-		</dict>
-		<key>SVProgressHUD.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict/>
-</dict>
-</plist>

+ 26 - 0
Pods/Target Support Files/Pods-Temperature/Pods-Temperature-acknowledgements.markdown

@@ -591,4 +591,30 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+
+## TYPagerController
+
+The MIT License (MIT)
+
+Copyright (c) 2016 tany
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 Generated by CocoaPods - https://cocoapods.org

+ 32 - 0
Pods/Target Support Files/Pods-Temperature/Pods-Temperature-acknowledgements.plist

@@ -663,6 +663,38 @@ SOFTWARE.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License (MIT)
+
+Copyright (c) 2016 tany
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>TYPagerController</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>Generated by CocoaPods - https://cocoapods.org</string>

+ 2 - 1
Pods/Target Support Files/Pods-Temperature/Pods-Temperature-frameworks-Debug-input-files.xcfilelist

@@ -8,4 +8,5 @@ ${BUILT_PRODUCTS_DIR}/MMKV/MMKV.framework
 ${BUILT_PRODUCTS_DIR}/MMKVCore/MMKVCore.framework
 ${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework
 ${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework
-${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework
+${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework
+${BUILT_PRODUCTS_DIR}/TYPagerController/TYPagerController.framework

+ 2 - 1
Pods/Target Support Files/Pods-Temperature/Pods-Temperature-frameworks-Debug-output-files.xcfilelist

@@ -7,4 +7,5 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MMKV.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MMKVCore.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework
-${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVProgressHUD.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVProgressHUD.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TYPagerController.framework

+ 2 - 1
Pods/Target Support Files/Pods-Temperature/Pods-Temperature-frameworks-Release-input-files.xcfilelist

@@ -8,4 +8,5 @@ ${BUILT_PRODUCTS_DIR}/MMKV/MMKV.framework
 ${BUILT_PRODUCTS_DIR}/MMKVCore/MMKVCore.framework
 ${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework
 ${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework
-${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework
+${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework
+${BUILT_PRODUCTS_DIR}/TYPagerController/TYPagerController.framework

+ 2 - 1
Pods/Target Support Files/Pods-Temperature/Pods-Temperature-frameworks-Release-output-files.xcfilelist

@@ -7,4 +7,5 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MMKV.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MMKVCore.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework
-${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVProgressHUD.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVProgressHUD.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TYPagerController.framework

+ 2 - 0
Pods/Target Support Files/Pods-Temperature/Pods-Temperature-frameworks.sh

@@ -186,6 +186,7 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/TYPagerController/TYPagerController.framework"
 fi
 if [[ "$CONFIGURATION" == "Release" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework"
@@ -198,6 +199,7 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/TYPagerController/TYPagerController.framework"
 fi
 if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
   wait

+ 4 - 4
Pods/Target Support Files/Pods-Temperature/Pods-Temperature.debug.xcconfig

@@ -1,10 +1,10 @@
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/MMKV" "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/MMKV" "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture/FDFullscreenPopGesture.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB/FMDB.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension/MJExtension.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MMKV/MMKV.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore/MMKVCore.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry/Masonry.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture/FDFullscreenPopGesture.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB/FMDB.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension/MJExtension.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MMKV/MMKV.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore/MMKVCore.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry/Masonry.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController/TYPagerController.framework/Headers"
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -isystem "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture/FDFullscreenPopGesture.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/FMDB/FMDB.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension/MJExtension.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MMKV/MMKV.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore/MMKVCore.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Masonry/Masonry.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MMKV" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD"
-OTHER_LDFLAGS = $(inherited) -l"c++" -l"sqlite3" -l"z" -framework "AFNetworking" -framework "CoreFoundation" -framework "FDFullscreenPopGesture" -framework "FMDB" -framework "Foundation" -framework "ImageIO" -framework "MJExtension" -framework "MJRefresh" -framework "MMKV" -framework "MMKVCore" -framework "Masonry" -framework "QuartzCore" -framework "SDWebImage" -framework "SVProgressHUD" -framework "UIKit"
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture/FDFullscreenPopGesture.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/FMDB/FMDB.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension/MJExtension.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MMKV/MMKV.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore/MMKVCore.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Masonry/Masonry.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController/TYPagerController.framework/Headers" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MMKV" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController"
+OTHER_LDFLAGS = $(inherited) -l"c++" -l"sqlite3" -l"z" -framework "AFNetworking" -framework "CoreFoundation" -framework "FDFullscreenPopGesture" -framework "FMDB" -framework "Foundation" -framework "ImageIO" -framework "MJExtension" -framework "MJRefresh" -framework "MMKV" -framework "MMKVCore" -framework "Masonry" -framework "QuartzCore" -framework "SDWebImage" -framework "SVProgressHUD" -framework "TYPagerController" -framework "UIKit"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

+ 4 - 4
Pods/Target Support Files/Pods-Temperature/Pods-Temperature.release.xcconfig

@@ -1,10 +1,10 @@
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/MMKV" "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/MMKV" "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture/FDFullscreenPopGesture.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB/FMDB.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension/MJExtension.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MMKV/MMKV.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore/MMKVCore.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry/Masonry.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture/FDFullscreenPopGesture.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB/FMDB.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension/MJExtension.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MMKV/MMKV.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore/MMKVCore.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry/Masonry.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController/TYPagerController.framework/Headers"
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -isystem "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture/FDFullscreenPopGesture.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/FMDB/FMDB.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension/MJExtension.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MMKV/MMKV.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore/MMKVCore.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Masonry/Masonry.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MMKV" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD"
-OTHER_LDFLAGS = $(inherited) -l"c++" -l"sqlite3" -l"z" -framework "AFNetworking" -framework "CoreFoundation" -framework "FDFullscreenPopGesture" -framework "FMDB" -framework "Foundation" -framework "ImageIO" -framework "MJExtension" -framework "MJRefresh" -framework "MMKV" -framework "MMKVCore" -framework "Masonry" -framework "QuartzCore" -framework "SDWebImage" -framework "SVProgressHUD" -framework "UIKit"
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture/FDFullscreenPopGesture.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/FMDB/FMDB.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension/MJExtension.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MMKV/MMKV.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore/MMKVCore.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Masonry/Masonry.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController/TYPagerController.framework/Headers" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/FDFullscreenPopGesture" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MMKV" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MMKVCore" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController"
+OTHER_LDFLAGS = $(inherited) -l"c++" -l"sqlite3" -l"z" -framework "AFNetworking" -framework "CoreFoundation" -framework "FDFullscreenPopGesture" -framework "FMDB" -framework "Foundation" -framework "ImageIO" -framework "MJExtension" -framework "MJRefresh" -framework "MMKV" -framework "MMKVCore" -framework "Masonry" -framework "QuartzCore" -framework "SDWebImage" -framework "SVProgressHUD" -framework "TYPagerController" -framework "UIKit"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

+ 18 - 0
Temperature.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		03245AF92A8E5448003DF602 /* RDSSelectDeviceMainVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 03245AF82A8E5448003DF602 /* RDSSelectDeviceMainVC.m */; };
+		03245AFC2A8E5459003DF602 /* RDSSelectDeviceSubVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 03245AFB2A8E5459003DF602 /* RDSSelectDeviceSubVC.m */; };
+		03245AFF2A8E5E2B003DF602 /* RDSDeviceTypeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 03245AFE2A8E5E2B003DF602 /* RDSDeviceTypeModel.m */; };
 		03D1A3712A8CF47700106033 /* UIFont+Temperature.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D1A3702A8CF47700106033 /* UIFont+Temperature.m */; };
 		03D1A3742A8CF5B200106033 /* UIColor+Temperature.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D1A3732A8CF5B200106033 /* UIColor+Temperature.m */; };
 		19F0EABC3C1DE4F3D3AD4610 /* Pods_Temperature.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B774C01636692E126F78C586 /* Pods_Temperature.framework */; };
@@ -195,6 +198,12 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		03245AF72A8E5448003DF602 /* RDSSelectDeviceMainVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RDSSelectDeviceMainVC.h; sourceTree = "<group>"; };
+		03245AF82A8E5448003DF602 /* RDSSelectDeviceMainVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RDSSelectDeviceMainVC.m; sourceTree = "<group>"; };
+		03245AFA2A8E5459003DF602 /* RDSSelectDeviceSubVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RDSSelectDeviceSubVC.h; sourceTree = "<group>"; };
+		03245AFB2A8E5459003DF602 /* RDSSelectDeviceSubVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RDSSelectDeviceSubVC.m; sourceTree = "<group>"; };
+		03245AFD2A8E5E2B003DF602 /* RDSDeviceTypeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RDSDeviceTypeModel.h; sourceTree = "<group>"; };
+		03245AFE2A8E5E2B003DF602 /* RDSDeviceTypeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RDSDeviceTypeModel.m; sourceTree = "<group>"; };
 		03D1A36F2A8CF47700106033 /* UIFont+Temperature.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIFont+Temperature.h"; sourceTree = "<group>"; };
 		03D1A3702A8CF47700106033 /* UIFont+Temperature.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIFont+Temperature.m"; sourceTree = "<group>"; };
 		03D1A3722A8CF5B200106033 /* UIColor+Temperature.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIColor+Temperature.h"; sourceTree = "<group>"; };
@@ -535,6 +544,8 @@
 				22C68A1C296803D400996E26 /* ModelImg.m */,
 				22534EC429F911E200E4EBC2 /* WeatherModel.h */,
 				22534EC529F911E200E4EBC2 /* WeatherModel.m */,
+				03245AFD2A8E5E2B003DF602 /* RDSDeviceTypeModel.h */,
+				03245AFE2A8E5E2B003DF602 /* RDSDeviceTypeModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -804,6 +815,10 @@
 				226EDB08298BB33100015C0A /* RDSRoomSetVC.h */,
 				226EDB09298BB33100015C0A /* RDSRoomSetVC.m */,
 				226EDB0A298BB33100015C0A /* RDSRoomSetVC.xib */,
+				03245AF72A8E5448003DF602 /* RDSSelectDeviceMainVC.h */,
+				03245AF82A8E5448003DF602 /* RDSSelectDeviceMainVC.m */,
+				03245AFA2A8E5459003DF602 /* RDSSelectDeviceSubVC.h */,
+				03245AFB2A8E5459003DF602 /* RDSSelectDeviceSubVC.m */,
 				2275BEFC296D4EF900B5C7AC /* RDSResetDeviceVC.h */,
 				2275BEFD296D4EF900B5C7AC /* RDSResetDeviceVC.m */,
 				2275BEFE296D4EF900B5C7AC /* RDSResetDeviceVC.xib */,
@@ -1510,6 +1525,7 @@
 				22F9FFC0292E059A00BAB3F6 /* RDSResetPwdVC.m in Sources */,
 				220357E6293466D50081B5B8 /* RDSConstant.m in Sources */,
 				22AFE61D29135DD100793E79 /* WLButtonCountdownManager.m in Sources */,
+				03245AFC2A8E5459003DF602 /* RDSSelectDeviceSubVC.m in Sources */,
 				22338A65292B29AF00AD07FB /* RDSBindDeviceVC.m in Sources */,
 				227F2086294AC945008B9EC1 /* RDSMyInfoVC.m in Sources */,
 				22AFE61E29135DD100793E79 /* WLCaptcheButton.m in Sources */,
@@ -1530,6 +1546,7 @@
 				22CC23792907921300E627E9 /* RDCheckAppVersion.m in Sources */,
 				22F9FFE8292F010F00BAB3F6 /* NSString+FFDBExtern.m in Sources */,
 				22F9FFE6292F010F00BAB3F6 /* FFDBSafeOperation.m in Sources */,
+				03245AF92A8E5448003DF602 /* RDSSelectDeviceMainVC.m in Sources */,
 				22CC238A2907921300E627E9 /* RDSHudShower.m in Sources */,
 				226EDB06298B551300015C0A /* RDSAddMemberVC.m in Sources */,
 				22CC23072907915D00E627E9 /* RDSBarButtonItem.m in Sources */,
@@ -1556,6 +1573,7 @@
 				22CC23782907921300E627E9 /* RDSRgbColor.m in Sources */,
 				22A8C25129038804008B9448 /* RDSBaseXibView.m in Sources */,
 				226EDB0B298BB33100015C0A /* RDSRoomSetVC.m in Sources */,
+				03245AFF2A8E5E2B003DF602 /* RDSDeviceTypeModel.m in Sources */,
 				22338A5429287A9C00AD07FB /* PopAnimationTool.m in Sources */,
 				22A8C24F29038804008B9448 /* RDSBaseTableViewController.m in Sources */,
 				2275BEFF296D4EF900B5C7AC /* RDSResetDeviceVC.m in Sources */,

+ 0 - 5
Temperature.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict/>
-</plist>

BIN
Temperature.xcworkspace/xcuserdata/sam.xcuserdatad/UserInterfaceState.xcuserstate


+ 0 - 14
Temperature.xcworkspace/xcuserdata/sam.xcuserdatad/WorkspaceSettings.xcsettings

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildLocationStyle</key>
-	<string>UseAppPreferences</string>
-	<key>CustomBuildLocationType</key>
-	<string>RelativeToDerivedData</string>
-	<key>DerivedDataLocationStyle</key>
-	<string>Default</string>
-	<key>ShowSharedSchemesAutomaticallyEnabled</key>
-	<true/>
-</dict>
-</plist>

+ 0 - 248
Temperature.xcworkspace/xcuserdata/sam.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   uuid = "99ADF645-2351-4ADD-AEB0-14EB9785F1AD"
-   type = "0"
-   version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "62872247-3CD1-4A94-B5EA-1B9D8E9A7DF0"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Temperature/LanguageManager.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "23"
-            endingLineNumber = "23"
-            landmarkName = "+setUserLanguage:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "020BFC49-151F-418F-A273-8DAA86100380"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Temperature/LanguageManager.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "34"
-            endingLineNumber = "34"
-            landmarkName = "+userLanguage"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "5B84741F-912B-4A09-A839-F84CBF129DC7"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Temperature/LanguageManager.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "42"
-            endingLineNumber = "42"
-            landmarkName = "+resetSystemLanguage"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F987EB18-AE4B-47EC-946F-1FFC06003F71"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Temperature/LanguageManager.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "84"
-            endingLineNumber = "84"
-            landmarkName = "-backItem"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "65E09B19-5889-48CB-B7FE-4966BDAE37C2"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Temperature/Category/NSBundle+Language.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "37"
-            endingLineNumber = "37"
-            landmarkName = "+cl_mainBundle"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "57C15253-2A0A-48A6-93C9-ABCF18D4CB9D"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Temperature/Category/NSBundle+Language.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "43"
-            endingLineNumber = "43"
-            landmarkName = "+cl_mainBundle"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "0E9881EB-C4F8-4053-9DA7-062B6F7A76E1"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Temperature/Tools/RDCheckAppVersion/RDCheckAppVersion.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "105"
-            endingLineNumber = "105"
-            landmarkName = "-p_checkUpdateOnAppStoreContent:canCancel:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "735F7B5B-E239-4B3C-8066-48B032042634"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Temperature/NetWork/RDSDemoApiHelper.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "429"
-            endingLineNumber = "429"
-            landmarkName = "+rds_getHomeDetailWithHomeId:success:failure:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "C700104C-C136-4C7D-B141-3DBC5FA1B869"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Temperature/ControlModule/Home/Model/WeatherModel.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "23"
-            endingLineNumber = "23"
-            landmarkName = "+rds_getWeatherFinished:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "C77C32CF-0112-46C3-B37E-30355022A649"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Temperature/ControlModule/Home/Controller/RDSInputWiFiVC.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "94"
-            endingLineNumber = "94"
-            landmarkName = "-onNextBtnClick:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "564E6350-F8F4-4F75-8862-82FA17320148"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Temperature/ControlModule/Home/QRCode/OPQRCodeViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "235"
-            endingLineNumber = "235"
-            landmarkName = "-captureOutput:didOutputMetadataObjects:fromConnection:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "A04E20BF-6C7D-4D46-8B09-90A53194CFE7"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Temperature/NetWork/RDSDemoApiHelper.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "393"
-            endingLineNumber = "393"
-            landmarkName = "+rds_getDefaultHomeSuccess:failure:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "A04E20BF-6C7D-4D46-8B09-90A53194CFE7 - 3810c77d1e80c69c"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "+[RDSDemoApiHelper rds_getDefaultHomeSuccess:failure:]"
-                  moduleName = "Temperature"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/sam/Documents/%E9%A1%B9%E7%9B%AE/%E6%B0%B8%E7%BB%AD%E7%BB%BF%E5%BB%BA485%E6%B8%A9%E6%8E%A7%E7%B3%BB%E7%BB%9F/Temperature/Temperature/NetWork/RDSDemoApiHelper.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "394"
-                  endingLineNumber = "394"
-                  offsetFromSymbolStart = "336">
-               </Location>
-               <Location
-                  uuid = "A04E20BF-6C7D-4D46-8B09-90A53194CFE7 - 3810c77d1e80c67d"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "+[RDSDemoApiHelper rds_getDefaultHomeSuccess:failure:]"
-                  moduleName = "Temperature"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/sam/Documents/%E9%A1%B9%E7%9B%AE/%E6%B0%B8%E7%BB%AD%E7%BB%BF%E5%BB%BA485%E6%B8%A9%E6%8E%A7%E7%B3%BB%E7%BB%9F/Temperature/Temperature/NetWork/RDSDemoApiHelper.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "393"
-                  endingLineNumber = "393"
-                  offsetFromSymbolStart = "336">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F7E08028-F3F8-49D3-92AF-DE31BBC001EB"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Temperature/ControlModule/Home/Model/RDSUserInfoModel.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "24"
-            endingLineNumber = "24"
-            landmarkName = "+rds_getCurrentUserInfoFinished:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
-</Bucket>

+ 16 - 0
Temperature/ControlModule/Home/Controller/RDSSelectDeviceMainVC.h

@@ -0,0 +1,16 @@
+//
+//  RDSSelectDeviceMainVC.h
+//  Temperature
+//
+//  Created by 姓二名哈字富贵儿 on 2023/8/17.
+//
+
+#import "RDSBaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RDSSelectDeviceMainVC : RDSBaseViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 136 - 0
Temperature/ControlModule/Home/Controller/RDSSelectDeviceMainVC.m

@@ -0,0 +1,136 @@
+//
+//  RDSSelectDeviceMainVC.m
+//  Temperature
+//
+//  Created by 姓二名哈字富贵儿 on 2023/8/17.
+//
+
+#import "RDSSelectDeviceMainVC.h"
+#import "RDSSelectDeviceSubVC.h"
+#import <TYPagerController/TYPagerController.h>
+#import <TYPagerController/TYTabPagerBar.h>
+#import "RDSDeviceTypeModel.h"
+
+@interface RDSSelectDeviceMainVC () <TYTabPagerBarDataSource, TYTabPagerBarDelegate, TYPagerControllerDelegate, TYPagerControllerDataSource>
+
+@property (nonatomic, strong) RDSDeviceTypeModel *deviceTypeModel;
+
+@property (nonatomic, strong) TYTabPagerBar *pagerBar;
+@property (nonatomic, strong) TYPagerController *pagerController;
+@property (nonatomic, strong) NSMutableArray *pagerBarTitleArray;
+
+@end
+
+@implementation RDSSelectDeviceMainVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self configSubviews];
+    
+    [self.deviceTypeModel fetchDeviceTypeList];
+}
+
+- (void)configSubviews {
+    self.navigationItem.title = @"选择设备";
+    
+    self.pagerBar = [[TYTabPagerBar alloc] init];
+    self.pagerBar.layout.barStyle = TYPagerBarStyleProgressView;
+    self.pagerBar.layout.normalTextColor = [UIColor colorWithHexString:@"#333333"];
+    self.pagerBar.layout.selectedTextColor = [UIColor colorWithHexString:@"#14C9C8"];
+    self.pagerBar.layout.normalTextFont = [UIFont pingFangSCMediumOfSize:15];
+    self.pagerBar.layout.selectedTextFont = [UIFont pingFangSCMediumOfSize:15];
+    self.pagerBar.layout.progressHeight = 2;
+    self.pagerBar.layout.progressWidth = 40;
+    self.pagerBar.layout.progressColor = [UIColor colorWithHexString:@"#14C9C8"];
+    self.pagerBar.layout.cellSpacing = 0;
+    self.pagerBar.layout.cellEdging = 0;
+    self.pagerBar.layout.sectionInset = UIEdgeInsetsMake(0, 20, 0, 20);
+    self.pagerBar.layout.progressWidth = 28;
+    self.pagerBar.layout.progressHeight = 4;
+    self.pagerBar.layout.adjustContentCellsCenter = NO;
+    self.pagerBar.dataSource = self;
+    self.pagerBar.delegate = self;
+    [self.pagerBar registerClass:[TYTabPagerBarCell class] forCellWithReuseIdentifier:[TYTabPagerBarCell cellIdentifier]];
+    [self.view addSubview:self.pagerBar];
+    [self.pagerBar mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.mas_equalTo(0);
+        make.top.equalTo(self.view.mas_safeAreaLayoutGuideTop);
+        make.height.mas_equalTo(44);
+    }];
+    
+    self.pagerController = [[TYPagerController alloc]init];
+    self.pagerController.layout.addVisibleItemOnlyWhenScrollAnimatedEnd = YES;
+    self.pagerController.automaticallySystemManagerViewAppearanceMethods = NO;
+    self.pagerController.dataSource = self;
+    self.pagerController.delegate = self;
+    self.pagerController.view.backgroundColor = [UIColor colorWithHexString:@"#FBFBFB"];
+    self.pagerController.scrollView.backgroundColor = [UIColor colorWithHexString:@"#FBFBFB"];
+    self.pagerController.scrollView.bounces = NO;
+    [self addChildViewController:self.pagerController];
+    [self.view addSubview:self.pagerController.view];
+    [self.pagerController.view mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.mas_equalTo(0);
+        make.top.equalTo(self.pagerBar.mas_bottom).offset(12);
+        make.bottom.equalTo(self.view);
+    }];
+        
+    [self.pagerBar reloadData];
+    [self.pagerController reloadData];
+}
+
+
+#pragma mark - TYTabPagerBarDataSource
+- (NSInteger)numberOfItemsInPagerTabBar {
+    return self.pagerBarTitleArray.count;
+}
+
+- (UICollectionViewCell<TYTabPagerBarCellProtocol> *)pagerTabBar:(TYTabPagerBar *)pagerTabBar cellForItemAtIndex:(NSInteger)index {
+    UICollectionViewCell<TYTabPagerBarCellProtocol> *cell = [pagerTabBar dequeueReusableCellWithReuseIdentifier:[TYTabPagerBarCell cellIdentifier] forIndex:index];
+    NSString *title = self.pagerBarTitleArray[index];
+    cell.titleLabel.text = title;
+    return cell;
+}
+
+#pragma mark - TYTabPagerBarDelegate
+- (CGFloat)pagerTabBar:(TYTabPagerBar *)pagerTabBar widthForItemAtIndex:(NSInteger)index {
+    return 61;
+}
+
+- (void)pagerTabBar:(TYTabPagerBar *)pagerTabBar didSelectItemAtIndex:(NSInteger)index {
+    [self.pagerController scrollToControllerAtIndex:index animate:YES];
+}
+
+#pragma mark - TYPagerControllerDataSource
+- (NSInteger)numberOfControllersInPagerController {
+    return self.pagerBarTitleArray.count;
+}
+
+- (UIViewController *)pagerController:(TYPagerController *)pagerController controllerForIndex:(NSInteger)index prefetching:(BOOL)prefetching {
+    return [[RDSSelectDeviceSubVC alloc] init];
+}
+
+#pragma mark - TYPagerControllerDelegate
+- (void)pagerController:(TYPagerController *)pagerController transitionFromIndex:(NSInteger)fromIndex toIndex:(NSInteger)toIndex animated:(BOOL)animated {
+    [self.pagerBar scrollToItemFromIndex:fromIndex toIndex:toIndex animate:animated];
+}
+
+- (void)pagerController:(TYPagerController *)pagerController transitionFromIndex:(NSInteger)fromIndex toIndex:(NSInteger)toIndex progress:(CGFloat)progress {
+    [self.pagerBar scrollToItemFromIndex:fromIndex toIndex:toIndex progress:progress];
+}
+
+#pragma mark - Getter
+- (NSMutableArray *)pagerBarTitleArray {
+    if (!_pagerBarTitleArray) {
+        _pagerBarTitleArray = [NSMutableArray arrayWithObjects:@"氟系统", @"水系统", nil];
+    }
+    return _pagerBarTitleArray;
+}
+
+- (RDSDeviceTypeModel *)deviceTypeModel {
+    if (!_deviceTypeModel) {
+        _deviceTypeModel = [[RDSDeviceTypeModel alloc] init];
+    }
+    return _deviceTypeModel;
+}
+
+@end

+ 18 - 0
Temperature/ControlModule/Home/Controller/RDSSelectDeviceSubVC.h

@@ -0,0 +1,18 @@
+//
+//  RDSSelectDeviceSubVC.h
+//  Temperature
+//
+//  Created by 姓二名哈字富贵儿 on 2023/8/17.
+//
+
+#import "RDSBaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RDSSelectDeviceSubVC : RDSBaseViewController
+
+@property (nonatomic, strong) NSArray *dataSource;
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 49 - 0
Temperature/ControlModule/Home/Controller/RDSSelectDeviceSubVC.m

@@ -0,0 +1,49 @@
+//
+//  RDSSelectDeviceSubVC.m
+//  Temperature
+//
+//  Created by 姓二名哈字富贵儿 on 2023/8/17.
+//
+
+#import "RDSSelectDeviceSubVC.h"
+
+@interface RDSSelectDeviceSubVC () <UITableViewDelegate, UITableViewDataSource>
+
+@property (nonatomic, strong) UITableView *tableView;
+
+@end
+
+@implementation RDSSelectDeviceSubVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self configSubviews];
+}
+
+- (void)configSubviews {
+    self.tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
+    self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+    self.tableView.rowHeight = 110;
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    [self.view addSubview:self.tableView];
+    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.bottom.equalTo(self.view);
+        make.top.equalTo(self.view.mas_safeAreaLayoutGuideTop);
+    }];
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return self.dataSource.count;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return 1;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return [[UITableViewCell alloc] init];
+}
+
+@end

+ 27 - 0
Temperature/ControlModule/Home/Model/RDSDeviceTypeModel.h

@@ -0,0 +1,27 @@
+//
+//  RDSDeviceTypeModel.h
+//  Temperature
+//
+//  Created by 姓二名哈字富贵儿 on 2023/8/17.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RDSDeviceTypeModel : NSObject
+
+@property (nonatomic, copy) NSString *record_id;
+@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *code;
+@property (nonatomic, copy) NSString *parent_id;
+@property (nonatomic, copy) NSString *icon;
+@property (nonatomic, strong) NSArray *children;
+
+@property (nonatomic, strong) NSMutableArray<RDSDeviceTypeModel *> *deviceTypeList;
+
+- (void)fetchDeviceTypeList;
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 20 - 0
Temperature/ControlModule/Home/Model/RDSDeviceTypeModel.m

@@ -0,0 +1,20 @@
+//
+//  RDSDeviceTypeModel.m
+//  Temperature
+//
+//  Created by 姓二名哈字富贵儿 on 2023/8/17.
+//
+
+#import "RDSDeviceTypeModel.h"
+
+@implementation RDSDeviceTypeModel
+
+- (void)fetchDeviceTypeList {
+    [RDSDemoApiHelper rds_getDeviceTypeListSuccess:^(id responseObject) {
+        NSLog(@"responseObject is %@", responseObject);
+    } failure:^(NSError *error) {
+        
+    }];
+}
+
+@end

+ 10 - 3
Temperature/ControlModule/Home/View/RDSRoomCell.m

@@ -37,9 +37,16 @@
     self.roomNameLabel.text = model.name;
     self.iconView.image = [UIImage imageNamed:@"icon_fluorine_main_controller"];
     self.deviceTypeLabel.text = @"主控制器";
-    self.pointView.backgroundColor = [UIColor colorWithHexString:@"#14C9C8"];
-    self.statusLabel.textColor = [UIColor colorWithHexString:@"#14C9C8"];
-    self.statusLabel.text = @"温度24°C 湿度38%";
+    self.deviceSwitch.on = model.power;
+    if (model.power) {
+        self.statusLabel.text = [NSString stringWithFormat:@"温度%@°C 湿度%@%%", @(model.temperature), @(model.humidity)];
+        self.statusLabel.textColor = [UIColor colorWithHexString:@"#14C9C8"];
+        self.pointView.backgroundColor = [UIColor colorWithHexString:@"#14C9C8"];
+    } else {
+        self.statusLabel.text = @"已离线";
+        self.statusLabel.textColor = [UIColor colorWithHexString:@"#FAAD14"];
+        self.pointView.backgroundColor = [UIColor colorWithHexString:@"#FAAD14"];
+    }
 }
 
 

+ 7 - 3
Temperature/ControlModule/Room/Controller/RDSRoomVC.m

@@ -13,6 +13,7 @@
 #import "RDSResetDeviceVC.h"
 #import <MJRefresh/MJRefresh.h>
 #import "GCDTimer.h"// 轮询定时器
+#import "RDSSelectDeviceMainVC.h"
 
 static NSString * const RDSRoomCellID = @"RDSRoomCellID";
 @interface RDSRoomVC ()<UICollectionViewDelegate, UICollectionViewDataSource>
@@ -109,9 +110,12 @@ static NSString * const RDSRoomCellID = @"RDSRoomCellID";
 }
 
 - (void)p_onAddRoomBtn{
-    RDSResetDeviceVC *vc = [[RDSResetDeviceVC alloc] init];
-    vc.hidesBottomBarWhenPushed = YES;
-    [self pushViewController:vc animated:YES];
+    RDSSelectDeviceMainVC *selectDeviceMainVC = [[RDSSelectDeviceMainVC alloc] init];
+    selectDeviceMainVC.hidesBottomBarWhenPushed = YES;
+    [self pushViewController:selectDeviceMainVC animated:YES];
+//    RDSResetDeviceVC *vc = [[RDSResetDeviceVC alloc] init];
+//    vc.hidesBottomBarWhenPushed = YES;
+//    [self pushViewController:vc animated:YES];
 }
 
 - (void)p_setupCollectionView {

+ 3 - 0
Temperature/NetWork/RDSDemoApiHelper.h

@@ -169,6 +169,9 @@ AS_SINGLETON(RDSDemoApiHelper)
 + (void)rds_getRoomListSuccess:(void (^)(id responseObject))success
                   failure:(void (^)(NSError *error))failure;
 
+/// 设备类型列表查询
++ (void)rds_getDeviceTypeListSuccess:(void (^)(id responseObject))success
+                             failure:(void (^)(NSError *error))failure;
 
 /// 创建房间(绑定分控面板)
 /// - Parameters:

+ 13 - 0
Temperature/NetWork/RDSDemoApiHelper.m

@@ -580,6 +580,19 @@ DEF_SINGLETON(RDSDemoApiHelper)
                               progress:nil];
 }
 
++ (void)rds_getDeviceTypeListSuccess:(void (^)(id))success failure:(void (^)(NSError *))failure {
+    NSDictionary *hearder = @{
+        @"Authorization" : TheDataManager.token,
+        @"X-YX-APP": TheApiHelper.appHeader
+    };
+    
+    [RDSDemoApiHelper getWithUrlString:@"device_types"
+                             paraments:nil
+                               headers:hearder
+                               success:success
+                                  fail:failure
+                              progress:nil];
+}
 
 + (void)rds_addRoomName:(NSString *)name control_number:(NSString *)control_number success:(void (^)(id))success failure:(void (^)(NSError *))failure{
     

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott