工具更新

HeYongRui · May 27, 2020 · 303f75f · 303f75f
1 parent 388c839
commit 303f75f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/base/src/main/java/com/heyongrui/base/utils/UpdateCheckUtil.java b/base/src/main/java/com/heyongrui/base/utils/UpdateCheckUtil.java
@@ -156,7 +156,7 @@ public void onYes(Dialog dialog) {
                         dialog.dismiss();
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {//6.0加入了动态权限
                             PermissionUtils.permission(PermissionConstants.STORAGE)
-                                    .rationale(shouldRequest -> shouldRequest.again(true))
+                                    .rationale((activity, shouldRequest) -> { shouldRequest.again(true);})
                                     .callback(new PermissionUtils.FullCallback() {
                                         @Override
                                         public void onGranted(List<String> permissionsGranted) {

diff --git a/config.gradle b/config.gradle
@@ -36,7 +36,7 @@ ext {
             rxandroid         : '2.1.1',
             glide             : '4.9.0',
             fragmentationx    : '1.0.1',
-            utilcode          : '1.25.5',
+            utilcode          : '1.28.6',
             immersionbar      : '3.0.0-beta05',
             baseRlvAdapter    : '2.9.49-androidx',
             smartRefreshLayout: '1.1.0-andx-15',

diff --git a/main/src/main/java/com/heyongrui/main/mob/view/MobActivity.java b/main/src/main/java/com/heyongrui/main/mob/view/MobActivity.java
@@ -87,7 +87,7 @@ protected void init(Bundle savedInstanceState) {
         etEnd = findViewById(R.id.et_end);
         etInput = findViewById(R.id.et_input);
         Button btnQuery = findViewById(R.id.btn_query);
-        ClickUtils.applyScale(btnQuery);
+        ClickUtils.applyPressedViewScale(btnQuery);
         tvContent = findViewById(R.id.tv_content);
         tvContent.setMovementMethod(ScrollingMovementMethod.getInstance());
         rlvMob = findViewById(R.id.rlv_mob);

diff --git a/main/src/main/java/com/heyongrui/main/mob/view/MobWeatherActivity.java b/main/src/main/java/com/heyongrui/main/mob/view/MobWeatherActivity.java
@@ -257,7 +257,7 @@ public void playSunAnim(@FloatRange(from = 0.0, to = 1.0) float stopPercent) {
     protected void onResume() {
         super.onResume();
         PermissionUtils.permission(PermissionConstants.LOCATION)
-                .rationale(shouldRequest -> shouldRequest.again(true))
+                .rationale((activity, shouldRequest) -> shouldRequest.again(true) )
                 .callback(new PermissionUtils.FullCallback() {
                     @Override
                     public void onGranted(List<String> permissionsGranted) {

diff --git a/module/src/main/java/com/heyongrui/module/textword/view/SmartRobotActivity.java b/module/src/main/java/com/heyongrui/module/textword/view/SmartRobotActivity.java
@@ -166,7 +166,7 @@ public void afterTextChanged(Editable editable) {
     private void performSpeechAnalysis() {
         if (null != mIiflytekProvider) {
             PermissionUtils.permission(PermissionConstants.STORAGE, PermissionConstants.MICROPHONE, PermissionConstants.CONTACTS, PermissionConstants.PHONE)
-                    .rationale(shouldRequest -> shouldRequest.again(true))
+                    .rationale((activity, shouldRequest) -> shouldRequest.again(true))
                     .callback(new PermissionUtils.SimpleCallback() {
                         @Override
                         public void onGranted() {

diff --git a/network/src/main/java/com/heyongrui/network/interceptor/HeaderInterceptor.java b/network/src/main/java/com/heyongrui/network/interceptor/HeaderInterceptor.java
@@ -86,4 +86,5 @@ private String getUniqueID() {
         UniqueID = new UUID(m_szDevIDShort.hashCode(), serial.hashCode()).toString();
         return UniqueID;
     }
+
 }
diff --git a/user/src/main/java/com/heyongrui/user/EncourageActivity.java b/user/src/main/java/com/heyongrui/user/EncourageActivity.java
@@ -45,7 +45,7 @@ protected void init(Bundle savedInstanceState) {
                 finish();
             } else if (id == R.id.btn_wx_encourage) {
                 PermissionUtils.permission(PermissionConstants.STORAGE)
-                        .rationale(shouldRequest -> shouldRequest.again(true))
+                        .rationale((activity, shouldRequest) -> shouldRequest.again(true))
                         .callback(new PermissionUtils.FullCallback() {
                             @Override
                             public void onGranted(List<String> permissionsGranted) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,4 +86,5 @@ private String getUniqueID() { @@
             UniqueID = new UUID(m_szDevIDShort.hashCode(), serial.hashCode()).toString();
             return UniqueID;
         }
     }