From 80a51be0db3e5364ec154baa7cd4afc91795e96f Mon Sep 17 00:00:00 2001
From: unknown <zhongchao@zdauto.com>
Date: Wed, 22 Jul 2020 18:12:53 +0800
Subject: [PATCH] ..

---
 app/proguard-rules.pro                        | 29 +++++++++++--------
 .../biz/MogoAuthorizeManagerImpl.kt           |  2 +-
 .../module_authorize_fragment.xml             |  2 +-
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index a72d1b4092..fc5ea40cf1 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -177,30 +177,34 @@
 -keep @kotlin.Metadata class *
 -keepclasseswithmembers @kotlin.Metadata class * { *; }
 
+-dontwarn android.telephony.TelephonyManager.**
+-keep class android.telephony.TelephonyManager.**{*;}
+
 #----------------------------------------第三方库----------------------------------------------
 #-----高德地图-----
+
+#内置语音 V5.6.0之后
+-keep class com.alibaba.idst.nls.**{*;}
+-keep class com.google.**{*;}
+-keep class com.nlspeech.nlscodec.** {*;}
+-keep public class com.alibaba.mit.alitts.*{*;}
+-keep class com.alibaba.mit.alitts.** {*;}
+-dontwarn com.alibaba.mit.alitts.ICallback
+
 #3D 地图 V5.0.0之后：
--keep   class com.amap.api.maps.**{*;}
--keep   class com.autonavi.**{*;}
--keep   class com.amap.api.trace.**{*;}
+-keep class com.amap.api.maps.**{*;}
+-keep class com.autonavi.**{*;}
+-keep class com.amap.api.trace.**{*;}
 #定位
+-keep class com.loc.** {*;}
 -keep class com.amap.api.location.**{*;}
 -keep class com.amap.api.fence.**{*;}
--keep class com.loc.**{*;}
 -keep class com.autonavi.aps.amapapi.model.**{*;}
 #搜索
 -keep class com.amap.api.services.**{*;}
 #导航
 -keep class com.amap.api.navi.**{*;}
 
-#内置语音 V5.6.0之后
--keep class com.alibaba.idst.nls.**{*;}
--keep class com.google.**{*;}
--keep class com.nlspeech.nlscodec.** {*;}
--keep class com.alibaba.mit.alitts.** {*;}
-
--dontwarn android.telephony.**
--keep class android.telephony.TelephonyManager$CellInfoCallback
 
 #-----Gson-----
 -dontwarn sun.misc.**
@@ -340,6 +344,7 @@
 -keep class com.zhidao.autopilot.support.**{*;}
 -keep class com.zhidao.voice.library.**{*;}
 -keep class com.zhidao.voicesdk.**{*;}
+-dontwarn com.elegant.network.**
 
 
 
diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt
index 6c91ab12fc..7fe63c7fdb 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt
@@ -18,7 +18,7 @@ open abstract class MogoAuthorizeManagerImpl : IMogoAuthorizeInvoke {
 
     override fun needAuthorize(tag: String): Boolean {
         Logger.d(TAG, "===== needAuthorize update agreement in background")
-        baseController.checkIfNeedAuthorize(tag.toAuthorizeType())
+//        baseController.checkIfNeedAuthorize(tag.toAuthorizeType())
         return needAuthorization(tag.toAuthorizeType())
     }
 
diff --git a/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1000/module_authorize_fragment.xml b/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1000/module_authorize_fragment.xml
index 43b33aa0c5..3365c3c4d6 100644
--- a/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1000/module_authorize_fragment.xml
+++ b/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1000/module_authorize_fragment.xml
@@ -151,7 +151,7 @@
             android:layout_height="0px"
             android:layout_marginBottom="@dimen/dp_139"
             android:scrollbarSize="@dimen/dp_442"
-            android:layout_marginTop="@dimen/dp_139"
+            android:layout_marginTop="@dimen/dp_35"
             android:scrollbarTrackHorizontal="@drawable/module_authorize_scrollbar"
             android:scrollbarThumbVertical="@drawable/module_authorize_scrollbar"
             app:layout_constraintBottom_toBottomOf="parent"