Commit 94db4e27 authored by hbcui1984's avatar hbcui1984

Android 4.4以上版本使用pop-in动画

parent 01342cfa
...@@ -77,39 +77,6 @@ ...@@ -77,39 +77,6 @@
document.getElementById("toastBtn").addEventListener('tap', function() { document.getElementById("toastBtn").addEventListener('tap', function() {
mui.toast('欢迎体验Hello MUI'); mui.toast('欢迎体验Hello MUI');
}); });
document.getElementById("pickDateBtn").addEventListener('tap', function() {
var dDate = new Date();
dDate.setFullYear(2014, 7, 16);
var minDate = new Date();
minDate.setFullYear(2010, 0, 1);
var maxDate = new Date();
maxDate.setFullYear(2016, 11, 31);
plus.nativeUI.pickDate(function(e) {
var d = e.date;
info.innerText = '您选择的日期是:' + d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate();
}, function(e) {
info.innerText = "您没有选择日期";
}, {
title: "请选择日期",
date: dDate,
minDate: minDate,
maxDate: maxDate
});
})
document.getElementById("pickTimeBtn").addEventListener('tap', function() {
var dTime = new Date();
dTime.setHours(6, 0);
plus.nativeUI.pickTime(function(e) {
var d = e.date;
info.innerText = "您选择的时间是:" + d.getHours() + ":" + d.getMinutes();
}, function(e) {
info.innerText = "您没有选择时间"
}, {
title: "请选择时间",
is24Hour: true,
time: dTime
});
});
</script> </script>
</body> </body>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
//更换标题 //更换标题
title.innerHTML = this.querySelector('.mui-tab-label').innerHTML; title.innerHTML = this.querySelector('.mui-tab-label').innerHTML;
//显示目标选项卡 //显示目标选项卡
if(aniShow[targetTab]){ if(mui.os.ios||aniShow[targetTab]){
plus.webview.show(targetTab); plus.webview.show(targetTab);
}else{ }else{
var temp = {}; var temp = {};
......
...@@ -80,12 +80,17 @@ ...@@ -80,12 +80,17 @@
doubletap:true doubletap:true
} }
}); });
var contentWebview = null; var contentWebview = null,self = null;
var titleElem = document.getElementById("title");
mui.plusReady(function () {
self = plus.webview.currentWebview();
});
mui.back = function() { mui.back = function() {
var current = plus.webview.currentWebview(); var current = plus.webview.currentWebview();
current.hide('auto'); current.hide('auto');
setTimeout(function() { setTimeout(function() {
document.getElementById("title").className = 'mui-title mui-fadeout'; titleElem.className = 'mui-title mui-fadeout';
titleElem.innerText = '';
if(contentWebview==null){ if(contentWebview==null){
contentWebview = current.children()[0]; contentWebview = current.children()[0];
} }
...@@ -93,12 +98,14 @@ ...@@ -93,12 +98,14 @@
}, 350); }, 350);
} }
var titleElem = document.getElementById("title")
var menu = document.getElementById("menu") var menu = document.getElementById("menu")
window.addEventListener("updateHeader", function(e) { window.addEventListener("updateHeader", function(e) {
var title = e.detail.title; var title = e.detail.title;
var showMenu = e.detail.showMenu; var showMenu = e.detail.showMenu;
var href = e.detail.target;
var aniShow = e.detail.aniShow;
titleElem.innerHTML = title; titleElem.innerHTML = title;
titleElem.className = "mui-title mui-fadein"; titleElem.className = "mui-title mui-fadein";
var display = showMenu ? "" : "none"; var display = showMenu ? "" : "none";
...@@ -109,6 +116,20 @@ ...@@ -109,6 +116,20 @@
} }
menu.style.display = display; menu.style.display = display;
if(mui.os.android&&parseFloat(mui.os.version)>=4.4){
if(contentWebview==null){
contentWebview = self.children()[0];
}
if (contentWebview.getURL() != href) {
contentWebview.loadURL(href);
} else {
contentWebview.show();
}
setTimeout(function () {
self.show(aniShow);
},10);
}
}); });
document.getElementById("menu").addEventListener('tap', function(e) { document.getElementById("menu").addEventListener('tap', function(e) {
......
...@@ -410,7 +410,9 @@ ...@@ -410,7 +410,9 @@
} }
} }
//Android平台暂时使用slide-in-right动画 //Android平台暂时使用slide-in-right动画
// aniShow = "slide-in-right" if(mui.os.android&&parseFloat(mui.os.version)<4.4){
aniShow = "slide-in-right"
}
} }
//初始化,并预加载webview模式的选项卡 //初始化,并预加载webview模式的选项卡
function preload () { function preload () {
...@@ -562,9 +564,12 @@ ...@@ -562,9 +564,12 @@
//通知模板修改标题,并显示隐藏右上角图标; //通知模板修改标题,并显示隐藏右上角图标;
mui.fire(headerWebview, 'updateHeader', { mui.fire(headerWebview, 'updateHeader', {
title: title, title: title,
showMenu: showMenu showMenu: showMenu,
target:href,
aniShow: aniShow
}); });
if(mui.os.ios||(mui.os.android&&parseFloat(mui.os.version)<4.4)){
var reload = true; var reload = true;
if (!template.loaded) { if (!template.loaded) {
if (contentWebview.getURL() != this.href) { if (contentWebview.getURL() != this.href) {
...@@ -580,6 +585,7 @@ ...@@ -580,6 +585,7 @@
headerWebview.show(aniShow, 150); headerWebview.show(aniShow, 150);
} }
} }
}
}); });
var index = null; //主页面 var index = null; //主页面
function openMenu() { function openMenu() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment