From 0b4e854b955ec05659bb0a0eb998ccc58e7dff23 Mon Sep 17 00:00:00 2001
From: Godfather <981964879@qq.com>
Date: Sat, 22 Jan 2022 14:26:33 +0800
Subject: [PATCH] =?UTF-8?q?version:1.5=20fix:=20update:=E5=A4=A9=E6=B0=94?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../os/activity/weather/WeatherActivity.java  | 13 +++-
 .../main/res/layout-land/activity_applist.xml |  1 +
 .../main/res/layout-land/activity_weather.xml | 30 +++++++-
 .../main/res/layout-port/activity_applist.xml |  1 +
 .../main/res/layout-port/activity_weather.xml | 69 +++++++++++++++++++
 5 files changed, 112 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/uiui/os/activity/weather/WeatherActivity.java b/app/src/main/java/com/uiui/os/activity/weather/WeatherActivity.java
index e0adc76..0e4e73a 100644
--- a/app/src/main/java/com/uiui/os/activity/weather/WeatherActivity.java
+++ b/app/src/main/java/com/uiui/os/activity/weather/WeatherActivity.java
@@ -1,6 +1,9 @@
 package com.uiui.os.activity.weather;
 
 import android.content.res.Resources;
+import android.media.Image;
+import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.recyclerview.widget.GridLayoutManager;
@@ -24,6 +27,9 @@ public class WeatherActivity extends BaseActivity implements WeatherContact.Weat
     RecyclerView rv_weather;
     @BindView(R.id.tv_location)
     TextView tv_location;
+    @BindView(R.id.iv_back)
+    ImageView iv_back;
+
     private WeatherPresenter mPresenter;
     private WeatherDayApdapter mWeatherDayApdapter;
 
@@ -47,7 +53,12 @@ public class WeatherActivity extends BaseActivity implements WeatherContact.Weat
 //        rv_weather.addItemDecoration(new RecyclerItemDecoration(ScreenUtils.dp2px(resources, 10), ScreenUtils.dp2px(resources, 10), 3));
         mWeatherDayApdapter = new WeatherDayApdapter();
         rv_weather.setAdapter(mWeatherDayApdapter);
-
+        iv_back.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
     }
 
     @Override
diff --git a/app/src/main/res/layout-land/activity_applist.xml b/app/src/main/res/layout-land/activity_applist.xml
index 0f43966..6231c52 100644
--- a/app/src/main/res/layout-land/activity_applist.xml
+++ b/app/src/main/res/layout-land/activity_applist.xml
@@ -16,6 +16,7 @@
             android:id="@+id/iv_back"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
             android:adjustViewBounds="true"
             android:scaleType="centerCrop"
             android:src="@drawable/back"
diff --git a/app/src/main/res/layout-land/activity_weather.xml b/app/src/main/res/layout-land/activity_weather.xml
index 9ab73a8..99ce23b 100644
--- a/app/src/main/res/layout-land/activity_weather.xml
+++ b/app/src/main/res/layout-land/activity_weather.xml
@@ -6,6 +6,34 @@
     android:layout_height="match_parent"
     tools:context=".activity.weather.WeatherActivity">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:adjustViewBounds="true"
+            android:layout_marginStart="8dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/back"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:text="最近7天趋势预报"
+            android:textColor="@color/white"
+            android:textSize="24sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/iv_back"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_weather"
         android:layout_width="match_parent"
@@ -13,7 +41,7 @@
         app:layout_constraintBottom_toTopOf="@+id/constraintLayout2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/constraintLayout3" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/constraintLayout2"
diff --git a/app/src/main/res/layout-port/activity_applist.xml b/app/src/main/res/layout-port/activity_applist.xml
index 0f43966..6231c52 100644
--- a/app/src/main/res/layout-port/activity_applist.xml
+++ b/app/src/main/res/layout-port/activity_applist.xml
@@ -16,6 +16,7 @@
             android:id="@+id/iv_back"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
             android:adjustViewBounds="true"
             android:scaleType="centerCrop"
             android:src="@drawable/back"
diff --git a/app/src/main/res/layout-port/activity_weather.xml b/app/src/main/res/layout-port/activity_weather.xml
index da19102..99ce23b 100644
--- a/app/src/main/res/layout-port/activity_weather.xml
+++ b/app/src/main/res/layout-port/activity_weather.xml
@@ -6,4 +6,73 @@
     android:layout_height="match_parent"
     tools:context=".activity.weather.WeatherActivity">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:adjustViewBounds="true"
+            android:layout_marginStart="8dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/back"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:text="最近7天趋势预报"
+            android:textColor="@color/white"
+            android:textSize="24sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/iv_back"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_weather"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/constraintLayout2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/constraintLayout3" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:adjustViewBounds="true"
+            android:scaleType="centerInside"
+            android:src="@drawable/icon_location"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_location"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="位置"
+            android:textColor="@color/white"
+            android:textSize="20sp"
+            app:layout_constraintBottom_toBottomOf="@+id/imageView"
+            app:layout_constraintStart_toEndOf="@+id/imageView"
+            app:layout_constraintTop_toTopOf="@+id/imageView" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file