Skip to content
This repository was archived by the owner on Jun 3, 2021. It is now read-only.

adapter tel scheme of playground & fix typo #1402

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

adapter tel scheme of playground & fix typo #1402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5a7078
[android] adapter scheme "tel"
zshshr Aug 7, 2018
0d0afc3
[android] fix typo
zshshr Aug 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/playground/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ under the License.
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.CALL_PHONE" />

<uses-feature android:name="android.hardware.camera"/>
<uses-feature android:name="android.hardware.camera.autofocus"/>
Expand Down
8 changes: 8 additions & 0 deletions android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ public void openURL(String url) {
return;
}


if(TextUtils.equals("tel", scheme)){
Intent intent = new Intent(Intent.ACTION_DIAL,Uri.parse(url));
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mWXSDKInstance.getContext().startActivity(intent);
return;
}

if (TextUtils.equals("http", scheme) || TextUtils.equals("https", scheme) || TextUtils.equals("file", scheme)) {
builder.append(url);
} else {
Expand Down
6 changes: 3 additions & 3 deletions android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ public WXHeader(WXSDKInstance instance, WXVContainer parent, String instanceId,

public WXHeader(WXSDKInstance instance, WXVContainer parent, boolean lazy, BasicComponentData basicComponentData) {
super(instance, parent, lazy, basicComponentData);
String parantType = parent.getComponentType();
if(WXBasicComponentType.LIST.equals(parantType)
|| WXBasicComponentType.RECYCLE_LIST.equals(parantType)){
String parentType = parent.getComponentType();
if(WXBasicComponentType.LIST.equals(parentType)
|| WXBasicComponentType.RECYCLE_LIST.equals(parentType)){
setSticky(Constants.Value.STICKY);
}
}
Expand Down