From a29160563cc64f368f6aa2d6275ddd550d9a2680 Mon Sep 17 00:00:00 2001 From: fanhuitong <981964879@qq.com> Date: Tue, 11 Oct 2022 10:24:39 +0800 Subject: [PATCH] =?UTF-8?q?version:4.1=20fix:=E4=BC=98=E5=8C=96=E5=A4=A9?= =?UTF-8?q?=E6=B0=94=E6=A8=AA=E7=AB=96=E5=B1=8F=E6=8A=A5=E9=94=99=20update?= =?UTF-8?q?:=E6=9B=B4=E6=96=B0=E5=A4=A9=E6=B0=94=E8=83=8C=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/weather/WeatherPresenter.java | 8 +++-- .../uiui/aios/adapter/WeatherDayApdapter.java | 29 ++++++++++++------ .../drawable-hdpi/background_weather_rain.png | Bin 4751 -> 0 bytes .../drawable-hdpi/background_weather_sun.png | Bin 4958 -> 0 bytes .../background_weather_sunny.png | Bin 4836 -> 0 bytes .../res/drawable/background_weather_rain.xml | 20 ++++++++++++ .../res/drawable/background_weather_sun.xml | 20 ++++++++++++ .../res/drawable/background_weather_sunny.xml | 20 ++++++++++++ .../main/res/layout-land/activity_weather.xml | 2 +- app/src/main/res/layout-land/item_weather.xml | 14 +++++---- .../main/res/layout-port/activity_weather.xml | 5 +-- app/src/main/res/layout-port/item_weather.xml | 26 ++++++++-------- 12 files changed, 112 insertions(+), 32 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/background_weather_rain.png delete mode 100644 app/src/main/res/drawable-hdpi/background_weather_sun.png delete mode 100644 app/src/main/res/drawable-hdpi/background_weather_sunny.png create mode 100644 app/src/main/res/drawable/background_weather_rain.xml create mode 100644 app/src/main/res/drawable/background_weather_sun.xml create mode 100644 app/src/main/res/drawable/background_weather_sunny.xml diff --git a/app/src/main/java/com/uiui/aios/activity/weather/WeatherPresenter.java b/app/src/main/java/com/uiui/aios/activity/weather/WeatherPresenter.java index 73d5a98..c0c65f9 100644 --- a/app/src/main/java/com/uiui/aios/activity/weather/WeatherPresenter.java +++ b/app/src/main/java/com/uiui/aios/activity/weather/WeatherPresenter.java @@ -82,7 +82,9 @@ public class WeatherPresenter implements WeatherContact.Presenter { @Override public void onError(Throwable throwable) { Log.e("getWeather", "onError: " + throwable.getMessage()); - mView.setWeather(null); + if (mView != null) { + mView.setWeather(null); + } } @Override @@ -90,7 +92,9 @@ public class WeatherPresenter implements WeatherContact.Presenter { String jsonString = new Gson().toJson(weatherDailyBean); Log.d("getWeather", "onSuccess: " + jsonString); mMMKV.encode(WEATHER_DAILY_KEY, jsonString); - mView.setWeather(weatherDailyBean); + if (mView != null) { + mView.setWeather(weatherDailyBean); + } } }); } diff --git a/app/src/main/java/com/uiui/aios/adapter/WeatherDayApdapter.java b/app/src/main/java/com/uiui/aios/adapter/WeatherDayApdapter.java index e8b65f0..d19ee49 100644 --- a/app/src/main/java/com/uiui/aios/adapter/WeatherDayApdapter.java +++ b/app/src/main/java/com/uiui/aios/adapter/WeatherDayApdapter.java @@ -16,6 +16,9 @@ import androidx.recyclerview.widget.RecyclerView; import com.qweather.sdk.bean.weather.WeatherDailyBean; import com.uiui.aios.R; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; public class WeatherDayApdapter extends RecyclerView.Adapter { @@ -40,17 +43,25 @@ public class WeatherDayApdapter extends RecyclerView.AdapterS#hONF{+sGFj0~`gO`A9cWp-mQl$3d zl72<-Gk(qIa!3 z=?seRq{>xtWvV=r6TH-m^G38(mMqU!&Lr)_!$pf_N>zd^NwS#m(g*<~prYw>^JC=FR^hcjfes(OL&pgYAVEDMOW`$;60ekR|W3+`|#)vPG0oxTo zYmNTVk&RNpLbeTau!){JU086 zBO4l0*{<#T)&*V=uSt@!tOMsuQ!l5cIi`R9A#v=7m)_cbIj65$k+SB_s#_!Ho-cin zd&>3pzG(H8n!(cBJNI|@^pxlp41KN$%PaV%r%SKzzT0(9?|^@oY4KK|*Vv9C(eE(w?Hk`l9fGwc70b+ux5Br zJT$aWTs+W!;oS|tcd$qG9$ozPM|5&63tbmwANu6pjY|$G5wi&Yt43u(!2w-MsRz2} z6`^aYI9i(`dyUwZv158)|3Q66SG6UohnGv!LXUP9o-HpJ-lwxKbwim`c!$EXy50>= zKCtce$GL_|D->a{N{c-@>gc?;Ep7e7VZBRVBhpOiyMD>Zc;|TB0`~G%vvS%iEz!Do zY0;)hqw&sLYlJWPRBp3FhQo8pdsX5Mu_Kvk?)|$rR1T;jwqapvvGbEZID~(@ajNe> zQM{&EcenRFt?vcn%;x8i)Afs&T>j&%YpV<`dQzjy&f_5iXL|0?V^v>Of||;}$g9}`jLKVAMC46E z0fs;Qnh^?NbCHH+fo`=dIZ$eeSP5Kk#6|&HWcG;9`?~f73YbI0xmlt;?O$7?feez6snyP@FSA z;tS~Tz%~F*UcMdV0iO`oNSpQTG%8+5Jlo7?PE4gKUpL-gQ-P!M)>wsVL|MpvG?A|K%E` z4LU0@fmfK7KXu%pLh0#H2yYJYg)L$wrrAIy6D`bN2&Q9bs##lIQNWh+X(S2&M!XXf zazN2i4=P($Cj$fn^<$m4%Lx` zi2#QTZyC&{(V!;ogeo)41mHCZEBgP1Imd+_e-rZ=y8u3HFP_~&2?2+cgm~?LS%^~y zHv^uU!EvT<&u+bC0yo}&d;kDUfB+NwGdng8Lk$f>bIR$=0n9Yqxzbi96S`!D7+kWk z67!)U0A?K!juIF?EieH^CCkj!3VO!25Q7?offJg?0bUJ)@+kRcgub2FH4aH5!k;1NI4cbOU*x`5PV^0KBg4w#@i%rg2&V?EQlTAHBWK#-@Y(owWN zxC+vYB*oW^xVX)aH#_!V9F}~ETftmgOrXmF+*7P~ac;B$*$Gs!7=lp>6Q?~3w83|? zI&pHi)=csDE#pHqTuFgvvct`a8?Ol8QO)Y@X9UBx_fuNBaX}ct73_MitO=5aE1Y&Cnf7-W-a)a}J% zC$VBtc5mwK&AP9el+lURH7@D@3C1ba1>@DRqJWyAduBnbbd%vIDZ)@H0}M=bjVuBR zna|5w+=(!JvF?r4pBZ(mrzI5wY#Kj_D?Fj*44Y}L!9(+nwDkz!T4yR3UA6YFZZ%@Y zZQTul#E{t5&F7k=5BD6@?J$gZtWa>ukbeb4-lQv?uz&D~8W0@w{ex6-P=8Q}x}ds% z@x`K9QQ=W8^0GpE#$`(foxZEMgWeXxX19h}kDIs9{1pXbZCQkcgxo8_W@Evp8x%xs ztcZ*)xleVvKvAgmf*Hz*%pAovg;(2)F?jS6Gscg!)0fMrELbgDfXcMaPGs1)orK(mc*GSL8c$Wh zBrfBRG{G%TFHni*)rE318{GWPE!l|Ugoi!7C_TM$;kx45`0?ghp$}X!rJ^XoFj4C7 zwnwVxswic~O2JUy#9)k0dhrez4{_w=GM7J6T$l+7_tRGx&fz83OzY_)m>%seSO}Q$ z**J|G?P~)&`jUgkYA%f4C`z$F4iEqB&d&KA@9C>n1>MZSd%Al43tLnC@G}3^41$-7 z7xvRLh>><tH zL49+7sXY=Hn%f>$-P$rB@9&@7Y=hdr-Rr5(xwq-(u90G$+8-Gv6_mgFO8!yr(fuw@ z1`p`{+l;lPQ&8qF>#rF3lSkuwZ1&!dZMH*i28PDw_YY0i3)u(yzuq-h{)7KTqweug z)omMeWzV(pj9&5UssY)($xlw`-tOynYo3IvUI-1%S7dywxX4;w(_!3rEPkZhhx&Uf z#kfs9yl6v92YdZ*_bt1w77SNZ^*JDQUUb{)m`i{BIy&Ipjf48`o~}}T_noeEanD~}UyS|(RV;7t zYFN;)!}~k^d1Gb4uwEBhu+r}wf9UL{YtbWa26Xb#``w?Eu=e2pB3isKf;b!$|H1zN DhW5{Q diff --git a/app/src/main/res/drawable-hdpi/background_weather_sun.png b/app/src/main/res/drawable-hdpi/background_weather_sun.png deleted file mode 100644 index 475bdb045a0017bed9e970c1be19ea4b77005e88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4958 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 diff --git a/app/src/main/res/drawable-hdpi/background_weather_sunny.png b/app/src/main/res/drawable-hdpi/background_weather_sunny.png deleted file mode 100644 index 6a70299b0e1f926b8ba71cc8f0d035918bf0b485..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4836 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 diff --git a/app/src/main/res/drawable/background_weather_rain.xml b/app/src/main/res/drawable/background_weather_rain.xml new file mode 100644 index 0000000..f8ef3be --- /dev/null +++ b/app/src/main/res/drawable/background_weather_rain.xml @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_weather_sun.xml b/app/src/main/res/drawable/background_weather_sun.xml new file mode 100644 index 0000000..1094952 --- /dev/null +++ b/app/src/main/res/drawable/background_weather_sun.xml @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_weather_sunny.xml b/app/src/main/res/drawable/background_weather_sunny.xml new file mode 100644 index 0000000..b057981 --- /dev/null +++ b/app/src/main/res/drawable/background_weather_sunny.xml @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_weather.xml b/app/src/main/res/layout-land/activity_weather.xml index fd3af79..a7a3c76 100644 --- a/app/src/main/res/layout-land/activity_weather.xml +++ b/app/src/main/res/layout-land/activity_weather.xml @@ -69,7 +69,7 @@ android:layout_height="wrap_content" android:text="位置" android:textColor="@color/white" - android:textSize="20sp" + android:textSize="@dimen/sp_18" app:layout_constraintBottom_toBottomOf="@+id/imageView" app:layout_constraintStart_toEndOf="@+id/imageView" app:layout_constraintTop_toTopOf="@+id/imageView" /> diff --git a/app/src/main/res/layout-land/item_weather.xml b/app/src/main/res/layout-land/item_weather.xml index 7e3e275..ba1ad16 100644 --- a/app/src/main/res/layout-land/item_weather.xml +++ b/app/src/main/res/layout-land/item_weather.xml @@ -25,10 +25,12 @@ android:id="@+id/tv_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="36dp" - android:text="2022-01-21 17:48:48" + android:layout_marginBottom="@dimen/dp_8" + android:maxLines="1" + android:singleLine="true" + android:text="17:48" android:textColor="@color/black" - android:textSize="20sp" + android:textSize="@dimen/sp_20" app:layout_constraintBottom_toTopOf="@+id/iv_weather" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -49,9 +51,9 @@ android:id="@+id/tv_weather" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="36dp" + android:layout_marginTop="@dimen/dp_8" android:textColor="@color/black" - android:textSize="20sp" + android:textSize="@dimen/sp_20" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/iv_weather" /> @@ -60,7 +62,7 @@ android:id="@+id/tv_temp" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" + android:layout_marginTop="@dimen/dp_8" android:text="15-22" android:textColor="@color/black" android:textSize="26sp" diff --git a/app/src/main/res/layout-port/activity_weather.xml b/app/src/main/res/layout-port/activity_weather.xml index fd3af79..1892692 100644 --- a/app/src/main/res/layout-port/activity_weather.xml +++ b/app/src/main/res/layout-port/activity_weather.xml @@ -10,12 +10,13 @@ android:id="@+id/constraintLayout3" android:layout_width="match_parent" android:layout_height="wrap_content"> + diff --git a/app/src/main/res/layout-port/item_weather.xml b/app/src/main/res/layout-port/item_weather.xml index df7047c..e78cccf 100644 --- a/app/src/main/res/layout-port/item_weather.xml +++ b/app/src/main/res/layout-port/item_weather.xml @@ -29,24 +29,24 @@ android:id="@+id/tv_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="36dp" - android:text="2022-01-21 17:48:48" + android:layout_marginStart="@dimen/dp_32" + android:layout_marginTop="@dimen/dp_32" + android:text="17:48" android:textColor="@color/black" - android:textSize="20sp" - app:layout_constraintBottom_toTopOf="@+id/iv_weather" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + android:textSize="@dimen/sp_20" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@+id/iv_bg" /> + app:layout_constraintEnd_toEndOf="@+id/iv_weather" + app:layout_constraintStart_toStartOf="@+id/iv_weather" + app:layout_constraintTop_toBottomOf="@+id/iv_weather" /> \ No newline at end of file