Skip to content
This repository was archived by the owner on Sep 9, 2022. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e483201

Browse files
committedMar 11, 2019
Fixed Glide bugs which can't display bgpic on Pie.
1 parent 4c68bdb commit e483201

File tree

11 files changed

+19
-12
lines changed

11 files changed

+19
-12
lines changed
 

‎app/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
applicationId "com.absinthe.chillweather"
77
minSdkVersion 21
88
targetSdkVersion 28
9-
versionCode 624
10-
versionName "1.0.7"
9+
versionCode 636
10+
versionName "1.0.8"
1111
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1212
}
1313
buildTypes {
@@ -35,9 +35,9 @@ dependencies {
3535
implementation 'com.google.android.material:material:1.0.0'
3636

3737
implementation 'org.litepal.android:java:3.0.0'
38-
implementation 'com.squareup.okhttp3:okhttp:3.12.0'
38+
implementation 'com.squareup.okhttp3:okhttp:3.13.1'
3939
implementation 'com.google.code.gson:gson:2.8.5'
40-
implementation 'com.github.bumptech.glide:glide:4.8.0'
40+
implementation 'com.github.bumptech.glide:glide:4.9.0'
4141
implementation 'com.wenwenwen888:searchbox:1.0.0'
4242
implementation 'com.github.daniel-stoneuk:material-about-library:2.4.2'
4343
implementation 'com.mikepenz:iconics-core:3.1.0'

‎app/src/main/AndroidManifest.xml

+7-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
android:supportsRtl="true"
3939
android:theme="@style/Splashscreen"
4040
tools:ignore="GoogleAppIndexingWarning,RtlEnabled"
41-
tools:targetApi="donut">
41+
android:usesCleartextTraffic="true"
42+
tools:targetApi="n">
4243
<activity android:name=".MainActivity">
4344
<intent-filter>
4445
<action android:name="android.intent.action.MAIN" />
@@ -48,12 +49,16 @@
4849
</activity>
4950
<activity
5051
android:name=".WeatherActivity"
51-
android:launchMode="singleTask"></activity>
52+
android:launchMode="singleTask" />
5253

5354
<meta-data
5455
android:name="TencentMapSDK"
5556
android:value="NE6BZ-WLH6V-WLVPM-UGGQT-OZIUE-2EFR7" />
5657

58+
<meta-data
59+
android:name="android.max_aspect"
60+
android:value="2.1"/>
61+
5762
<activity
5863
android:name=".RecyclerActivity"
5964
android:label="@string/city_manage"

‎app/src/main/assets/version.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"VersionCode": "624",
3-
"VersionName": "1.0.7"
2+
"VersionCode": "636",
3+
"VersionName": "1.0.8"
44
}

‎app/src/main/java/com/absinthe/chillweather/WeatherActivity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import android.view.LayoutInflater;
3434
import android.view.MotionEvent;
3535
import android.view.View;
36+
import android.view.WindowManager;
3637
import android.widget.Button;
3738
import android.widget.ImageView;
3839
import android.widget.LinearLayout;
@@ -258,7 +259,7 @@ public void initView() {
258259
.into(ivNavHeaderPic); //防止长按无法回弹
259260
break;
260261
}
261-
return true; //还回为true,说明事件已经完成了,不会再被其他事件监听器调用
262+
return true; //返回为true,说明事件已经完成了,不会再被其他事件监听器调用
262263
});
263264

264265
NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-754 Bytes
Loading
-26.5 KB
Loading
Loading
Loading

‎app/src/main/res/layout/activity_weather.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<ImageView
1010
android:id="@+id/iv_bing_pic"
1111
android:layout_width="match_parent"
12-
android:layout_height="match_parent"
13-
android:scaleType="centerCrop"
12+
android:layout_height="wrap_content"
1413
android:background="@drawable/bg_loading"
14+
android:scaleType="centerCrop"
1515
android:contentDescription="@string/background_pic" />
1616

1717
<androidx.drawerlayout.widget.DrawerLayout

‎app/src/main/res/layout/nav_header.xml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
android:id="@+id/iv_nav_header"
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent"
12+
android:scaleType="centerCrop"
1213
android:background="@drawable/bg_nav_header_pic"/>
1314

1415
</RelativeLayout>

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.3.0'
10+
classpath 'com.android.tools.build:gradle:3.3.2'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

0 commit comments

Comments
 (0)
This repository has been archived.