Skip to content

Commit 9996adb

Browse files
sospartansospartan
committed
Merge branch 'dev' of github.com:alibaba/weex into dev
2 parents d276ada + df179da commit 9996adb

File tree

275 files changed

+5042
-1084
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

275 files changed

+5042
-1084
lines changed

‎examples/module/stream-demo.we‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
me.getResult = "request failed";
8282
}else{
8383
console.log('get:'+ret);
84-
me.getResult = ret.data;
84+
me.getResult = JSON.stringify(ret.data);
8585
}
8686
},function(response){
8787
console.log('get in progress:'+response.length);
@@ -96,8 +96,8 @@
9696
if(!ret.ok){
9797
me.postResult = "request failed";
9898
}else{
99-
console.log('get:'+ret);
100-
me.postResult = ret.data;
99+
console.log('get:'+JSON.stringify(ret));
100+
me.postResult = JSON.stringify(ret.data);
101101
}
102102
},function(response){
103103
console.log('get in progress:'+response.length);
@@ -112,8 +112,8 @@
112112
if(!ret.ok){
113113
me.putResult = "request failed";
114114
}else{
115-
console.log('get:'+ret);
116-
me.putResult = ret.data;
115+
console.log('get:'+JSON.stringify(ret));
116+
me.putResult = JSON.stringify(ret.data);
117117
}
118118
},function(response){
119119
console.log('get in progress:'+response.length);
@@ -129,8 +129,8 @@
129129
if(!ret.ok){
130130
me.deleteResult = "request failed";
131131
}else{
132-
console.log('get:'+ret);
133-
me.deleteResult = ret.data;
132+
console.log('get:'+JSON.stringify(ret));
133+
me.deleteResult = JSON.stringify(ret.data);
134134
}
135135
},function(response){
136136
console.log('get in progress:'+response.length);
@@ -145,7 +145,7 @@
145145
if(ret.statusText !== 'I\'m a teapot'){
146146
me.headResult = "request failed";
147147
}else{
148-
console.log('get:'+ret);
148+
console.log('get:'+JSON.stringify(ret));
149149
me.headResult = ret.statusText;
150150
}
151151
},function(response){
@@ -161,8 +161,8 @@
161161
if(!ret.ok){
162162
me.patchResult = "request failed";
163163
}else{
164-
console.log('get:'+ret);
165-
me.patchResult = ret.data;
164+
console.log('get:'+JSON.stringify(ret));
165+
me.patchResult = JSON.stringify(request.data);
166166
}
167167
},function(response){
168168
console.log('get in progress:'+response.length);

‎ios/WXDevtool/Podfile‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Uncomment this line to define a global platform for your project
2+
ali_source 'alibaba-specs'
3+
ali_source 'alibaba-specs-mirror'
4+
5+
platform :ios, '7.0'
6+
inhibit_all_warnings!
7+
target 'TBWXDevTool' do
8+
pod 'WeexSDK', '~> 0.6.0.5'
9+
end

‎ios/WXDevtool/Products/TBWXDevTool.framework/Info.plist‎

744 Bytes
Binary file not shown.

‎ios/WXDevtool/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Remote debug for your native iOS app using Chrome Developer Tools
1010
$:weex-devtool
1111

1212
it will launch chrome browser, showing wss ip address in chrome address bar.
13+
14+
For more detailed instructions, redirect to [weex-toolkit](https://github.com/weexteam/weex-toolkit#weex-debug-command)
1315
1416
1517
## playground install WXDevtool

‎ios/WXDevtool/TBWXDevTool.xcodeproj/project.pbxproj‎

Lines changed: 1180 additions & 0 deletions
Large diffs are not rendered by default.

‎ios/WXDevtool/TBWXDevTool.xcodeproj/xcshareddata/xcschemes/TBWXDevTool_MTL.xcscheme‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0720"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "0ABB39ED1D3F37700091332E"
18+
BuildableName = "libTBWXDevTool_MTL.a"
19+
BlueprintName = "TBWXDevTool_MTL"
20+
ReferencedContainer = "container:TBWXDevTool.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
34+
</TestAction>
35+
<LaunchAction
36+
buildConfiguration = "Debug"
37+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39+
launchStyle = "0"
40+
useCustomWorkingDirectory = "NO"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "0ABB39ED1D3F37700091332E"
49+
BuildableName = "libTBWXDevTool_MTL.a"
50+
BlueprintName = "TBWXDevTool_MTL"
51+
ReferencedContainer = "container:TBWXDevTool.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</LaunchAction>
57+
<ProfileAction
58+
buildConfiguration = "Release"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "0ABB39ED1D3F37700091332E"
67+
BuildableName = "libTBWXDevTool_MTL.a"
68+
BlueprintName = "TBWXDevTool_MTL"
69+
ReferencedContainer = "container:TBWXDevTool.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
72+
</ProfileAction>
73+
<AnalyzeAction
74+
buildConfiguration = "Debug">
75+
</AnalyzeAction>
76+
<ArchiveAction
77+
buildConfiguration = "Release"
78+
revealArchiveInOrganizer = "YES">
79+
</ArchiveAction>
80+
</Scheme>

‎ios/WXDevtool/TBWXDevTool.xcodeproj/xcshareddata/xcschemes/TBWeexDevTool.xcscheme‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0720"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "0AFA101A1D2D1439006E30BB"
18+
BuildableName = "TBWeexDevTool"
19+
BlueprintName = "TBWeexDevTool"
20+
ReferencedContainer = "container:TBWXDevTool.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
34+
</TestAction>
35+
<LaunchAction
36+
buildConfiguration = "Debug"
37+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39+
launchStyle = "0"
40+
useCustomWorkingDirectory = "NO"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "0AFA101A1D2D1439006E30BB"
49+
BuildableName = "TBWeexDevTool"
50+
BlueprintName = "TBWeexDevTool"
51+
ReferencedContainer = "container:TBWXDevTool.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</LaunchAction>
57+
<ProfileAction
58+
buildConfiguration = "Release"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "0AFA101A1D2D1439006E30BB"
67+
BuildableName = "TBWeexDevTool"
68+
BlueprintName = "TBWeexDevTool"
69+
ReferencedContainer = "container:TBWXDevTool.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
72+
</ProfileAction>
73+
<AnalyzeAction
74+
buildConfiguration = "Debug">
75+
</AnalyzeAction>
76+
<ArchiveAction
77+
buildConfiguration = "Release"
78+
revealArchiveInOrganizer = "YES">
79+
</ArchiveAction>
80+
</Scheme>

‎ios/WXDevtool/TBWXDevTool.xcworkspace/xcshareddata/xcschemes/TBWXDevTool.xcscheme‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0720"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "0AFA0ECA1D2CE79E006E30BB"
18+
BuildableName = "TBWXDevTool.framework"
19+
BlueprintName = "TBWXDevTool"
20+
ReferencedContainer = "container:TBWXDevTool.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
34+
</TestAction>
35+
<LaunchAction
36+
buildConfiguration = "Release"
37+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39+
launchStyle = "0"
40+
useCustomWorkingDirectory = "NO"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "0AFA0ECA1D2CE79E006E30BB"
49+
BuildableName = "TBWXDevTool.framework"
50+
BlueprintName = "TBWXDevTool"
51+
ReferencedContainer = "container:TBWXDevTool.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</LaunchAction>
57+
<ProfileAction
58+
buildConfiguration = "Release"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "0AFA0ECA1D2CE79E006E30BB"
67+
BuildableName = "TBWXDevTool.framework"
68+
BlueprintName = "TBWXDevTool"
69+
ReferencedContainer = "container:TBWXDevTool.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
72+
</ProfileAction>
73+
<AnalyzeAction
74+
buildConfiguration = "Debug">
75+
</AnalyzeAction>
76+
<ArchiveAction
77+
buildConfiguration = "Release"
78+
revealArchiveInOrganizer = "YES">
79+
</ArchiveAction>
80+
</Scheme>

0 commit comments

Comments
 (0)