1.1.5 version

tonylu110 · tonylu110 · commit e77e8ece18bf · 2022-03-15T17:43:18.000+08:00
diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 3,
     "name": "uyou 新标签页",
     "description": "这是一个很好看的新标签页！",
-    "version": "1.1.4",
+    "version": "1.1.5",
     "icons": {
         "128": "extension.png",
         "48": "extension.png",
diff --git a/newPage/css/setting.css b/newPage/css/setting.css
@@ -397,6 +397,34 @@
     background-color: #035fa5;
 }
 
+.apiImgButton{
+    background-color: #0078d4;
+    border-radius: 8px;
+    padding: 10px;
+    width: 130px;
+    color: white;
+    font-size: 15px;
+    text-align: center;
+    cursor: pointer;
+    user-select: none;
+    margin: 5px;
+}
+.apiImgButton:active{
+    background-color: #035fa5
+}
+#apiImgs{
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    margin: 0px -5px 0px -5px;
+}
+#mobileApiImgs{
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    margin: 0px -5px 0px -5px;
+}
+
 .hsFeatureHides{
     background-color: #e6e6e6;
     border-radius: 8px;
diff --git a/newPage/css/style.css b/newPage/css/style.css
@@ -96,11 +96,20 @@ body{
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    width: 73px;
-    padding: 3px;
+    width: 72px;
+    padding: 4px;
     background-color: #ffffff70;
     border-radius: 8px;
     height: 100%;
+    text-align: center;
+}
+.weatherTime{
+    background-color: #ffffff70;
+    padding: 3px;
+    margin-bottom: 2px;
+    width: 40px;
+    text-align: center;
+    border-radius: 20px;
 }
 
 #click{
@@ -148,13 +157,12 @@ body{
     outline: 0px;
 }
 .searchbar img{
-    height: 30px;
-    width: 30px;
+    padding: 5px;
+    height: 20px;
+    width: 20px;
     margin-right: 10px;
     border-radius: 50%;
-}
-.searchbar img:hover{
-    background-color: #00000010;
+    background-color: white;
 }
 
 /* This is favourite link style */
diff --git a/newPage/index.html b/newPage/index.html
@@ -107,6 +107,17 @@
                     </div>
                     <div id="picError"></div>
                     <img src="" id="viewImg" style="display: none;">
+                    <div id="apiImg">
+                        <div class="backgroundTitile">自动切换图片</div>
+                        <div id="apiImgs">
+                            <div class="apiImgButton" id="bingImg">Bing 每日一图</div>
+                            <div class="apiImgButton" id="cwImg">东方 Project</div>
+                        </div>
+                        <div id="mobileApiImgs" style="display: none;">
+                            <div class="apiImgButton" id="bingImgMobile">Bing 每日一图</div>
+                            <div class="apiImgButton" id="cwImgMobile">东方 Project</div>
+                        </div>
+                    </div>
                     <div id="exImg">
                         <div class="backgroundTitile">本地图片</div>
                         <div class="exImgs" id="exImgs">
@@ -386,19 +397,19 @@
                     <div id="todayWeathertemp"></div>
                     <div class="feaWeather">
                         <div class="feaWeatherbox">
-                            <div id="time2"></div>
+                            <div id="time2" class="weatherTime"></div>
                             <div id="day2Weather"></div>
                             <img src="" id="day2Img" style="width: 30px; height: 30px;">
                             <div id="day2Temp"></div>
                         </div>
                         <div class="feaWeatherbox">
-                            <div id="time3"></div>
+                            <div id="time3" class="weatherTime"></div>
                             <div id="day3Weather"></div>
                             <img src="" id="day3Img" style="width: 30px; height: 30px;">
                             <div id="day3Temp"></div>
                         </div>
                         <div class="feaWeatherbox">
-                            <div id="time4"></div>
+                            <div id="time4" class="weatherTime"></div>
                             <div id="day4Weather"></div>
                             <img src="" id="day4Img" style="width: 30px; height: 30px;">
                             <div id="day4Temp"></div>
diff --git a/newPage/js/features/settingMenu.js b/newPage/js/features/settingMenu.js
@@ -58,6 +58,8 @@ function settingMenus() {
             elemenetGetId('uploadBtn').style.width = settingWidth - 62 + 'px';
             elemenetGetId('onlinePicUrl').style.width = settingWidth - 97 + 'px';
             elemenetGetId('review').style.width = '70px';
+            elemenetGetClass('apiImgButton')[2].style.width = settingWidth / 2 - 46.5 + 'px';
+            elemenetGetClass('apiImgButton')[3].style.width = settingWidth / 2 - 46.5 + 'px';
         }
     }
     elemenetGetId('festuresSettings').onclick = function () {
@@ -173,4 +175,23 @@ function loaclImgChange() {
         chrome.storage.local.set({ 'picUrl': "'imgs/mobile/background - 5.jpg'" });
         elemenetGetId('background').style.backgroundImage = 'url("imgs/mobile/background - 5.jpg")';
     }
+}
+
+function apiImg() {
+    elemenetGetId('bingImg').onclick = function () {
+        chrome.storage.local.set({ 'picUrl': "https://api.dujin.org/bing/1920.php" });
+        elemenetGetId('background').style.backgroundImage = 'url("https://api.dujin.org/bing/1920.php")';
+    }
+    elemenetGetId('cwImg').onclick = function () {
+        chrome.storage.local.set({ 'picUrl': "https://img.paulzzh.com/touhou/random" });
+        elemenetGetId('background').style.backgroundImage = 'url("https://img.paulzzh.com/touhou/random")';
+    }
+    elemenetGetId('bingImgMobile').onclick = function () {
+        chrome.storage.local.set({ 'picUrl': "https://api.dujin.org/bing/m.php" });
+        elemenetGetId('background').style.backgroundImage = 'url("https://api.dujin.org/bing/m.php")';
+    }
+    elemenetGetId('cwImgMobile').onclick = function () {
+        chrome.storage.local.set({ 'picUrl': "https://img.paulzzh.com/touhou/random?size=wap" });
+        elemenetGetId('background').style.backgroundImage = 'url("https://img.paulzzh.com/touhou/random?size=wap")';
+    }
 }
diff --git a/newPage/js/features/settings.js b/newPage/js/features/settings.js
@@ -128,4 +128,5 @@ function settingUse() {
     loaclImgChange();
     otherFeatures();
     moreSearch();
+    apiImg();
 }
diff --git a/newPage/js/features/weather.js b/newPage/js/features/weather.js
@@ -1,6 +1,16 @@
 function weatherGet(city, day) {
     var httpRequest = new XMLHttpRequest();
     day = day - 1;
+
+    function dayTo(str) {
+        return str.match(/\（([^)]*)\）/);
+    }
+    function dayTo2(str) {
+        return str.split(/\（.*?\）/);
+    }
+
+    var weatherTime = '';
+
     httpRequest.open('GET', 'https://query.asilu.com/weather/baidu/?city=' + city, true);
     httpRequest.send();
 
@@ -40,7 +50,14 @@ function weatherGet(city, day) {
                 } else {
                     weatherImg = 'imgs/dLinkIcon.png';
                 }
-                elemenetGetId('time' + dayfea).innerText = obj.weather[dayfea - 1].date;
+
+                if (dayfea < 4) {
+                    weatherTime = dayTo(obj.weather[dayfea - 1].date)[1];
+                } else {
+                    weatherTime = dayTo2(obj.weather[dayfea - 1].date)[0]
+                }
+
+                elemenetGetId('time' + dayfea).innerText = weatherTime;
                 elemenetGetId('day' + dayfea + 'Weather').innerText = obj.weather[dayfea - 1].weather;
                 elemenetGetId('day' + dayfea + 'Img').src = weatherImg;
                 elemenetGetId('day' + dayfea + 'Temp').innerText = obj.weather[dayfea - 1].temp;
@@ -127,6 +144,13 @@ function weatherUse() {
                     weatherHide = !weatherHide;
                 }
             } else {
+                elemenetGetClass('feaWeatherbox')[0].style.marginLeft = '-3px';
+                elemenetGetClass('feaWeatherbox')[2].style.marginRight = '-3px';
+                elemenetGetClass('feaWeatherbox')[0].style.width = '74px';
+                elemenetGetClass('feaWeatherbox')[1].style.width = '74px';
+                elemenetGetClass('feaWeatherbox')[2].style.width = '74px';
+                elemenetGetClass('feaWeather')[0].style.marginBottom = '4px';
+                elemenetGetId('weather').style.height = '250px'
                 setTimeout(function () {
                     elemenetGetId('weatherMain').style.display = '';
                     if (elemenetGetId('button').innerText == '暂时没有有连接到可以访问互联网的网络哦~') {
diff --git a/newPage/js/main/main.js b/newPage/js/main/main.js
@@ -33,7 +33,7 @@ function changeStyle() {
     elemenetGetClass('backgroundTitile')[num].style.backgroundColor = '#ffffff70';
     elemenetGetClass('backgroundTitile')[num].style.borderRadius = '10px';
     elemenetGetClass('backgroundTitile')[num].style.padding = '10px';
-    if (num == 0 || num == 1 || num == 2) {
+    if (num == 0 || num == 1 || num == 2 || num == 3) {
       elemenetGetClass('backgroundTitile')[num].style.width = 'fit-content';
     }
     if (num == 1) {
@@ -99,6 +99,8 @@ function changeStyle() {
     elemenetGetId('weather').style.transition = '0s';
     elemenetGetId('top-right').style.zIndex = 102;
     elemenetGetId('weatherImg').style.transition = '0s';
+    elemenetGetId('apiImgs').style.display = 'none';
+    elemenetGetId('mobileApiImgs').style.display = '';
     elemenetGetClass('mobileExImgs')[0].style.display = '';
     elemenetGetClass('donateMsg')[0].style.backgroundColor = '#ffffff70'
     elemenetGetClass('donateMsg')[0].style.borderRadius = '10px';
@@ -109,6 +111,7 @@ function changeStyle() {
     titleBack(3);
     titleBack(4);
     titleBack(5);
+    titleBack(6);
     window.onresize = function () {
       var nowHeight = document.documentElement.clientHeight;
       if (screenHeight - nowHeight > 50) {
diff --git a/popupPage/extension.html b/popupPage/extension.html
@@ -15,13 +15,19 @@ <h2>欢迎使用 uyou 新标签页</h2>
         <div id="web">前往官网</div>
     </div>
     <div class="Title new">当前版本：</div>
+    <div class="message">
+        <div class="v">版本：1.1.5</div>
+        <div class="info">新增更多自动切换图片源</div>
+        <div class="info">优化天气功能显示</div>
+        <div class="info">优化搜索栏图标</div>
+    </div>
+    <div class="Title old">历史版本：</div>
     <div class="message">
         <div class="v">版本：1.1.4</div>
         <div class="info">新增天气功能</div>
         <div class="info">新增点击空白区域关闭设置/一言功能</div>
         <div class="info">新增点击空白区域关闭关于/历史记录功能</div>
     </div>
-    <div class="Title old">历史版本：</div>
     <div class="message">
         <div class="v">版本：1.1.3</div>
         <div class="info">优化了移动端扩展菜单样式</div>

Original file line number	Diff line number	Diff line change
`@@ -128,4 +128,5 @@ function settingUse() {`
`128`	`128`	`loaclImgChange();`
`129`	`129`	`otherFeatures();`
`130`	`130`	`moreSearch();`
	`131`	`+ apiImg();`
`131`	`132`	`}`