ソースを参照
Merge branch 'master' of http://14.18.190.141:3016/gosea/insiBoxiOS
# Conflicts: # Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/xcschememanagement.plist # Pods/Target Support Files/Pods-双子星云手机-双子星云手机UITests/Pods-双子星云手机-双子星云手机UITests-acknowledgements.markdown # Pods/Target Support Files/Pods-双子星云手机-双子星云手机UITests/Pods-双子星云手机-双子星云手机UITests-acknowledgements.plist # Pods/Target Support Files/Pods-双子星云手机/Pods-双子星云手机-acknowledgements.markdown # Pods/Target Support Files/Pods-双子星云手机/Pods-双子星云手机-acknowledgements.plist # Pods/Target Support Files/Pods-双子星云手机Tests/Pods-双子星云手机Tests.debug.xcconfig # Pods/Target Support Files/Pods-双子星云手机Tests/Pods-双子星云手机Tests.release.xcconfig # 创维盒子/Podfile.lock # 创维盒子/Pods/CocoaAsyncSocket/LICENSE.txt # 创维盒子/Pods/CocoaAsyncSocket/README.markdown # 创维盒子/Pods/CocoaAsyncSocket/Source/GCD/GCDAsyncSocket.h # 创维盒子/Pods/CocoaAsyncSocket/Source/GCD/GCDAsyncSocket.m # 创维盒子/Pods/CocoaAsyncSocket/Source/GCD/GCDAsyncUdpSocket.h # 创维盒子/Pods/CocoaAsyncSocket/Source/GCD/GCDAsyncUdpSocket.m # 创维盒子/Pods/Headers/Private/CocoaAsyncSocket/GCDAsyncSocket.h # 创维盒子/Pods/Headers/Private/CocoaAsyncSocket/GCDAsyncUdpSocket.h # 创维盒子/Pods/Headers/Private/RayProxy/RaylinkProxy.h # 创维盒子/Pods/Headers/Public/CocoaAsyncSocket/GCDAsyncSocket.h # 创维盒子/Pods/Headers/Public/CocoaAsyncSocket/GCDAsyncUdpSocket.h # 创维盒子/Pods/Headers/Public/RayProxy/RayProxy-umbrella.h # 创维盒子/Pods/Headers/Public/RayProxy/RayProxy.modulemap # 创维盒子/Pods/Headers/Public/RayProxy/RaylinkProxy.h # 创维盒子/Pods/Local Podspecs/RayProxy.podspec.json # 创维盒子/Pods/Manifest.lock # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/AFNetworking.xcscheme # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/CocoaAsyncSocket.xcscheme # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/HUPhotoBrowser.xcscheme # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/IQKeyboardManager.xcscheme # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/JQImagePicker.xcscheme # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/MJExtension.xcscheme # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/Masonry.xcscheme # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/Pods-双子星云手机Tests.xcscheme # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/Pods-隐私保护-双子星云手机UITests.xcscheme # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/Pods-隐私保护.xcscheme # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/RayProxy.xcscheme # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/SDWebImage.xcscheme # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/SVProgressHUD.xcscheme # 创维盒子/Pods/Pods.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/TZImagePickerController.xcscheme # 创维盒子/Pods/Target Support Files/AFNetworking/AFNetworking.debug.xcconfig # 创维盒子/Pods/Target Support Files/AFNetworking/AFNetworking.release.xcconfig # 创维盒子/Pods/Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket-dummy.m # 创维盒子/Pods/Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.debug.xcconfig # 创维盒子/Pods/Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.release.xcconfig # 创维盒子/Pods/Target Support Files/Pods-隐私保护-双子星云手机UITests/Pods-隐私保护-双子星云手机UITests-dummy.m # 创维盒子/Pods/Target Support Files/Pods-隐私保护-双子星云手机UITests/Pods-隐私保护-双子星云手机UITests-resources-Debug-input-files.xcfilelist # 创维盒子/Pods/Target Support Files/Pods-隐私保护-双子星云手机UITests/Pods-隐私保护-双子星云手机UITests-resources-Debug-output-files.xcfilelist # 创维盒子/Pods/Target Support Files/Pods-隐私保护-双子星云手机UITests/Pods-隐私保护-双子星云手机UITests-resources-Release-input-files.xcfilelist # 创维盒子/Pods/Target Support Files/Pods-隐私保护-双子星云手机UITests/Pods-隐私保护-双子星云手机UITests-resources-Release-output-files.xcfilelist # 创维盒子/Pods/Target Support Files/Pods-隐私保护-双子星云手机UITests/Pods-隐私保护-双子星云手机UITests-resources.sh # 创维盒子/Pods/Target Support Files/Pods-隐私保护-双子星云手机UITests/Pods-隐私保护-双子星云手机UITests-umbrella.h # 创维盒子/Pods/Target Support Files/Pods-隐私保护-双子星云手机UITests/Pods-隐私保护-双子星云手机UITests.debug.xcconfig # 创维盒子/Pods/Target Support Files/Pods-隐私保护-双子星云手机UITests/Pods-隐私保护-双子星云手机UITests.modulemap # 创维盒子/Pods/Target Support Files/Pods-隐私保护-双子星云手机UITests/Pods-隐私保护-双子星云手机UITests.release.xcconfig # 创维盒子/Pods/Target Support Files/Pods-隐私保护/Pods-隐私保护-dummy.m # 创维盒子/Pods/Target Support Files/Pods-隐私保护/Pods-隐私保护-resources-Debug-input-files.xcfilelist # 创维盒子/Pods/Target Support Files/Pods-隐私保护/Pods-隐私保护-resources-Debug-output-files.xcfilelist # 创维盒子/Pods/Target Support Files/Pods-隐私保护/Pods-隐私保护-resources-Release-input-files.xcfilelist # 创维盒子/Pods/Target Support Files/Pods-隐私保护/Pods-隐私保护-resources-Release-output-files.xcfilelist # 创维盒子/Pods/Target Support Files/Pods-隐私保护/Pods-隐私保护-resources.sh # 创维盒子/Pods/Target Support Files/Pods-隐私保护/Pods-隐私保护-umbrella.h # 创维盒子/Pods/Target Support Files/Pods-隐私保护/Pods-隐私保护.debug.xcconfig # 创维盒子/Pods/Target Support Files/Pods-隐私保护/Pods-隐私保护.modulemap # 创维盒子/Pods/Target Support Files/Pods-隐私保护/Pods-隐私保护.release.xcconfig # 创维盒子/Pods/Target Support Files/RayProxy/RayProxy-dummy.m # 创维盒子/Pods/Target Support Files/RayProxy/RayProxy-umbrella.h # 创维盒子/Pods/Target Support Files/RayProxy/RayProxy.debug.xcconfig # 创维盒子/Pods/Target Support Files/RayProxy/RayProxy.modulemap # 创维盒子/Pods/Target Support Files/RayProxy/RayProxy.release.xcconfig # 创维盒子/双子星云手机/Class/Guide/GuideLastView.h # 创维盒子/双子星云手机/Class/Guide/GuideLastView.m # 创维盒子/双子星云手机/Class/Guide/GuideView.h # 创维盒子/双子星云手机/Class/Guide/GuideView.m # 创维盒子/双子星云手机/Class/Guide/SetPWDSecondViewController.h # 创维盒子/双子星云手机/Class/Guide/SetPWDSecondViewController.m # 创维盒子/双子星云手机/Class/Set/ChangeDevice/QRCodeScanForChangeDeviceViewController.h # 创维盒子/双子星云手机/Class/Set/ChangeDevice/QRCodeScanForChangeDeviceViewController.m # 创维盒子/双子星云手机/Class/Set/ChangeDevice/TipsQRCodeForChangeDeviceViewController.h # 创维盒子/双子星云手机/Class/Set/ChangeDevice/TipsQRCodeForChangeDeviceViewController.m # 创维盒子/双子星云手机/Class/Set/ModifyPWD/ModifyPWDFirstViewController.h # 创维盒子/双子星云手机/Class/Set/ModifyPWD/ModifyPWDFirstViewController.m # 创维盒子/双子星云手机/Class/Set/ModifyPWD/ModifyPWDSecondViewController.h # 创维盒子/双子星云手机/Class/Set/ModifyPWD/ModifyPWDSecondViewController.m # 创维盒子/双子星云手机/Vendor/UDP/RYShearDeviceUDPManager.h # 创维盒子/双子星云手机/Vendor/UDP/RYShearDeviceUDPManager.m # 创维盒子/双子星云手机/Vendor/UDP/ShearDeviceUDPManager.h # 创维盒子/双子星云手机/Vendor/UDP/ShearDeviceUDPManager.m # 双子星云手机.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate # 双子星云手机.xcworkspace/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist # 双子星云手机/Class/Guide/GuideViewController.m # 双子星云手机/Class/Guide/QRCodeScanViewController.m # 双子星云手机/Class/Guide/SetPWDFirstViewController.m # 双子星云手机/Class/Guide/TipsQRCodeViewController.m # 双子星云手机/Class/Set/MySetViewController.m
wangjian
+ 0
- 0
.gitignore
Podfile → 创维盒子/Podfile
+ 8
- 0
Podfile.lock
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||