From 75f2bafb6eaa2f5af79d05dc84b14c55bf932a1e Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 28 Aug 2020 16:17:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=87=E5=88=B7=E6=96=B0debug?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8E=BB=E6=8E=89ticket=E5=92=8C=E9=AA=8C?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../launchercard/LauncherCardRefresher.java   | 38 +++----------------
 1 file changed, 5 insertions(+), 33 deletions(-)

diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
index eb4181fa8c..0a4dac8b63 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
@@ -75,11 +75,6 @@ class LauncherCardRefresher {
      */
     private int mDefaultConfigCounter = 0;
 
-    /**
-     * 因为缓存ticket失效导致失败的情况，需要重新请求ticket然后再次获取数据，这里重试3次
-     */
-    private int mRefreshTicketCounter = 0;
-
     private LauncherCardRefresher( Context context ) {
         mContext = context;
         mRefreshModel = new RefreshModel( mContext );
@@ -170,7 +165,6 @@ class LauncherCardRefresher {
         mLaunchTTSText = mContext.getString( R.string.module_service_open_app_tip );
         startExplorerWayStrategy();
         mDefaultConfigCounter = 0;
-        mRefreshTicketCounter = 0;
         // 延时加载数据，已保证accOn之后网络恢复正常
         long delay = ONE_MINUTE;
         if ( NetworkUtils.isConnected( mContext ) ) {
@@ -359,6 +353,11 @@ class LauncherCardRefresher {
         final Map< String, Object > query = new ParamsProvider.Builder( mContext )
                 .append( "modelType", 30 )
                 .build();
+        if ( DebugConfig.isDebug() ) {
+            // debug 去掉ticket和验签
+            query.remove( "ticket" );
+            query.remove( "sig" );
+        }
         mZhidaoRefreshModel.getRefreshApiService().getCarAdvertisingList( query )
                 .subscribeOn( Schedulers.io() )
                 .observeOn( AndroidSchedulers.mainThread() )
@@ -383,39 +382,12 @@ class LauncherCardRefresher {
                     @Override
                     public void onError( String message, int code ) {
                         super.onError( message, code );
-                        if ( code == 100046 ) {
-                            refreshTicket();
-                        }
                         Logger.e( TAG, "获取配置失败 msg = %s, code = %s", message, code );
                     }
                 } );
 
     }
 
-    private void refreshTicket() {
-        mRefreshTicketCounter++;
-        Logger.d( TAG, "刷新ticket." );
-        MarkerServiceHandler.getApis().getPassportManagerApi().requestTicket( new IMogoTicketCallback() {
-            @Override
-            public void onTicketGot( String ticket ) {
-                Logger.d( TAG, "ticket=%s", ticket );
-                if ( mRefreshTicketCounter < 3 ) {
-                    startAdvertisementsStrategy();
-                }
-            }
-
-            @Override
-            public void onError( int code, String msg ) {
-                Logger.d( TAG, "code=%s, msg=%s", code, msg );
-            }
-
-            @Override
-            public void onLoginSuccess( String token, String sn ) {
-                Logger.d( TAG, "token=%s, sn=%s", token, sn );
-            }
-        } );
-    }
-
     private void handleGotCarAdvertisingList( List< LauncherCardAdvertisementData.LauncherCardAdvertisement > data ) {
         if ( data == null ) {
             mAdvertisements = null;