Преглед изворни кода

引入 jsBridge;增加设备 h5 控制页面;设备离线状态使用 room 的 is_online 判断。

wanwenkai пре 1 година
родитељ
комит
a97027bfeb

+ 1 - 0
Podfile

@@ -27,6 +27,7 @@ pod 'FDFullscreenPopGesture'   #全屏侧滑返回
 pod 'MMKV'
 pod 'TYPagerController'
 pod 'YBPopupMenu'
+pod 'WebViewJavascriptBridge', '~> 6.0'
 
 end
 

+ 6 - 2
Podfile.lock

@@ -29,6 +29,7 @@ PODS:
   - SDWebImage/Core (5.17.0)
   - SVProgressHUD (2.2.5)
   - TYPagerController (2.1.2)
+  - WebViewJavascriptBridge (6.0.3)
   - YBPopupMenu (1.3.0)
 
 DEPENDENCIES:
@@ -42,6 +43,7 @@ DEPENDENCIES:
   - SDWebImage
   - SVProgressHUD
   - TYPagerController
+  - WebViewJavascriptBridge (~> 6.0)
   - YBPopupMenu
 
 SPEC REPOS:
@@ -57,6 +59,7 @@ SPEC REPOS:
     - SDWebImage
     - SVProgressHUD
     - TYPagerController
+    - WebViewJavascriptBridge
     - YBPopupMenu
 
 SPEC CHECKSUMS:
@@ -71,8 +74,9 @@ SPEC CHECKSUMS:
   SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   TYPagerController: 262556ecef99986d26ed77fb1288a198ed42f4af
+  WebViewJavascriptBridge: 7f5bc4d3581e672e8f32bd0f812d54bc69bb8e29
   YBPopupMenu: ace6d58993c6013e44eea203fd5d1e00a039a0b6
 
-PODFILE CHECKSUM: 96ec02f9a00e3e05a9a2917980004495ccdc3317
+PODFILE CHECKSUM: a9f7f4d645e8cc7d13f24c22cb0a79ea4eb7b156
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.3

+ 6 - 2
Pods/Manifest.lock

@@ -29,6 +29,7 @@ PODS:
   - SDWebImage/Core (5.17.0)
   - SVProgressHUD (2.2.5)
   - TYPagerController (2.1.2)
+  - WebViewJavascriptBridge (6.0.3)
   - YBPopupMenu (1.3.0)
 
 DEPENDENCIES:
@@ -42,6 +43,7 @@ DEPENDENCIES:
   - SDWebImage
   - SVProgressHUD
   - TYPagerController
+  - WebViewJavascriptBridge (~> 6.0)
   - YBPopupMenu
 
 SPEC REPOS:
@@ -57,6 +59,7 @@ SPEC REPOS:
     - SDWebImage
     - SVProgressHUD
     - TYPagerController
+    - WebViewJavascriptBridge
     - YBPopupMenu
 
 SPEC CHECKSUMS:
@@ -71,8 +74,9 @@ SPEC CHECKSUMS:
   SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   TYPagerController: 262556ecef99986d26ed77fb1288a198ed42f4af
+  WebViewJavascriptBridge: 7f5bc4d3581e672e8f32bd0f812d54bc69bb8e29
   YBPopupMenu: ace6d58993c6013e44eea203fd5d1e00a039a0b6
 
-PODFILE CHECKSUM: 96ec02f9a00e3e05a9a2917980004495ccdc3317
+PODFILE CHECKSUM: a9f7f4d645e8cc7d13f24c22cb0a79ea4eb7b156
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.3

Разлика између датотеке није приказан због своје велике величине
+ 982 - 945
Pods/Pods.xcodeproj/project.pbxproj


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

@@ -618,6 +618,32 @@ SOFTWARE.
 
 
 
+## WebViewJavascriptBridge
+
+Copyright (c) 2011-2015 Marcus Westin, Antoine Lagadec
+
+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.
+
+
 ## YBPopupMenu
 
 MIT License

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

@@ -695,6 +695,38 @@ SOFTWARE.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright (c) 2011-2015 Marcus Westin, Antoine Lagadec
+
+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>WebViewJavascriptBridge</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>MIT License

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

@@ -10,4 +10,5 @@ ${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework
 ${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework
 ${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework
 ${BUILT_PRODUCTS_DIR}/TYPagerController/TYPagerController.framework
+${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework
 ${BUILT_PRODUCTS_DIR}/YBPopupMenu/YBPopupMenu.framework

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

@@ -9,4 +9,5 @@ ${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}/TYPagerController.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YBPopupMenu.framework

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

@@ -10,4 +10,5 @@ ${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework
 ${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework
 ${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework
 ${BUILT_PRODUCTS_DIR}/TYPagerController/TYPagerController.framework
+${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework
 ${BUILT_PRODUCTS_DIR}/YBPopupMenu/YBPopupMenu.framework

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

@@ -9,4 +9,5 @@ ${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}/TYPagerController.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YBPopupMenu.framework

+ 3 - 1
Pods/Target Support Files/Pods-Temperature/Pods-Temperature-frameworks.sh

@@ -18,7 +18,7 @@ echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
 COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
-SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
+SWIFT_STDLIB_PATH="${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 BCSYMBOLMAP_DIR="BCSymbolMaps"
 
 
@@ -187,6 +187,7 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/TYPagerController/TYPagerController.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/YBPopupMenu/YBPopupMenu.framework"
 fi
 if [[ "$CONFIGURATION" == "Release" ]]; then
@@ -201,6 +202,7 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/TYPagerController/TYPagerController.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/YBPopupMenu/YBPopupMenu.framework"
 fi
 if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then

+ 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" "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController" "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu"
+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" "${PODS_CONFIGURATION_BUILD_DIR}/WebViewJavascriptBridge" "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu"
 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" "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController/TYPagerController.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu/YBPopupMenu.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" "${PODS_CONFIGURATION_BUILD_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu/YBPopupMenu.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" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController/TYPagerController.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu/YBPopupMenu.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" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu"
-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" -framework "YBPopupMenu"
+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" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu/YBPopupMenu.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" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/WebViewJavascriptBridge" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu"
+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" -framework "WebKit" -framework "WebViewJavascriptBridge" -framework "YBPopupMenu"
 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" "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController" "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu"
+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" "${PODS_CONFIGURATION_BUILD_DIR}/WebViewJavascriptBridge" "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu"
 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" "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController/TYPagerController.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu/YBPopupMenu.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" "${PODS_CONFIGURATION_BUILD_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu/YBPopupMenu.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" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/TYPagerController/TYPagerController.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu/YBPopupMenu.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" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu"
-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" -framework "YBPopupMenu"
+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" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu/YBPopupMenu.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" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/WebViewJavascriptBridge" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/YBPopupMenu"
+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" -framework "WebKit" -framework "WebViewJavascriptBridge" -framework "YBPopupMenu"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

+ 6 - 0
Temperature.xcodeproj/project.pbxproj

@@ -14,6 +14,7 @@
 		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 */; };
 		03DB89162A9789A900718F10 /* RDSDeviceTypeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 03DB89152A9789A900718F10 /* RDSDeviceTypeCell.m */; };
+		0A5C569F2B2047F40073753F /* RDSControlWebVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A5C569E2B2047F40073753F /* RDSControlWebVC.m */; };
 		19F0EABC3C1DE4F3D3AD4610 /* Pods_Temperature.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B774C01636692E126F78C586 /* Pods_Temperature.framework */; };
 		220357E6293466D50081B5B8 /* RDSConstant.m in Sources */ = {isa = PBXBuildFile; fileRef = 220357E5293466D40081B5B8 /* RDSConstant.m */; };
 		220357EA293735BF0081B5B8 /* RDSMemberModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 220357E9293735BF0081B5B8 /* RDSMemberModel.m */; };
@@ -215,6 +216,8 @@
 		03DB89142A9789A900718F10 /* RDSDeviceTypeCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RDSDeviceTypeCell.h; sourceTree = "<group>"; };
 		03DB89152A9789A900718F10 /* RDSDeviceTypeCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RDSDeviceTypeCell.m; sourceTree = "<group>"; };
 		03E22E122B1E0FBA00634ECD /* RDSDeviceHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RDSDeviceHeader.h; sourceTree = "<group>"; };
+		0A5C569D2B2047F40073753F /* RDSControlWebVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RDSControlWebVC.h; sourceTree = "<group>"; };
+		0A5C569E2B2047F40073753F /* RDSControlWebVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RDSControlWebVC.m; sourceTree = "<group>"; };
 		220357E5293466D40081B5B8 /* RDSConstant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RDSConstant.m; sourceTree = "<group>"; };
 		220357E8293735BF0081B5B8 /* RDSMemberModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RDSMemberModel.h; sourceTree = "<group>"; };
 		220357E9293735BF0081B5B8 /* RDSMemberModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RDSMemberModel.m; sourceTree = "<group>"; };
@@ -816,6 +819,8 @@
 			children = (
 				22CC22FC2906720900E627E9 /* RDSHomeVC.h */,
 				22CC22FD2906720900E627E9 /* RDSHomeVC.m */,
+				0A5C569D2B2047F40073753F /* RDSControlWebVC.h */,
+				0A5C569E2B2047F40073753F /* RDSControlWebVC.m */,
 				222562DB2923670E00A7E17A /* RDSAirControlVC.h */,
 				222562DC2923670E00A7E17A /* RDSAirControlVC.m */,
 				222562DD2923670E00A7E17A /* RDSAirControlVC.xib */,
@@ -1636,6 +1641,7 @@
 				22F9FFE4292F010F00BAB3F6 /* FFDBTransaction.m in Sources */,
 				228417D02911FDCA00DFF017 /* RDSRootControl.m in Sources */,
 				22CC23312907919400E627E9 /* UIImage+Extension.m in Sources */,
+				0A5C569F2B2047F40073753F /* RDSControlWebVC.m in Sources */,
 				22B762FE298A130C005D602F /* RDSAddHomeVC.m in Sources */,
 				22F9FFE3292F010F00BAB3F6 /* FFDataBaseModel+Sqlite.m in Sources */,
 				22CE690F2912076A00569030 /* RDSFindVC.m in Sources */,

+ 19 - 0
Temperature/ControlModule/Home/Controller/RDSControlWebVC.h

@@ -0,0 +1,19 @@
+//
+//  RDSControlWebVC.h
+//  Temperature
+//  
+//  Created by Kevin on 2023/12/6.
+//
+    
+
+#import "RDSBaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RDSControlWebVC : RDSBaseViewController
+
+- (instancetype)initWithRecordId:(NSString *)recordId code:(NSString *)code;
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 70 - 0
Temperature/ControlModule/Home/Controller/RDSControlWebVC.m

@@ -0,0 +1,70 @@
+//
+//  RDSControlWebVC.m
+//  Temperature
+//  
+//  Created by Kevin on 2023/12/6.
+
+
+#import "RDSControlWebVC.h"
+#import <WebViewJavascriptBridge/WebViewJavascriptBridge.h>
+#import <WebKit/WebKit.h>
+
+@interface RDSControlWebVC () <WKUIDelegate, WKNavigationDelegate>
+
+@property (nonatomic, strong) WKWebView *webView;
+@property (nonatomic, strong) WebViewJavascriptBridge *bridge;
+
+@property (nonatomic, copy) NSString *requestURL;
+
+@end
+
+@implementation RDSControlWebVC
+
+- (instancetype)initWithRecordId:(NSString *)recordId code:(NSString *)code {
+    self = [super init];
+    if (self) {
+        self.requestURL = [NSString stringWithFormat:@"https://app.yongxulvjian.com/#/Room/%@/%@", recordId, code];
+    }
+    return self;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    [self configSubviews];
+    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.requestURL]]];
+}
+
+- (void)configSubviews {
+    [self.view addSubview:self.webView];
+    [self.webView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.mas_equalTo(UIEdgeInsetsZero);
+    }];
+}
+
+- (void)jsBridge {
+    RDS_WEAKSELF(weakSelf)
+    self.bridge = [WebViewJavascriptBridge bridgeForWebView:_webView];
+    [self.bridge setWebViewDelegate:self];
+    
+    // js 回调
+    [self.bridge registerHandler:@"closeWebView" handler:^(id data, WVJBResponseCallback responseCallback) {
+        [weakSelf.navigationController popViewControllerAnimated:YES];
+    }];
+}
+
+- (WKWebView *)webView {
+    if (!_webView) {
+        WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc] init];
+        config.userContentController = [[WKUserContentController alloc] init];
+        config.allowsInlineMediaPlayback = YES;
+        _webView = [[WKWebView alloc] initWithFrame:CGRectZero configuration:config];
+        _webView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+//        _webView.UIDelegate = self;
+//        _webView.navigationDelegate = self;
+        [self jsBridge];
+    }
+    return _webView;
+}
+
+@end

+ 2 - 2
Temperature/ControlModule/Home/View/RDSRoomCell.m

@@ -55,8 +55,8 @@
     
     self.deviceSwitch.on = model.power;
     
-    RDSHomeModel *currentHome = TheDataManager.detailHome;
-    if (currentHome.is_online) {
+//    RDSHomeModel *currentHome = TheDataManager.detailHome;
+    if (model.is_online) {
         self.statusLabel.text = [NSString stringWithFormat:@"温度%@°C 湿度%@%%", @(model.temperature), @(model.humidity)];
         self.statusLabel.textColor = [UIColor colorWithHexString:@"#14C9C8"];
         self.pointView.backgroundColor = [UIColor colorWithHexString:@"#14C9C8"];

+ 1 - 0
Temperature/ControlModule/Room/Model/RDSRoomModel.h

@@ -62,6 +62,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) int fan_value;            // 风阀档位
 @property (nonatomic, assign) BOOL timer_status;        // 定时状态
 @property (nonatomic, strong) NSNumber *duration;       // 定时时长
+@property (nonatomic, assign) BOOL is_online;           // 在线状态
 
 
 + (void)rds_getRoomListFinished:(void(^)(NSError *error))finished;

Неке датотеке нису приказане због велике количине промена