Skip to content

Commit

Permalink
屏蔽掉假的weather数据
Browse files Browse the repository at this point in the history
Change-Id: I142e679b28a0f6a2038e4fa396b6c8fc7d974a3d
  • Loading branch information
SundoggyNew committed Sep 9, 2020
1 parent 10c1dfe commit 5c0e074
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class HomeHeadViewHolder1 : CRecyclerView.HeadViewHolder<FamilyEntity> {

override fun show() {
weatherEntity?.let {
itemView.tv_weather_number.text = it.number
itemView.tv_weather.text = it.weather
// itemView.tv_weather_number.text = it.number
// itemView.tv_weather.text = it.weather
}
App.data.getCurrentFamily()?.let {
itemView.tv_home_name.text = it.FamilyName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class HomeHeadViewHolder2 : CRecyclerView.HeadViewHolder<FamilyEntity> {

override fun show() {
weatherEntity?.let {
itemView.tv_weather_number.text = it.number
itemView.tv_weather.text = it.weather
// itemView.tv_weather_number.text = it.number
// itemView.tv_weather.text = it.weather
}
App.data.getCurrentFamily().let {
itemView.tv_home_name.text = it.FamilyName
Expand Down
20 changes: 9 additions & 11 deletions app/src/main/res/layout/head_home1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="104dp">
android:layout_height="54dp">

<TextView
android:id="@+id/tv_home_name"
Expand Down Expand Up @@ -60,28 +60,26 @@
android:layout_marginStart="16dp"
android:layout_marginTop="18dp"
android:maxLines="1"
android:text="28℃"
android:textColor="@color/black_333333"
android:textSize="@dimen/ts_12"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_home_name" />

<View
android:layout_width="1dp"
android:layout_height="10dp"
android:layout_marginStart="8dp"
android:background="@color/black_333333"
app:layout_constraintBottom_toBottomOf="@+id/tv_weather_number"
app:layout_constraintLeft_toRightOf="@+id/tv_weather_number"
app:layout_constraintTop_toTopOf="@+id/tv_weather_number" />
<!-- <View-->
<!-- android:layout_width="1dp"-->
<!-- android:layout_height="10dp"-->
<!-- android:layout_marginStart="8dp"-->
<!-- android:background="@color/black_333333"-->
<!-- app:layout_constraintBottom_toBottomOf="@+id/tv_weather_number"-->
<!-- app:layout_constraintLeft_toRightOf="@+id/tv_weather_number"-->
<!-- app:layout_constraintTop_toTopOf="@+id/tv_weather_number" />-->

<TextView
android:id="@+id/tv_weather"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="17dp"
android:maxLines="1"
android:text="多云转晴"
android:textColor="@color/black_333333"
android:textSize="@dimen/ts_12"
app:layout_constraintBottom_toBottomOf="@+id/tv_weather_number"
Expand Down

0 comments on commit 5c0e074

Please sign in to comment.