Merge branch 'dev' of github.com:alibaba/weex into dev

alibaba · Aug 10, 2016 · 9996adb · 9996adb
2 parents d276ada + df179da
commit 9996adb
Show file tree

Hide file tree

Showing 275 changed files with 5,042 additions and 1,084 deletions.
diff --git a/examples/module/stream-demo.we b/examples/module/stream-demo.we
@@ -81,7 +81,7 @@
           me.getResult = "request failed";
         }else{
           console.log('get:'+ret);
-          me.getResult = ret.data;
+          me.getResult = JSON.stringify(ret.data);
         }
       },function(response){
         console.log('get in progress:'+response.length);
@@ -96,8 +96,8 @@
         if(!ret.ok){
           me.postResult = "request failed";
         }else{
-          console.log('get:'+ret);
-          me.postResult = ret.data;
+          console.log('get:'+JSON.stringify(ret));
+          me.postResult = JSON.stringify(ret.data);
         }
       },function(response){
         console.log('get in progress:'+response.length);
@@ -112,8 +112,8 @@
         if(!ret.ok){
           me.putResult = "request failed";
         }else{
-          console.log('get:'+ret);
-          me.putResult = ret.data;
+          console.log('get:'+JSON.stringify(ret));
+          me.putResult = JSON.stringify(ret.data);
         }
       },function(response){
         console.log('get in progress:'+response.length);
@@ -129,8 +129,8 @@
         if(!ret.ok){
           me.deleteResult = "request failed";
         }else{
-          console.log('get:'+ret);
-          me.deleteResult = ret.data;
+          console.log('get:'+JSON.stringify(ret));
+          me.deleteResult = JSON.stringify(ret.data);
         }
       },function(response){
         console.log('get in progress:'+response.length);
@@ -145,7 +145,7 @@
         if(ret.statusText !== 'I\'m a teapot'){
           me.headResult = "request failed";
         }else{
-          console.log('get:'+ret);
+          console.log('get:'+JSON.stringify(ret));
           me.headResult = ret.statusText;
         }
       },function(response){
@@ -161,8 +161,8 @@
         if(!ret.ok){
           me.patchResult = "request failed";
         }else{
-          console.log('get:'+ret);
-          me.patchResult = ret.data;
+          console.log('get:'+JSON.stringify(ret));
+          me.patchResult = JSON.stringify(request.data);
         }
       },function(response){
         console.log('get in progress:'+response.length);

diff --git a/ios/WXDevtool/Podfile b/ios/WXDevtool/Podfile
@@ -0,0 +1,9 @@
+# Uncomment this line to define a global platform for your project
+ali_source 'alibaba-specs'
+ali_source 'alibaba-specs-mirror'
+
+platform :ios, '7.0'
+inhibit_all_warnings!
+target 'TBWXDevTool' do
+pod 'WeexSDK', '~> 0.6.0.5'
+end
diff --git a/ios/WXDevtool/Products/TBWXDevTool.framework/Info.plist b/ios/WXDevtool/Products/TBWXDevTool.framework/Info.plist
diff --git a/ios/WXDevtool/README.md b/ios/WXDevtool/README.md
@@ -10,6 +10,8 @@ Remote debug for your native iOS app using Chrome Developer Tools
 		$:weex-devtool  
 
 	it will launch chrome browser, showing wss ip address in chrome address bar.
+
+	For more detailed instructions, redirect to [weex-toolkit](https://github.com/weexteam/weex-toolkit#weex-debug-command)
 		
 		
 ## playground install WXDevtool

diff --git a/ios/WXDevtool/TBWXDevTool.xcodeproj/project.pbxproj b/ios/WXDevtool/TBWXDevTool.xcodeproj/project.pbxproj
diff --git a/ios/WXDevtool/TBWXDevTool.xcodeproj/xcshareddata/xcschemes/TBWXDevTool_MTL.xcscheme b/ios/WXDevtool/TBWXDevTool.xcodeproj/xcshareddata/xcschemes/TBWXDevTool_MTL.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0720"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0ABB39ED1D3F37700091332E"
+               BuildableName = "libTBWXDevTool_MTL.a"
+               BlueprintName = "TBWXDevTool_MTL"
+               ReferencedContainer = "container:TBWXDevTool.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </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">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0ABB39ED1D3F37700091332E"
+            BuildableName = "libTBWXDevTool_MTL.a"
+            BlueprintName = "TBWXDevTool_MTL"
+            ReferencedContainer = "container:TBWXDevTool.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0ABB39ED1D3F37700091332E"
+            BuildableName = "libTBWXDevTool_MTL.a"
+            BlueprintName = "TBWXDevTool_MTL"
+            ReferencedContainer = "container:TBWXDevTool.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/ios/WXDevtool/TBWXDevTool.xcodeproj/xcshareddata/xcschemes/TBWeexDevTool.xcscheme b/ios/WXDevtool/TBWXDevTool.xcodeproj/xcshareddata/xcschemes/TBWeexDevTool.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0720"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0AFA101A1D2D1439006E30BB"
+               BuildableName = "TBWeexDevTool"
+               BlueprintName = "TBWeexDevTool"
+               ReferencedContainer = "container:TBWXDevTool.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </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">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0AFA101A1D2D1439006E30BB"
+            BuildableName = "TBWeexDevTool"
+            BlueprintName = "TBWeexDevTool"
+            ReferencedContainer = "container:TBWXDevTool.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0AFA101A1D2D1439006E30BB"
+            BuildableName = "TBWeexDevTool"
+            BlueprintName = "TBWeexDevTool"
+            ReferencedContainer = "container:TBWXDevTool.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/ios/WXDevtool/TBWXDevTool.xcworkspace/xcshareddata/xcschemes/TBWXDevTool.xcscheme b/ios/WXDevtool/TBWXDevTool.xcworkspace/xcshareddata/xcschemes/TBWXDevTool.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0720"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0AFA0ECA1D2CE79E006E30BB"
+               BuildableName = "TBWXDevTool.framework"
+               BlueprintName = "TBWXDevTool"
+               ReferencedContainer = "container:TBWXDevTool.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0AFA0ECA1D2CE79E006E30BB"
+            BuildableName = "TBWXDevTool.framework"
+            BlueprintName = "TBWXDevTool"
+            ReferencedContainer = "container:TBWXDevTool.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0AFA0ECA1D2CE79E006E30BB"
+            BuildableName = "TBWXDevTool.framework"
+            BlueprintName = "TBWXDevTool"
+            ReferencedContainer = "container:TBWXDevTool.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>