Skip to content

Commit c051071

Browse files
jenly1314jenly1314
committed
更新编译SDK至30
1 parent 25b42be commit c051071

File tree

8 files changed

+94
-56
lines changed

8 files changed

+94
-56
lines changed

‎README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,16 @@ public interface ApplicationComponent {
545545

546546
## 版本记录
547547

548+
#### v2.2.0：2021-11-17
549+
* minSdk要求从 16+ 改为 21+
550+
* 更新编译SDK至30
551+
* 更新Gradle至v6.7.1
552+
* 更新Appcompat至v1.3.1
553+
* 更新Okhttp至v4.9.2
554+
* 更新Hilt至v2.40.1
555+
* 更新Gson至v2.8.9
556+
* 更新Timber至v5.0.1
557+
548558
#### v2.1.1：2021-6-29
549559
* 更新Hilt至v2.37
550560
* 更新Gson至v2.8.7

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

‎mvvmframe/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ dependencies {
6363
//appcompat
6464
compileOnly deps.appcompat
6565

66+
//okhttp
67+
api deps.okhttp
6668
//retrofit
6769
api deps.retrofit.retrofit
6870
api deps.retrofit.gson

‎mvvmframe/src/main/java/com/king/frame/mvvmframe/base/BaseActivity.java

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.os.SystemClock;
1010
import android.text.TextUtils;
1111
import android.util.DisplayMetrics;
12+
import android.view.Gravity;
1213
import android.view.KeyEvent;
1314
import android.view.LayoutInflater;
1415
import android.view.View;
@@ -443,7 +444,7 @@ protected void dismissDialog(Dialog dialog){
443444
}
444445

445446
protected void dismissPopupWindow(PopupWindow popupWindow){
446-
if(popupWindow!=null && popupWindow.isShowing()){
447+
if(popupWindow != null && popupWindow.isShowing()){
447448
popupWindow.dismiss();
448449
}
449450
}
@@ -500,13 +501,26 @@ protected void showDialog(Context context,View contentView,float widthRatio){
500501
showDialog(context,contentView, R.style.mvvmframe_dialog,widthRatio);
501502
}
502503

503-
protected void showDialog(Context context, View contentView, @StyleRes int resId, float widthRatio){
504-
showDialog(context,contentView,resId,widthRatio,true);
504+
protected void showDialog(Context context, View contentView, @StyleRes int styleId, float widthRatio){
505+
showDialog(context,contentView,styleId,widthRatio,true);
505506
}
506507

507-
protected void showDialog(Context context, View contentView, @StyleRes int resId, float widthRatio, final boolean isCancel){
508+
protected void showDialog(Context context, View contentView, @StyleRes int styleId, float widthRatio, final boolean isCancel){
509+
showDialog(context, contentView, styleId, Gravity.NO_GRAVITY, widthRatio, isCancel);
510+
511+
}
512+
513+
protected void showDialog(Context context, View contentView, @StyleRes int styleId, int gravity, float widthRatio, final boolean isCancel){
514+
showDialog(context, contentView, styleId, gravity, widthRatio, 0, 0, isCancel);
515+
}
516+
517+
protected void showDialog(Context context, View contentView, @StyleRes int styleId, int gravity, float widthRatio,float horizontalMargin, float verticalMargin, final boolean isCancel){
518+
showDialog(context, contentView, styleId, gravity, widthRatio, horizontalMargin, verticalMargin, 0, 0, isCancel);
519+
}
520+
521+
protected void showDialog(Context context, View contentView, @StyleRes int styleId, int gravity, float widthRatio,float horizontalMargin, float verticalMargin, float horizontalWeight, float verticalWeight, final boolean isCancel){
508522
dismissDialog();
509-
mDialog = new Dialog(context,resId);
523+
mDialog = new Dialog(context, styleId);
510524
mDialog.setContentView(contentView);
511525
mDialog.setCanceledOnTouchOutside(false);
512526
mDialog.setOnKeyListener(new DialogInterface.OnKeyListener() {
@@ -522,18 +536,20 @@ public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
522536

523537
}
524538
});
525-
setDialogWindow(mDialog,widthRatio);
539+
setWindow(mDialog.getWindow(),gravity, widthRatio,horizontalMargin, verticalMargin, horizontalWeight, verticalWeight);
526540
mDialog.show();
527541

528542
}
529543

530-
protected void setDialogWindow(Dialog dialog, float widthRatio){
531-
setWindow(dialog.getWindow(),widthRatio);
532-
}
533544

534-
protected void setWindow(Window window, float widthRatio){
545+
protected void setWindow(Window window,int gravity,float widthRatio, float horizontalMargin, float verticalMargin, float horizontalWeight, float verticalWeight){
535546
WindowManager.LayoutParams lp = window.getAttributes();
536547
lp.width = (int)(getWidthPixels() * widthRatio);
548+
lp.gravity = gravity;
549+
lp.horizontalMargin = horizontalMargin;
550+
lp.verticalMargin = verticalMargin;
551+
lp.horizontalWeight = horizontalWeight;
552+
lp.verticalWeight = verticalWeight;
537553
window.setAttributes(lp);
538554
}
539555

‎mvvmframe/src/main/java/com/king/frame/mvvmframe/base/BaseDialogFragment.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.os.SystemClock;
1010
import android.text.TextUtils;
1111
import android.util.DisplayMetrics;
12+
import android.view.Gravity;
1213
import android.view.LayoutInflater;
1314
import android.view.View;
1415
import android.view.ViewGroup;
@@ -116,7 +117,7 @@ protected void initWindow(Window window){
116117
if(window != null){
117118
window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
118119
window.getAttributes().windowAnimations = R.style.mvvmframe_dialog_animation;
119-
setWindow(window, DEFAULT_WIDTH_RATIO);
120+
setWindow(window, Gravity.NO_GRAVITY, DEFAULT_WIDTH_RATIO, 0, 0, 0, 0);
120121
}
121122
}
122123

@@ -469,7 +470,7 @@ protected void dismissDialog(Dialog dialog){
469470
}
470471

471472
protected void dismissPopupWindow(PopupWindow popupWindow){
472-
if(popupWindow!=null && popupWindow.isShowing()){
473+
if(popupWindow != null && popupWindow.isShowing()){
473474
popupWindow.dismiss();
474475
}
475476
}
@@ -506,13 +507,14 @@ protected void showProgressDialog(View v,boolean isCancel){
506507
mProgressDialog.show();
507508
}
508509

509-
protected void setDialogWindow(Dialog dialog, float widthRatio){
510-
setWindow(dialog.getWindow(),widthRatio);
511-
}
512-
513-
protected void setWindow(Window window, float widthRatio){
510+
protected void setWindow(Window window,int gravity,float widthRatio, float horizontalMargin, float verticalMargin, float horizontalWeight, float verticalWeight){
514511
WindowManager.LayoutParams lp = window.getAttributes();
515512
lp.width = (int)(getWidthPixels() * widthRatio);
513+
lp.gravity = gravity;
514+
lp.horizontalMargin = horizontalMargin;
515+
lp.verticalMargin = verticalMargin;
516+
lp.horizontalWeight = horizontalWeight;
517+
lp.verticalWeight = verticalWeight;
516518
window.setAttributes(lp);
517519
}
518520

‎mvvmframe/src/main/java/com/king/frame/mvvmframe/base/BaseFragment.java

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.os.SystemClock;
1010
import android.text.TextUtils;
1111
import android.util.DisplayMetrics;
12+
import android.view.Gravity;
1213
import android.view.KeyEvent;
1314
import android.view.LayoutInflater;
1415
import android.view.View;
@@ -471,7 +472,7 @@ protected void dismissDialog(Dialog dialog){
471472
}
472473

473474
protected void dismissPopupWindow(PopupWindow popupWindow){
474-
if(popupWindow!=null && popupWindow.isShowing()){
475+
if(popupWindow != null && popupWindow.isShowing()){
475476
popupWindow.dismiss();
476477
}
477478
}
@@ -528,13 +529,26 @@ protected void showDialog(Context context,View contentView,float widthRatio){
528529
showDialog(context,contentView, R.style.mvvmframe_dialog,widthRatio);
529530
}
530531

531-
protected void showDialog(Context context, View contentView, @StyleRes int resId, float widthRatio){
532-
showDialog(context,contentView,resId,widthRatio,true);
532+
protected void showDialog(Context context, View contentView, @StyleRes int styleId, float widthRatio){
533+
showDialog(context,contentView,styleId,widthRatio,true);
533534
}
534535

535-
protected void showDialog(Context context, View contentView, @StyleRes int resId, float widthRatio,final boolean isCancel){
536+
protected void showDialog(Context context, View contentView, @StyleRes int styleId, float widthRatio, final boolean isCancel){
537+
showDialog(context, contentView, styleId, Gravity.NO_GRAVITY, widthRatio, isCancel);
538+
539+
}
540+
541+
protected void showDialog(Context context, View contentView, @StyleRes int styleId, int gravity, float widthRatio, final boolean isCancel){
542+
showDialog(context, contentView, styleId, gravity, widthRatio, 0, 0, isCancel);
543+
}
544+
545+
protected void showDialog(Context context, View contentView, @StyleRes int styleId, int gravity, float widthRatio,float horizontalMargin, float verticalMargin, final boolean isCancel){
546+
showDialog(context, contentView, styleId, gravity, widthRatio, horizontalMargin, verticalMargin, 0, 0, isCancel);
547+
}
548+
549+
protected void showDialog(Context context, View contentView, @StyleRes int styleId, int gravity, float widthRatio,float horizontalMargin, float verticalMargin, float horizontalWeight, float verticalWeight, final boolean isCancel){
536550
dismissDialog();
537-
mDialog = new Dialog(context,resId);
551+
mDialog = new Dialog(context, styleId);
538552
mDialog.setContentView(contentView);
539553
mDialog.setCanceledOnTouchOutside(false);
540554
mDialog.setOnKeyListener(new DialogInterface.OnKeyListener() {
@@ -550,18 +564,20 @@ public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
550564

551565
}
552566
});
553-
setDialogWindow(mDialog,widthRatio);
567+
setWindow(mDialog.getWindow(),gravity, widthRatio,horizontalMargin, verticalMargin, horizontalWeight, verticalWeight);
554568
mDialog.show();
555569

556570
}
557571

558-
protected void setDialogWindow(Dialog dialog, float widthRatio){
559-
setWindow(dialog.getWindow(),widthRatio);
560-
}
561572

562-
protected void setWindow(Window window, float widthRatio){
573+
protected void setWindow(Window window,int gravity,float widthRatio, float horizontalMargin, float verticalMargin, float horizontalWeight, float verticalWeight){
563574
WindowManager.LayoutParams lp = window.getAttributes();
564575
lp.width = (int)(getWidthPixels() * widthRatio);
576+
lp.gravity = gravity;
577+
lp.horizontalMargin = horizontalMargin;
578+
lp.verticalMargin = verticalMargin;
579+
lp.horizontalWeight = horizontalWeight;
580+
lp.verticalWeight = verticalWeight;
565581
window.setAttributes(lp);
566582
}
567583

‎mvvmframe/src/main/java/com/king/frame/mvvmframe/http/interceptor/LogInterceptor.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import okhttp3.RequestBody;
1212
import okhttp3.Response;
1313
import okhttp3.ResponseBody;
14-
import okhttp3.internal.Util;
1514
import okio.Buffer;
1615
import okio.BufferedSource;
1716
import okio.GzipSource;
@@ -97,13 +96,7 @@ private Charset getCharset(RequestBody requestBody,@NonNull Charset defaultChars
9796
}
9897

9998
private Charset getCharset(ResponseBody responseBody,@NonNull Charset defaultCharset){
100-
Charset charset = responseBody.contentType() != null ? responseBody.contentType().charset(defaultCharset) : defaultCharset;
101-
try {
102-
return Util.bomAwareCharset(responseBody.source(),charset);
103-
} catch (Exception e) {
104-
Timber.w(e);
105-
}
106-
return charset;
99+
return responseBody.contentType() != null ? responseBody.contentType().charset(defaultCharset) : defaultCharset;
107100
}
108101

109102
/**

‎versions.gradle

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ ext.app_version = app_version
66

77
//build version
88
def build_versions = [:]
9-
build_versions.minSdk = 16
10-
build_versions.targetSdk = 29
11-
build_versions.compileSdk = 29
12-
build_versions.buildTools = "29.0.3"
9+
build_versions.minSdk = 21
10+
build_versions.targetSdk = 30
11+
build_versions.compileSdk = 30
12+
build_versions.buildTools = "30.0.3"
1313
ext.build_versions = build_versions
1414

1515
ext.deps = [:]
@@ -20,15 +20,15 @@ def versions = [:]
2020
versions.bintrayPublish = '1.0.0'
2121
versions.mavenPublish = '0.13.0'
2222

23-
versions.gralde = '4.1.1'
24-
versions.kotlin = "1.4.32"
25-
versions.coreKtx = "1.3.2"
23+
versions.gralde = "4.2.2"
24+
versions.kotlin = "1.6.0"
25+
versions.coreKtx = "1.7.0"
2626

27-
versions.material = "1.2.1"
28-
versions.appcompat = "1.2.0"
27+
versions.material = "1.4.0"
28+
versions.appcompat = "1.3.1"
2929
versions.swiperefreshlayout = "1.1.0"
3030
versions.recyclerview = "1.2.0"
31-
versions.constraintLayout = "2.0.4"
31+
versions.constraintLayout = "2.1.1"
3232

3333
versions.kotlinxCoroutines = "1.4.3"
3434
versions.lifecycleKtx="2.3.1"
@@ -47,21 +47,21 @@ versions.lifecycleExtensions = "2.2.0"
4747
versions.room = "2.3.0"
4848

4949
//dagger
50-
versions.dagger = "2.37"
50+
versions.dagger = "2.40.1"
5151
//hilt
52-
versions.daggerHilt = "2.37"
52+
versions.daggerHilt = "2.40.1"
5353
//versions.hilt = "1.0.0-alpha02"
54-
54+
versions.okhttp = "4.9.2"
5555
versions.retrofit = "2.9.0"
56-
versions.gson = "2.8.7"
56+
versions.gson = "2.8.9"
5757

5858
//jenly
5959
versions.base = "3.2.1-androidx"
6060
versions.appupdater = "1.0.10-androidx"
6161
versions.neverCrash = "1.0.0"
6262
versions.retrofitHelper = "1.0.1"
6363

64-
versions.timber = "4.7.1"
64+
versions.timber = "5.0.1"
6565
versions.logger = "2.2.0"
6666

6767
versions.leakcanary = "2.7"
@@ -142,6 +142,8 @@ deps.dagger = dagger
142142
//
143143
//deps.hilt = hilt
144144

145+
deps.okhttp = "com.squareup.okhttp3:okhttp:$versions.okhttp"
146+
145147
//retrofit
146148
def retrofit = [:]
147149
retrofit.retrofit = "com.squareup.retrofit2:retrofit:$versions.retrofit"
@@ -179,12 +181,9 @@ ext.deps = deps
179181

180182
def addRepos(RepositoryHandler handler) {
181183
handler.google()
182-
handler.jcenter()
183184
handler.mavenCentral()
184-
// handler.maven { url "https://maven.aliyun.com/repository/google" }
185-
// handler.maven { url "https://maven.aliyun.com/repository/central" }
186-
// handler.maven { url "https://maven.aliyun.com/repository/public" }
187-
// handler.maven { url "https://dl.bintray.com/jenly/maven" }
185+
handler.jcenter()
186+
188187
handler.maven { url "https://jitpack.io" }
189188

190189
}

0 commit comments

Comments
 (0)