Permalink
Browse files

Merge branch 'ios-feature-20170118' into dev-release095

  • Loading branch information...
2 parents 4d9dcc1 + 50641f1 commit 1e837f38a967798a2f3f6d948b2eb727470be5c9 @sospartan sospartan committed Jan 11, 2017
Showing with 4,452 additions and 1,600 deletions.
  1. +1 −2 examples/component/slider-neighbor/{silder-neighbor.we → index.we}
  2. +2 −0 examples/index.we
  3. +112 −0 examples/module/websocket-demo.we
  4. +42 −31 ios/playground/WeexDemo.xcodeproj/project.pbxproj
  5. +7 −0 ios/playground/WeexDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  6. +1 −1 ios/playground/WeexDemo.xcodeproj/xcshareddata/xcschemes/WeexDemo.xcscheme
  7. +3 −1 ios/playground/WeexDemo/AppDelegate.m
  8. +1 −1 ios/playground/WeexDemo/Scanner/WXScannerVC.m
  9. +6 −0 ios/playground/WeexDemo/WXDemoViewController.m
  10. +2 −2 ios/{sdk/WeexSDK/Sources/Handler/WXNetworkDefaultImpl.h → playground/WeexDemo/WXSyncTestModule.h}
  11. +38 −0 ios/playground/WeexDemo/WXSyncTestModule.m
  12. +8 −4 ios/sdk/WeexSDK.podspec
  13. +168 −24 ios/sdk/WeexSDK.xcodeproj/project.pbxproj
  14. +7 −7 ios/sdk/WeexSDK/Resources/main.js
  15. +15 −0 ios/sdk/WeexSDK/Sources/Bridge/JSValue+Weex.h
  16. +90 −0 ios/sdk/WeexSDK/Sources/Bridge/JSValue+Weex.m
  17. +9 −2 ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.h
  18. +94 −33 ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
  19. +20 −0 ios/sdk/WeexSDK/Sources/Bridge/WXCallJSMethod.h
  20. +35 −0 ios/sdk/WeexSDK/Sources/Bridge/WXCallJSMethod.m
  21. +21 −0 ios/sdk/WeexSDK/Sources/Bridge/WXComponentMethod.h
  22. +51 −0 ios/sdk/WeexSDK/Sources/Bridge/WXComponentMethod.m
  23. +5 −0 ios/sdk/WeexSDK/Sources/Bridge/WXDebugLoggerBridge.m
  24. +39 −1 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
  25. +28 −0 ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.h
  26. +99 −0 ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m
  27. +8 −8 ios/sdk/WeexSDK/Sources/Component/WXCanvasComponent.m
  28. +3 −1 ios/sdk/WeexSDK/Sources/Component/WXCellComponent.h
  29. +10 −0 ios/sdk/WeexSDK/Sources/Component/WXCellComponent.m
  30. +20 −0 ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.h
  31. +116 −0 ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.m
  32. +19 −1 ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
  33. +51 −5 ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
  34. +3 −2 ios/sdk/WeexSDK/Sources/Component/WXIndicatorComponent.m
  35. +40 −8 ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
  36. +2 −0 ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.h
  37. +13 −5 ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
  38. +47 −1 ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m
  39. +54 −49 ios/sdk/WeexSDK/Sources/Component/WXSliderNeighborComponent.m
  40. +96 −103 ios/sdk/WeexSDK/Sources/Component/WXTextAreaComponent.m
  41. +34 −6 ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
  42. +118 −144 ios/sdk/WeexSDK/Sources/Component/WXTextInputComponent.m
  43. +3 −0 ios/sdk/WeexSDK/Sources/Component/WXTransform.h
  44. +18 −7 ios/sdk/WeexSDK/Sources/Component/WXTransform.m
  45. +1 −1 ios/sdk/WeexSDK/Sources/Component/WXVideoComponent.m
  46. +27 −21 ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
  47. +20 −26 ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.m
  48. +38 −2 ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
  49. +48 −3 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h
  50. +54 −8 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
  51. +3 −2 ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
  52. +120 −21 ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
  53. +0 −111 ios/sdk/WeexSDK/Sources/Handler/WXNetworkDefaultImpl.m
  54. +52 −35 ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
  55. +30 −0 ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.h
  56. +174 −0 ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m
  57. +24 −0 ios/sdk/WeexSDK/Sources/Loader/WXWebSocketLoader.h
  58. +131 −0 ios/sdk/WeexSDK/Sources/Loader/WXWebSocketLoader.m
  59. +24 −5 ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h
  60. +72 −15 ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.m
  61. +3 −3 ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.m
  62. +10 −2 ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.h
  63. +29 −29 ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
  64. +0 −1 ios/sdk/WeexSDK/Sources/Manager/WXDatePickerManager.h
  65. +1 −57 ios/sdk/WeexSDK/Sources/Manager/WXDatePickerManager.m
  66. +0 −1 ios/sdk/WeexSDK/Sources/Manager/WXHandlerFactory.m
  67. +3 −3 ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.h
  68. +13 −87 ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.m
  69. +2 −2 ios/sdk/WeexSDK/Sources/Manager/WXModuleFactory.h
  70. +21 −11 ios/sdk/WeexSDK/Sources/Manager/WXModuleFactory.m
  71. +0 −111 ios/sdk/WeexSDK/Sources/Manager/WXModuleManager.m
  72. +9 −2 ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m
  73. +5 −5 ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.h
  74. +5 −14 ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.m
  75. +38 −0 ios/sdk/WeexSDK/Sources/Manager/WXServiceFactory.h
  76. +102 −0 ios/sdk/WeexSDK/Sources/Manager/WXServiceFactory.m
  77. +9 −9 ios/sdk/WeexSDK/Sources/Model/WXBridgeMethod.h
  78. +63 −22 ios/sdk/WeexSDK/Sources/Model/WXBridgeMethod.m
  79. +10 −0 ios/sdk/WeexSDK/Sources/Model/WXComponent.h
  80. +32 −7 ios/sdk/WeexSDK/Sources/Model/WXComponent.m
  81. +51 −5 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h
  82. +291 −130 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
  83. +8 −0 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance_private.h
  84. +22 −4 ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
  85. +15 −16 ios/sdk/WeexSDK/Sources/Module/WXDomModule.m
  86. +1 −0 ios/sdk/WeexSDK/Sources/Module/WXGlobalEventModule.m
  87. +14 −0 ios/sdk/WeexSDK/Sources/Module/WXMetaModule.h
  88. +40 −0 ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m
  89. +16 −12 ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m
  90. +1 −1 ios/sdk/WeexSDK/Sources/Module/WXStreamModule.h
  91. +112 −108 ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m
  92. +15 −0 ios/sdk/WeexSDK/Sources/Module/WXWebSocketModule.h
  93. +137 −0 ios/sdk/WeexSDK/Sources/Module/WXWebSocketModule.m
  94. +2 −0 ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.h
  95. +35 −0 ios/sdk/WeexSDK/Sources/Network/WXResourceRequest.h
  96. +57 −0 ios/sdk/WeexSDK/Sources/Network/WXResourceRequest.m
  97. +45 −0 ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandler.h
  98. +15 −0 ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandlerDefaultImpl.h
  99. +90 −0 ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandlerDefaultImpl.m
  100. +2 −4 ios/sdk/WeexSDK/Sources/{Manager/WXModuleManager.h → Network/WXResourceResponse.h}
  101. +14 −0 ios/sdk/WeexSDK/Sources/Network/WXResourceResponse.m
  102. +23 −5 ios/sdk/WeexSDK/Sources/Protocol/WXBridgeProtocol.h
  103. +26 −5 ios/sdk/WeexSDK/Sources/Protocol/WXNavigationProtocol.h
  104. +1 −0 ios/sdk/WeexSDK/Sources/Protocol/WXNetworkProtocol.h
  105. +1 −9 ios/sdk/WeexSDK/Sources/Protocol/WXURLRewriteProtocol.h
  106. +20 −2 ios/sdk/WeexSDK/Sources/Utility/WXConvert.h
  107. +81 −6 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
  108. +20 −7 ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
  109. +8 −5 ios/sdk/WeexSDK/Sources/Utility/WXType.h
  110. +27 −30 ios/sdk/WeexSDK/Sources/Utility/WXUtility.h
  111. +74 −45 ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
  112. +66 −0 ios/sdk/WeexSDK/Sources/View/WXComponent+PseudoClassManagement.h
  113. +144 −0 ios/sdk/WeexSDK/Sources/View/WXComponent+PseudoClassManagement.m
  114. +13 −1 ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
  115. +1 −1 ios/sdk/WeexSDK/Sources/View/WXView.m
  116. +18 −0 ios/sdk/WeexSDK/Sources/WebSocket/SRWebSocket+Weex.h
  117. +36 −0 ios/sdk/WeexSDK/Sources/WebSocket/SRWebSocket+Weex.m
  118. +14 −0 ios/sdk/WeexSDK/Sources/WebSocket/WXWebSocketDefaultImpl.h
  119. +110 −0 ios/sdk/WeexSDK/Sources/WebSocket/WXWebSocketDefaultImpl.m
  120. +26 −0 ios/sdk/WeexSDK/Sources/WebSocket/WXWebSocketHandler.h
  121. +1 −0 ios/sdk/WeexSDK/Sources/WeexSDK.h
  122. +1 −1 ios/sdk/WeexSDKTests/TestSupportUtils.m
  123. +12 −12 ios/sdk/WeexSDKTests/WXBridgeMethodTests.m
  124. +0 −109 ios/sdk/WeexSDKTests/WXNetworkTests.m
  125. +2 −2 ios/sdk/WeexSDKTests/WXRootViewTests.m
  126. +8 −7 ios/sdk/WeexSDKTests/WXSDKEngineTests.m
  127. +0 −4 ios/sdk/WeexSDKTests/WXSDKManagerTests.m
  128. +2 −2 ios/sdk/WeexSDKTests/WXStreamModuleTests.m
  129. +2 −2 ios/sdk/WeexSDKTests/WXURLRewriteTests.m
@@ -1,8 +1,7 @@
<template>
<scroller style="flex-direction: column; background-color: #ffffff;width:750;height:600;border-width: 0;">
- <TC_Support_MainTitle title="AG_Test_Slider-Neighbor_Auto_Play"></TC_Support_MainTitle>
<div style="height:410; border-width:3; border-style:solid; border-color:#000000;margin:10;">
- <slider-neighbor style="width:700;height:400;" neighbor-scale="0.7" interval="3000" neighbor-alpha="0.8" auto-play="{{attr_auto_play}}">
+ <slider-neighbor style="width:700;height:400;" neighbor-scale="0.8" neighbor-space="30" current-item-scale="0.95" interval="3000" neighbor-alpha="0.8" auto-play="{{attr_auto_play}}">
<container style="">
<image style="width:650;background-color:#FFFFDF;height:400;" src="https://gw.alicdn.com/tps/TB1dzanMVXXXXXQXVXXXXXXXXXX-573-412.png"></image>
</container>
View
@@ -25,6 +25,7 @@
{name: 'component/list/list-basic', title: 'List (Basic)'},
{name: 'component/list/list-demo', title: 'List (Advanced)'},
{name: 'component/slider/index', title: 'Slider'},
+ {name: 'component/slider-neighbor/index', title: 'Slider Neighbor'},
{name: 'component/a-demo', title: 'A'},
{name: 'component/video-demo', title: 'Video'},
{name: 'component/countdown-demo', title: 'Countdown'},
@@ -38,6 +39,7 @@
{name: 'module/instance-api', title: 'Instance API'},
{name: 'module/modal', title: 'Modal'},
{name: 'module/stream-demo', title: 'Stream'},
+ {name: 'module/websocket-demo', title: 'WebSocket'},
{name: 'module/storage-demo',title:'Storage'},
{name: 'module/picker-demo',title:'Picker'},
{name: 'module/componentRect',title:'componentRect'},
@@ -0,0 +1,112 @@
+<template>
+ <scroller>
+ <wxc-panel title="websocket" type="primary">
+ <input
+ type="text"
+ placeholder="please input message to send"
+ class="input"
+ autofocus="false"
+ value=""
+ onchange="onchange"
+ oninput="oninput"
+ id = "input"
+ />
+ <div style="flex-direction: row; justify-content: center;">
+ <wxc-button value="connect" size="small" type="primary" onclick="{{connect}}"></wxc-button>
+ <wxc-button value="send" size="small" onclick="{{send}}" type="primary" style="margin-left:20px;"></wxc-button>
+ <wxc-button value="close" size="small" onclick="{{close}}" type="primary" style="margin-left:20px;"></wxc-button>
+
+ </div>
+
+ <wxc-panel title="method = send">
+ <text>{{sendinfo}}</text>
+ </wxc-panel>
+
+ <wxc-panel title="method = onopen">
+ <text>{{onopeninfo}}</text>
+ </wxc-panel>
+
+ <wxc-panel title="method = onmessage">
+ <text>{{onmessage}}</text>
+ </wxc-panel>
+
+ <wxc-panel title="method = onclose">
+ <text>{{oncloseinfo}}</text>
+ </wxc-panel>
+
+ <wxc-panel title="method = onerror">
+ <text>{{onerrorinfo}}</text>
+ </wxc-panel>
+
+ <wxc-panel title="method = close">
+ <text>{{closeinfo}}</text>
+ </wxc-panel>
+ </wxc-panel>
+ </scroller>
+</template>
+
+<style>
+ .input {
+ font-size: 40px;
+ height: 80px;
+ width: 600px;
+ }
+</style>
+
+<script>
+ require('weex-components');
+ var navigator = require('@weex-module/navigator');
+ var modal = require('@weex-module/modal');
+ var websocket = require('@weex-module/webSocket');
+ module.exports = {
+ data: {
+ connectinfo: '',
+ sendinfo: '',
+ onopeninfo: '',
+ onmessage: '',
+ oncloseinfo: '',
+ onerrorinfo: '',
+ closeinfo: '',
+ txtInput:'',
+ navBarHeight: 88,
+ title: 'Navigator',
+ dir: 'examples',
+ baseURL: '',
+ },
+ methods: {
+ connect:function() {
+ websocket.WebSocket('ws://115.29.193.48:8088','');
+ var self = this;
+ websocket.onopen = function(e)
+ {
+ self.onopeninfo = e;
+ }
+ websocket.onmessage = function(e)
+ {
+ self.onmessage = e.data;
+ }
+ websocket.onerror = function(e)
+ {
+ self.onerrorinfo = e.data;
+ }
+ websocket.onclose = function(e)
+ {
+ self.onerrorinfo = e.code;
+ }
+ },
+ send:function(e) {
+ var input = this.$el('input');
+ input.blur();
+ websocket.send(this.txtInput);
+ this.sendinfo = this.txtInput;
+
+ },
+ oninput: function(event) {
+ this.txtInput = event.value;
+ },
+ close:function(e) {
+ websocket.close();
+ },
+ }
+ };
+</script>
@@ -11,6 +11,7 @@
564B94671DD9C65000441C8D /* WeexUITestDemo-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 564B94661DD9C65000441C8D /* WeexUITestDemo-Info.plist */; };
59EA0DA71D2E7D19004F904A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 59EA0DA61D2E7D19004F904A /* Images.xcassets */; };
741DFE091DDDD519009B020F /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 741DFE081DDDD519009B020F /* libstdc++.tbd */; };
+ 7478481E1E0CD4910044500D /* WXSyncTestModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 7478481D1E0CD4910044500D /* WXSyncTestModule.m */; };
74CC79EB1C2B9E4700829368 /* UIViewController+WXDemoNaviBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 74CC79EA1C2B9E4700829368 /* UIViewController+WXDemoNaviBar.m */; };
775BEE801C1E8ECC008D1629 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 775BEE7F1C1E8ECC008D1629 /* main.m */; };
775BEE831C1E8ECC008D1629 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 775BEE821C1E8ECC008D1629 /* AppDelegate.m */; };
@@ -24,6 +25,8 @@
84361D3B1CA10F8E00F43825 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 775BEE7F1C1E8ECC008D1629 /* main.m */; };
84361D421CA10F8E00F43825 /* libPods-WeexDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7601607D735D7F8D88971230 /* libPods-WeexDemo.a */; };
84361D5B1CA10F8E00F43825 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 775BEE8A1C1E8ECC008D1629 /* Assets.xcassets */; };
+ 846FC8DA1E1B853100949E7D /* WXSyncTestModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 7478481D1E0CD4910044500D /* WXSyncTestModule.m */; };
+ 846FC8DB1E1B853600949E7D /* WXATViewHierarchyPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = DCABAFF21D029685001C8592 /* WXATViewHierarchyPlugin.m */; };
84D7CAC71CE3266C00D48D46 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7475ACA01CD8444A0044E96C /* libsqlite3.0.tbd */; };
8A0B5EFFF75BF82EA481983D /* libPods-WeexUITestDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E48C20F443AA337D1FE97622 /* libPods-WeexUITestDemo.a */; };
DC5E503E1D0D97130059F0EB /* weex.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5E503C1D0D97130059F0EB /* weex.png */; };
@@ -63,6 +66,8 @@
741DFE081DDDD519009B020F /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; };
7453E3641C9FA971001EB427 /* DemoDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoDefine.h; sourceTree = "<group>"; };
7475ACA01CD8444A0044E96C /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
+ 7478481C1E0CD4910044500D /* WXSyncTestModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXSyncTestModule.h; sourceTree = "<group>"; };
+ 7478481D1E0CD4910044500D /* WXSyncTestModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXSyncTestModule.m; sourceTree = "<group>"; };
74CC79E91C2B9E4700829368 /* UIViewController+WXDemoNaviBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+WXDemoNaviBar.h"; sourceTree = "<group>"; };
74CC79EA1C2B9E4700829368 /* UIViewController+WXDemoNaviBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+WXDemoNaviBar.m"; sourceTree = "<group>"; };
7601607D735D7F8D88971230 /* libPods-WeexDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-WeexDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -273,6 +278,8 @@
children = (
DCABAFFF1D02975E001C8592 /* WXEventModule.h */,
DCABB0001D02975E001C8592 /* WXEventModule.m */,
+ 7478481C1E0CD4910044500D /* WXSyncTestModule.h */,
+ 7478481D1E0CD4910044500D /* WXSyncTestModule.m */,
);
name = module;
sourceTree = "<group>";
@@ -302,13 +309,13 @@
isa = PBXNativeTarget;
buildConfigurationList = 775BEEA81C1E8ECC008D1629 /* Build configuration list for PBXNativeTarget "WeexDemo" */;
buildPhases = (
- 359BEE13DD78032A2CB791E8 /* Check Pods Manifest.lock */,
+ B5825066F03BDD65A25F2701 /* 📦 Check Pods Manifest.lock */,
74CC7A221C2C13BF00829368 /* Start Samples */,
775BEE771C1E8ECC008D1629 /* Sources */,
775BEE781C1E8ECC008D1629 /* Frameworks */,
775BEE791C1E8ECC008D1629 /* Resources */,
- 0B3B6C05EE2F8A3B30DE551F /* Copy Pods Resources */,
- 5ED24D6A09B32268BB031206 /* Embed Pods Frameworks */,
+ 685399B3421CD1410375A2AD /* 📦 Embed Pods Frameworks */,
+ C715566148067A7FFAB7797D /* 📦 Copy Pods Resources */,
);
buildRules = (
);
@@ -341,12 +348,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 84361D711CA10F8E00F43825 /* Build configuration list for PBXNativeTarget "WeexUITestDemo" */;
buildPhases = (
- 84361D271CA10F8E00F43825 /* Check Pods Manifest.lock */,
+ 84361D271CA10F8E00F43825 /* 📦 Check Pods Manifest.lock */,
84361D291CA10F8E00F43825 /* Sources */,
84361D3C1CA10F8E00F43825 /* Frameworks */,
84361D431CA10F8E00F43825 /* Resources */,
- 84361D6F1CA10F8E00F43825 /* Copy Pods Resources */,
- 84361D701CA10F8E00F43825 /* Embed Pods Frameworks */,
+ 84361D6F1CA10F8E00F43825 /* 📦 Copy Pods Resources */,
+ 84361D701CA10F8E00F43825 /* 📦 Embed Pods Frameworks */,
567369891CE436EB000A646C /* ShellScript */,
);
buildRules = (
@@ -430,122 +437,121 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
- 0B3B6C05EE2F8A3B30DE551F /* Copy Pods Resources */ = {
+ 567369891CE436EB000A646C /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
- name = "Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo-resources.sh\"\n";
- showEnvVarsInLog = 0;
+ shellScript = "myFile=\"XcodeCoverage/exportenv.sh\"\n\nif [ -f \"$myFile\" ]; then\nXcodeCoverage/exportenv.sh\nfi";
};
- 359BEE13DD78032A2CB791E8 /* Check Pods Manifest.lock */ = {
+ 685399B3421CD1410375A2AD /* 📦 Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
- name = "Check Pods Manifest.lock";
+ name = "📦 Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
- 567369891CE436EB000A646C /* ShellScript */ = {
+ 74CC7A221C2C13BF00829368 /* Start Samples */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
+ name = "Start Samples";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "myFile=\"XcodeCoverage/exportenv.sh\"\n\nif [ -f \"$myFile\" ]; then\nXcodeCoverage/exportenv.sh\nfi";
+ shellScript = "set -x\n\nif nc -w 5 -z localhost 12580 ; then\n echo \"Port 12580 already in use, server is running\"\nelse\n open \"$SRCROOT/../../start\"\nfi\n\n";
};
- 5ED24D6A09B32268BB031206 /* Embed Pods Frameworks */ = {
+ 84361D271CA10F8E00F43825 /* 📦 Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
- name = "Embed Pods Frameworks";
+ name = "📦 Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "
-";
+ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
- 74CC7A221C2C13BF00829368 /* Start Samples */ = {
+ 84361D6F1CA10F8E00F43825 /* 📦 Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
- name = "Start Samples";
+ name = "📦 Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "set -x\n\nif nc -w 5 -z localhost 12580 ; then\n echo \"Port 12580 already in use, server is running\"\nelse\n open \"$SRCROOT/../../start\"\nfi\n\n";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexUITestDemo/Pods-WeexUITestDemo-resources.sh\"\n";
+ showEnvVarsInLog = 0;
};
- 84361D271CA10F8E00F43825 /* Check Pods Manifest.lock */ = {
+ 84361D701CA10F8E00F43825 /* 📦 Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
- name = "Check Pods Manifest.lock";
+ name = "📦 Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexUITestDemo/Pods-WeexUITestDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
- 84361D6F1CA10F8E00F43825 /* Copy Pods Resources */ = {
+ B5825066F03BDD65A25F2701 /* 📦 Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
- name = "Copy Pods Resources";
+ name = "📦 Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexUITestDemo/Pods-WeexUITestDemo-resources.sh\"\n";
+ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
- 84361D701CA10F8E00F43825 /* Embed Pods Frameworks */ = {
+ C715566148067A7FFAB7797D /* 📦 Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
- name = "Embed Pods Frameworks";
+ name = "📦 Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexUITestDemo/Pods-WeexUITestDemo-frameworks.sh\"\n";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -560,6 +566,7 @@
775BEE861C1E8ECC008D1629 /* WXDemoViewController.m in Sources */,
74CC79EB1C2B9E4700829368 /* UIViewController+WXDemoNaviBar.m in Sources */,
DCABB0011D02975E001C8592 /* WXEventModule.m in Sources */,
+ 7478481E1E0CD4910044500D /* WXSyncTestModule.m in Sources */,
775BEE831C1E8ECC008D1629 /* AppDelegate.m in Sources */,
DCABAFF41D029685001C8592 /* WXATViewHierarchyPlugin.m in Sources */,
775BEE801C1E8ECC008D1629 /* main.m in Sources */,
@@ -579,6 +586,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 846FC8DB1E1B853600949E7D /* WXATViewHierarchyPlugin.m in Sources */,
+ 846FC8DA1E1B853100949E7D /* WXSyncTestModule.m in Sources */,
DCA812FB1D0401570029BF62 /* WXImgLoaderDefaultImpl.m in Sources */,
DCA812FA1D0401500029BF62 /* WXEventModule.m in Sources */,
DCA812F91D0401420029BF62 /* WXSelectComponent.m in Sources */,
@@ -695,6 +704,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+ DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -724,6 +734,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+ DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+ version = "1.0">
+ <FileRef
+ location = "self:">
+ </FileRef>
+</Workspace>
Oops, something went wrong.

0 comments on commit 1e837f3

Please sign in to comment.