Skip to content

Commit

Permalink
Merge branch 'ios-feature-20170118' into dev-release095
Browse files Browse the repository at this point in the history
  • Loading branch information
sospartan committed Jan 11, 2017
2 parents 4d9dcc1 + 50641f1 commit 1e837f3
Show file tree
Hide file tree
Showing 129 changed files with 4,452 additions and 1,600 deletions.
@@ -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>
Expand Down
2 changes: 2 additions & 0 deletions examples/index.we
Expand Up @@ -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'},
Expand All @@ -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'},
Expand Down
112 changes: 112 additions & 0 deletions examples/module/websocket-demo.we
@@ -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>
73 changes: 42 additions & 31 deletions ios/playground/WeexDemo.xcodeproj/project.pbxproj
Expand Up @@ -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 */; };
Expand All @@ -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 */; };
Expand Down Expand Up @@ -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; };
Expand Down Expand Up @@ -273,6 +278,8 @@
children = (
DCABAFFF1D02975E001C8592 /* WXEventModule.h */,
DCABB0001D02975E001C8592 /* WXEventModule.m */,
7478481C1E0CD4910044500D /* WXSyncTestModule.h */,
7478481D1E0CD4910044500D /* WXSyncTestModule.m */,
);
name = module;
sourceTree = "<group>";
Expand Down Expand Up @@ -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 = (
);
Expand Down Expand Up @@ -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 = (
Expand Down Expand Up @@ -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 */
Expand All @@ -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 */,
Expand All @@ -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 */,
Expand Down Expand Up @@ -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)",
Expand Down Expand Up @@ -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)",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1e837f3

Please sign in to comment.