muzi
/
macUI
mirror of https://github.com/1099438829/macUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修正天气显示

This commit is contained in:
muzi_ys 2020-02-04 13:13:57 +08:00
parent 857ed6cccc
commit afa16abd25
4 changed files with 210 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
css/index.css
View File

@ -196,10 +196,10 @@ body {
#win10-menu {
position: fixed;
top: 24px;
left: 0.5%;
left: 0.5rem;
background-color: rgba(255,255,255,0.55);
height: auto;
width: 10%;
width: 12rem;
max-width: 880px;
overflow: auto;
z-index: 1000;
@ -791,11 +791,6 @@ body {
height: 30px;
}
.win10-open-iframe .layui-layer-title{
line-height:30px;
height: 30px;
}
.win10-open-iframe .layui-layer-title .icon ,#win10_btn_group_middle .btn_title .icon{
font-size: 15px;
padding: 1px;
@ -809,6 +804,9 @@ body {
.win10-open-iframe .layui-layer-title img.icon,#win10_btn_group_middle .btn_title img.icon{
width: 20px;
position: relative;
}
.win10-open-iframe .layui-layer-title img.icon{
top:5px ;
}

199
css/index.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
js/mac.js
View File

@ -756,7 +756,7 @@ window.Win10 = {
'<span class="notice-header-title">天气</span>'+
'</div>' +
'<div class="notice-body">' +
'<iframe src="http://www.seniverse.com/weather/weather.aspx?uid=U43DF172E7&cid=CHBJ000000&l=&p=SMART&a=1&u=C&s=13&m=2&x=1&d=1&fc=&bgc=2E93D9&bc=&ti=0&in=0&li=" frameborder="0" scrolling="no" width="97%" height="150" style="padding:5px;" allowTransparency="true"></iframe>'+
'<iframe scrolling="no" src="https://tianqiapi.com/api.php?style=tw&skin=pitaya" frameborder="0" width="280" height="500" allowtransparency="true"></iframe>'+
'</div></div>';
}
$("#win10_command_center .command-body.today").html(today).addClass('active');
@ -858,7 +858,7 @@ window.Win10 = {
}
});
layer.tips(Win10.lang('新消息:','New message:')+title, '#win10_btn_command', {
tips: [1, '#3c6a4a'],
tips: [1, 'rgba(0, 0, 0, 0.7)'],
time: 3000
});
if($("#win10_command_center").hasClass('hidden_right')){

8
js/mac.min.js vendored
View File

@ -1,5 +1,7 @@
window.Win10={_version:'v1.1.2.4',_debug:true,_bgs:{main:'',mobile:'',},_wallpaperBlur:true,_countTask:0,_newMsgCount:0,_animated_classes:[],_animated_liveness:0,_switchMenuTooHurry:false,_lang:'unknown',_iframeOnClick:{resolution:200,iframes:[],interval:null,Iframe:function(){this.element=arguments[0];this.cb=arguments[1];this.hasTracked=false;},track:function(element,cb){this.iframes.push(new this.Iframe(element,cb));if(!this.interval){var _this=this;this.interval=setInterval(function(){_this.checkClick();},this.resolution);}},checkClick:function(){if(document.activeElement){var activeElement=document.activeElement;for(var i in this.iframes){var eid=undefined;if((eid=this.iframes[i].element.id)&&!document.getElementById(eid)){delete this.iframes[i];continue;}
if(activeElement===this.iframes[i].element){if(this.iframes[i].hasTracked===false){this.iframes[i].cb.apply(window,[]);this.iframes[i].hasTracked=true;}}else{this.iframes[i].hasTracked=false;}}}}},_iframe_click_lock_children:{},_handleReady:[],_hideShortcut:function(){var that=$("#win10 #win10-shortcuts .shortcut");that.removeClass('animated flipInX');that.addClass('animated flipOutX');},_showShortcut:function(){var that=$("#win10 #win10-shortcuts .shortcut");that.removeClass('animated flipOutX');that.addClass('animated flipInX');},_checkBgUrls:function(){var loaders=$('#win10>.img-loader');var flag=false;if(Win10.isSmallScreen()){if(Win10._bgs.mobile){loaders.each(function(){var loader=$(this);if(loader.attr('src')===Win10._bgs.mobile&&loader.hasClass('loaded')){Win10._setBackgroundImg(Win10._bgs.mobile);flag=true;}});if(!flag){var img=$('<img class="img-loader" src="'+Win10._bgs.mobile+'" />');$('#win10').append(img);Win10._onImgComplete(img[0],function(){img.addClass('loaded');Win10._setBackgroundImg(Win10._bgs.mobile);})}}}else{if(Win10._bgs.main){loaders.each(function(){var loader=$(this);if(loader.attr('src')===Win10._bgs.main&&loader.hasClass('loaded')){Win10._setBackgroundImg(Win10._bgs.main);flag=true;}});if(!flag){var img=$('<img class="img-loader" src="'+Win10._bgs.main+'" />');$('#win10').append(img);Win10._onImgComplete(img[0],function(){img.addClass('loaded');Win10._setBackgroundImg(Win10._bgs.main);})}}}
if(activeElement===this.iframes[i].element){if(this.iframes[i].hasTracked===false){this.iframes[i].cb.apply(window,[]);this.iframes[i].hasTracked=true;}}else{this.iframes[i].hasTracked=false;}}}}},_iframe_click_lock_children:{},_renderBar:function(){if(this._countTask<=0){return;}
var btns=$("#win10_btn_group_middle>.btn");btns.css('width',('calc('+(1/this._countTask*100)+'% - 1px )'))},_handleReady:[],_hideShortcut:function(){var that=$("#win10 #win10-shortcuts .shortcut");that.removeClass('animated flipInX');that.addClass('animated flipOutX');},_showShortcut:function(){var that=$("#win10 #win10-shortcuts .shortcut");that.removeClass('animated flipOutX');that.addClass('animated flipInX');},_checkBgUrls:function(){var loaders=$('#win10>.img-loader');var flag=false;if(Win10.isSmallScreen()){if(Win10._bgs.mobile){loaders.each(function(){var loader=$(this);if(loader.attr('src')===Win10._bgs.mobile&&loader.hasClass('loaded')){Win10._setBackgroundImg(Win10._bgs.mobile);flag=true;}});if(!flag){var img=$('<img class="img-loader" src="'+Win10._bgs.mobile+'" />');$('#win10').append(img);Win10._onImgComplete(img[0],function(){img.addClass('loaded');Win10._setBackgroundImg(Win10._bgs.mobile);})}}}else{if(Win10._bgs.main){loaders.each(function(){var loader=$(this);if(loader.attr('src')===Win10._bgs.main&&loader.hasClass('loaded')){Win10._setBackgroundImg(Win10._bgs.main);flag=true;}});if(!flag){var img=$('<img class="img-loader" src="'+Win10._bgs.main+'" />');$('#win10').append(img);Win10._onImgComplete(img[0],function(){img.addClass('loaded');Win10._setBackgroundImg(Win10._bgs.main);})}}}
if(Win10._wallpaperBlur){$('.background').addClass('blur');}},_startAnimate:function(){setInterval(function(){var classes_lenth=Win10._animated_classes.length;var animated_liveness=Win10._animated_liveness;if(animated_liveness===0||classes_lenth===0||!$("#win10-menu").hasClass('opened')){return;}
$('#win10-menu>.blocks>.menu_group>.block').each(function(){if(!$(this).hasClass('onAnimate')&&Math.random()<=animated_liveness){var that=$(this);var class_animate=Win10._animated_classes[Math.floor((Math.random()*classes_lenth))];that.addClass('onAnimate');setTimeout(function(){that.addClass(class_animate);setTimeout(function(){that.removeClass('onAnimate');that.removeClass(class_animate);},3000);},Math.random()*2*1000)}})},1000);},_onImgComplete:function(img,callback){if(!img){return;}
var timer=setInterval(function(){if(img.complete){callback(img);clearInterval(timer);}},50)},_setBackgroundImg:function(img){$('#win10 .background').css('background-image','url('+img+')')},_settop:function(layero){if(!isNaN(layero)){layero=this.getLayeroByIndex(layero);}
@ -81,10 +83,10 @@ else if(hour<19){hours='傍晚'+(hour-12);}
else if(hour<22){hours='晚上'+(hour-12);}
else{hours='深夜'+(hour-12)}
return hours;}
var viewdate={};var date=new Date();viewdate.second=date.getSeconds();;viewdate.minute=get_min(date);viewdate.hour=get_hour(date);viewdate.day=date.getDate();viewdate.week=get_week(date);viewdate.weekDay=get_weekday(date);viewdate.month=date.getMonth()+1;viewdate.fullYear=date.getFullYear();viewdate.year=date.getYear();var lunar_obj=new lunar(date);viewdate.lunarmonth=get_lunarmonth(lunar_obj.month);var lunar_day=Math.floor(lunar_obj.day);viewdate.lunarday=get_lunarday(lunar_day);viewdate.lunar=lunar_obj.year+"-"+lunar_obj.month+"-"+lunar_day;viewdate.ganzhi=get_ganzhi(lunar_obj.year);viewdate.animal=get_animal(lunar_obj.year);return viewdate;},renderCommand:function(today=null){var active=$("#win10_command_center .command-body.today").hasClass('active');if(!active){if(!today){var lunarDate=Win10.getLunarObj();var today='<div class="command-body-calendar">'+'<div class="command-body-calendar-date normal-date">'+lunarDate.month+'月'+lunarDate.day+'日 '+lunarDate.week+'</div>'+'<div class="command-body-calendar-date lunar-date">'+lunarDate.ganzhi+'年'+lunarDate.lunarmonth+lunarDate.lunarday+'</div>'+'</div>';today+='<div class="notice">'+'<div class="notice-header">'+'<span class="notice-header-icon"><img src="./img/icon/weather.png" class="notice-header-icon-img" /></span>'+'<span class="notice-header-title">天气</span>'+'</div>'+'<div class="notice-body">'+'<iframe src="http://www.seniverse.com/weather/weather.aspx?uid=U43DF172E7&cid=CHBJ000000&l=&p=SMART&a=1&u=C&s=13&m=2&x=1&d=1&fc=&bgc=2E93D9&bc=&ti=0&in=0&li=" frameborder="0" scrolling="no" width="97%" height="150" style="padding:5px;" allowTransparency="true"></iframe>'+'</div></div>';}
var viewdate={};var date=new Date();viewdate.second=date.getSeconds();;viewdate.minute=get_min(date);viewdate.hour=get_hour(date);viewdate.day=date.getDate();viewdate.week=get_week(date);viewdate.weekDay=get_weekday(date);viewdate.month=date.getMonth()+1;viewdate.fullYear=date.getFullYear();viewdate.year=date.getYear();var lunar_obj=new lunar(date);viewdate.lunarmonth=get_lunarmonth(lunar_obj.month);var lunar_day=Math.floor(lunar_obj.day);viewdate.lunarday=get_lunarday(lunar_day);viewdate.lunar=lunar_obj.year+"-"+lunar_obj.month+"-"+lunar_day;viewdate.ganzhi=get_ganzhi(lunar_obj.year);viewdate.animal=get_animal(lunar_obj.year);return viewdate;},renderCommand:function(today=null){var active=$("#win10_command_center .command-body.today").hasClass('active');if(!active){if(!today){var lunarDate=Win10.getLunarObj();var today='<div class="command-body-calendar">'+'<div class="command-body-calendar-date normal-date">'+lunarDate.month+'月'+lunarDate.day+'日 '+lunarDate.week+'</div>'+'<div class="command-body-calendar-date lunar-date">'+lunarDate.ganzhi+'年'+lunarDate.lunarmonth+lunarDate.lunarday+'</div>'+'</div>';today+='<div class="notice">'+'<div class="notice-header">'+'<span class="notice-header-icon"><img src="./img/icon/weather.png" class="notice-header-icon-img" /></span>'+'<span class="notice-header-title">天气</span>'+'</div>'+'<div class="notice-body">'+'<iframe scrolling="no" src="https://tianqiapi.com/api.php?style=tw&skin=pitaya" frameborder="0" width="280" height="500" allowtransparency="true"></iframe>'+'</div></div>';}
$("#win10_command_center .command-body.today").html(today).addClass('active');}},menuOpen:function(){$("#win10-menu").addClass('opened');$("#win10-menu").removeClass('hidden');$(".win10-open-iframe").addClass('hide');},menuToggle:function(){if(!$("#win10-menu").hasClass('opened')){this.menuOpen();}else{this.menuClose();}},commandCenterClose:function(){$("#win10_command_center").addClass('hidden_right');this._showShortcut();$(".win10-open-iframe").removeClass('hide');},commandCenterOpen:function(){$("#win10_command_center").removeClass('hidden_right');$(".win10-open-iframe").addClass('hide');$("#win10-msg-nof").removeClass('on-new-msg fa-commenting-o');},renderShortcuts:function(){var h=parseInt(($("#win10 #win10-shortcuts")[0].offsetHeight-85)/100);var x=0,y=0;$("#win10 #win10-shortcuts .shortcut").each(function(){$(this).css({left:x*82+10,top:y*100+10,});y++;if(y>=h){y=0;x++;}});},renderDocks:function(){var cell_width=60;var width=document.body.clientWidth;var docks=$("#footer .dock li");var max_num=parseInt(width/cell_width)-1;for(var i=0;i<docks.length;i++){if(i>max_num){docks.eq(i).css('display','none');}else{docks.eq(i).css('display','list-item');}}
if(width>768){$("#footer .dock li a img").hover(function(){$(this).parent('a').prev().css('display','flex');},function(){$(this).parent('a').prev().css('display','none');});}else{$("#footer .dock li a img").hover(function(){$(this).parent('a').prev().css('display','none');});}},commandCenterToggle:function(){if($("#win10_command_center").hasClass('hidden_right')){this.commandCenterOpen();}else{this.commandCenterClose();}},newMsg:function(title,content,handle_click,app_name='提示消息',app_icon='<img src="./img/icon/weather.png" class="notice-header-icon-img" />',is_del=true){var msg='<div class="notice">'+'<div class="notice-header">'+'<span class="notice-header-icon">'+app_icon+'</span>'+'<span class="notice-header-title">'+app_name+'</span>';if(is_del){msg+='<span class="btn_close_msg fa fa-times-circle"></span>';}
msg+='</div>'+'<div class="notice-body">'+'<div class="msg">'+'<div class="title">'+title+'</div>'+'<div class="content">'+content+'</div>'+'</div></div></div>';var e=$(msg);$("#win10_command_center .msgs").prepend(e);e.find('.content:first,.title:first').click(function(){if(handle_click){handle_click(e);}});layer.tips(Win10.lang('新消息:','New message:')+title,'#win10_btn_command',{tips:[1,'#3c6a4a'],time:3000});if($("#win10_command_center").hasClass('hidden_right')){$("#win10-msg-nof").addClass('on-new-msg');}},getLayeroByIndex:function(index){return $('#'+'layui-layer'+index)},isSmallScreen:function(size){if(!size){size=768}
msg+='</div>'+'<div class="notice-body">'+'<div class="msg">'+'<div class="title">'+title+'</div>'+'<div class="content">'+content+'</div>'+'</div></div></div>';var e=$(msg);$("#win10_command_center .msgs").prepend(e);e.find('.content:first,.title:first').click(function(){if(handle_click){handle_click(e);}});layer.tips(Win10.lang('新消息:','New message:')+title,'#win10_btn_command',{tips:[1,'rgba(0, 0, 0, 0.7)'],time:3000});if($("#win10_command_center").hasClass('hidden_right')){$("#win10-msg-nof").addClass('on-new-msg');}},getLayeroByIndex:function(index){return $('#'+'layui-layer'+index)},isSmallScreen:function(size){if(!size){size=768}
var width=document.body.clientWidth;return width<size;},enableFullScreen:function(){var docElm=document.documentElement;if(docElm.requestFullscreen){docElm.requestFullscreen();}
else if(docElm.mozRequestFullScreen){docElm.mozRequestFullScreen();}
else if(docElm.webkitRequestFullScreen){docElm.webkitRequestFullScreen();}