tt/VscoolOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.0.2

Browse Source 
update:
bugfixes:取消天气背景显示
This commit is contained in:
Fanhuitong
2024-07-15 09:26:10 +08:00
parent b4fc904734
commit c815636e5e
9 changed files with 61 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -15,8 +15,8 @@ android {
applicationId "com.xxpatx.os" applicationId "com.xxpatx.os"
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 29 targetSdkVersion 29
versionCode 2 versionCode 3
versionName "1.0.1" versionName "1.0.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

10
app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java
View File

@@ -118,19 +118,19 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
public void onChanged(@Nullable WeatherNowBean.NowBaseBean nowBaseBean) { public void onChanged(@Nullable WeatherNowBean.NowBaseBean nowBaseBean) {
mViewDataBinding.tvTemp.setText(nowBaseBean.getTemp() + "℃"); mViewDataBinding.tvTemp.setText(nowBaseBean.getTemp() + "℃");
if (DayUtils.isNight()) { if (DayUtils.isNight()) {
mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_night)); // mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_night));
} else { } else {
switch (nowBaseBean.getIcon()) { switch (nowBaseBean.getIcon()) {
default: default:
case "100": case "100":
case "150": case "150":
//晴 //晴
mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather)); // mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather));
break; break;
case "102": case "102":
case "152": case "152":
//少云 //少云
mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_rain)); // mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_rain));
break; break;
} }
} }
@@ -189,10 +189,10 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
@Override @Override
public void onChanged(List<Contact> contacts) { public void onChanged(List<Contact> contacts) {
if (contacts == null || contacts.size() == 0) { if (contacts == null || contacts.size() == 0) {
mViewDataBinding.tvNoContact.setVisibility(View.VISIBLE); mViewDataBinding.clNodata.setVisibility(View.VISIBLE);
mViewDataBinding.rvContact.setVisibility(View.GONE); mViewDataBinding.rvContact.setVisibility(View.GONE);
} else { } else {
mViewDataBinding.tvNoContact.setVisibility(View.GONE); mViewDataBinding.clNodata.setVisibility(View.GONE);
mViewDataBinding.rvContact.setVisibility(View.VISIBLE); mViewDataBinding.rvContact.setVisibility(View.VISIBLE);
} }
mContactAdapter.setContactList(contacts); mContactAdapter.setContactList(contacts);

6
app/src/main/java/com/xxpatx/os/fragment/custom/CustomFragment.java
View File

@@ -818,13 +818,13 @@ public class CustomFragment extends BaseMvvmFragment<CustomViewModel, FragmentCu
case "102": case "102":
case "152": case "152":
if (DayUtils.isNight()) { if (DayUtils.isNight()) {
mViewDataBinding.clWeather.setBackground(ContextCompat.getDrawable(mContext, R.drawable.background_weather_sun)); // mViewDataBinding.clWeather.setBackground(ContextCompat.getDrawable(mContext, R.drawable.background_weather_sun));
} else { } else {
mViewDataBinding.clWeather.setBackground(ContextCompat.getDrawable(mContext, R.drawable.background_weather_sun_night)); // mViewDataBinding.clWeather.setBackground(ContextCompat.getDrawable(mContext, R.drawable.background_weather_sun_night));
} }
break; break;
default: default:
mViewDataBinding.clWeather.setBackground(ContextCompat.getDrawable(mContext, R.drawable.background_weather_rain)); // mViewDataBinding.clWeather.setBackground(ContextCompat.getDrawable(mContext, R.drawable.background_weather_rain));
} }
} else { } else {
//在此查看返回数据失败的原因 //在此查看返回数据失败的原因

6
app/src/main/java/com/xxpatx/os/fragment/home/HomeFragment.java
View File

@@ -230,19 +230,19 @@ public class HomeFragment extends BaseMvvmFragment<HomeViewModel, FragmentHomeBi
public void onChanged(@Nullable WeatherNowBean.NowBaseBean nowBaseBean) { public void onChanged(@Nullable WeatherNowBean.NowBaseBean nowBaseBean) {
mViewDataBinding.tvTemp.setText(nowBaseBean.getTemp() + "℃"); mViewDataBinding.tvTemp.setText(nowBaseBean.getTemp() + "℃");
if (DayUtils.isNight()) { if (DayUtils.isNight()) {
mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_night)); // mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_night));
} else { } else {
switch (nowBaseBean.getIcon()) { switch (nowBaseBean.getIcon()) {
default: default:
case "100": case "100":
case "150": case "150":
//晴 //晴
mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather)); // mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather));
break; break;
case "102": case "102":
case "152": case "152":
//少云 //少云
mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_rain)); // mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_rain));
break; break;
} }
} }

6
app/src/main/java/com/xxpatx/os/fragment/settings/SettingsFragment.java
View File

@@ -110,19 +110,19 @@ public class SettingsFragment extends BaseMvvmFragment<SettingsViewModel, Fragme
public void onChanged(@Nullable WeatherNowBean.NowBaseBean nowBaseBean) { public void onChanged(@Nullable WeatherNowBean.NowBaseBean nowBaseBean) {
mViewDataBinding.tvTemp.setText(nowBaseBean.getTemp() + "℃"); mViewDataBinding.tvTemp.setText(nowBaseBean.getTemp() + "℃");
if (DayUtils.isNight()) { if (DayUtils.isNight()) {
mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_night)); // mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_night));
} else { } else {
switch (nowBaseBean.getIcon()) { switch (nowBaseBean.getIcon()) {
default: default:
case "100": case "100":
case "150": case "150":
//晴 //晴
mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather)); // mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather));
break; break;
case "102": case "102":
case "152": case "152":
//少云 //少云
mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_rain)); // mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_rain));
break; break;
} }
} }

1
app/src/main/res/layout-land/fragment_home.xml
View File

@@ -31,7 +31,6 @@
android:id="@+id/cl_weather" android:id="@+id/cl_weather"
android:layout_width="157dp" android:layout_width="157dp"
android:layout_height="96dp" android:layout_height="96dp"
android:background="@drawable/custom_bg_weather"
android:onClick="@{click::toWeather}" android:onClick="@{click::toWeather}"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">

1
app/src/main/res/layout-port/fragment_home.xml
View File

@@ -36,7 +36,6 @@
android:id="@+id/cl_weather" android:id="@+id/cl_weather"
android:layout_width="330dp" android:layout_width="330dp"
android:layout_height="165dp" android:layout_height="165dp"
android:background="@drawable/card_weather_background"
android:onClick="@{click::toWeather}" android:onClick="@{click::toWeather}"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">

77
app/src/main/res/layout/fragment_contact_home.xml
View File

@@ -27,7 +27,6 @@
android:id="@+id/cl_weather" android:id="@+id/cl_weather"
android:layout_width="330dp" android:layout_width="330dp"
android:layout_height="165dp" android:layout_height="165dp"
android:background="@drawable/card_weather_background"
android:onClick="@{click::toWeather}" android:onClick="@{click::toWeather}"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
@@ -147,39 +146,53 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cl_weather" /> app:layout_constraintTop_toBottomOf="@+id/cl_weather" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_nodata"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="12dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cl_weather" >
<TextView
android:id="@+id/tv_no_contact"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:gravity="center"
android:text="暂无联系人"
android:textColor="@color/white"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/tv_add"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_add"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:background="@drawable/fragment_add_contact_background"
android:gravity="center"
android:onClick="@{click::toAdd}"
android:text="添加联系人"
android:textColor="@color/white"
android:textSize="16sp"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_no_contact"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:gravity="center"
android:text="暂无联系人"
android:textColor="@color/white"
android:textSize="20sp"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/tv_add"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_add"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:background="@drawable/fragment_add_contact_background"
android:gravity="center"
android:onClick="@{click::toAdd}"
android:text="添加联系人"
android:textColor="@color/white"
android:textSize="16sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</layout> </layout>

1
app/src/main/res/layout/fragment_settings.xml
View File

@@ -32,7 +32,6 @@
android:id="@+id/cl_weather" android:id="@+id/cl_weather"
android:layout_width="330dp" android:layout_width="330dp"
android:layout_height="165dp" android:layout_height="165dp"
android:background="@drawable/card_weather_background"
android:onClick="@{click::toWeather}" android:onClick="@{click::toWeather}"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">