diff --git a/.idea/gradle.xml b/.idea/gradle.xml index b59a552525..8e9756d758 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -77,7 +77,6 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index a2da5c6cd8..e082ea7475 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 1b82ce8c86..a0bde360cb 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -2,6 +2,7 @@ package com.mogo.launcher; import android.content.Context; import android.content.Intent; +import android.os.Process; import android.text.TextUtils; import android.util.Log; @@ -27,6 +28,7 @@ import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.passport.IMogoTicketCallback; import com.mogo.test.crashreport.ITestCrashReportProvider; +import com.mogo.utils.ProcessUtils; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.LogLevel; import com.mogo.utils.logger.Logger; @@ -70,6 +72,9 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) ); } else { } + // TODO + MogoModulePaths.addModule( new MogoModule( ServiceConst.PATH_TTS_CONFIG, ServiceConst.PATH_TTS_CONFIG ) ); + MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_WIDGETS, MogoServicePaths.PATH_WIDGETS ) ); if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD ) { MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) ); @@ -90,7 +95,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_MOGO_MONITOR, "MogoMonitor" ) ); MogoModulePaths.addModule( new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME ) ); - MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_GLOBAL_UNWAKE,"GlobalUnwake")); + MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_GLOBAL_UNWAKE, "GlobalUnwake" ) ); if ( !DebugConfig.isLauncher() ) { PersistentManager.getInstance().initManager( this ); @@ -109,13 +114,11 @@ public class MogoApplication extends AbsMogoApplication { @Override protected boolean shouldInit() { - return !LeakCanary.isInAnalyzerProcess( this ); + Logger.w( TAG, "evaluate shouldInit() with: %s", ProcessUtils.getProcessName( Process.myPid() ) ); + return ProcessUtils.isMainProcess( this ); } private void initDebugConfig() { - if ( !shouldInit() ) { - return; - } DebugConfig.setNetMode( BuildConfig.NET_ENV ); DebugConfig.setDebug( BuildConfig.DEBUG ); DebugConfig.setLaunchLocationService( BuildConfig.LAUNCH_LOCATION_SERVICE ); @@ -186,10 +189,12 @@ public class MogoApplication extends AbsMogoApplication { private void prepareSocketAndLocationServices( IMogoServiceApis apis ) { apis.getSocketManagerApi( getApplicationContext() ).init( getApplicationContext(), DebugConfig.getSocketAppId() ); - apis.getLocationInfoApi().start(); - apis.getMapServiceApi().getSingletonLocationClient( getApplicationContext() ).addLocationListener( location -> { - apis.getLocationInfoApi().provideLocation( location ); - } ); + if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) { + apis.getLocationInfoApi().start(); + apis.getMapServiceApi().getSingletonLocationClient( getApplicationContext() ).addLocationListener( location -> { + apis.getLocationInfoApi().provideLocation( location ); + } ); + } } @Override diff --git a/config.gradle b/config.gradle index 2a864bd5cc..1e1f4f4592 100644 --- a/config.gradle +++ b/config.gradle @@ -157,7 +157,7 @@ targetSdkVersion : 22, gpssimulatordebug : "com.mogo.module:module-gps-simulator-debug:${MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION}", gpssimulatornoop : "com.mogo.module:module-gps-simulator-noop:${MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION}", - adasapi : "com.zhidao.autopilot.support:adas:1.0.1", + adasapi : "com.zhidao.autopilot.support:adas:1.0.6.3", adasconfigapi : "com.zhidao.adasconfig:adasconfig:1.1.5", // 个人中心的SDK diff --git a/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/socket/SocketManager.java b/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/socket/SocketManager.java index 22e6fb427c..f49e36068e 100644 --- a/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/socket/SocketManager.java +++ b/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/socket/SocketManager.java @@ -144,7 +144,6 @@ public class SocketManager implements IMogoSocketManager, OnSocketReceiveCallbac if ( listener != null ) { listener.onAck( msgId ); } - Logger.d( TAG, "send message success: msgType = %d, appId = %s, productLine = %d", msgType, appId, productLine ); } catch ( InvalidProtocolBufferException e ) { e.printStackTrace(); } diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/ProcessUtils.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/ProcessUtils.java index 3b9d54eaae..90e57647b1 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/ProcessUtils.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/ProcessUtils.java @@ -67,7 +67,7 @@ public class ProcessUtils { * @param pid 进程号 * @return 进程名 */ - private static String getProcessName( int pid ) { + public static String getProcessName( int pid ) { BufferedReader reader = null; try { reader = new BufferedReader( new FileReader( "/proc/" + pid + "/cmdline" ) ); diff --git a/gradle.properties b/gradle.properties index 343c7e7243..acaee21dcb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -52,80 +52,80 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=2.0.6 -MOGO_UTILS_VERSION=2.0.6 -MAP_AMAP_VERSION=2.0.6 -MAP_AUTONAVI_VERSION=2.0.6 -MOGO_MAP_VERSION=2.0.6 -MOGO_MAP_API_VERSION=2.0.6 -MOGO_SERVICE_VERSION=2.0.6 -MOGO_SERVICE_API_VERSION=2.0.6 -MOGO_CONNECTION_VERSION=2.0.6 -MOGO_MODULE_APPS_VERSION=2.0.6 -MOGO_MODULE_NAVI_VERSION=2.0.6 -MOGO_MODULE_SHARE_VERSION=2.0.6 -MOGO_MODULE_COMMON_VERSION=2.0.6 -MOGO_MODULE_MAIN_VERSION=2.0.6 -MOGO_MODULE_MAP_VERSION=2.0.6 -MOGO_MODULE_SERVICE_VERSION=2.0.6 -MOGO_MODULE_EXTENSIONS_VERSION=2.0.6 -MOGO_MODULE_SEARCH_VERSION=2.0.6 -MOGO_MODULE_BACK_VERSION=2.0.6 -MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.6 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.6 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.6 -MOGO_MODULE_AUTHORIZE_VERSION=2.0.6 -MOGO_MODULE_GUIDE_VERSION=2.0.6 -MOGO_MODULE_MEDIA_VERSION=2.0.6 -MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.6 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.6 -MOGO_MODULE_V2X_VERSION=2.0.6 +MOGO_COMMONS_VERSION=2.0.7 +MOGO_UTILS_VERSION=2.0.7 +MAP_AMAP_VERSION=2.0.7 +MAP_AUTONAVI_VERSION=2.0.7 +MOGO_MAP_VERSION=2.0.7 +MOGO_MAP_API_VERSION=2.0.7 +MOGO_SERVICE_VERSION=2.0.7 +MOGO_SERVICE_API_VERSION=2.0.7 +MOGO_CONNECTION_VERSION=2.0.7 +MOGO_MODULE_APPS_VERSION=2.0.7 +MOGO_MODULE_NAVI_VERSION=2.0.7 +MOGO_MODULE_SHARE_VERSION=2.0.7 +MOGO_MODULE_COMMON_VERSION=2.0.7 +MOGO_MODULE_MAIN_VERSION=2.0.7 +MOGO_MODULE_MAP_VERSION=2.0.7 +MOGO_MODULE_SERVICE_VERSION=2.0.7 +MOGO_MODULE_EXTENSIONS_VERSION=2.0.7 +MOGO_MODULE_SEARCH_VERSION=2.0.7 +MOGO_MODULE_BACK_VERSION=2.0.7 +MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.7 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.7 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.7 +MOGO_MODULE_AUTHORIZE_VERSION=2.0.7 +MOGO_MODULE_GUIDE_VERSION=2.0.7 +MOGO_MODULE_MEDIA_VERSION=2.0.7 +MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.7 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.7 +MOGO_MODULE_V2X_VERSION=2.0.7 # 基础服务实现:passport、socket、location -MOGO_BASE_SERVICES_APK_VERSION=2.0.6 -MOGO_BASE_SERVICES_SDK_VERSION=2.0.6 +MOGO_BASE_SERVICES_APK_VERSION=2.0.7 +MOGO_BASE_SERVICES_SDK_VERSION=2.0.7 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=2.0.6 +MOGO_MODULE_TANLU_VERSION=2.0.7 # 视频引导 -MOGO_MODULE_GUIDESHOW_VERSION=2.0.6 +MOGO_MODULE_GUIDESHOW_VERSION=2.0.7 # 推送 -MOGO_MODULE_PUSH_VERSION=2.0.6 -MOGO_MODULE_PUSH_BASE_VERSION=2.0.6 -MOGO_MODULE_PUSH_NOOP_VERSION=2.0.6 +MOGO_MODULE_PUSH_VERSION=2.0.7 +MOGO_MODULE_PUSH_BASE_VERSION=2.0.7 +MOGO_MODULE_PUSH_NOOP_VERSION=2.0.7 # 探路上报和分享模块 -TANLULIB_VERSION=2.0.6 -MOGO_TANLU_API_VERSION=2.0.6 +TANLULIB_VERSION=2.0.7 +MOGO_TANLU_API_VERSION=2.0.7 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.0.6 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.6 +MOGO_MODULE_LEFT_PANEL_VERSION=2.0.7 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.7 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.0.6 +MOGO_MODULE_WIDGETS_VERSION=2.0.7 # obu -MOGO_MODULE_OBU_VERSION=2.0.6 +MOGO_MODULE_OBU_VERSION=2.0.7 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.0.6 -MOGO_SKIN_LIGHT_VERSION=2.0.6 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.6 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.6 -SKIN_SUPPORT_VERSION=2.0.6 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.6 -SKIN_SUPPORT_CARDVIEW_VERSION=2.0.6 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.6 -SKIN_SUPPORT_DESIGN_VERSION=2.0.6 +MOGO_SKIN_SUPPORT_VERSION=2.0.7 +MOGO_SKIN_LIGHT_VERSION=2.0.7 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.7 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.7 +SKIN_SUPPORT_VERSION=2.0.7 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.7 +SKIN_SUPPORT_CARDVIEW_VERSION=2.0.7 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.7 +SKIN_SUPPORT_DESIGN_VERSION=2.0.7 # 闪屏页 -MOGO_MODULE_SPLASH_VERSION=2.0.6 -MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.6 +MOGO_MODULE_SPLASH_VERSION=2.0.7 +MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.7 # monitor -MOGO_MODULE_MONITOR_VERSION=2.0.6 +MOGO_MODULE_MONITOR_VERSION=2.0.7 # bugly -CRASHREPORT_VERSION=2.0.6 -CRASHREPORT_BUGLY_VERSION=2.0.6 -CRASHREPORT_NOOP_VERSION=2.0.6 +CRASHREPORT_VERSION=2.0.7 +CRASHREPORT_BUGLY_VERSION=2.0.7 +CRASHREPORT_NOOP_VERSION=2.0.7 ## tts -TTS_BASE_VERSION=2.0.6 -TTS_DI_VERSION=2.0.6 -TTS_ZHI_VERSION=2.0.6 -TTS_NOOP_VERSION=2.0.6 +TTS_BASE_VERSION=2.0.7 +TTS_DI_VERSION=2.0.7 +TTS_ZHI_VERSION=2.0.7 +TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index f2b1e6815d..20095d285f 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -1,18 +1,27 @@ package com.mogo.map.impl.amap; import android.content.Context; +import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Color; import android.graphics.Point; import android.graphics.Rect; +import android.graphics.drawable.Drawable; import android.location.Location; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; import android.os.SystemClock; import android.os.Trace; -import android.util.Log; +import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.animation.Interpolator; +import android.widget.ImageView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.amap.api.maps.AMap; import com.amap.api.maps.AMapUtils; @@ -32,7 +41,9 @@ import com.amap.api.navi.AMapNaviViewListener; import com.amap.api.navi.AMapNaviViewOptions; import com.amap.api.navi.enums.AMapNaviViewShowMode; import com.amap.api.navi.model.NaviInfo; -import com.mogo.commons.debug.DebugConfig; +import com.bumptech.glide.request.RequestOptions; +import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.transition.Transition; import com.mogo.map.IMogoMap; import com.mogo.map.IMogoMapView; import com.mogo.map.MogoLatLng; @@ -51,8 +62,11 @@ import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.MapCameraPosition; import com.mogo.map.uicontroller.MapControlResult; +import com.mogo.utils.UiThreadHandler; import com.mogo.utils.WindowUtils; +import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; +import com.mogo.utils.storage.SharedPrefsMgr; import java.util.List; @@ -73,7 +87,8 @@ public class AMapNaviViewWrapper implements IMogoMapView, AMapNaviViewListener, AMapMessageListener, AMap.OnCameraChangeListener, - AMap.OnMyLocationChangeListener { + AMap.OnMyLocationChangeListener, + Handler.Callback{ private static final String TAG = "AMapNaviViewWrapper"; @@ -122,6 +137,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, // 设置路线相关的配置属性,如:路线的路况颜色,路线上是否显示摄像头气泡等。 // options.setRouteOverlayOptions( MapStyleUtils.getRouteOverlayOptions() ); // 设置自车的图片对象 + checkDefaultOption(); options.setCarBitmap( BitmapFactory.decodeResource( getContext().getResources(), DEFAULT_OPTION.getNaviCursorRes() ) ); // 设置指南针图标否在导航界面显示,默认显示。true,显示;false,隐藏。 options.setCompassEnabled( false ); @@ -525,9 +541,12 @@ public class AMapNaviViewWrapper implements IMogoMapView, } } + private boolean isVisible = false; + @Override public void showMyLocation( boolean visible ) { Logger.d( TAG, "showMyLocation1 %s", visible ); + isVisible = visible; if ( visible && NaviClient.getInstance( getContext() ).isNaviing() ) { return; } @@ -543,14 +562,23 @@ public class AMapNaviViewWrapper implements IMogoMapView, } else { style.myLocationType( MyLocationStyle.LOCATION_TYPE_FOLLOW ); } + mMapView.getMap().setMyLocationStyle( style ); if ( visible ) { // 强制刷新一遍车标 - style.myLocationIcon( BitmapDescriptorFactory.fromResource( mCarCursorOption.getCarCursorRes() ) ); + setCarCursorOption(null); +// style.myLocationIcon( BitmapDescriptorFactory.fromResource( mCarCursorOption.getCarCursorRes() ) ); } - mMapView.getMap().setMyLocationStyle( style ); } } + private boolean isInEmphasizeAnim = false; + + @Override + public void emphasizeMyLocation() { + isInEmphasizeAnim = true; + setCarCursorOption(null); + } + @Override public void showMyLocation( View view ) { if ( NaviClient.getInstance( getContext() ).isNaviing() ) { @@ -874,7 +902,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, } else { if ( ( int ) location.getBearing() == 0 && mLastDriveLocationShadow != null ) { - if ( mMyLocationMarker == null ) { + if ( mMyLocationMarker == null || mMyLocationMarker.isRemoved() ) { initMyLocationMarker(); } if ( mMyLocationMarker != null ) { @@ -911,18 +939,41 @@ public class AMapNaviViewWrapper implements IMogoMapView, return mIsCarLocked; } + private String myLocationConfigCache = null; + private boolean isUseDefaultOption = false; + + private void checkDefaultOption(){ + String myLocationConfig = SharedPrefsMgr.getInstance(getContext()).getString( + "MY_LOCATION_CONFIG", ""); + if (myLocationConfigCache == null || !myLocationConfigCache.equals(myLocationConfig)) { + // 内存缓存的地址为空,或者内存缓存的地址和sp保存的config不一致,那得重新获取bitmap + loadMyLocationIcon(myLocationConfig); + } else if (isInEmphasizeAnim) { + DEFAULT_OPTION.setCarCursorBmp(inflateMyLocation(myLocationBitmap)); + } + + } + @Override public void setCarCursorOption( CarCursorOption option ) { + if (!isVisible) { + // 当前自车图标没有显示,所以先不走下面的流程 + return; + } if ( mCarCursorOption != null && mCarCursorOption != DEFAULT_OPTION ) { mCarCursorOption.destroy(); } + checkDefaultOption(); if ( option != null ) { try { + isUseDefaultOption = false; mCarCursorOption = option.clone(); } catch ( Exception e ) { + isUseDefaultOption = true; mCarCursorOption = DEFAULT_OPTION; } } else { + isUseDefaultOption = true; mCarCursorOption = DEFAULT_OPTION; } if ( !checkAMapView() ) { @@ -981,4 +1032,96 @@ public class AMapNaviViewWrapper implements IMogoMapView, mMapView.getMap().moveCamera( CameraUpdateFactory.changeBearing( bearing ) ); } } + + protected void loadMyLocationIcon(String url) { + if ( Looper.myLooper() != Looper.getMainLooper() ) { + UiThreadHandler.post( ()-> loadMyLocationIconInUiThread(url)); + } else { + loadMyLocationIconInUiThread(url); + } + } + + private void loadMyLocationIconInUiThread(String url) { + + if (!url.isEmpty()) { + RequestOptions options = new RequestOptions() + .placeholder( DEFAULT_OPTION.getCarCursorRes() ) + .error( DEFAULT_OPTION.getCarCursorRes() ) + .dontAnimate(); + GlideApp.with( getContext() ) + .asBitmap() + .load( url ) + .apply( options ) + .into( new SimpleTarget< Bitmap >() { + @Override + public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition< ? super Bitmap > transition ) { + if (isUseDefaultOption) { + myLocationConfigCache = url; + myLocationBitmap = resource; + DEFAULT_OPTION.setCarCursorBmp(inflateMyLocation(resource)); + setCarCursorOption(null); + } + } + + @Override + public void onLoadStarted( @Nullable Drawable placeholder ) { + } + + @Override + public void onLoadCleared( @Nullable Drawable placeholder ) { + } + + @Override + public void onLoadFailed( @Nullable Drawable errorDrawable ) { + } + } ); + } + } + + private float emphasizeAnimOffset = 1f; + + private Bitmap inflateMyLocation(Bitmap res) { + if (res == null) { + throw new IllegalArgumentException("inflate myLocation bitmap can not be null!"); + } + View root = + LayoutInflater.from(getContext()).inflate(R.layout.module_map_amap_my_location, null, false); + ImageView iv = root.findViewById(R.id.module_map_amap_my_location_iv); + iv.setImageBitmap(res); + if (isInEmphasizeAnim) { + iv.setScaleX(emphasizeAnimOffset); + iv.setScaleY(emphasizeAnimOffset); + handler.sendEmptyMessageDelayed(MSG_CONTINUE_EMPHASIZE_ANIM, EMPHASIZE_ANIM_DELAY); + } + return BitmapDescriptorFactory.fromView(root).getBitmap(); + } + + /** + * 目前仅用于强调动画 + */ + private Handler handler = new Handler(this); + private static final int MSG_CONTINUE_EMPHASIZE_ANIM = 1001; + private static final long EMPHASIZE_ANIM_DELAY = 80; + private int emphasizeAnimProgress = 0; + private Bitmap myLocationBitmap; + + @Override + public boolean handleMessage(Message msg) { + if (msg.what == MSG_CONTINUE_EMPHASIZE_ANIM) { + if (emphasizeAnimProgress < 5) { + emphasizeAnimOffset += 0.1; + emphasizeAnimProgress++; + }else if(emphasizeAnimProgress<10){ + emphasizeAnimOffset -= 0.1; + emphasizeAnimProgress++; + } else if (emphasizeAnimProgress == 10) { + isInEmphasizeAnim = false; + emphasizeAnimProgress = 0; + emphasizeAnimOffset = 1; + } + setCarCursorOption(null); + return true; + } + return false; + } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java index f081517786..6beedf3fc1 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java @@ -426,6 +426,11 @@ public class AMapViewWrapper implements IMogoMapView, } } + @Override + public void emphasizeMyLocation() { + // 空实现 + } + @Override public void showMyLocation( View view ) { if ( NaviClient.getInstance( getContext() ).isNaviing() ) { diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java index 113abe60f0..68a8f2fd5d 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java @@ -99,6 +99,13 @@ public class AMapUIController implements IMogoMapUIController { } } + @Override + public void emphasizeMyLocation() { + if ( mClient != null ) { + mClient.emphasizeMyLocation(); + } + } + @Override public void showMyLocation( View view ) { if ( mClient != null ) { diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/module_map_amap_my_location_icon.png b/libraries/map-amap/src/main/res/drawable-xhdpi/module_map_amap_my_location_icon.png new file mode 100644 index 0000000000..b71e0a3b1d Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-xhdpi/module_map_amap_my_location_icon.png differ diff --git a/libraries/map-amap/src/main/res/layout/module_map_amap_my_location.xml b/libraries/map-amap/src/main/res/layout/module_map_amap_my_location.xml new file mode 100644 index 0000000000..690f7b6c48 --- /dev/null +++ b/libraries/map-amap/src/main/res/layout/module_map_amap_my_location.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/libraries/map-amap/src/main/res/values-xhdpi/dimens.xml b/libraries/map-amap/src/main/res/values-xhdpi/dimens.xml new file mode 100644 index 0000000000..9c08d26451 --- /dev/null +++ b/libraries/map-amap/src/main/res/values-xhdpi/dimens.xml @@ -0,0 +1,6 @@ + + + 370px + 78px + 120px + \ No newline at end of file diff --git a/libraries/map-amap/src/main/res/values/dimens.xml b/libraries/map-amap/src/main/res/values/dimens.xml index e8bccfa287..6898799649 100644 --- a/libraries/map-amap/src/main/res/values/dimens.xml +++ b/libraries/map-amap/src/main/res/values/dimens.xml @@ -1,4 +1,7 @@ 60px + 78px + 120px + 146px \ No newline at end of file diff --git a/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviReceiver.java b/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviReceiver.java index c100707450..bc6d302e76 100644 --- a/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviReceiver.java +++ b/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviReceiver.java @@ -58,7 +58,6 @@ public class AutoNaviReceiver extends BroadcastReceiver { } int keyType = intent.getIntExtra( "KEY_TYPE", 0 ); - Logger.d( TAG, "receive: keyType = %d", keyType ); switch ( keyType ) { case 10001: handleAutoNaviInfo( context, intent ); diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java index 419f4cc00a..6cfa109ab9 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java @@ -71,6 +71,11 @@ public interface IMogoMapUIController { */ void showMyLocation( View view ); + /** + * 强调自车位置,加个动画突显一下自车位置 + */ + void emphasizeMyLocation(); + /** * 以外部定位的方式改变当前位置 * diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java index f4642f2440..8ba96d4333 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java @@ -92,6 +92,13 @@ public class MogoMapUIController implements IMogoMapUIController { } } + @Override + public void emphasizeMyLocation() { + if ( mDelegate != null ) { + mDelegate.emphasizeMyLocation(); + } + } + @Override public void showMyLocation( View view ) { if ( mDelegate != null ) { diff --git a/libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.java b/libraries/mogo-tanlu-api/build/generated/ap_generated_sources/release/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.java similarity index 100% rename from libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.java rename to libraries/mogo-tanlu-api/build/generated/ap_generated_sources/release/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.java diff --git a/libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.java b/libraries/mogo-tanlu-api/build/generated/ap_generated_sources/release/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.java similarity index 100% rename from libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.java rename to libraries/mogo-tanlu-api/build/generated/ap_generated_sources/release/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.java diff --git a/libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.java b/libraries/mogo-tanlu-api/build/generated/ap_generated_sources/release/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.java similarity index 100% rename from libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.java rename to libraries/mogo-tanlu-api/build/generated/ap_generated_sources/release/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.java diff --git a/libraries/mogo-tanlu-api/build/generated/source/buildConfig/debug/com/zhidao/mogo/tanlu/api/BuildConfig.java b/libraries/mogo-tanlu-api/build/generated/source/buildConfig/release/com/zhidao/mogo/tanlu/api/BuildConfig.java similarity index 74% rename from libraries/mogo-tanlu-api/build/generated/source/buildConfig/debug/com/zhidao/mogo/tanlu/api/BuildConfig.java rename to libraries/mogo-tanlu-api/build/generated/source/buildConfig/release/com/zhidao/mogo/tanlu/api/BuildConfig.java index 3a6f788df8..3d5f367fc0 100644 --- a/libraries/mogo-tanlu-api/build/generated/source/buildConfig/debug/com/zhidao/mogo/tanlu/api/BuildConfig.java +++ b/libraries/mogo-tanlu-api/build/generated/source/buildConfig/release/com/zhidao/mogo/tanlu/api/BuildConfig.java @@ -4,15 +4,15 @@ package com.zhidao.mogo.tanlu.api; public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); + public static final boolean DEBUG = false; public static final String LIBRARY_PACKAGE_NAME = "com.zhidao.mogo.tanlu.api"; /** * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME */ @Deprecated public static final String APPLICATION_ID = "com.zhidao.mogo.tanlu.api"; - public static final String BUILD_TYPE = "debug"; + public static final String BUILD_TYPE = "release"; public static final String FLAVOR = ""; public static final int VERSION_CODE = 1; - public static final String VERSION_NAME = "2.0.0"; + public static final String VERSION_NAME = "2.0.1"; } diff --git a/libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json b/libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json deleted file mode 100644 index eb04d27c69..0000000000 --- a/libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"2.0.0","enabled":true,"outputFile":"mogo-tanlu-api-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.tanlu.api","split":""}}] \ No newline at end of file diff --git a/libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml b/libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml similarity index 89% rename from libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml rename to libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml index 8238402a94..c34bad881c 100644 --- a/libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml +++ b/libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="2.0.1" > - \ No newline at end of file diff --git a/libraries/mogo-tanlu-api/build/intermediates/incremental/mergeDebugShaders/merger.xml b/libraries/mogo-tanlu-api/build/intermediates/incremental/mergeDebugShaders/merger.xml deleted file mode 100644 index 8d4a75c89c..0000000000 --- a/libraries/mogo-tanlu-api/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/libraries/mogo-tanlu-api/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml b/libraries/mogo-tanlu-api/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml new file mode 100644 index 0000000000..c27fc56e7e --- /dev/null +++ b/libraries/mogo-tanlu-api/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/libraries/mogo-tanlu-api/build/intermediates/incremental/mergeReleaseShaders/merger.xml b/libraries/mogo-tanlu-api/build/intermediates/incremental/mergeReleaseShaders/merger.xml new file mode 100644 index 0000000000..3e8c9574db --- /dev/null +++ b/libraries/mogo-tanlu-api/build/intermediates/incremental/mergeReleaseShaders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugAssets/merger.xml b/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugAssets/merger.xml deleted file mode 100644 index d821fda9db..0000000000 --- a/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugResources/compile-file-map.properties deleted file mode 100644 index 2ad3ab5a78..0000000000 --- a/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ /dev/null @@ -1 +0,0 @@ -#Fri Nov 13 11:02:48 CST 2020 diff --git a/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugResources/merger.xml b/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugResources/merger.xml deleted file mode 100644 index b1ad91453e..0000000000 --- a/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugResources/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/libraries/mogo-tanlu-api/build/intermediates/incremental/packageReleaseAssets/merger.xml b/libraries/mogo-tanlu-api/build/intermediates/incremental/packageReleaseAssets/merger.xml new file mode 100644 index 0000000000..36a3b64899 --- /dev/null +++ b/libraries/mogo-tanlu-api/build/intermediates/incremental/packageReleaseAssets/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/libraries/mogo-tanlu-api/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/libraries/mogo-tanlu-api/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties new file mode 100644 index 0000000000..e38ce76230 --- /dev/null +++ b/libraries/mogo-tanlu-api/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties @@ -0,0 +1 @@ +#Wed Nov 18 18:46:15 CST 2020 diff --git a/libraries/mogo-tanlu-api/build/intermediates/incremental/packageReleaseResources/merger.xml b/libraries/mogo-tanlu-api/build/intermediates/incremental/packageReleaseResources/merger.xml new file mode 100644 index 0000000000..7c15a290f2 --- /dev/null +++ b/libraries/mogo-tanlu-api/build/intermediates/incremental/packageReleaseResources/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/libraries/mogo-tanlu-api/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/libraries/mogo-tanlu-api/build/intermediates/incremental/release-mergeNativeLibs/merge-state similarity index 79% rename from libraries/mogo-tanlu-api/build/intermediates/incremental/debug-mergeJavaRes/merge-state rename to libraries/mogo-tanlu-api/build/intermediates/incremental/release-mergeNativeLibs/merge-state index 6e3e15aef9..aca86fa273 100644 Binary files a/libraries/mogo-tanlu-api/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/libraries/mogo-tanlu-api/build/intermediates/incremental/release-mergeNativeLibs/merge-state differ diff --git a/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/BuildConfig.class b/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/BuildConfig.class deleted file mode 100644 index acc771d93a..0000000000 Binary files a/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/BuildConfig.class and /dev/null differ diff --git a/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.class b/libraries/mogo-tanlu-api/build/intermediates/javac/release/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.class similarity index 100% rename from libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.class rename to libraries/mogo-tanlu-api/build/intermediates/javac/release/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.class diff --git a/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.class b/libraries/mogo-tanlu-api/build/intermediates/javac/release/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.class similarity index 100% rename from libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.class rename to libraries/mogo-tanlu-api/build/intermediates/javac/release/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.class diff --git a/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.class b/libraries/mogo-tanlu-api/build/intermediates/javac/release/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.class similarity index 100% rename from libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.class rename to libraries/mogo-tanlu-api/build/intermediates/javac/release/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.class diff --git a/libraries/mogo-tanlu-api/build/intermediates/javac/release/classes/com/zhidao/mogo/tanlu/api/BuildConfig.class b/libraries/mogo-tanlu-api/build/intermediates/javac/release/classes/com/zhidao/mogo/tanlu/api/BuildConfig.class new file mode 100644 index 0000000000..1c14c7d194 Binary files /dev/null and b/libraries/mogo-tanlu-api/build/intermediates/javac/release/classes/com/zhidao/mogo/tanlu/api/BuildConfig.class differ diff --git a/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.class b/libraries/mogo-tanlu-api/build/intermediates/javac/release/classes/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.class similarity index 100% rename from libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.class rename to libraries/mogo-tanlu-api/build/intermediates/javac/release/classes/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.class diff --git a/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/TanluApiConst.class b/libraries/mogo-tanlu-api/build/intermediates/javac/release/classes/com/zhidao/mogo/tanlu/api/TanluApiConst.class similarity index 100% rename from libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/TanluApiConst.class rename to libraries/mogo-tanlu-api/build/intermediates/javac/release/classes/com/zhidao/mogo/tanlu/api/TanluApiConst.class diff --git a/libraries/mogo-tanlu-api/build/intermediates/library_java_res/debug/res.jar b/libraries/mogo-tanlu-api/build/intermediates/library_java_res/release/res.jar similarity index 100% rename from libraries/mogo-tanlu-api/build/intermediates/library_java_res/debug/res.jar rename to libraries/mogo-tanlu-api/build/intermediates/library_java_res/release/res.jar diff --git a/libraries/mogo-tanlu-api/build/intermediates/library_manifest/debug/AndroidManifest.xml b/libraries/mogo-tanlu-api/build/intermediates/library_manifest/release/AndroidManifest.xml similarity index 89% rename from libraries/mogo-tanlu-api/build/intermediates/library_manifest/debug/AndroidManifest.xml rename to libraries/mogo-tanlu-api/build/intermediates/library_manifest/release/AndroidManifest.xml index 8238402a94..c34bad881c 100644 --- a/libraries/mogo-tanlu-api/build/intermediates/library_manifest/debug/AndroidManifest.xml +++ b/libraries/mogo-tanlu-api/build/intermediates/library_manifest/release/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="2.0.1" > +5 android:versionName="2.0.1" > 6 7 /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml +8-->F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml 9 android:targetSdkVersion="22" /> -9-->/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml +9-->F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml 10 / 11 12 diff --git a/libraries/mogo-tanlu-api/build/intermediates/merged_java_res/debug/out.jar b/libraries/mogo-tanlu-api/build/intermediates/merged_java_res/debug/out.jar deleted file mode 100644 index 15cb0ecb3e..0000000000 Binary files a/libraries/mogo-tanlu-api/build/intermediates/merged_java_res/debug/out.jar and /dev/null differ diff --git a/libraries/mogo-tanlu-api/build/intermediates/merged_manifests/debug/output.json b/libraries/mogo-tanlu-api/build/intermediates/merged_manifests/debug/output.json deleted file mode 100644 index ccdff5b84c..0000000000 --- a/libraries/mogo-tanlu-api/build/intermediates/merged_manifests/debug/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"2.0.0","enabled":true,"outputFile":"mogo-tanlu-api-debug.aar","fullName":"debug","baseName":"debug"},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.tanlu.api","split":""}}] \ No newline at end of file diff --git a/libraries/mogo-tanlu-api/build/intermediates/merged_manifests/release/output.json b/libraries/mogo-tanlu-api/build/intermediates/merged_manifests/release/output.json new file mode 100644 index 0000000000..f0360a5fd2 --- /dev/null +++ b/libraries/mogo-tanlu-api/build/intermediates/merged_manifests/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"2.0.1","enabled":true,"outputFile":"mogo-tanlu-api-release.aar","fullName":"release","baseName":"release"},"path":"..\\..\\library_manifest\\release\\AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.tanlu.api","split":""}}] \ No newline at end of file diff --git a/libraries/mogo-tanlu-api/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt b/libraries/mogo-tanlu-api/build/intermediates/res/symbol-table-with-package/release/package-aware-r.txt similarity index 99% rename from libraries/mogo-tanlu-api/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt rename to libraries/mogo-tanlu-api/build/intermediates/res/symbol-table-with-package/release/package-aware-r.txt index b26994c6a4..1c058e74a5 100644 --- a/libraries/mogo-tanlu-api/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt +++ b/libraries/mogo-tanlu-api/build/intermediates/res/symbol-table-with-package/release/package-aware-r.txt @@ -618,6 +618,7 @@ dimen compat_button_padding_vertical_material dimen compat_control_corner_material dimen compat_notification_large_icon_max_height dimen compat_notification_large_icon_max_width +dimen corner_radius_cancel dimen disabled_alpha_material_dark dimen disabled_alpha_material_light dimen dp_0 diff --git a/libraries/mogo-tanlu-api/build/intermediates/runtime_library_classes/debug/classes.jar b/libraries/mogo-tanlu-api/build/intermediates/runtime_library_classes/debug/classes.jar deleted file mode 100644 index 3af7c0bea3..0000000000 Binary files a/libraries/mogo-tanlu-api/build/intermediates/runtime_library_classes/debug/classes.jar and /dev/null differ diff --git a/libraries/mogo-tanlu-api/build/intermediates/packaged-classes/debug/classes.jar b/libraries/mogo-tanlu-api/build/intermediates/runtime_library_classes/release/classes.jar similarity index 77% rename from libraries/mogo-tanlu-api/build/intermediates/packaged-classes/debug/classes.jar rename to libraries/mogo-tanlu-api/build/intermediates/runtime_library_classes/release/classes.jar index 3af7c0bea3..f03af8d202 100644 Binary files a/libraries/mogo-tanlu-api/build/intermediates/packaged-classes/debug/classes.jar and b/libraries/mogo-tanlu-api/build/intermediates/runtime_library_classes/release/classes.jar differ diff --git a/libraries/mogo-tanlu-api/build/intermediates/symbols/debug/R.txt b/libraries/mogo-tanlu-api/build/intermediates/symbols/release/R.txt similarity index 78% rename from libraries/mogo-tanlu-api/build/intermediates/symbols/debug/R.txt rename to libraries/mogo-tanlu-api/build/intermediates/symbols/release/R.txt index 9572a1efbe..0ef42c32b3 100644 --- a/libraries/mogo-tanlu-api/build/intermediates/symbols/debug/R.txt +++ b/libraries/mogo-tanlu-api/build/intermediates/symbols/release/R.txt @@ -617,1117 +617,1118 @@ int dimen compat_button_padding_vertical_material 0x7f070053 int dimen compat_control_corner_material 0x7f070054 int dimen compat_notification_large_icon_max_height 0x7f070055 int dimen compat_notification_large_icon_max_width 0x7f070056 -int dimen disabled_alpha_material_dark 0x7f070057 -int dimen disabled_alpha_material_light 0x7f070058 -int dimen dp_0 0x7f070059 -int dimen dp_0_1 0x7f07005a -int dimen dp_0_5 0x7f07005b -int dimen dp_1 0x7f07005c -int dimen dp_10 0x7f07005d -int dimen dp_100 0x7f07005e -int dimen dp_1000 0x7f07005f -int dimen dp_101 0x7f070060 -int dimen dp_102 0x7f070061 -int dimen dp_103 0x7f070062 -int dimen dp_104 0x7f070063 -int dimen dp_104_5 0x7f070064 -int dimen dp_105 0x7f070065 -int dimen dp_106 0x7f070066 -int dimen dp_107 0x7f070067 -int dimen dp_108 0x7f070068 -int dimen dp_109 0x7f070069 -int dimen dp_11 0x7f07006a -int dimen dp_110 0x7f07006b -int dimen dp_111 0x7f07006c -int dimen dp_112 0x7f07006d -int dimen dp_113 0x7f07006e -int dimen dp_114 0x7f07006f -int dimen dp_115 0x7f070070 -int dimen dp_116 0x7f070071 -int dimen dp_117 0x7f070072 -int dimen dp_118 0x7f070073 -int dimen dp_119 0x7f070074 -int dimen dp_12 0x7f070075 -int dimen dp_120 0x7f070076 -int dimen dp_121 0x7f070077 -int dimen dp_122 0x7f070078 -int dimen dp_123 0x7f070079 -int dimen dp_124 0x7f07007a -int dimen dp_125 0x7f07007b -int dimen dp_126 0x7f07007c -int dimen dp_127 0x7f07007d -int dimen dp_128 0x7f07007e -int dimen dp_129 0x7f07007f -int dimen dp_13 0x7f070080 -int dimen dp_130 0x7f070081 -int dimen dp_1300 0x7f070082 -int dimen dp_131 0x7f070083 -int dimen dp_132 0x7f070084 -int dimen dp_133 0x7f070085 -int dimen dp_134 0x7f070086 -int dimen dp_134_5 0x7f070087 -int dimen dp_135 0x7f070088 -int dimen dp_136 0x7f070089 -int dimen dp_137 0x7f07008a -int dimen dp_138 0x7f07008b -int dimen dp_139 0x7f07008c -int dimen dp_14 0x7f07008d -int dimen dp_140 0x7f07008e -int dimen dp_141 0x7f07008f -int dimen dp_142 0x7f070090 -int dimen dp_143 0x7f070091 -int dimen dp_144 0x7f070092 -int dimen dp_145 0x7f070093 -int dimen dp_146 0x7f070094 -int dimen dp_147 0x7f070095 -int dimen dp_148 0x7f070096 -int dimen dp_149 0x7f070097 -int dimen dp_15 0x7f070098 -int dimen dp_150 0x7f070099 -int dimen dp_151 0x7f07009a -int dimen dp_152 0x7f07009b -int dimen dp_153 0x7f07009c -int dimen dp_154 0x7f07009d -int dimen dp_155 0x7f07009e -int dimen dp_156 0x7f07009f -int dimen dp_157 0x7f0700a0 -int dimen dp_158 0x7f0700a1 -int dimen dp_159 0x7f0700a2 -int dimen dp_16 0x7f0700a3 -int dimen dp_160 0x7f0700a4 -int dimen dp_161 0x7f0700a5 -int dimen dp_162 0x7f0700a6 -int dimen dp_163 0x7f0700a7 -int dimen dp_164 0x7f0700a8 -int dimen dp_165 0x7f0700a9 -int dimen dp_166 0x7f0700aa -int dimen dp_167 0x7f0700ab -int dimen dp_168 0x7f0700ac -int dimen dp_169 0x7f0700ad -int dimen dp_17 0x7f0700ae -int dimen dp_170 0x7f0700af -int dimen dp_171 0x7f0700b0 -int dimen dp_172 0x7f0700b1 -int dimen dp_173 0x7f0700b2 -int dimen dp_174 0x7f0700b3 -int dimen dp_175 0x7f0700b4 -int dimen dp_176 0x7f0700b5 -int dimen dp_177 0x7f0700b6 -int dimen dp_178 0x7f0700b7 -int dimen dp_179 0x7f0700b8 -int dimen dp_18 0x7f0700b9 -int dimen dp_180 0x7f0700ba -int dimen dp_181 0x7f0700bb -int dimen dp_182 0x7f0700bc -int dimen dp_183 0x7f0700bd -int dimen dp_184 0x7f0700be -int dimen dp_185 0x7f0700bf -int dimen dp_186 0x7f0700c0 -int dimen dp_187 0x7f0700c1 -int dimen dp_188 0x7f0700c2 -int dimen dp_189 0x7f0700c3 -int dimen dp_19 0x7f0700c4 -int dimen dp_190 0x7f0700c5 -int dimen dp_191 0x7f0700c6 -int dimen dp_191_25 0x7f0700c7 -int dimen dp_192 0x7f0700c8 -int dimen dp_1920 0x7f0700c9 -int dimen dp_193 0x7f0700ca -int dimen dp_194 0x7f0700cb -int dimen dp_195 0x7f0700cc -int dimen dp_196 0x7f0700cd -int dimen dp_197 0x7f0700ce -int dimen dp_198 0x7f0700cf -int dimen dp_199 0x7f0700d0 -int dimen dp_1_5 0x7f0700d1 -int dimen dp_2 0x7f0700d2 -int dimen dp_20 0x7f0700d3 -int dimen dp_200 0x7f0700d4 -int dimen dp_201 0x7f0700d5 -int dimen dp_202 0x7f0700d6 -int dimen dp_203 0x7f0700d7 -int dimen dp_204 0x7f0700d8 -int dimen dp_205 0x7f0700d9 -int dimen dp_206 0x7f0700da -int dimen dp_207 0x7f0700db -int dimen dp_208 0x7f0700dc -int dimen dp_209 0x7f0700dd -int dimen dp_21 0x7f0700de -int dimen dp_210 0x7f0700df -int dimen dp_211 0x7f0700e0 -int dimen dp_212 0x7f0700e1 -int dimen dp_213 0x7f0700e2 -int dimen dp_214 0x7f0700e3 -int dimen dp_215 0x7f0700e4 -int dimen dp_216 0x7f0700e5 -int dimen dp_217 0x7f0700e6 -int dimen dp_218 0x7f0700e7 -int dimen dp_219 0x7f0700e8 -int dimen dp_22 0x7f0700e9 -int dimen dp_220 0x7f0700ea -int dimen dp_221 0x7f0700eb -int dimen dp_222 0x7f0700ec -int dimen dp_223 0x7f0700ed -int dimen dp_224 0x7f0700ee -int dimen dp_225 0x7f0700ef -int dimen dp_226 0x7f0700f0 -int dimen dp_227 0x7f0700f1 -int dimen dp_228 0x7f0700f2 -int dimen dp_229 0x7f0700f3 -int dimen dp_23 0x7f0700f4 -int dimen dp_230 0x7f0700f5 -int dimen dp_231 0x7f0700f6 -int dimen dp_232 0x7f0700f7 -int dimen dp_233 0x7f0700f8 -int dimen dp_234 0x7f0700f9 -int dimen dp_235 0x7f0700fa -int dimen dp_236 0x7f0700fb -int dimen dp_237 0x7f0700fc -int dimen dp_238 0x7f0700fd -int dimen dp_239 0x7f0700fe -int dimen dp_24 0x7f0700ff -int dimen dp_240 0x7f070100 -int dimen dp_241 0x7f070101 -int dimen dp_242 0x7f070102 -int dimen dp_243 0x7f070103 -int dimen dp_244 0x7f070104 -int dimen dp_245 0x7f070105 -int dimen dp_246 0x7f070106 -int dimen dp_247 0x7f070107 -int dimen dp_248 0x7f070108 -int dimen dp_249 0x7f070109 -int dimen dp_25 0x7f07010a -int dimen dp_250 0x7f07010b -int dimen dp_251 0x7f07010c -int dimen dp_252 0x7f07010d -int dimen dp_253 0x7f07010e -int dimen dp_254 0x7f07010f -int dimen dp_255 0x7f070110 -int dimen dp_256 0x7f070111 -int dimen dp_257 0x7f070112 -int dimen dp_258 0x7f070113 -int dimen dp_259 0x7f070114 -int dimen dp_26 0x7f070115 -int dimen dp_260 0x7f070116 -int dimen dp_261 0x7f070117 -int dimen dp_262 0x7f070118 -int dimen dp_263 0x7f070119 -int dimen dp_264 0x7f07011a -int dimen dp_265 0x7f07011b -int dimen dp_266 0x7f07011c -int dimen dp_267 0x7f07011d -int dimen dp_268 0x7f07011e -int dimen dp_269 0x7f07011f -int dimen dp_27 0x7f070120 -int dimen dp_270 0x7f070121 -int dimen dp_271 0x7f070122 -int dimen dp_272 0x7f070123 -int dimen dp_273 0x7f070124 -int dimen dp_274 0x7f070125 -int dimen dp_275 0x7f070126 -int dimen dp_276 0x7f070127 -int dimen dp_277 0x7f070128 -int dimen dp_278 0x7f070129 -int dimen dp_279 0x7f07012a -int dimen dp_28 0x7f07012b -int dimen dp_280 0x7f07012c -int dimen dp_281 0x7f07012d -int dimen dp_282 0x7f07012e -int dimen dp_283 0x7f07012f -int dimen dp_284 0x7f070130 -int dimen dp_285 0x7f070131 -int dimen dp_286 0x7f070132 -int dimen dp_287 0x7f070133 -int dimen dp_288 0x7f070134 -int dimen dp_289 0x7f070135 -int dimen dp_29 0x7f070136 -int dimen dp_290 0x7f070137 -int dimen dp_291 0x7f070138 -int dimen dp_292 0x7f070139 -int dimen dp_293 0x7f07013a -int dimen dp_294 0x7f07013b -int dimen dp_295 0x7f07013c -int dimen dp_296 0x7f07013d -int dimen dp_297 0x7f07013e -int dimen dp_298 0x7f07013f -int dimen dp_299 0x7f070140 -int dimen dp_2_5 0x7f070141 -int dimen dp_3 0x7f070142 -int dimen dp_30 0x7f070143 -int dimen dp_300 0x7f070144 -int dimen dp_301 0x7f070145 -int dimen dp_302 0x7f070146 -int dimen dp_303 0x7f070147 -int dimen dp_304 0x7f070148 -int dimen dp_305 0x7f070149 -int dimen dp_306 0x7f07014a -int dimen dp_307 0x7f07014b -int dimen dp_308 0x7f07014c -int dimen dp_309 0x7f07014d -int dimen dp_31 0x7f07014e -int dimen dp_310 0x7f07014f -int dimen dp_311 0x7f070150 -int dimen dp_312 0x7f070151 -int dimen dp_313 0x7f070152 -int dimen dp_314 0x7f070153 -int dimen dp_315 0x7f070154 -int dimen dp_316 0x7f070155 -int dimen dp_317 0x7f070156 -int dimen dp_318 0x7f070157 -int dimen dp_319 0x7f070158 -int dimen dp_32 0x7f070159 -int dimen dp_320 0x7f07015a -int dimen dp_321 0x7f07015b -int dimen dp_322 0x7f07015c -int dimen dp_323 0x7f07015d -int dimen dp_324 0x7f07015e -int dimen dp_325 0x7f07015f -int dimen dp_326 0x7f070160 -int dimen dp_327 0x7f070161 -int dimen dp_328 0x7f070162 -int dimen dp_329 0x7f070163 -int dimen dp_33 0x7f070164 -int dimen dp_330 0x7f070165 -int dimen dp_331 0x7f070166 -int dimen dp_332 0x7f070167 -int dimen dp_333 0x7f070168 -int dimen dp_334 0x7f070169 -int dimen dp_335 0x7f07016a -int dimen dp_336 0x7f07016b -int dimen dp_337 0x7f07016c -int dimen dp_338 0x7f07016d -int dimen dp_339 0x7f07016e -int dimen dp_34 0x7f07016f -int dimen dp_340 0x7f070170 -int dimen dp_341 0x7f070171 -int dimen dp_342 0x7f070172 -int dimen dp_343 0x7f070173 -int dimen dp_344 0x7f070174 -int dimen dp_345 0x7f070175 -int dimen dp_346 0x7f070176 -int dimen dp_347 0x7f070177 -int dimen dp_348 0x7f070178 -int dimen dp_349 0x7f070179 -int dimen dp_35 0x7f07017a -int dimen dp_350 0x7f07017b -int dimen dp_351 0x7f07017c -int dimen dp_352 0x7f07017d -int dimen dp_353 0x7f07017e -int dimen dp_354 0x7f07017f -int dimen dp_355 0x7f070180 -int dimen dp_356 0x7f070181 -int dimen dp_357 0x7f070182 -int dimen dp_358 0x7f070183 -int dimen dp_359 0x7f070184 -int dimen dp_36 0x7f070185 -int dimen dp_366 0x7f070186 -int dimen dp_367 0x7f070187 -int dimen dp_368 0x7f070188 -int dimen dp_369 0x7f070189 -int dimen dp_37 0x7f07018a -int dimen dp_370 0x7f07018b -int dimen dp_371 0x7f07018c -int dimen dp_372 0x7f07018d -int dimen dp_373 0x7f07018e -int dimen dp_374 0x7f07018f -int dimen dp_375 0x7f070190 -int dimen dp_376 0x7f070191 -int dimen dp_377 0x7f070192 -int dimen dp_378 0x7f070193 -int dimen dp_379 0x7f070194 -int dimen dp_38 0x7f070195 -int dimen dp_380 0x7f070196 -int dimen dp_381 0x7f070197 -int dimen dp_382 0x7f070198 -int dimen dp_383 0x7f070199 -int dimen dp_384 0x7f07019a -int dimen dp_385 0x7f07019b -int dimen dp_386 0x7f07019c -int dimen dp_387 0x7f07019d -int dimen dp_388 0x7f07019e -int dimen dp_389 0x7f07019f -int dimen dp_39 0x7f0701a0 -int dimen dp_390 0x7f0701a1 -int dimen dp_391 0x7f0701a2 -int dimen dp_392 0x7f0701a3 -int dimen dp_393 0x7f0701a4 -int dimen dp_394 0x7f0701a5 -int dimen dp_395 0x7f0701a6 -int dimen dp_396 0x7f0701a7 -int dimen dp_397 0x7f0701a8 -int dimen dp_398 0x7f0701a9 -int dimen dp_399 0x7f0701aa -int dimen dp_3_5 0x7f0701ab -int dimen dp_4 0x7f0701ac -int dimen dp_40 0x7f0701ad -int dimen dp_400 0x7f0701ae -int dimen dp_401 0x7f0701af -int dimen dp_402 0x7f0701b0 -int dimen dp_403 0x7f0701b1 -int dimen dp_404 0x7f0701b2 -int dimen dp_405 0x7f0701b3 -int dimen dp_406 0x7f0701b4 -int dimen dp_407 0x7f0701b5 -int dimen dp_408 0x7f0701b6 -int dimen dp_409 0x7f0701b7 -int dimen dp_41 0x7f0701b8 -int dimen dp_410 0x7f0701b9 -int dimen dp_411 0x7f0701ba -int dimen dp_412 0x7f0701bb -int dimen dp_413 0x7f0701bc -int dimen dp_414 0x7f0701bd -int dimen dp_415 0x7f0701be -int dimen dp_416 0x7f0701bf -int dimen dp_417 0x7f0701c0 -int dimen dp_418 0x7f0701c1 -int dimen dp_419 0x7f0701c2 -int dimen dp_42 0x7f0701c3 -int dimen dp_420 0x7f0701c4 -int dimen dp_421 0x7f0701c5 -int dimen dp_422 0x7f0701c6 -int dimen dp_423 0x7f0701c7 -int dimen dp_424 0x7f0701c8 -int dimen dp_425 0x7f0701c9 -int dimen dp_426 0x7f0701ca -int dimen dp_427 0x7f0701cb -int dimen dp_428 0x7f0701cc -int dimen dp_429 0x7f0701cd -int dimen dp_43 0x7f0701ce -int dimen dp_430 0x7f0701cf -int dimen dp_431 0x7f0701d0 -int dimen dp_432 0x7f0701d1 -int dimen dp_433 0x7f0701d2 -int dimen dp_434 0x7f0701d3 -int dimen dp_435 0x7f0701d4 -int dimen dp_436 0x7f0701d5 -int dimen dp_437 0x7f0701d6 -int dimen dp_438 0x7f0701d7 -int dimen dp_439 0x7f0701d8 -int dimen dp_44 0x7f0701d9 -int dimen dp_440 0x7f0701da -int dimen dp_441 0x7f0701db -int dimen dp_442 0x7f0701dc -int dimen dp_443 0x7f0701dd -int dimen dp_444 0x7f0701de -int dimen dp_445 0x7f0701df -int dimen dp_446 0x7f0701e0 -int dimen dp_447 0x7f0701e1 -int dimen dp_448 0x7f0701e2 -int dimen dp_449 0x7f0701e3 -int dimen dp_45 0x7f0701e4 -int dimen dp_450 0x7f0701e5 -int dimen dp_451 0x7f0701e6 -int dimen dp_452 0x7f0701e7 -int dimen dp_453 0x7f0701e8 -int dimen dp_454 0x7f0701e9 -int dimen dp_455 0x7f0701ea -int dimen dp_456 0x7f0701eb -int dimen dp_457 0x7f0701ec -int dimen dp_458 0x7f0701ed -int dimen dp_459 0x7f0701ee -int dimen dp_46 0x7f0701ef -int dimen dp_460 0x7f0701f0 -int dimen dp_461 0x7f0701f1 -int dimen dp_462 0x7f0701f2 -int dimen dp_463 0x7f0701f3 -int dimen dp_464 0x7f0701f4 -int dimen dp_465 0x7f0701f5 -int dimen dp_466 0x7f0701f6 -int dimen dp_467 0x7f0701f7 -int dimen dp_468 0x7f0701f8 -int dimen dp_469 0x7f0701f9 -int dimen dp_47 0x7f0701fa -int dimen dp_470 0x7f0701fb -int dimen dp_471 0x7f0701fc -int dimen dp_472 0x7f0701fd -int dimen dp_473 0x7f0701fe -int dimen dp_474 0x7f0701ff -int dimen dp_475 0x7f070200 -int dimen dp_476 0x7f070201 -int dimen dp_477 0x7f070202 -int dimen dp_478 0x7f070203 -int dimen dp_479 0x7f070204 -int dimen dp_48 0x7f070205 -int dimen dp_480 0x7f070206 -int dimen dp_481 0x7f070207 -int dimen dp_482 0x7f070208 -int dimen dp_483 0x7f070209 -int dimen dp_484 0x7f07020a -int dimen dp_485 0x7f07020b -int dimen dp_486 0x7f07020c -int dimen dp_487 0x7f07020d -int dimen dp_488 0x7f07020e -int dimen dp_489 0x7f07020f -int dimen dp_49 0x7f070210 -int dimen dp_490 0x7f070211 -int dimen dp_491 0x7f070212 -int dimen dp_492 0x7f070213 -int dimen dp_493 0x7f070214 -int dimen dp_494 0x7f070215 -int dimen dp_495 0x7f070216 -int dimen dp_496 0x7f070217 -int dimen dp_497 0x7f070218 -int dimen dp_498 0x7f070219 -int dimen dp_499 0x7f07021a -int dimen dp_4_5 0x7f07021b -int dimen dp_5 0x7f07021c -int dimen dp_50 0x7f07021d -int dimen dp_500 0x7f07021e -int dimen dp_501 0x7f07021f -int dimen dp_502 0x7f070220 -int dimen dp_503 0x7f070221 -int dimen dp_504 0x7f070222 -int dimen dp_505 0x7f070223 -int dimen dp_506 0x7f070224 -int dimen dp_507 0x7f070225 -int dimen dp_508 0x7f070226 -int dimen dp_509 0x7f070227 -int dimen dp_51 0x7f070228 -int dimen dp_510 0x7f070229 -int dimen dp_511 0x7f07022a -int dimen dp_512 0x7f07022b -int dimen dp_513 0x7f07022c -int dimen dp_514 0x7f07022d -int dimen dp_515 0x7f07022e -int dimen dp_516 0x7f07022f -int dimen dp_517 0x7f070230 -int dimen dp_518 0x7f070231 -int dimen dp_519 0x7f070232 -int dimen dp_52 0x7f070233 -int dimen dp_520 0x7f070234 -int dimen dp_521 0x7f070235 -int dimen dp_522 0x7f070236 -int dimen dp_523 0x7f070237 -int dimen dp_524 0x7f070238 -int dimen dp_525 0x7f070239 -int dimen dp_526 0x7f07023a -int dimen dp_527 0x7f07023b -int dimen dp_528 0x7f07023c -int dimen dp_529 0x7f07023d -int dimen dp_53 0x7f07023e -int dimen dp_530 0x7f07023f -int dimen dp_531 0x7f070240 -int dimen dp_532 0x7f070241 -int dimen dp_533 0x7f070242 -int dimen dp_534 0x7f070243 -int dimen dp_535 0x7f070244 -int dimen dp_536 0x7f070245 -int dimen dp_537 0x7f070246 -int dimen dp_538 0x7f070247 -int dimen dp_539 0x7f070248 -int dimen dp_54 0x7f070249 -int dimen dp_540 0x7f07024a -int dimen dp_541 0x7f07024b -int dimen dp_542 0x7f07024c -int dimen dp_543 0x7f07024d -int dimen dp_544 0x7f07024e -int dimen dp_545 0x7f07024f -int dimen dp_546 0x7f070250 -int dimen dp_547 0x7f070251 -int dimen dp_548 0x7f070252 -int dimen dp_549 0x7f070253 -int dimen dp_55 0x7f070254 -int dimen dp_550 0x7f070255 -int dimen dp_551 0x7f070256 -int dimen dp_552 0x7f070257 -int dimen dp_553 0x7f070258 -int dimen dp_554 0x7f070259 -int dimen dp_555 0x7f07025a -int dimen dp_556 0x7f07025b -int dimen dp_557 0x7f07025c -int dimen dp_558 0x7f07025d -int dimen dp_559 0x7f07025e -int dimen dp_56 0x7f07025f -int dimen dp_560 0x7f070260 -int dimen dp_561 0x7f070261 -int dimen dp_562 0x7f070262 -int dimen dp_563 0x7f070263 -int dimen dp_564 0x7f070264 -int dimen dp_565 0x7f070265 -int dimen dp_566 0x7f070266 -int dimen dp_567 0x7f070267 -int dimen dp_568 0x7f070268 -int dimen dp_569 0x7f070269 -int dimen dp_57 0x7f07026a -int dimen dp_570 0x7f07026b -int dimen dp_571 0x7f07026c -int dimen dp_572 0x7f07026d -int dimen dp_573 0x7f07026e -int dimen dp_574 0x7f07026f -int dimen dp_575 0x7f070270 -int dimen dp_576 0x7f070271 -int dimen dp_577 0x7f070272 -int dimen dp_578 0x7f070273 -int dimen dp_579 0x7f070274 -int dimen dp_58 0x7f070275 -int dimen dp_580 0x7f070276 -int dimen dp_581 0x7f070277 -int dimen dp_582 0x7f070278 -int dimen dp_583 0x7f070279 -int dimen dp_584 0x7f07027a -int dimen dp_585 0x7f07027b -int dimen dp_586 0x7f07027c -int dimen dp_587 0x7f07027d -int dimen dp_588 0x7f07027e -int dimen dp_589 0x7f07027f -int dimen dp_59 0x7f070280 -int dimen dp_590 0x7f070281 -int dimen dp_591 0x7f070282 -int dimen dp_592 0x7f070283 -int dimen dp_593 0x7f070284 -int dimen dp_594 0x7f070285 -int dimen dp_595 0x7f070286 -int dimen dp_596 0x7f070287 -int dimen dp_597 0x7f070288 -int dimen dp_598 0x7f070289 -int dimen dp_599 0x7f07028a -int dimen dp_6 0x7f07028b -int dimen dp_60 0x7f07028c -int dimen dp_600 0x7f07028d -int dimen dp_601 0x7f07028e -int dimen dp_602 0x7f07028f -int dimen dp_603 0x7f070290 -int dimen dp_604 0x7f070291 -int dimen dp_605 0x7f070292 -int dimen dp_606 0x7f070293 -int dimen dp_607 0x7f070294 -int dimen dp_608 0x7f070295 -int dimen dp_609 0x7f070296 -int dimen dp_61 0x7f070297 -int dimen dp_610 0x7f070298 -int dimen dp_611 0x7f070299 -int dimen dp_612 0x7f07029a -int dimen dp_613 0x7f07029b -int dimen dp_614 0x7f07029c -int dimen dp_615 0x7f07029d -int dimen dp_616 0x7f07029e -int dimen dp_617 0x7f07029f -int dimen dp_618 0x7f0702a0 -int dimen dp_619 0x7f0702a1 -int dimen dp_62 0x7f0702a2 -int dimen dp_620 0x7f0702a3 -int dimen dp_621 0x7f0702a4 -int dimen dp_622 0x7f0702a5 -int dimen dp_623 0x7f0702a6 -int dimen dp_624 0x7f0702a7 -int dimen dp_625 0x7f0702a8 -int dimen dp_626 0x7f0702a9 -int dimen dp_627 0x7f0702aa -int dimen dp_628 0x7f0702ab -int dimen dp_629 0x7f0702ac -int dimen dp_63 0x7f0702ad -int dimen dp_630 0x7f0702ae -int dimen dp_631 0x7f0702af -int dimen dp_632 0x7f0702b0 -int dimen dp_633 0x7f0702b1 -int dimen dp_634 0x7f0702b2 -int dimen dp_635 0x7f0702b3 -int dimen dp_636 0x7f0702b4 -int dimen dp_637 0x7f0702b5 -int dimen dp_638 0x7f0702b6 -int dimen dp_639 0x7f0702b7 -int dimen dp_64 0x7f0702b8 -int dimen dp_640 0x7f0702b9 -int dimen dp_641 0x7f0702ba -int dimen dp_642 0x7f0702bb -int dimen dp_643 0x7f0702bc -int dimen dp_644 0x7f0702bd -int dimen dp_645 0x7f0702be -int dimen dp_646 0x7f0702bf -int dimen dp_647 0x7f0702c0 -int dimen dp_648 0x7f0702c1 -int dimen dp_649 0x7f0702c2 -int dimen dp_65 0x7f0702c3 -int dimen dp_650 0x7f0702c4 -int dimen dp_651 0x7f0702c5 -int dimen dp_652 0x7f0702c6 -int dimen dp_653 0x7f0702c7 -int dimen dp_654 0x7f0702c8 -int dimen dp_655 0x7f0702c9 -int dimen dp_656 0x7f0702ca -int dimen dp_657 0x7f0702cb -int dimen dp_658 0x7f0702cc -int dimen dp_659 0x7f0702cd -int dimen dp_66 0x7f0702ce -int dimen dp_660 0x7f0702cf -int dimen dp_661 0x7f0702d0 -int dimen dp_662 0x7f0702d1 -int dimen dp_663 0x7f0702d2 -int dimen dp_664 0x7f0702d3 -int dimen dp_665 0x7f0702d4 -int dimen dp_666 0x7f0702d5 -int dimen dp_667 0x7f0702d6 -int dimen dp_668 0x7f0702d7 -int dimen dp_669 0x7f0702d8 -int dimen dp_67 0x7f0702d9 -int dimen dp_670 0x7f0702da -int dimen dp_671 0x7f0702db -int dimen dp_672 0x7f0702dc -int dimen dp_673 0x7f0702dd -int dimen dp_674 0x7f0702de -int dimen dp_675 0x7f0702df -int dimen dp_676 0x7f0702e0 -int dimen dp_677 0x7f0702e1 -int dimen dp_678 0x7f0702e2 -int dimen dp_679 0x7f0702e3 -int dimen dp_68 0x7f0702e4 -int dimen dp_680 0x7f0702e5 -int dimen dp_681 0x7f0702e6 -int dimen dp_682 0x7f0702e7 -int dimen dp_683 0x7f0702e8 -int dimen dp_684 0x7f0702e9 -int dimen dp_685 0x7f0702ea -int dimen dp_686 0x7f0702eb -int dimen dp_687 0x7f0702ec -int dimen dp_688 0x7f0702ed -int dimen dp_689 0x7f0702ee -int dimen dp_69 0x7f0702ef -int dimen dp_690 0x7f0702f0 -int dimen dp_691 0x7f0702f1 -int dimen dp_692 0x7f0702f2 -int dimen dp_693 0x7f0702f3 -int dimen dp_694 0x7f0702f4 -int dimen dp_695 0x7f0702f5 -int dimen dp_696 0x7f0702f6 -int dimen dp_697 0x7f0702f7 -int dimen dp_698 0x7f0702f8 -int dimen dp_699 0x7f0702f9 -int dimen dp_7 0x7f0702fa -int dimen dp_70 0x7f0702fb -int dimen dp_700 0x7f0702fc -int dimen dp_701 0x7f0702fd -int dimen dp_702 0x7f0702fe -int dimen dp_703 0x7f0702ff -int dimen dp_704 0x7f070300 -int dimen dp_705 0x7f070301 -int dimen dp_706 0x7f070302 -int dimen dp_707 0x7f070303 -int dimen dp_708 0x7f070304 -int dimen dp_709 0x7f070305 -int dimen dp_71 0x7f070306 -int dimen dp_710 0x7f070307 -int dimen dp_711 0x7f070308 -int dimen dp_712 0x7f070309 -int dimen dp_713 0x7f07030a -int dimen dp_714 0x7f07030b -int dimen dp_715 0x7f07030c -int dimen dp_716 0x7f07030d -int dimen dp_717 0x7f07030e -int dimen dp_718 0x7f07030f -int dimen dp_719 0x7f070310 -int dimen dp_72 0x7f070311 -int dimen dp_720 0x7f070312 -int dimen dp_721 0x7f070313 -int dimen dp_722 0x7f070314 -int dimen dp_723 0x7f070315 -int dimen dp_724 0x7f070316 -int dimen dp_725 0x7f070317 -int dimen dp_726 0x7f070318 -int dimen dp_727 0x7f070319 -int dimen dp_728 0x7f07031a -int dimen dp_729 0x7f07031b -int dimen dp_73 0x7f07031c -int dimen dp_730 0x7f07031d -int dimen dp_731 0x7f07031e -int dimen dp_732 0x7f07031f -int dimen dp_733 0x7f070320 -int dimen dp_734 0x7f070321 -int dimen dp_735 0x7f070322 -int dimen dp_736 0x7f070323 -int dimen dp_737 0x7f070324 -int dimen dp_738 0x7f070325 -int dimen dp_739 0x7f070326 -int dimen dp_74 0x7f070327 -int dimen dp_740 0x7f070328 -int dimen dp_741 0x7f070329 -int dimen dp_742 0x7f07032a -int dimen dp_743 0x7f07032b -int dimen dp_744 0x7f07032c -int dimen dp_745 0x7f07032d -int dimen dp_746 0x7f07032e -int dimen dp_747 0x7f07032f -int dimen dp_748 0x7f070330 -int dimen dp_749 0x7f070331 -int dimen dp_75 0x7f070332 -int dimen dp_750 0x7f070333 -int dimen dp_751 0x7f070334 -int dimen dp_752 0x7f070335 -int dimen dp_753 0x7f070336 -int dimen dp_754 0x7f070337 -int dimen dp_755 0x7f070338 -int dimen dp_756 0x7f070339 -int dimen dp_757 0x7f07033a -int dimen dp_758 0x7f07033b -int dimen dp_759 0x7f07033c -int dimen dp_76 0x7f07033d -int dimen dp_760 0x7f07033e -int dimen dp_761 0x7f07033f -int dimen dp_762 0x7f070340 -int dimen dp_763 0x7f070341 -int dimen dp_764 0x7f070342 -int dimen dp_765 0x7f070343 -int dimen dp_766 0x7f070344 -int dimen dp_767 0x7f070345 -int dimen dp_768 0x7f070346 -int dimen dp_769 0x7f070347 -int dimen dp_77 0x7f070348 -int dimen dp_770 0x7f070349 -int dimen dp_771 0x7f07034a -int dimen dp_772 0x7f07034b -int dimen dp_773 0x7f07034c -int dimen dp_774 0x7f07034d -int dimen dp_775 0x7f07034e -int dimen dp_776 0x7f07034f -int dimen dp_777 0x7f070350 -int dimen dp_778 0x7f070351 -int dimen dp_779 0x7f070352 -int dimen dp_78 0x7f070353 -int dimen dp_780 0x7f070354 -int dimen dp_781 0x7f070355 -int dimen dp_782 0x7f070356 -int dimen dp_783 0x7f070357 -int dimen dp_784 0x7f070358 -int dimen dp_785 0x7f070359 -int dimen dp_786 0x7f07035a -int dimen dp_787 0x7f07035b -int dimen dp_788 0x7f07035c -int dimen dp_789 0x7f07035d -int dimen dp_79 0x7f07035e -int dimen dp_790 0x7f07035f -int dimen dp_791 0x7f070360 -int dimen dp_792 0x7f070361 -int dimen dp_793 0x7f070362 -int dimen dp_794 0x7f070363 -int dimen dp_795 0x7f070364 -int dimen dp_796 0x7f070365 -int dimen dp_797 0x7f070366 -int dimen dp_798 0x7f070367 -int dimen dp_799 0x7f070368 -int dimen dp_7_5 0x7f070369 -int dimen dp_8 0x7f07036a -int dimen dp_80 0x7f07036b -int dimen dp_800 0x7f07036c -int dimen dp_801 0x7f07036d -int dimen dp_802 0x7f07036e -int dimen dp_803 0x7f07036f -int dimen dp_804 0x7f070370 -int dimen dp_805 0x7f070371 -int dimen dp_806 0x7f070372 -int dimen dp_807 0x7f070373 -int dimen dp_808 0x7f070374 -int dimen dp_809 0x7f070375 -int dimen dp_81 0x7f070376 -int dimen dp_810 0x7f070377 -int dimen dp_811 0x7f070378 -int dimen dp_812 0x7f070379 -int dimen dp_813 0x7f07037a -int dimen dp_814 0x7f07037b -int dimen dp_815 0x7f07037c -int dimen dp_816 0x7f07037d -int dimen dp_817 0x7f07037e -int dimen dp_818 0x7f07037f -int dimen dp_819 0x7f070380 -int dimen dp_82 0x7f070381 -int dimen dp_820 0x7f070382 -int dimen dp_821 0x7f070383 -int dimen dp_822 0x7f070384 -int dimen dp_823 0x7f070385 -int dimen dp_824 0x7f070386 -int dimen dp_825 0x7f070387 -int dimen dp_826 0x7f070388 -int dimen dp_827 0x7f070389 -int dimen dp_828 0x7f07038a -int dimen dp_829 0x7f07038b -int dimen dp_83 0x7f07038c -int dimen dp_830 0x7f07038d -int dimen dp_831 0x7f07038e -int dimen dp_832 0x7f07038f -int dimen dp_833 0x7f070390 -int dimen dp_834 0x7f070391 -int dimen dp_835 0x7f070392 -int dimen dp_836 0x7f070393 -int dimen dp_837 0x7f070394 -int dimen dp_838 0x7f070395 -int dimen dp_839 0x7f070396 -int dimen dp_84 0x7f070397 -int dimen dp_840 0x7f070398 -int dimen dp_841 0x7f070399 -int dimen dp_842 0x7f07039a -int dimen dp_843 0x7f07039b -int dimen dp_844 0x7f07039c -int dimen dp_845 0x7f07039d -int dimen dp_846 0x7f07039e -int dimen dp_847 0x7f07039f -int dimen dp_848 0x7f0703a0 -int dimen dp_849 0x7f0703a1 -int dimen dp_85 0x7f0703a2 -int dimen dp_850 0x7f0703a3 -int dimen dp_851 0x7f0703a4 -int dimen dp_852 0x7f0703a5 -int dimen dp_853 0x7f0703a6 -int dimen dp_854 0x7f0703a7 -int dimen dp_855 0x7f0703a8 -int dimen dp_856 0x7f0703a9 -int dimen dp_857 0x7f0703aa -int dimen dp_858 0x7f0703ab -int dimen dp_859 0x7f0703ac -int dimen dp_86 0x7f0703ad -int dimen dp_860 0x7f0703ae -int dimen dp_861 0x7f0703af -int dimen dp_862 0x7f0703b0 -int dimen dp_863 0x7f0703b1 -int dimen dp_864 0x7f0703b2 -int dimen dp_865 0x7f0703b3 -int dimen dp_866 0x7f0703b4 -int dimen dp_867 0x7f0703b5 -int dimen dp_868 0x7f0703b6 -int dimen dp_869 0x7f0703b7 -int dimen dp_87 0x7f0703b8 -int dimen dp_870 0x7f0703b9 -int dimen dp_871 0x7f0703ba -int dimen dp_872 0x7f0703bb -int dimen dp_873 0x7f0703bc -int dimen dp_874 0x7f0703bd -int dimen dp_875 0x7f0703be -int dimen dp_876 0x7f0703bf -int dimen dp_877 0x7f0703c0 -int dimen dp_878 0x7f0703c1 -int dimen dp_879 0x7f0703c2 -int dimen dp_88 0x7f0703c3 -int dimen dp_880 0x7f0703c4 -int dimen dp_881 0x7f0703c5 -int dimen dp_882 0x7f0703c6 -int dimen dp_883 0x7f0703c7 -int dimen dp_884 0x7f0703c8 -int dimen dp_885 0x7f0703c9 -int dimen dp_886 0x7f0703ca -int dimen dp_887 0x7f0703cb -int dimen dp_888 0x7f0703cc -int dimen dp_889 0x7f0703cd -int dimen dp_89 0x7f0703ce -int dimen dp_890 0x7f0703cf -int dimen dp_891 0x7f0703d0 -int dimen dp_892 0x7f0703d1 -int dimen dp_893 0x7f0703d2 -int dimen dp_894 0x7f0703d3 -int dimen dp_895 0x7f0703d4 -int dimen dp_896 0x7f0703d5 -int dimen dp_897 0x7f0703d6 -int dimen dp_898 0x7f0703d7 -int dimen dp_899 0x7f0703d8 -int dimen dp_9 0x7f0703d9 -int dimen dp_90 0x7f0703da -int dimen dp_900 0x7f0703db -int dimen dp_901 0x7f0703dc -int dimen dp_902 0x7f0703dd -int dimen dp_903 0x7f0703de -int dimen dp_904 0x7f0703df -int dimen dp_905 0x7f0703e0 -int dimen dp_906 0x7f0703e1 -int dimen dp_907 0x7f0703e2 -int dimen dp_908 0x7f0703e3 -int dimen dp_909 0x7f0703e4 -int dimen dp_91 0x7f0703e5 -int dimen dp_910 0x7f0703e6 -int dimen dp_911 0x7f0703e7 -int dimen dp_912 0x7f0703e8 -int dimen dp_913 0x7f0703e9 -int dimen dp_914 0x7f0703ea -int dimen dp_915 0x7f0703eb -int dimen dp_916 0x7f0703ec -int dimen dp_917 0x7f0703ed -int dimen dp_918 0x7f0703ee -int dimen dp_919 0x7f0703ef -int dimen dp_92 0x7f0703f0 -int dimen dp_920 0x7f0703f1 -int dimen dp_921 0x7f0703f2 -int dimen dp_922 0x7f0703f3 -int dimen dp_923 0x7f0703f4 -int dimen dp_924 0x7f0703f5 -int dimen dp_925 0x7f0703f6 -int dimen dp_926 0x7f0703f7 -int dimen dp_927 0x7f0703f8 -int dimen dp_928 0x7f0703f9 -int dimen dp_929 0x7f0703fa -int dimen dp_93 0x7f0703fb -int dimen dp_930 0x7f0703fc -int dimen dp_931 0x7f0703fd -int dimen dp_932 0x7f0703fe -int dimen dp_933 0x7f0703ff -int dimen dp_934 0x7f070400 -int dimen dp_935 0x7f070401 -int dimen dp_936 0x7f070402 -int dimen dp_937 0x7f070403 -int dimen dp_938 0x7f070404 -int dimen dp_939 0x7f070405 -int dimen dp_94 0x7f070406 -int dimen dp_940 0x7f070407 -int dimen dp_941 0x7f070408 -int dimen dp_942 0x7f070409 -int dimen dp_943 0x7f07040a -int dimen dp_944 0x7f07040b -int dimen dp_945 0x7f07040c -int dimen dp_946 0x7f07040d -int dimen dp_947 0x7f07040e -int dimen dp_948 0x7f07040f -int dimen dp_949 0x7f070410 -int dimen dp_95 0x7f070411 -int dimen dp_950 0x7f070412 -int dimen dp_951 0x7f070413 -int dimen dp_952 0x7f070414 -int dimen dp_953 0x7f070415 -int dimen dp_954 0x7f070416 -int dimen dp_955 0x7f070417 -int dimen dp_956 0x7f070418 -int dimen dp_957 0x7f070419 -int dimen dp_958 0x7f07041a -int dimen dp_959 0x7f07041b -int dimen dp_96 0x7f07041c -int dimen dp_960 0x7f07041d -int dimen dp_961 0x7f07041e -int dimen dp_962 0x7f07041f -int dimen dp_963 0x7f070420 -int dimen dp_964 0x7f070421 -int dimen dp_965 0x7f070422 -int dimen dp_966 0x7f070423 -int dimen dp_967 0x7f070424 -int dimen dp_968 0x7f070425 -int dimen dp_969 0x7f070426 -int dimen dp_97 0x7f070427 -int dimen dp_970 0x7f070428 -int dimen dp_971 0x7f070429 -int dimen dp_972 0x7f07042a -int dimen dp_973 0x7f07042b -int dimen dp_974 0x7f07042c -int dimen dp_975 0x7f07042d -int dimen dp_976 0x7f07042e -int dimen dp_977 0x7f07042f -int dimen dp_978 0x7f070430 -int dimen dp_979 0x7f070431 -int dimen dp_98 0x7f070432 -int dimen dp_980 0x7f070433 -int dimen dp_981 0x7f070434 -int dimen dp_982 0x7f070435 -int dimen dp_983 0x7f070436 -int dimen dp_984 0x7f070437 -int dimen dp_985 0x7f070438 -int dimen dp_986 0x7f070439 -int dimen dp_987 0x7f07043a -int dimen dp_988 0x7f07043b -int dimen dp_989 0x7f07043c -int dimen dp_99 0x7f07043d -int dimen dp_990 0x7f07043e -int dimen dp_991 0x7f07043f -int dimen dp_992 0x7f070440 -int dimen dp_993 0x7f070441 -int dimen dp_994 0x7f070442 -int dimen dp_995 0x7f070443 -int dimen dp_996 0x7f070444 -int dimen dp_997 0x7f070445 -int dimen dp_998 0x7f070446 -int dimen dp_999 0x7f070447 -int dimen dp_m_1 0x7f070448 -int dimen dp_m_10 0x7f070449 -int dimen dp_m_12 0x7f07044a -int dimen dp_m_2 0x7f07044b -int dimen dp_m_20 0x7f07044c -int dimen dp_m_30 0x7f07044d -int dimen dp_m_5 0x7f07044e -int dimen dp_m_60 0x7f07044f -int dimen dp_m_8 0x7f070450 -int dimen fastscroll_default_thickness 0x7f070451 -int dimen fastscroll_margin 0x7f070452 -int dimen fastscroll_minimum_range 0x7f070453 -int dimen heart_ratingbar_height 0x7f070454 -int dimen heart_ratingbar_width 0x7f070455 -int dimen highlight_alpha_material_colored 0x7f070456 -int dimen highlight_alpha_material_dark 0x7f070457 -int dimen highlight_alpha_material_light 0x7f070458 -int dimen hint_alpha_material_dark 0x7f070459 -int dimen hint_alpha_material_light 0x7f07045a -int dimen hint_pressed_alpha_material_dark 0x7f07045b -int dimen hint_pressed_alpha_material_light 0x7f07045c -int dimen item_touch_helper_max_drag_scroll_per_frame 0x7f07045d -int dimen item_touch_helper_swipe_escape_max_velocity 0x7f07045e -int dimen item_touch_helper_swipe_escape_velocity 0x7f07045f -int dimen module_common_shadow_width 0x7f070460 -int dimen module_common_shadow_width_pos 0x7f070461 -int dimen module_commons_toast_icon_width 0x7f070462 -int dimen module_commons_toast_marginBottom 0x7f070463 -int dimen module_commons_toast_marginLeft 0x7f070464 -int dimen module_commons_toast_marginRight 0x7f070465 -int dimen module_commons_toast_marginTop 0x7f070466 -int dimen module_commons_toast_maxWidth 0x7f070467 -int dimen module_commons_toast_minWidth 0x7f070468 -int dimen module_commons_toast_space_between_icon_and_msg 0x7f070469 -int dimen module_commons_toast_textSize 0x7f07046a -int dimen module_commons_toast_with_left_drawable_marginBottom 0x7f07046b -int dimen module_commons_toast_with_left_drawable_marginLeft 0x7f07046c -int dimen module_commons_toast_with_left_drawable_marginTop 0x7f07046d -int dimen module_commons_toast_y_offset 0x7f07046e -int dimen notification_action_icon_size 0x7f07046f -int dimen notification_action_text_size 0x7f070470 -int dimen notification_big_circle_margin 0x7f070471 -int dimen notification_content_margin_start 0x7f070472 -int dimen notification_large_icon_height 0x7f070473 -int dimen notification_large_icon_width 0x7f070474 -int dimen notification_main_column_padding_top 0x7f070475 -int dimen notification_media_narrow_margin 0x7f070476 -int dimen notification_right_icon_size 0x7f070477 -int dimen notification_right_side_padding_top 0x7f070478 -int dimen notification_small_icon_background_padding 0x7f070479 -int dimen notification_small_icon_size_as_large 0x7f07047a -int dimen notification_subtext_size 0x7f07047b -int dimen notification_top_pad 0x7f07047c -int dimen notification_top_pad_large_text 0x7f07047d -int dimen panel_list_item_title_size 0x7f07047e -int dimen path_width 0x7f07047f -int dimen ratingbar_padding 0x7f070480 -int dimen share_item_address 0x7f070481 -int dimen sp_10 0x7f070482 -int dimen sp_11 0x7f070483 -int dimen sp_12 0x7f070484 -int dimen sp_13 0x7f070485 -int dimen sp_14 0x7f070486 -int dimen sp_15 0x7f070487 -int dimen sp_16 0x7f070488 -int dimen sp_17 0x7f070489 -int dimen sp_18 0x7f07048a -int dimen sp_19 0x7f07048b -int dimen sp_20 0x7f07048c -int dimen sp_21 0x7f07048d -int dimen sp_22 0x7f07048e -int dimen sp_23 0x7f07048f -int dimen sp_24 0x7f070490 -int dimen sp_25 0x7f070491 -int dimen sp_28 0x7f070492 -int dimen sp_30 0x7f070493 -int dimen sp_32 0x7f070494 -int dimen sp_34 0x7f070495 -int dimen sp_36 0x7f070496 -int dimen sp_38 0x7f070497 -int dimen sp_40 0x7f070498 -int dimen sp_42 0x7f070499 -int dimen sp_48 0x7f07049a -int dimen sp_6 0x7f07049b -int dimen sp_7 0x7f07049c -int dimen sp_8 0x7f07049d -int dimen sp_9 0x7f07049e -int dimen subtitle_corner_radius 0x7f07049f -int dimen subtitle_outline_width 0x7f0704a0 -int dimen subtitle_shadow_offset 0x7f0704a1 -int dimen subtitle_shadow_radius 0x7f0704a2 -int dimen tooltip_corner_radius 0x7f0704a3 -int dimen tooltip_horizontal_padding 0x7f0704a4 -int dimen tooltip_margin 0x7f0704a5 -int dimen tooltip_precise_anchor_extra_offset 0x7f0704a6 -int dimen tooltip_precise_anchor_threshold 0x7f0704a7 -int dimen tooltip_vertical_padding 0x7f0704a8 -int dimen tooltip_y_offset_non_touch 0x7f0704a9 -int dimen tooltip_y_offset_touch 0x7f0704aa -int dimen v2x_panel_loading_top 0x7f0704ab -int dimen v2x_share_btn_height 0x7f0704ac -int dimen v2x_share_btn_width 0x7f0704ad +int dimen corner_radius_cancel 0x7f070057 +int dimen disabled_alpha_material_dark 0x7f070058 +int dimen disabled_alpha_material_light 0x7f070059 +int dimen dp_0 0x7f07005a +int dimen dp_0_1 0x7f07005b +int dimen dp_0_5 0x7f07005c +int dimen dp_1 0x7f07005d +int dimen dp_10 0x7f07005e +int dimen dp_100 0x7f07005f +int dimen dp_1000 0x7f070060 +int dimen dp_101 0x7f070061 +int dimen dp_102 0x7f070062 +int dimen dp_103 0x7f070063 +int dimen dp_104 0x7f070064 +int dimen dp_104_5 0x7f070065 +int dimen dp_105 0x7f070066 +int dimen dp_106 0x7f070067 +int dimen dp_107 0x7f070068 +int dimen dp_108 0x7f070069 +int dimen dp_109 0x7f07006a +int dimen dp_11 0x7f07006b +int dimen dp_110 0x7f07006c +int dimen dp_111 0x7f07006d +int dimen dp_112 0x7f07006e +int dimen dp_113 0x7f07006f +int dimen dp_114 0x7f070070 +int dimen dp_115 0x7f070071 +int dimen dp_116 0x7f070072 +int dimen dp_117 0x7f070073 +int dimen dp_118 0x7f070074 +int dimen dp_119 0x7f070075 +int dimen dp_12 0x7f070076 +int dimen dp_120 0x7f070077 +int dimen dp_121 0x7f070078 +int dimen dp_122 0x7f070079 +int dimen dp_123 0x7f07007a +int dimen dp_124 0x7f07007b +int dimen dp_125 0x7f07007c +int dimen dp_126 0x7f07007d +int dimen dp_127 0x7f07007e +int dimen dp_128 0x7f07007f +int dimen dp_129 0x7f070080 +int dimen dp_13 0x7f070081 +int dimen dp_130 0x7f070082 +int dimen dp_1300 0x7f070083 +int dimen dp_131 0x7f070084 +int dimen dp_132 0x7f070085 +int dimen dp_133 0x7f070086 +int dimen dp_134 0x7f070087 +int dimen dp_134_5 0x7f070088 +int dimen dp_135 0x7f070089 +int dimen dp_136 0x7f07008a +int dimen dp_137 0x7f07008b +int dimen dp_138 0x7f07008c +int dimen dp_139 0x7f07008d +int dimen dp_14 0x7f07008e +int dimen dp_140 0x7f07008f +int dimen dp_141 0x7f070090 +int dimen dp_142 0x7f070091 +int dimen dp_143 0x7f070092 +int dimen dp_144 0x7f070093 +int dimen dp_145 0x7f070094 +int dimen dp_146 0x7f070095 +int dimen dp_147 0x7f070096 +int dimen dp_148 0x7f070097 +int dimen dp_149 0x7f070098 +int dimen dp_15 0x7f070099 +int dimen dp_150 0x7f07009a +int dimen dp_151 0x7f07009b +int dimen dp_152 0x7f07009c +int dimen dp_153 0x7f07009d +int dimen dp_154 0x7f07009e +int dimen dp_155 0x7f07009f +int dimen dp_156 0x7f0700a0 +int dimen dp_157 0x7f0700a1 +int dimen dp_158 0x7f0700a2 +int dimen dp_159 0x7f0700a3 +int dimen dp_16 0x7f0700a4 +int dimen dp_160 0x7f0700a5 +int dimen dp_161 0x7f0700a6 +int dimen dp_162 0x7f0700a7 +int dimen dp_163 0x7f0700a8 +int dimen dp_164 0x7f0700a9 +int dimen dp_165 0x7f0700aa +int dimen dp_166 0x7f0700ab +int dimen dp_167 0x7f0700ac +int dimen dp_168 0x7f0700ad +int dimen dp_169 0x7f0700ae +int dimen dp_17 0x7f0700af +int dimen dp_170 0x7f0700b0 +int dimen dp_171 0x7f0700b1 +int dimen dp_172 0x7f0700b2 +int dimen dp_173 0x7f0700b3 +int dimen dp_174 0x7f0700b4 +int dimen dp_175 0x7f0700b5 +int dimen dp_176 0x7f0700b6 +int dimen dp_177 0x7f0700b7 +int dimen dp_178 0x7f0700b8 +int dimen dp_179 0x7f0700b9 +int dimen dp_18 0x7f0700ba +int dimen dp_180 0x7f0700bb +int dimen dp_181 0x7f0700bc +int dimen dp_182 0x7f0700bd +int dimen dp_183 0x7f0700be +int dimen dp_184 0x7f0700bf +int dimen dp_185 0x7f0700c0 +int dimen dp_186 0x7f0700c1 +int dimen dp_187 0x7f0700c2 +int dimen dp_188 0x7f0700c3 +int dimen dp_189 0x7f0700c4 +int dimen dp_19 0x7f0700c5 +int dimen dp_190 0x7f0700c6 +int dimen dp_191 0x7f0700c7 +int dimen dp_191_25 0x7f0700c8 +int dimen dp_192 0x7f0700c9 +int dimen dp_1920 0x7f0700ca +int dimen dp_193 0x7f0700cb +int dimen dp_194 0x7f0700cc +int dimen dp_195 0x7f0700cd +int dimen dp_196 0x7f0700ce +int dimen dp_197 0x7f0700cf +int dimen dp_198 0x7f0700d0 +int dimen dp_199 0x7f0700d1 +int dimen dp_1_5 0x7f0700d2 +int dimen dp_2 0x7f0700d3 +int dimen dp_20 0x7f0700d4 +int dimen dp_200 0x7f0700d5 +int dimen dp_201 0x7f0700d6 +int dimen dp_202 0x7f0700d7 +int dimen dp_203 0x7f0700d8 +int dimen dp_204 0x7f0700d9 +int dimen dp_205 0x7f0700da +int dimen dp_206 0x7f0700db +int dimen dp_207 0x7f0700dc +int dimen dp_208 0x7f0700dd +int dimen dp_209 0x7f0700de +int dimen dp_21 0x7f0700df +int dimen dp_210 0x7f0700e0 +int dimen dp_211 0x7f0700e1 +int dimen dp_212 0x7f0700e2 +int dimen dp_213 0x7f0700e3 +int dimen dp_214 0x7f0700e4 +int dimen dp_215 0x7f0700e5 +int dimen dp_216 0x7f0700e6 +int dimen dp_217 0x7f0700e7 +int dimen dp_218 0x7f0700e8 +int dimen dp_219 0x7f0700e9 +int dimen dp_22 0x7f0700ea +int dimen dp_220 0x7f0700eb +int dimen dp_221 0x7f0700ec +int dimen dp_222 0x7f0700ed +int dimen dp_223 0x7f0700ee +int dimen dp_224 0x7f0700ef +int dimen dp_225 0x7f0700f0 +int dimen dp_226 0x7f0700f1 +int dimen dp_227 0x7f0700f2 +int dimen dp_228 0x7f0700f3 +int dimen dp_229 0x7f0700f4 +int dimen dp_23 0x7f0700f5 +int dimen dp_230 0x7f0700f6 +int dimen dp_231 0x7f0700f7 +int dimen dp_232 0x7f0700f8 +int dimen dp_233 0x7f0700f9 +int dimen dp_234 0x7f0700fa +int dimen dp_235 0x7f0700fb +int dimen dp_236 0x7f0700fc +int dimen dp_237 0x7f0700fd +int dimen dp_238 0x7f0700fe +int dimen dp_239 0x7f0700ff +int dimen dp_24 0x7f070100 +int dimen dp_240 0x7f070101 +int dimen dp_241 0x7f070102 +int dimen dp_242 0x7f070103 +int dimen dp_243 0x7f070104 +int dimen dp_244 0x7f070105 +int dimen dp_245 0x7f070106 +int dimen dp_246 0x7f070107 +int dimen dp_247 0x7f070108 +int dimen dp_248 0x7f070109 +int dimen dp_249 0x7f07010a +int dimen dp_25 0x7f07010b +int dimen dp_250 0x7f07010c +int dimen dp_251 0x7f07010d +int dimen dp_252 0x7f07010e +int dimen dp_253 0x7f07010f +int dimen dp_254 0x7f070110 +int dimen dp_255 0x7f070111 +int dimen dp_256 0x7f070112 +int dimen dp_257 0x7f070113 +int dimen dp_258 0x7f070114 +int dimen dp_259 0x7f070115 +int dimen dp_26 0x7f070116 +int dimen dp_260 0x7f070117 +int dimen dp_261 0x7f070118 +int dimen dp_262 0x7f070119 +int dimen dp_263 0x7f07011a +int dimen dp_264 0x7f07011b +int dimen dp_265 0x7f07011c +int dimen dp_266 0x7f07011d +int dimen dp_267 0x7f07011e +int dimen dp_268 0x7f07011f +int dimen dp_269 0x7f070120 +int dimen dp_27 0x7f070121 +int dimen dp_270 0x7f070122 +int dimen dp_271 0x7f070123 +int dimen dp_272 0x7f070124 +int dimen dp_273 0x7f070125 +int dimen dp_274 0x7f070126 +int dimen dp_275 0x7f070127 +int dimen dp_276 0x7f070128 +int dimen dp_277 0x7f070129 +int dimen dp_278 0x7f07012a +int dimen dp_279 0x7f07012b +int dimen dp_28 0x7f07012c +int dimen dp_280 0x7f07012d +int dimen dp_281 0x7f07012e +int dimen dp_282 0x7f07012f +int dimen dp_283 0x7f070130 +int dimen dp_284 0x7f070131 +int dimen dp_285 0x7f070132 +int dimen dp_286 0x7f070133 +int dimen dp_287 0x7f070134 +int dimen dp_288 0x7f070135 +int dimen dp_289 0x7f070136 +int dimen dp_29 0x7f070137 +int dimen dp_290 0x7f070138 +int dimen dp_291 0x7f070139 +int dimen dp_292 0x7f07013a +int dimen dp_293 0x7f07013b +int dimen dp_294 0x7f07013c +int dimen dp_295 0x7f07013d +int dimen dp_296 0x7f07013e +int dimen dp_297 0x7f07013f +int dimen dp_298 0x7f070140 +int dimen dp_299 0x7f070141 +int dimen dp_2_5 0x7f070142 +int dimen dp_3 0x7f070143 +int dimen dp_30 0x7f070144 +int dimen dp_300 0x7f070145 +int dimen dp_301 0x7f070146 +int dimen dp_302 0x7f070147 +int dimen dp_303 0x7f070148 +int dimen dp_304 0x7f070149 +int dimen dp_305 0x7f07014a +int dimen dp_306 0x7f07014b +int dimen dp_307 0x7f07014c +int dimen dp_308 0x7f07014d +int dimen dp_309 0x7f07014e +int dimen dp_31 0x7f07014f +int dimen dp_310 0x7f070150 +int dimen dp_311 0x7f070151 +int dimen dp_312 0x7f070152 +int dimen dp_313 0x7f070153 +int dimen dp_314 0x7f070154 +int dimen dp_315 0x7f070155 +int dimen dp_316 0x7f070156 +int dimen dp_317 0x7f070157 +int dimen dp_318 0x7f070158 +int dimen dp_319 0x7f070159 +int dimen dp_32 0x7f07015a +int dimen dp_320 0x7f07015b +int dimen dp_321 0x7f07015c +int dimen dp_322 0x7f07015d +int dimen dp_323 0x7f07015e +int dimen dp_324 0x7f07015f +int dimen dp_325 0x7f070160 +int dimen dp_326 0x7f070161 +int dimen dp_327 0x7f070162 +int dimen dp_328 0x7f070163 +int dimen dp_329 0x7f070164 +int dimen dp_33 0x7f070165 +int dimen dp_330 0x7f070166 +int dimen dp_331 0x7f070167 +int dimen dp_332 0x7f070168 +int dimen dp_333 0x7f070169 +int dimen dp_334 0x7f07016a +int dimen dp_335 0x7f07016b +int dimen dp_336 0x7f07016c +int dimen dp_337 0x7f07016d +int dimen dp_338 0x7f07016e +int dimen dp_339 0x7f07016f +int dimen dp_34 0x7f070170 +int dimen dp_340 0x7f070171 +int dimen dp_341 0x7f070172 +int dimen dp_342 0x7f070173 +int dimen dp_343 0x7f070174 +int dimen dp_344 0x7f070175 +int dimen dp_345 0x7f070176 +int dimen dp_346 0x7f070177 +int dimen dp_347 0x7f070178 +int dimen dp_348 0x7f070179 +int dimen dp_349 0x7f07017a +int dimen dp_35 0x7f07017b +int dimen dp_350 0x7f07017c +int dimen dp_351 0x7f07017d +int dimen dp_352 0x7f07017e +int dimen dp_353 0x7f07017f +int dimen dp_354 0x7f070180 +int dimen dp_355 0x7f070181 +int dimen dp_356 0x7f070182 +int dimen dp_357 0x7f070183 +int dimen dp_358 0x7f070184 +int dimen dp_359 0x7f070185 +int dimen dp_36 0x7f070186 +int dimen dp_366 0x7f070187 +int dimen dp_367 0x7f070188 +int dimen dp_368 0x7f070189 +int dimen dp_369 0x7f07018a +int dimen dp_37 0x7f07018b +int dimen dp_370 0x7f07018c +int dimen dp_371 0x7f07018d +int dimen dp_372 0x7f07018e +int dimen dp_373 0x7f07018f +int dimen dp_374 0x7f070190 +int dimen dp_375 0x7f070191 +int dimen dp_376 0x7f070192 +int dimen dp_377 0x7f070193 +int dimen dp_378 0x7f070194 +int dimen dp_379 0x7f070195 +int dimen dp_38 0x7f070196 +int dimen dp_380 0x7f070197 +int dimen dp_381 0x7f070198 +int dimen dp_382 0x7f070199 +int dimen dp_383 0x7f07019a +int dimen dp_384 0x7f07019b +int dimen dp_385 0x7f07019c +int dimen dp_386 0x7f07019d +int dimen dp_387 0x7f07019e +int dimen dp_388 0x7f07019f +int dimen dp_389 0x7f0701a0 +int dimen dp_39 0x7f0701a1 +int dimen dp_390 0x7f0701a2 +int dimen dp_391 0x7f0701a3 +int dimen dp_392 0x7f0701a4 +int dimen dp_393 0x7f0701a5 +int dimen dp_394 0x7f0701a6 +int dimen dp_395 0x7f0701a7 +int dimen dp_396 0x7f0701a8 +int dimen dp_397 0x7f0701a9 +int dimen dp_398 0x7f0701aa +int dimen dp_399 0x7f0701ab +int dimen dp_3_5 0x7f0701ac +int dimen dp_4 0x7f0701ad +int dimen dp_40 0x7f0701ae +int dimen dp_400 0x7f0701af +int dimen dp_401 0x7f0701b0 +int dimen dp_402 0x7f0701b1 +int dimen dp_403 0x7f0701b2 +int dimen dp_404 0x7f0701b3 +int dimen dp_405 0x7f0701b4 +int dimen dp_406 0x7f0701b5 +int dimen dp_407 0x7f0701b6 +int dimen dp_408 0x7f0701b7 +int dimen dp_409 0x7f0701b8 +int dimen dp_41 0x7f0701b9 +int dimen dp_410 0x7f0701ba +int dimen dp_411 0x7f0701bb +int dimen dp_412 0x7f0701bc +int dimen dp_413 0x7f0701bd +int dimen dp_414 0x7f0701be +int dimen dp_415 0x7f0701bf +int dimen dp_416 0x7f0701c0 +int dimen dp_417 0x7f0701c1 +int dimen dp_418 0x7f0701c2 +int dimen dp_419 0x7f0701c3 +int dimen dp_42 0x7f0701c4 +int dimen dp_420 0x7f0701c5 +int dimen dp_421 0x7f0701c6 +int dimen dp_422 0x7f0701c7 +int dimen dp_423 0x7f0701c8 +int dimen dp_424 0x7f0701c9 +int dimen dp_425 0x7f0701ca +int dimen dp_426 0x7f0701cb +int dimen dp_427 0x7f0701cc +int dimen dp_428 0x7f0701cd +int dimen dp_429 0x7f0701ce +int dimen dp_43 0x7f0701cf +int dimen dp_430 0x7f0701d0 +int dimen dp_431 0x7f0701d1 +int dimen dp_432 0x7f0701d2 +int dimen dp_433 0x7f0701d3 +int dimen dp_434 0x7f0701d4 +int dimen dp_435 0x7f0701d5 +int dimen dp_436 0x7f0701d6 +int dimen dp_437 0x7f0701d7 +int dimen dp_438 0x7f0701d8 +int dimen dp_439 0x7f0701d9 +int dimen dp_44 0x7f0701da +int dimen dp_440 0x7f0701db +int dimen dp_441 0x7f0701dc +int dimen dp_442 0x7f0701dd +int dimen dp_443 0x7f0701de +int dimen dp_444 0x7f0701df +int dimen dp_445 0x7f0701e0 +int dimen dp_446 0x7f0701e1 +int dimen dp_447 0x7f0701e2 +int dimen dp_448 0x7f0701e3 +int dimen dp_449 0x7f0701e4 +int dimen dp_45 0x7f0701e5 +int dimen dp_450 0x7f0701e6 +int dimen dp_451 0x7f0701e7 +int dimen dp_452 0x7f0701e8 +int dimen dp_453 0x7f0701e9 +int dimen dp_454 0x7f0701ea +int dimen dp_455 0x7f0701eb +int dimen dp_456 0x7f0701ec +int dimen dp_457 0x7f0701ed +int dimen dp_458 0x7f0701ee +int dimen dp_459 0x7f0701ef +int dimen dp_46 0x7f0701f0 +int dimen dp_460 0x7f0701f1 +int dimen dp_461 0x7f0701f2 +int dimen dp_462 0x7f0701f3 +int dimen dp_463 0x7f0701f4 +int dimen dp_464 0x7f0701f5 +int dimen dp_465 0x7f0701f6 +int dimen dp_466 0x7f0701f7 +int dimen dp_467 0x7f0701f8 +int dimen dp_468 0x7f0701f9 +int dimen dp_469 0x7f0701fa +int dimen dp_47 0x7f0701fb +int dimen dp_470 0x7f0701fc +int dimen dp_471 0x7f0701fd +int dimen dp_472 0x7f0701fe +int dimen dp_473 0x7f0701ff +int dimen dp_474 0x7f070200 +int dimen dp_475 0x7f070201 +int dimen dp_476 0x7f070202 +int dimen dp_477 0x7f070203 +int dimen dp_478 0x7f070204 +int dimen dp_479 0x7f070205 +int dimen dp_48 0x7f070206 +int dimen dp_480 0x7f070207 +int dimen dp_481 0x7f070208 +int dimen dp_482 0x7f070209 +int dimen dp_483 0x7f07020a +int dimen dp_484 0x7f07020b +int dimen dp_485 0x7f07020c +int dimen dp_486 0x7f07020d +int dimen dp_487 0x7f07020e +int dimen dp_488 0x7f07020f +int dimen dp_489 0x7f070210 +int dimen dp_49 0x7f070211 +int dimen dp_490 0x7f070212 +int dimen dp_491 0x7f070213 +int dimen dp_492 0x7f070214 +int dimen dp_493 0x7f070215 +int dimen dp_494 0x7f070216 +int dimen dp_495 0x7f070217 +int dimen dp_496 0x7f070218 +int dimen dp_497 0x7f070219 +int dimen dp_498 0x7f07021a +int dimen dp_499 0x7f07021b +int dimen dp_4_5 0x7f07021c +int dimen dp_5 0x7f07021d +int dimen dp_50 0x7f07021e +int dimen dp_500 0x7f07021f +int dimen dp_501 0x7f070220 +int dimen dp_502 0x7f070221 +int dimen dp_503 0x7f070222 +int dimen dp_504 0x7f070223 +int dimen dp_505 0x7f070224 +int dimen dp_506 0x7f070225 +int dimen dp_507 0x7f070226 +int dimen dp_508 0x7f070227 +int dimen dp_509 0x7f070228 +int dimen dp_51 0x7f070229 +int dimen dp_510 0x7f07022a +int dimen dp_511 0x7f07022b +int dimen dp_512 0x7f07022c +int dimen dp_513 0x7f07022d +int dimen dp_514 0x7f07022e +int dimen dp_515 0x7f07022f +int dimen dp_516 0x7f070230 +int dimen dp_517 0x7f070231 +int dimen dp_518 0x7f070232 +int dimen dp_519 0x7f070233 +int dimen dp_52 0x7f070234 +int dimen dp_520 0x7f070235 +int dimen dp_521 0x7f070236 +int dimen dp_522 0x7f070237 +int dimen dp_523 0x7f070238 +int dimen dp_524 0x7f070239 +int dimen dp_525 0x7f07023a +int dimen dp_526 0x7f07023b +int dimen dp_527 0x7f07023c +int dimen dp_528 0x7f07023d +int dimen dp_529 0x7f07023e +int dimen dp_53 0x7f07023f +int dimen dp_530 0x7f070240 +int dimen dp_531 0x7f070241 +int dimen dp_532 0x7f070242 +int dimen dp_533 0x7f070243 +int dimen dp_534 0x7f070244 +int dimen dp_535 0x7f070245 +int dimen dp_536 0x7f070246 +int dimen dp_537 0x7f070247 +int dimen dp_538 0x7f070248 +int dimen dp_539 0x7f070249 +int dimen dp_54 0x7f07024a +int dimen dp_540 0x7f07024b +int dimen dp_541 0x7f07024c +int dimen dp_542 0x7f07024d +int dimen dp_543 0x7f07024e +int dimen dp_544 0x7f07024f +int dimen dp_545 0x7f070250 +int dimen dp_546 0x7f070251 +int dimen dp_547 0x7f070252 +int dimen dp_548 0x7f070253 +int dimen dp_549 0x7f070254 +int dimen dp_55 0x7f070255 +int dimen dp_550 0x7f070256 +int dimen dp_551 0x7f070257 +int dimen dp_552 0x7f070258 +int dimen dp_553 0x7f070259 +int dimen dp_554 0x7f07025a +int dimen dp_555 0x7f07025b +int dimen dp_556 0x7f07025c +int dimen dp_557 0x7f07025d +int dimen dp_558 0x7f07025e +int dimen dp_559 0x7f07025f +int dimen dp_56 0x7f070260 +int dimen dp_560 0x7f070261 +int dimen dp_561 0x7f070262 +int dimen dp_562 0x7f070263 +int dimen dp_563 0x7f070264 +int dimen dp_564 0x7f070265 +int dimen dp_565 0x7f070266 +int dimen dp_566 0x7f070267 +int dimen dp_567 0x7f070268 +int dimen dp_568 0x7f070269 +int dimen dp_569 0x7f07026a +int dimen dp_57 0x7f07026b +int dimen dp_570 0x7f07026c +int dimen dp_571 0x7f07026d +int dimen dp_572 0x7f07026e +int dimen dp_573 0x7f07026f +int dimen dp_574 0x7f070270 +int dimen dp_575 0x7f070271 +int dimen dp_576 0x7f070272 +int dimen dp_577 0x7f070273 +int dimen dp_578 0x7f070274 +int dimen dp_579 0x7f070275 +int dimen dp_58 0x7f070276 +int dimen dp_580 0x7f070277 +int dimen dp_581 0x7f070278 +int dimen dp_582 0x7f070279 +int dimen dp_583 0x7f07027a +int dimen dp_584 0x7f07027b +int dimen dp_585 0x7f07027c +int dimen dp_586 0x7f07027d +int dimen dp_587 0x7f07027e +int dimen dp_588 0x7f07027f +int dimen dp_589 0x7f070280 +int dimen dp_59 0x7f070281 +int dimen dp_590 0x7f070282 +int dimen dp_591 0x7f070283 +int dimen dp_592 0x7f070284 +int dimen dp_593 0x7f070285 +int dimen dp_594 0x7f070286 +int dimen dp_595 0x7f070287 +int dimen dp_596 0x7f070288 +int dimen dp_597 0x7f070289 +int dimen dp_598 0x7f07028a +int dimen dp_599 0x7f07028b +int dimen dp_6 0x7f07028c +int dimen dp_60 0x7f07028d +int dimen dp_600 0x7f07028e +int dimen dp_601 0x7f07028f +int dimen dp_602 0x7f070290 +int dimen dp_603 0x7f070291 +int dimen dp_604 0x7f070292 +int dimen dp_605 0x7f070293 +int dimen dp_606 0x7f070294 +int dimen dp_607 0x7f070295 +int dimen dp_608 0x7f070296 +int dimen dp_609 0x7f070297 +int dimen dp_61 0x7f070298 +int dimen dp_610 0x7f070299 +int dimen dp_611 0x7f07029a +int dimen dp_612 0x7f07029b +int dimen dp_613 0x7f07029c +int dimen dp_614 0x7f07029d +int dimen dp_615 0x7f07029e +int dimen dp_616 0x7f07029f +int dimen dp_617 0x7f0702a0 +int dimen dp_618 0x7f0702a1 +int dimen dp_619 0x7f0702a2 +int dimen dp_62 0x7f0702a3 +int dimen dp_620 0x7f0702a4 +int dimen dp_621 0x7f0702a5 +int dimen dp_622 0x7f0702a6 +int dimen dp_623 0x7f0702a7 +int dimen dp_624 0x7f0702a8 +int dimen dp_625 0x7f0702a9 +int dimen dp_626 0x7f0702aa +int dimen dp_627 0x7f0702ab +int dimen dp_628 0x7f0702ac +int dimen dp_629 0x7f0702ad +int dimen dp_63 0x7f0702ae +int dimen dp_630 0x7f0702af +int dimen dp_631 0x7f0702b0 +int dimen dp_632 0x7f0702b1 +int dimen dp_633 0x7f0702b2 +int dimen dp_634 0x7f0702b3 +int dimen dp_635 0x7f0702b4 +int dimen dp_636 0x7f0702b5 +int dimen dp_637 0x7f0702b6 +int dimen dp_638 0x7f0702b7 +int dimen dp_639 0x7f0702b8 +int dimen dp_64 0x7f0702b9 +int dimen dp_640 0x7f0702ba +int dimen dp_641 0x7f0702bb +int dimen dp_642 0x7f0702bc +int dimen dp_643 0x7f0702bd +int dimen dp_644 0x7f0702be +int dimen dp_645 0x7f0702bf +int dimen dp_646 0x7f0702c0 +int dimen dp_647 0x7f0702c1 +int dimen dp_648 0x7f0702c2 +int dimen dp_649 0x7f0702c3 +int dimen dp_65 0x7f0702c4 +int dimen dp_650 0x7f0702c5 +int dimen dp_651 0x7f0702c6 +int dimen dp_652 0x7f0702c7 +int dimen dp_653 0x7f0702c8 +int dimen dp_654 0x7f0702c9 +int dimen dp_655 0x7f0702ca +int dimen dp_656 0x7f0702cb +int dimen dp_657 0x7f0702cc +int dimen dp_658 0x7f0702cd +int dimen dp_659 0x7f0702ce +int dimen dp_66 0x7f0702cf +int dimen dp_660 0x7f0702d0 +int dimen dp_661 0x7f0702d1 +int dimen dp_662 0x7f0702d2 +int dimen dp_663 0x7f0702d3 +int dimen dp_664 0x7f0702d4 +int dimen dp_665 0x7f0702d5 +int dimen dp_666 0x7f0702d6 +int dimen dp_667 0x7f0702d7 +int dimen dp_668 0x7f0702d8 +int dimen dp_669 0x7f0702d9 +int dimen dp_67 0x7f0702da +int dimen dp_670 0x7f0702db +int dimen dp_671 0x7f0702dc +int dimen dp_672 0x7f0702dd +int dimen dp_673 0x7f0702de +int dimen dp_674 0x7f0702df +int dimen dp_675 0x7f0702e0 +int dimen dp_676 0x7f0702e1 +int dimen dp_677 0x7f0702e2 +int dimen dp_678 0x7f0702e3 +int dimen dp_679 0x7f0702e4 +int dimen dp_68 0x7f0702e5 +int dimen dp_680 0x7f0702e6 +int dimen dp_681 0x7f0702e7 +int dimen dp_682 0x7f0702e8 +int dimen dp_683 0x7f0702e9 +int dimen dp_684 0x7f0702ea +int dimen dp_685 0x7f0702eb +int dimen dp_686 0x7f0702ec +int dimen dp_687 0x7f0702ed +int dimen dp_688 0x7f0702ee +int dimen dp_689 0x7f0702ef +int dimen dp_69 0x7f0702f0 +int dimen dp_690 0x7f0702f1 +int dimen dp_691 0x7f0702f2 +int dimen dp_692 0x7f0702f3 +int dimen dp_693 0x7f0702f4 +int dimen dp_694 0x7f0702f5 +int dimen dp_695 0x7f0702f6 +int dimen dp_696 0x7f0702f7 +int dimen dp_697 0x7f0702f8 +int dimen dp_698 0x7f0702f9 +int dimen dp_699 0x7f0702fa +int dimen dp_7 0x7f0702fb +int dimen dp_70 0x7f0702fc +int dimen dp_700 0x7f0702fd +int dimen dp_701 0x7f0702fe +int dimen dp_702 0x7f0702ff +int dimen dp_703 0x7f070300 +int dimen dp_704 0x7f070301 +int dimen dp_705 0x7f070302 +int dimen dp_706 0x7f070303 +int dimen dp_707 0x7f070304 +int dimen dp_708 0x7f070305 +int dimen dp_709 0x7f070306 +int dimen dp_71 0x7f070307 +int dimen dp_710 0x7f070308 +int dimen dp_711 0x7f070309 +int dimen dp_712 0x7f07030a +int dimen dp_713 0x7f07030b +int dimen dp_714 0x7f07030c +int dimen dp_715 0x7f07030d +int dimen dp_716 0x7f07030e +int dimen dp_717 0x7f07030f +int dimen dp_718 0x7f070310 +int dimen dp_719 0x7f070311 +int dimen dp_72 0x7f070312 +int dimen dp_720 0x7f070313 +int dimen dp_721 0x7f070314 +int dimen dp_722 0x7f070315 +int dimen dp_723 0x7f070316 +int dimen dp_724 0x7f070317 +int dimen dp_725 0x7f070318 +int dimen dp_726 0x7f070319 +int dimen dp_727 0x7f07031a +int dimen dp_728 0x7f07031b +int dimen dp_729 0x7f07031c +int dimen dp_73 0x7f07031d +int dimen dp_730 0x7f07031e +int dimen dp_731 0x7f07031f +int dimen dp_732 0x7f070320 +int dimen dp_733 0x7f070321 +int dimen dp_734 0x7f070322 +int dimen dp_735 0x7f070323 +int dimen dp_736 0x7f070324 +int dimen dp_737 0x7f070325 +int dimen dp_738 0x7f070326 +int dimen dp_739 0x7f070327 +int dimen dp_74 0x7f070328 +int dimen dp_740 0x7f070329 +int dimen dp_741 0x7f07032a +int dimen dp_742 0x7f07032b +int dimen dp_743 0x7f07032c +int dimen dp_744 0x7f07032d +int dimen dp_745 0x7f07032e +int dimen dp_746 0x7f07032f +int dimen dp_747 0x7f070330 +int dimen dp_748 0x7f070331 +int dimen dp_749 0x7f070332 +int dimen dp_75 0x7f070333 +int dimen dp_750 0x7f070334 +int dimen dp_751 0x7f070335 +int dimen dp_752 0x7f070336 +int dimen dp_753 0x7f070337 +int dimen dp_754 0x7f070338 +int dimen dp_755 0x7f070339 +int dimen dp_756 0x7f07033a +int dimen dp_757 0x7f07033b +int dimen dp_758 0x7f07033c +int dimen dp_759 0x7f07033d +int dimen dp_76 0x7f07033e +int dimen dp_760 0x7f07033f +int dimen dp_761 0x7f070340 +int dimen dp_762 0x7f070341 +int dimen dp_763 0x7f070342 +int dimen dp_764 0x7f070343 +int dimen dp_765 0x7f070344 +int dimen dp_766 0x7f070345 +int dimen dp_767 0x7f070346 +int dimen dp_768 0x7f070347 +int dimen dp_769 0x7f070348 +int dimen dp_77 0x7f070349 +int dimen dp_770 0x7f07034a +int dimen dp_771 0x7f07034b +int dimen dp_772 0x7f07034c +int dimen dp_773 0x7f07034d +int dimen dp_774 0x7f07034e +int dimen dp_775 0x7f07034f +int dimen dp_776 0x7f070350 +int dimen dp_777 0x7f070351 +int dimen dp_778 0x7f070352 +int dimen dp_779 0x7f070353 +int dimen dp_78 0x7f070354 +int dimen dp_780 0x7f070355 +int dimen dp_781 0x7f070356 +int dimen dp_782 0x7f070357 +int dimen dp_783 0x7f070358 +int dimen dp_784 0x7f070359 +int dimen dp_785 0x7f07035a +int dimen dp_786 0x7f07035b +int dimen dp_787 0x7f07035c +int dimen dp_788 0x7f07035d +int dimen dp_789 0x7f07035e +int dimen dp_79 0x7f07035f +int dimen dp_790 0x7f070360 +int dimen dp_791 0x7f070361 +int dimen dp_792 0x7f070362 +int dimen dp_793 0x7f070363 +int dimen dp_794 0x7f070364 +int dimen dp_795 0x7f070365 +int dimen dp_796 0x7f070366 +int dimen dp_797 0x7f070367 +int dimen dp_798 0x7f070368 +int dimen dp_799 0x7f070369 +int dimen dp_7_5 0x7f07036a +int dimen dp_8 0x7f07036b +int dimen dp_80 0x7f07036c +int dimen dp_800 0x7f07036d +int dimen dp_801 0x7f07036e +int dimen dp_802 0x7f07036f +int dimen dp_803 0x7f070370 +int dimen dp_804 0x7f070371 +int dimen dp_805 0x7f070372 +int dimen dp_806 0x7f070373 +int dimen dp_807 0x7f070374 +int dimen dp_808 0x7f070375 +int dimen dp_809 0x7f070376 +int dimen dp_81 0x7f070377 +int dimen dp_810 0x7f070378 +int dimen dp_811 0x7f070379 +int dimen dp_812 0x7f07037a +int dimen dp_813 0x7f07037b +int dimen dp_814 0x7f07037c +int dimen dp_815 0x7f07037d +int dimen dp_816 0x7f07037e +int dimen dp_817 0x7f07037f +int dimen dp_818 0x7f070380 +int dimen dp_819 0x7f070381 +int dimen dp_82 0x7f070382 +int dimen dp_820 0x7f070383 +int dimen dp_821 0x7f070384 +int dimen dp_822 0x7f070385 +int dimen dp_823 0x7f070386 +int dimen dp_824 0x7f070387 +int dimen dp_825 0x7f070388 +int dimen dp_826 0x7f070389 +int dimen dp_827 0x7f07038a +int dimen dp_828 0x7f07038b +int dimen dp_829 0x7f07038c +int dimen dp_83 0x7f07038d +int dimen dp_830 0x7f07038e +int dimen dp_831 0x7f07038f +int dimen dp_832 0x7f070390 +int dimen dp_833 0x7f070391 +int dimen dp_834 0x7f070392 +int dimen dp_835 0x7f070393 +int dimen dp_836 0x7f070394 +int dimen dp_837 0x7f070395 +int dimen dp_838 0x7f070396 +int dimen dp_839 0x7f070397 +int dimen dp_84 0x7f070398 +int dimen dp_840 0x7f070399 +int dimen dp_841 0x7f07039a +int dimen dp_842 0x7f07039b +int dimen dp_843 0x7f07039c +int dimen dp_844 0x7f07039d +int dimen dp_845 0x7f07039e +int dimen dp_846 0x7f07039f +int dimen dp_847 0x7f0703a0 +int dimen dp_848 0x7f0703a1 +int dimen dp_849 0x7f0703a2 +int dimen dp_85 0x7f0703a3 +int dimen dp_850 0x7f0703a4 +int dimen dp_851 0x7f0703a5 +int dimen dp_852 0x7f0703a6 +int dimen dp_853 0x7f0703a7 +int dimen dp_854 0x7f0703a8 +int dimen dp_855 0x7f0703a9 +int dimen dp_856 0x7f0703aa +int dimen dp_857 0x7f0703ab +int dimen dp_858 0x7f0703ac +int dimen dp_859 0x7f0703ad +int dimen dp_86 0x7f0703ae +int dimen dp_860 0x7f0703af +int dimen dp_861 0x7f0703b0 +int dimen dp_862 0x7f0703b1 +int dimen dp_863 0x7f0703b2 +int dimen dp_864 0x7f0703b3 +int dimen dp_865 0x7f0703b4 +int dimen dp_866 0x7f0703b5 +int dimen dp_867 0x7f0703b6 +int dimen dp_868 0x7f0703b7 +int dimen dp_869 0x7f0703b8 +int dimen dp_87 0x7f0703b9 +int dimen dp_870 0x7f0703ba +int dimen dp_871 0x7f0703bb +int dimen dp_872 0x7f0703bc +int dimen dp_873 0x7f0703bd +int dimen dp_874 0x7f0703be +int dimen dp_875 0x7f0703bf +int dimen dp_876 0x7f0703c0 +int dimen dp_877 0x7f0703c1 +int dimen dp_878 0x7f0703c2 +int dimen dp_879 0x7f0703c3 +int dimen dp_88 0x7f0703c4 +int dimen dp_880 0x7f0703c5 +int dimen dp_881 0x7f0703c6 +int dimen dp_882 0x7f0703c7 +int dimen dp_883 0x7f0703c8 +int dimen dp_884 0x7f0703c9 +int dimen dp_885 0x7f0703ca +int dimen dp_886 0x7f0703cb +int dimen dp_887 0x7f0703cc +int dimen dp_888 0x7f0703cd +int dimen dp_889 0x7f0703ce +int dimen dp_89 0x7f0703cf +int dimen dp_890 0x7f0703d0 +int dimen dp_891 0x7f0703d1 +int dimen dp_892 0x7f0703d2 +int dimen dp_893 0x7f0703d3 +int dimen dp_894 0x7f0703d4 +int dimen dp_895 0x7f0703d5 +int dimen dp_896 0x7f0703d6 +int dimen dp_897 0x7f0703d7 +int dimen dp_898 0x7f0703d8 +int dimen dp_899 0x7f0703d9 +int dimen dp_9 0x7f0703da +int dimen dp_90 0x7f0703db +int dimen dp_900 0x7f0703dc +int dimen dp_901 0x7f0703dd +int dimen dp_902 0x7f0703de +int dimen dp_903 0x7f0703df +int dimen dp_904 0x7f0703e0 +int dimen dp_905 0x7f0703e1 +int dimen dp_906 0x7f0703e2 +int dimen dp_907 0x7f0703e3 +int dimen dp_908 0x7f0703e4 +int dimen dp_909 0x7f0703e5 +int dimen dp_91 0x7f0703e6 +int dimen dp_910 0x7f0703e7 +int dimen dp_911 0x7f0703e8 +int dimen dp_912 0x7f0703e9 +int dimen dp_913 0x7f0703ea +int dimen dp_914 0x7f0703eb +int dimen dp_915 0x7f0703ec +int dimen dp_916 0x7f0703ed +int dimen dp_917 0x7f0703ee +int dimen dp_918 0x7f0703ef +int dimen dp_919 0x7f0703f0 +int dimen dp_92 0x7f0703f1 +int dimen dp_920 0x7f0703f2 +int dimen dp_921 0x7f0703f3 +int dimen dp_922 0x7f0703f4 +int dimen dp_923 0x7f0703f5 +int dimen dp_924 0x7f0703f6 +int dimen dp_925 0x7f0703f7 +int dimen dp_926 0x7f0703f8 +int dimen dp_927 0x7f0703f9 +int dimen dp_928 0x7f0703fa +int dimen dp_929 0x7f0703fb +int dimen dp_93 0x7f0703fc +int dimen dp_930 0x7f0703fd +int dimen dp_931 0x7f0703fe +int dimen dp_932 0x7f0703ff +int dimen dp_933 0x7f070400 +int dimen dp_934 0x7f070401 +int dimen dp_935 0x7f070402 +int dimen dp_936 0x7f070403 +int dimen dp_937 0x7f070404 +int dimen dp_938 0x7f070405 +int dimen dp_939 0x7f070406 +int dimen dp_94 0x7f070407 +int dimen dp_940 0x7f070408 +int dimen dp_941 0x7f070409 +int dimen dp_942 0x7f07040a +int dimen dp_943 0x7f07040b +int dimen dp_944 0x7f07040c +int dimen dp_945 0x7f07040d +int dimen dp_946 0x7f07040e +int dimen dp_947 0x7f07040f +int dimen dp_948 0x7f070410 +int dimen dp_949 0x7f070411 +int dimen dp_95 0x7f070412 +int dimen dp_950 0x7f070413 +int dimen dp_951 0x7f070414 +int dimen dp_952 0x7f070415 +int dimen dp_953 0x7f070416 +int dimen dp_954 0x7f070417 +int dimen dp_955 0x7f070418 +int dimen dp_956 0x7f070419 +int dimen dp_957 0x7f07041a +int dimen dp_958 0x7f07041b +int dimen dp_959 0x7f07041c +int dimen dp_96 0x7f07041d +int dimen dp_960 0x7f07041e +int dimen dp_961 0x7f07041f +int dimen dp_962 0x7f070420 +int dimen dp_963 0x7f070421 +int dimen dp_964 0x7f070422 +int dimen dp_965 0x7f070423 +int dimen dp_966 0x7f070424 +int dimen dp_967 0x7f070425 +int dimen dp_968 0x7f070426 +int dimen dp_969 0x7f070427 +int dimen dp_97 0x7f070428 +int dimen dp_970 0x7f070429 +int dimen dp_971 0x7f07042a +int dimen dp_972 0x7f07042b +int dimen dp_973 0x7f07042c +int dimen dp_974 0x7f07042d +int dimen dp_975 0x7f07042e +int dimen dp_976 0x7f07042f +int dimen dp_977 0x7f070430 +int dimen dp_978 0x7f070431 +int dimen dp_979 0x7f070432 +int dimen dp_98 0x7f070433 +int dimen dp_980 0x7f070434 +int dimen dp_981 0x7f070435 +int dimen dp_982 0x7f070436 +int dimen dp_983 0x7f070437 +int dimen dp_984 0x7f070438 +int dimen dp_985 0x7f070439 +int dimen dp_986 0x7f07043a +int dimen dp_987 0x7f07043b +int dimen dp_988 0x7f07043c +int dimen dp_989 0x7f07043d +int dimen dp_99 0x7f07043e +int dimen dp_990 0x7f07043f +int dimen dp_991 0x7f070440 +int dimen dp_992 0x7f070441 +int dimen dp_993 0x7f070442 +int dimen dp_994 0x7f070443 +int dimen dp_995 0x7f070444 +int dimen dp_996 0x7f070445 +int dimen dp_997 0x7f070446 +int dimen dp_998 0x7f070447 +int dimen dp_999 0x7f070448 +int dimen dp_m_1 0x7f070449 +int dimen dp_m_10 0x7f07044a +int dimen dp_m_12 0x7f07044b +int dimen dp_m_2 0x7f07044c +int dimen dp_m_20 0x7f07044d +int dimen dp_m_30 0x7f07044e +int dimen dp_m_5 0x7f07044f +int dimen dp_m_60 0x7f070450 +int dimen dp_m_8 0x7f070451 +int dimen fastscroll_default_thickness 0x7f070452 +int dimen fastscroll_margin 0x7f070453 +int dimen fastscroll_minimum_range 0x7f070454 +int dimen heart_ratingbar_height 0x7f070455 +int dimen heart_ratingbar_width 0x7f070456 +int dimen highlight_alpha_material_colored 0x7f070457 +int dimen highlight_alpha_material_dark 0x7f070458 +int dimen highlight_alpha_material_light 0x7f070459 +int dimen hint_alpha_material_dark 0x7f07045a +int dimen hint_alpha_material_light 0x7f07045b +int dimen hint_pressed_alpha_material_dark 0x7f07045c +int dimen hint_pressed_alpha_material_light 0x7f07045d +int dimen item_touch_helper_max_drag_scroll_per_frame 0x7f07045e +int dimen item_touch_helper_swipe_escape_max_velocity 0x7f07045f +int dimen item_touch_helper_swipe_escape_velocity 0x7f070460 +int dimen module_common_shadow_width 0x7f070461 +int dimen module_common_shadow_width_pos 0x7f070462 +int dimen module_commons_toast_icon_width 0x7f070463 +int dimen module_commons_toast_marginBottom 0x7f070464 +int dimen module_commons_toast_marginLeft 0x7f070465 +int dimen module_commons_toast_marginRight 0x7f070466 +int dimen module_commons_toast_marginTop 0x7f070467 +int dimen module_commons_toast_maxWidth 0x7f070468 +int dimen module_commons_toast_minWidth 0x7f070469 +int dimen module_commons_toast_space_between_icon_and_msg 0x7f07046a +int dimen module_commons_toast_textSize 0x7f07046b +int dimen module_commons_toast_with_left_drawable_marginBottom 0x7f07046c +int dimen module_commons_toast_with_left_drawable_marginLeft 0x7f07046d +int dimen module_commons_toast_with_left_drawable_marginTop 0x7f07046e +int dimen module_commons_toast_y_offset 0x7f07046f +int dimen notification_action_icon_size 0x7f070470 +int dimen notification_action_text_size 0x7f070471 +int dimen notification_big_circle_margin 0x7f070472 +int dimen notification_content_margin_start 0x7f070473 +int dimen notification_large_icon_height 0x7f070474 +int dimen notification_large_icon_width 0x7f070475 +int dimen notification_main_column_padding_top 0x7f070476 +int dimen notification_media_narrow_margin 0x7f070477 +int dimen notification_right_icon_size 0x7f070478 +int dimen notification_right_side_padding_top 0x7f070479 +int dimen notification_small_icon_background_padding 0x7f07047a +int dimen notification_small_icon_size_as_large 0x7f07047b +int dimen notification_subtext_size 0x7f07047c +int dimen notification_top_pad 0x7f07047d +int dimen notification_top_pad_large_text 0x7f07047e +int dimen panel_list_item_title_size 0x7f07047f +int dimen path_width 0x7f070480 +int dimen ratingbar_padding 0x7f070481 +int dimen share_item_address 0x7f070482 +int dimen sp_10 0x7f070483 +int dimen sp_11 0x7f070484 +int dimen sp_12 0x7f070485 +int dimen sp_13 0x7f070486 +int dimen sp_14 0x7f070487 +int dimen sp_15 0x7f070488 +int dimen sp_16 0x7f070489 +int dimen sp_17 0x7f07048a +int dimen sp_18 0x7f07048b +int dimen sp_19 0x7f07048c +int dimen sp_20 0x7f07048d +int dimen sp_21 0x7f07048e +int dimen sp_22 0x7f07048f +int dimen sp_23 0x7f070490 +int dimen sp_24 0x7f070491 +int dimen sp_25 0x7f070492 +int dimen sp_28 0x7f070493 +int dimen sp_30 0x7f070494 +int dimen sp_32 0x7f070495 +int dimen sp_34 0x7f070496 +int dimen sp_36 0x7f070497 +int dimen sp_38 0x7f070498 +int dimen sp_40 0x7f070499 +int dimen sp_42 0x7f07049a +int dimen sp_48 0x7f07049b +int dimen sp_6 0x7f07049c +int dimen sp_7 0x7f07049d +int dimen sp_8 0x7f07049e +int dimen sp_9 0x7f07049f +int dimen subtitle_corner_radius 0x7f0704a0 +int dimen subtitle_outline_width 0x7f0704a1 +int dimen subtitle_shadow_offset 0x7f0704a2 +int dimen subtitle_shadow_radius 0x7f0704a3 +int dimen tooltip_corner_radius 0x7f0704a4 +int dimen tooltip_horizontal_padding 0x7f0704a5 +int dimen tooltip_margin 0x7f0704a6 +int dimen tooltip_precise_anchor_extra_offset 0x7f0704a7 +int dimen tooltip_precise_anchor_threshold 0x7f0704a8 +int dimen tooltip_vertical_padding 0x7f0704a9 +int dimen tooltip_y_offset_non_touch 0x7f0704aa +int dimen tooltip_y_offset_touch 0x7f0704ab +int dimen v2x_panel_loading_top 0x7f0704ac +int dimen v2x_share_btn_height 0x7f0704ad +int dimen v2x_share_btn_width 0x7f0704ae int drawable abc_ab_share_pack_mtrl_alpha 0x7f080001 int drawable abc_action_bar_item_background_material 0x7f080002 int drawable abc_btn_borderless_material 0x7f080003 diff --git a/libraries/mogo-tanlu-api/build/outputs/aar/mogo-tanlu-api-debug.aar b/libraries/mogo-tanlu-api/build/outputs/aar/mogo-tanlu-api-debug.aar deleted file mode 100644 index 7edd87ceec..0000000000 Binary files a/libraries/mogo-tanlu-api/build/outputs/aar/mogo-tanlu-api-debug.aar and /dev/null differ diff --git a/libraries/mogo-tanlu-api/build/outputs/logs/manifest-merger-debug-report.txt b/libraries/mogo-tanlu-api/build/outputs/logs/manifest-merger-debug-report.txt deleted file mode 100644 index 9cbaec15e9..0000000000 --- a/libraries/mogo-tanlu-api/build/outputs/logs/manifest-merger-debug-report.txt +++ /dev/null @@ -1,37 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12 -INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12 -INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12 -INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12 -INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12 -INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12 -INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12 - package - ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:2:5-40 - INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml - INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml - android:versionName - INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml - ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12 - INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml - android:versionCode - INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml - ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12 - INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml - xmlns:android - ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:11-69 -uses-sdk -INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml reason: use-sdk injection requested -INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml -INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml -INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml -INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml - android:targetSdkVersion - INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml - ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml - INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml - android:minSdkVersion - INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml - ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml - INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml diff --git a/libraries/mogo-tanlu-api/build/outputs/logs/manifest-merger-release-report.txt b/libraries/mogo-tanlu-api/build/outputs/logs/manifest-merger-release-report.txt new file mode 100644 index 0000000000..3acbb148c6 --- /dev/null +++ b/libraries/mogo-tanlu-api/build/outputs/logs/manifest-merger-release-report.txt @@ -0,0 +1,37 @@ +-- Merging decision tree log --- +manifest +ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12 +INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12 +INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12 +INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12 +INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12 +INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12 +INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12 + package + ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:2:5-40 + INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml + INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml + android:versionName + INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml + ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12 + INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml + android:versionCode + INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml + ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12 + INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml + xmlns:android + ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:11-69 +uses-sdk +INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml +INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml +INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml +INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml + android:targetSdkVersion + INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml + ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml + INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml + android:minSdkVersion + INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml + ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml + INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt index 4cbd8ca7e4..eac374183f 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt @@ -7,9 +7,9 @@ class HttpConstants { companion object { - const val DEV_BASE_URL_OWNER = "http://dzt-test.zhidaohulian.com/" + const val DEV_BASE_URL_OWNER = "http://dzt-test.zhidaozhixing.com/" const val RELEASE_BASE_URL_OWNER = "http://dzt.zhidaohulian.com/" - const val SHOW_BASE_URL_OWNER = "http://dzt-show.zhidaohulian.com/" + const val SHOW_BASE_URL_OWNER = "http://dzt-show.zhidaozhixing.com/" fun getBaseUrl(): String { return when (DebugConfig.getNetMode()) { diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationBody.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationBody.kt index 720e1da08e..950b41f760 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationBody.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationBody.kt @@ -22,5 +22,6 @@ data class InformationBody( val direction: Float, val poiType: String, //类型分类 val mainInfoId: Long, //事件id - val speed: Float //车速 + val speed: Float, //车速 + val fromType: String //上报触发来源 ) \ No newline at end of file diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt index 8aa47180e3..b31a0437f6 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt @@ -105,7 +105,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { latitude: Double, speed: Float ) { - Log.d(TAG, "takeVideo -------- isCustom = $isCustom ---mFromType = $mFromType ---type = $type ---speed = $speed" ) + Log.d(TAG, "takeVideo -------- isCustom = $isCustom ---mFromType = $mFromType ---type = $type ---speed = $speed") this.mType = type this.mainInfoId = mainInfoId this.mFromType = fromType @@ -114,7 +114,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { this.mSpeed = speed if (DebugConfig.getCarMachineType() == 0) { //自研车机 outputVideoPath = getCompressVideoPath() - CustomStatusHandler.offerVideoStatus(TakeEntity(isCustom, id,fromType)) + CustomStatusHandler.offerVideoStatus(TakeEntity(isCustom, id, fromType)) zdCarCoderController.takeVideo(cameraId, duration) trackGetVideo(1) } else { //比亚迪 @@ -123,7 +123,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { // TipToast.shortTip("分享失败,请检查网络") // } else { //失败了,传空地址,发起请求 - val entity = TakeEntity(isCustom, id,fromType) + val entity = TakeEntity(isCustom, id, fromType) videoAndThumbMap["video"] = "" videoAndThumbMap["thumb"] = "" @@ -165,42 +165,20 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { val isCustom = CustomStatusHandler.pollPhotoStatus() val entity = TakeEntity(isCustom, 0L) Log.e(TAG, "onTakePhotoFail -----mType = $mType --- isCustom = $isCustom") - //语音播报 1:上报路况,2:交通检查,3:封路 默认 mType 应该为null -// if (mType.equals(TANLU_ROAD_CONGESTION) || mType.equals(TANLU_TRAFFIC_CHECK) || mType.equals( -// TANLU_ROAD_CLOSURE -// ) -// || mType.equals(TANLU_ROAD_CURRENT) || mType.equals(TANLU_ROAD_PONDING) || mType.equals( -// TANLU_ROAD_ICING -// ) -// || mType.equals(TANLU_ROAD_HEAVY_FOG) || mType.equals(TANLU_ROAD_ACCIDENT) || mType.equals( -// TANLU_ROAD_WORK -// ) -// ) { -// taskAsync(1_500) { -// try { -// VoiceController.speakVoice("上报失败") -// if (isCustom) { -// sendGetInfoFailedReceiver(mType) -// } -// } catch (e: java.lang.Exception) { -// e.printStackTrace() -// } -// } + //获取图片失败也上报,图片不打点 + if (isCustom) { + CosStatusController().sendInformationDirectly( + INFO_TYPE_IMG, + mutableMapOf("pic" to ""), + mType, + entity, + mainInfoId, + mLongitude, + mLatitude, + mSpeed + ) + } - //获取图片失败也上报,图片不打点 - if (isCustom) { - CosStatusController().sendInformationDirectly( - INFO_TYPE_IMG, - mutableMapOf("pic" to ""), - mType, - entity, - mainInfoId, - mLongitude, - mLatitude, - mSpeed - ) - } -// } } //拍照成功回调返回图片本地路径 @@ -314,7 +292,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { entity?.let { if (it.isCustom) { compressVideo(videoPath, thumbnailPath, it) - }else if (entity.fromType in STRATEGY_UPLOAD_TYPE_ARRAY) { + } else if (entity.fromType in STRATEGY_UPLOAD_TYPE_ARRAY) { // 属于策略上报 compressVideo(videoPath, thumbnailPath, it) } else { @@ -433,6 +411,22 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { override fun onTakeVideoCancel(camera: Int) { Log.d(TAG, "onTakeVideoCancel -----camera = $camera") + val entity = CustomStatusHandler.pollVideoStatus() + //失败了,传空地址,发起请求 + videoAndThumbMap["video"] = "" + videoAndThumbMap["thumb"] = "" + + CosStatusController().sendInformationDirectly( + INFO_TYPE_VIDEO, + videoAndThumbMap, + mType, + entity, + mainInfoId, + mLongitude, + mLatitude, + mSpeed + ) + } //获取图片 diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt index d573b5ed0a..ae433565f4 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt @@ -85,23 +85,6 @@ class CosStatusController : CosStatusCallback { Log.d(TAG, "uploadCosFailed = $localPath") trackUploadCos(2) //语音播报 1:上报路况,2:交通检查,3:封路 默认 mType 应该为null - if (CarCorderController.mType.equals(TANLU_ROAD_CONGESTION) || CarCorderController.mType.equals( - TANLU_TRAFFIC_CHECK - ) || CarCorderController.mType.equals(TANLU_ROAD_CLOSURE) - || CarCorderController.mType.equals(TANLU_ROAD_CURRENT) || CarCorderController.mType.equals( - TANLU_ROAD_PONDING - ) || CarCorderController.mType.equals(TANLU_ROAD_ICING) - || CarCorderController.mType.equals(TANLU_ROAD_HEAVY_FOG) || CarCorderController.mType.equals( - TANLU_ROAD_ACCIDENT - ) || CarCorderController.mType.equals(TANLU_ROAD_WORK) - ) { -// VoiceController.speakVoice("cos上报失败") - Log.d(TAG, "uploadCosFailed mType = $mType") -// if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) { -// sendGetInfoFailedReceiver("100") -// } - } - if (!isRetry) { isRetry = true // taskAsync(30_000) { //去掉重试 @@ -153,7 +136,7 @@ class CosStatusController : CosStatusCallback { trackUploadCos(5) } } else { - //上传图片成功, 如果是上报路况,直接上传,TODO + //上传图片成功, 如果是上报路况,直接上传 Log.d(TAG, "uploadCosCompleted 分享成功 ---- mType = $mType") sendInformationDirectly( INFO_TYPE_IMG, @@ -195,7 +178,7 @@ class CosStatusController : CosStatusCallback { latitude: Double, speed: Float ) { - Log.d(TAG, "sendInformationDirectly poiType= $poiType ---- mainInfoId= $mainInfoId") + Log.d(TAG, "sendInformationDirectly poiType= $poiType ---- mainInfoId= $mainInfoId --- isCustom = ${entity?.isCustom}") //开始上传 entity?.isCustom?.let { mainServiceHttpModel.sendInformationMessage( @@ -213,7 +196,7 @@ class CosStatusController : CosStatusCallback { // CosCallbackMapController.mainService?.let { // CosCallbackMapController.mainService?.sendCustomResult(success) // } - Log.d(TAG, "type = $type ----success = $success") + Log.d(TAG, "type = $type ----success = $success ----fromType = $mFromType ----poiType = $poiType") if (success) { //分享成功,并打点,如果是上报拥堵,需要takeVideo if (type == INFO_TYPE_VIDEO) { diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt index 3810928fc6..3495d69f9c 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt @@ -128,8 +128,8 @@ class MainServiceController { //上传情报数据 fun sendInformationMessage( - type: Int, fromType: String, + type: Int, url: Map, isCustom: Boolean = false, trafficInfoType:String = "", @@ -145,7 +145,6 @@ class MainServiceController { mFromType = fromType mPoiType = poiType - //删除测试数据 var locationInfo = LocationUtil.getInstance().getLocationInfo() if (locationInfo.address.isNullOrEmpty()) { Log.d(TAG, " sendInformationMessage locationInfo.address = $locationInfo.address") @@ -153,7 +152,7 @@ class MainServiceController { geoLocation(type, url, locationInfo, isCustom,trafficInfoType, isShare, customSend,poiType,mainInfoId,speed, longitude,latitude) } else { postInformationMessage( - getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare,poiType,mainInfoId,longitude,latitude, speed), + getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare,poiType,mainInfoId,longitude,latitude, speed, mFromType), customSend ) } @@ -179,7 +178,7 @@ class MainServiceController { .geoCodeLocation(locationInfo.toLatLngPoint(), { Log.d(TAG, "geoLocation -------start -->") postInformationMessage( - getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare, poiType,mainInfoId,longitude,latitude, speed), + getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare, poiType,mainInfoId,longitude,latitude, speed, mFromType), customSend ) }, { @@ -192,10 +191,9 @@ class MainServiceController { //如果两次都失败,直接上报服务端 Log.d(TAG, "geoLocation ---- postInformationMessage ---false-->") postInformationMessage( - getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare, poiType,mainInfoId,longitude,latitude,speed), + getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare, poiType,mainInfoId,longitude,latitude,speed, mFromType), customSend ) - false } }) @@ -214,31 +212,26 @@ class MainServiceController { onSuccess { if (it.result != null) { Log.i(TAG, "upload success id = " + it.result.id) - Log.i(TAG, "upload success mFromType = $mFromType") if (mFromType == "6") { sendUgcStatusReceiver(it.result.id, mPoiType, mFromType) } } - trackUploadServer(1) -// CosStatusController().videoAndThumbMap.clear() customSend?.invoke(true) } onError { Log.i(TAG, "$it upload message ${it.message}") trackUploadServer(2) - Log.i(TAG, "upload onError mFromType = $mFromType") if (mFromType == "6") { sendUgcStatusReceiver(0, mPoiType, mFromType) } -// CosStatusController().videoAndThumbMap.clear() customSend?.invoke(false) } } } private fun sendUgcStatusReceiver(id: Long, type: String?, fromType: String?) { - Log.d(TAG, "sendUgcStatusReceiver ----> id = $id ---type = $type --fromType = $fromType ") + Log.d(TAG, "sendUgcStatusReceiver id = $id ---type = $type --fromType = $fromType ") var intent = Intent() intent.action = "com.v2x.ugc.upload.status" intent.putExtra("id", id) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt index 834dd0005a..d0019f7adc 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt @@ -1,5 +1,6 @@ package com.zhidao.roadcondition.util +import android.util.Log import com.google.gson.JsonArray import com.google.gson.JsonObject import com.mogo.commons.AbsMogoApplication @@ -33,7 +34,8 @@ fun getInformationBody( mainInfoId: Long, longitude: Double, latitude: Double, - speed: Float + speed: Float, + fromType: String ): InformationBody { var jsonArray = JsonArray() var type: Int @@ -50,6 +52,7 @@ fun getInformationBody( INFO_TYPE_IMG } var infoType = if (isCustom) 1 else 0 + Log.d("MainServiceController", "isCustom = $isCustom ---- infoType = $infoType") return InformationBody( jsonArray.toString(), locationInfo.address, @@ -72,7 +75,8 @@ fun getInformationBody( locationInfo.direction, poiType, mainInfoId, - speed + speed, + fromType ) } diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/constant/HttpConstant.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/constant/HttpConstant.kt index cbd611b68e..9a61c94ec7 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/constant/HttpConstant.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/constant/HttpConstant.kt @@ -5,10 +5,10 @@ import com.mogo.commons.debug.DebugConfig class HttpConstant { companion object { - const val HOST_DEV = "http://dzt-test.zhidaohulian.com" - const val HOST_TEST = "http://dzt-test.zhidaohulian.com" - const val HOST_DEMO = "http://dzt-show.zhidaohulian.com" - const val HOST_PRODUCT = "https://dzt.zhidaohulian.com" + const val HOST_DEV = "http://dzt-test.zhidaozhixing.com" + const val HOST_TEST = "http://dzt-test.zhidaozhixing.com" + const val HOST_DEMO = "http://dzt-show.zhidaozhixing.com" + const val HOST_PRODUCT = "http://dzt.zhidaozhixing.com" fun getNetHost(): String { return when (DebugConfig.getNetMode()) { diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/OwnCarModelEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/OwnCarModelEntity.java new file mode 100644 index 0000000000..91cc8a7f46 --- /dev/null +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/OwnCarModelEntity.java @@ -0,0 +1,58 @@ +package com.mogo.module.common.entity; + +/** + * 自车模型实体,用于从服务端获取不同等级的自车模型信息以及将此信息传递给adas + * + * @author tongchenfei + */ +public class OwnCarModelEntity { + /** + * 图片锁定 1-是 0-否 + */ + private int isLock; + private String imageUrl; + private String imageName; + private int imageLevel; + + public int getIsLock() { + return isLock; + } + + public void setIsLock(int isLock) { + this.isLock = isLock; + } + + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + + public String getImageName() { + return imageName; + } + + public void setImageName(String imageName) { + this.imageName = imageName; + } + + public int getImageLevel() { + return imageLevel; + } + + public void setImageLevel(int imageLevel) { + this.imageLevel = imageLevel; + } + + @Override + public String toString() { + return "OwnCarModelEntity{" + + "isLock=" + isLock + + ", imageUrl='" + imageUrl + '\'' + + ", imageName='" + imageName + '\'' + + ", imageLevel=" + imageLevel + + '}'; + } +} diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java index b59987f50e..94703ac3a5 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java @@ -14,8 +14,16 @@ import java.lang.reflect.Method; */ public class CarSeries { - public static boolean isF8xxSeries(){ - return DebugConfig.getProductFlavor().startsWith( "f8" ); + private static boolean invokeFlag = false; + private static boolean isF8xxSeries = false; + + public static boolean isF8xxSeries() { + if ( invokeFlag ) { + return isF8xxSeries; + } + isF8xxSeries = DebugConfig.getProductFlavor().startsWith( "f8" ); + invokeFlag = true; + return isF8xxSeries; } @Deprecated @@ -46,6 +54,12 @@ public class CarSeries { @Deprecated public static int CAR_SERIES = 0; + /** + * Deprecated. + * Use {@link DebugConfig#getProductFlavor()} instead. + * + * @return + */ @Deprecated public static int getSeries() { if ( CAR_SERIES != 0 ) { diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml index 2281aa213c..7db7abf2a5 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml @@ -1060,6 +1060,6 @@ 281px 90px 32px - 28px + 26px diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 9725eec012..52e86d3716 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -832,70 +832,84 @@ public class EntranceFragment extends MvpFragment { - if (!toggle) { - TopViewAnimHelper.getInstance().showNaviView(); - } else { - TopViewAnimHelper.getInstance().hideNaviView(); - } - toggle = !toggle; + SharedPrefsMgr.getInstance(getContext()).putString("MY_LOCATION_CONFIG", "https" + + "://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1605705236512" + + "&di=50620661ded7035fb84899a408f9f27e&imgtype=0&src=http%3A%2F%2Fb-ssl" + + ".duitang.com%2Fuploads%2Fitem%2F201409%2F11%2F20140911211243_3rT4u.jpeg"); + MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().setCarCursorOption(null); +// if (!toggle) { +// TopViewAnimHelper.getInstance().showNaviView(); +// } else { +// TopViewAnimHelper.getInstance().hideNaviView(); +// } +// toggle = !toggle; }); findViewById(R.id.btnDebugCtrlSubView).setOnClickListener(view -> { - View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null); - TextView tv = v.findViewById(R.id.tvIndex); - tv.setText("sub view height: " + currentHeight + ": " + v); - mApis.getTopViewManager().addSubView(v, new IMogoTopViewStatusListener() { - @Override - public void onViewAdded(View view) { - Logger.d(TAG, "onSubViewAdded: " + view); - } - - @Override - public void onViewRemoved(View view) { - Logger.d(TAG, "onSubViewRemoved: " + view); - } - - @Override - public void beforeViewAddAnim(View view) { - Logger.d(TAG, "beforeSubViewAddAnim: " + view); - } - - @Override - public void beforeViewRemoveAnim(View view) { - Logger.d(TAG, "beforeSubViewRemoveAnim: " + view); - } - }); + MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().emphasizeMyLocation(); +// View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null); +// TextView tv = v.findViewById(R.id.tvIndex); +// tv.setText("sub view height: " + currentHeight + ": " + v); +// mApis.getTopViewManager().addSubView(v, new IMogoTopViewStatusListener() { +// @Override +// public void onViewAdded(View view) { +// Logger.d(TAG, "onSubViewAdded: " + view); +// } +// +// @Override +// public void onViewRemoved(View view) { +// Logger.d(TAG, "onSubViewRemoved: " + view); +// } +// +// @Override +// public void beforeViewAddAnim(View view) { +// Logger.d(TAG, "beforeSubViewAddAnim: " + view); +// } +// +// @Override +// public void beforeViewRemoveAnim(View view) { +// Logger.d(TAG, "beforeSubViewRemoveAnim: " + view); +// } +// }); }); findViewById(R.id.btnDebugCtrlTopView).setOnClickListener(view -> { - View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null); - TextView tv = v.findViewById(R.id.tvIndex); - Random random = new Random(); - currentHeight = heights[random.nextInt(3)]; - tv.setText(" height: " + currentHeight + ": " + v); - ViewGroup.LayoutParams params = - new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, currentHeight); - mApis.getTopViewManager().addView(v, params, new IMogoTopViewStatusListener() { - @Override - public void onViewAdded(View view) { - Logger.d(TAG, "onViewAdded: " + view); - } + SharedPrefsMgr.getInstance(getContext()).putString("MY_LOCATION_CONFIG", "https" + + "://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1605705508574" + + "&di=339d3259ad21f5f48c8abcd1bafff324&imgtype=0&src=http%3A%2F%2Fc-ssl" + + ".duitang.com%2Fuploads%2Fitem%2F202004%2F23%2F20200423111550_4AJLr.thumb" + + ".1000_0.jpeg"); + MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().emphasizeMyLocation(); +// View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null); +// TextView tv = v.findViewById(R.id.tvIndex); +// Random random = new Random(); +// currentHeight = heights[random.nextInt(3)]; +// tv.setText(" height: " + currentHeight + ": " + v); +// ViewGroup.LayoutParams params = +// new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, currentHeight); +// mApis.getEntranceButtonController().addLeftFeatureView(v); - @Override - public void onViewRemoved(View view) { - Logger.d(TAG, "onViewRemoved: " + view); - } - - @Override - public void beforeViewAddAnim(View view) { - Logger.d(TAG, "beforeViewAddAnim: " + view); - } - - @Override - public void beforeViewRemoveAnim(View view) { - Logger.d(TAG, "beforeViewRemoveAnim: " + view); - } - }); +// mApis.getTopViewManager().addView(v, params, new IMogoTopViewStatusListener() { +// @Override +// public void onViewAdded(View view) { +// Logger.d(TAG, "onViewAdded: " + view); +// } +// +// @Override +// public void onViewRemoved(View view) { +// Logger.d(TAG, "onViewRemoved: " + view); +// } +// +// @Override +// public void beforeViewAddAnim(View view) { +// Logger.d(TAG, "beforeViewAddAnim: " + view); +// } +// +// @Override +// public void beforeViewRemoveAnim(View view) { +// Logger.d(TAG, "beforeViewRemoveAnim: " + view); +// } +// }); }); findViewById(R.id.btnDebugAddBottomLayerView).setOnClickListener(v -> { diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index efb20d7e2b..457428d4b4 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -9,13 +9,16 @@ import androidx.lifecycle.LifecycleOwner; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.Presenter; +import com.mogo.commons.network.SubscribeImpl; import com.mogo.commons.network.Utils; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.extensions.R; import com.mogo.module.extensions.bean.CommonConfig; import com.mogo.module.extensions.bean.CommonConfigResponse; +import com.mogo.module.extensions.net.DztHttpConstant; import com.mogo.module.extensions.net.GetConfigApiServices; import com.mogo.module.extensions.net.UserInfoNetApiServices; +import com.mogo.module.extensions.userinfo.CarModelListResponse; import com.mogo.module.extensions.userinfo.UserInfo; import com.mogo.module.extensions.userinfo.UserInfoConstant; import com.mogo.module.extensions.userinfo.UserInfoResponse; @@ -23,14 +26,19 @@ import com.mogo.module.extensions.weather.Phenomena; import com.mogo.module.extensions.weather.WeatherCallback; import com.mogo.module.extensions.weather.WeatherInfo; import com.mogo.module.extensions.weather.WeatherModel; +import com.mogo.module.share.constant.HttpConstant; import com.mogo.service.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; import com.mogo.service.statusmanager.IMogoMsgCenter; import com.mogo.service.statusmanager.IMogoMsgCenterListener; +import com.mogo.utils.DeviceIdUtils; import com.mogo.utils.digest.DigestUtils; import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.RequestOptions; +import com.mogo.utils.network.utils.GsonUtil; import com.mogo.utils.storage.SharedPrefsMgr; +import java.util.HashMap; import java.util.Map; import io.reactivex.SingleObserver; @@ -56,73 +64,80 @@ public class EntrancePresenter extends Presenter implements Weathe private IMogoNetwork mNetWork; + private Context context; + private boolean isResumed = false; public EntrancePresenter(Context context, EntranceView view) { super(view); - mWeatherModel = new WeatherModel( getContext() ); + this.context = context; + mWeatherModel = new WeatherModel(getContext()); mNetWork = MogoApisHandler.getInstance().getApis().getNetworkApi(); } @Override public void onCreate(@NonNull LifecycleOwner owner) { super.onCreate(owner); - mWeatherModel.init( this ); + mWeatherModel.init(this); mWeatherModel.queryWeatherInformation(); - mMsgCenter = ( IMogoMsgCenter ) ARouter.getInstance().build( MogoServicePaths.PATH_MSG_CENTER ).navigation(); - mMsgCenter.registerMsgCenterListener( this ); + mMsgCenter = + (IMogoMsgCenter) ARouter.getInstance().build(MogoServicePaths.PATH_MSG_CENTER).navigation(); + mMsgCenter.registerMsgCenterListener(this); } @Override - public void onWeatherLoaded( WeatherInfo weatherInfo ) { - if ( weatherInfo == null ) { + public void onWeatherLoaded(WeatherInfo weatherInfo) { + if (weatherInfo == null) { return; } - Phenomena phenomena = Phenomena.getById( weatherInfo.getPhenomena() ); - if ( phenomena == null ) { + Phenomena phenomena = Phenomena.getById(weatherInfo.getPhenomena()); + if (phenomena == null) { return; } - String temp = getContext().getResources().getString( R.string.module_ext_str_weather_temp_format, weatherInfo.getTemperature() ); + String temp = + getContext().getResources().getString(R.string.module_ext_str_weather_temp_format + , weatherInfo.getTemperature()); String desc = phenomena.nameCn; int resId = phenomena.resId; - mView.renderWeatherInfo( temp, desc, resId ); + mView.renderWeatherInfo(temp, desc, resId); } @Override - public void onMsgChanged( boolean hasMsg, int amount ) { - if ( mView != null ) { - mView.renderMsgInfo( hasMsg, amount ); + public void onMsgChanged(boolean hasMsg, int amount) { + if (mView != null) { + mView.renderMsgInfo(hasMsg, amount); } } @Override - public void onResume( @NonNull LifecycleOwner owner ) { - super.onResume( owner ); + public void onResume(@NonNull LifecycleOwner owner) { + super.onResume(owner); isResumed = true; if (userInfo != null) { mView.renderUserInfo(userInfo); } - if( DebugConfig.isNeedRequestUserInfo()){ + if (DebugConfig.isNeedRequestUserInfo()) { // 相当于每次onResume都会请求一下个人信息,目的是能够相对及时的同步手机端的个人信息修改 requestUserInfo(); } + requestCarModelList(); getCommonConfig(); } @Override - public void onPause( @NonNull LifecycleOwner owner ) { - super.onPause( owner ); + public void onPause(@NonNull LifecycleOwner owner) { + super.onPause(owner); isResumed = false; } @Override - public void onDestroy( @NonNull LifecycleOwner owner ) { - super.onDestroy( owner ); - if ( mWeatherModel != null ) { + public void onDestroy(@NonNull LifecycleOwner owner) { + super.onDestroy(owner); + if (mWeatherModel != null) { mWeatherModel.destroy(); } - if ( mMsgCenter != null ) { - mMsgCenter.unregisterMsgCenterListener( this ); + if (mMsgCenter != null) { + mMsgCenter.unregisterMsgCenterListener(this); } } @@ -134,44 +149,48 @@ public class EntrancePresenter extends Presenter implements Weathe .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - } - - @Override - public void onSuccess(CommonConfigResponse config) { - Logger.d(TAG, "getCommonConfig onSuccess -----> "); - if (config != null && config.result != null) { - CommonConfig.Speech speech = config.result.speech; - CommonConfig.ReportStrategy strategy = config.result.reportStrategy; - if (speech != null) { - Logger.d(TAG, "getCommonConfig onSuccess speech.count = " + speech.count); - SharedPrefsMgr.getInstance(getContext()).putInt(KEY_SERVER_SHOW_DAY_COUNT, speech.count); - } else { - Logger.e(TAG, "getCommonConfig onSuccess speech == null "); + @Override + public void onSubscribe(Disposable d) { } - if (strategy != null) { - Logger.d(TAG, "getCommonConfig onSuccess strategy.open = " + strategy.open); - SharedPrefsMgr.getInstance(getContext()).putBoolean("KEY_SERVER_REPORTSTRATEGY_SWITCH", strategy.open); - } else { - Logger.e(TAG, "getCommonConfig onSuccess strategy == null "); - } - } else { - Logger.e(TAG, "getCommonConfig onSuccess config == null"); - } - } + @Override + public void onSuccess(CommonConfigResponse config) { + Logger.d(TAG, "getCommonConfig onSuccess -----> "); + if (config != null && config.result != null) { + CommonConfig.Speech speech = config.result.speech; + CommonConfig.ReportStrategy strategy = config.result.reportStrategy; + if (speech != null) { + Logger.d(TAG, + "getCommonConfig onSuccess speech.count = " + speech.count); + SharedPrefsMgr.getInstance(getContext()).putInt(KEY_SERVER_SHOW_DAY_COUNT, speech.count); + } else { + Logger.e(TAG, "getCommonConfig onSuccess speech == null "); + } - @Override - public void onError(Throwable e) { - e.printStackTrace(); - Logger.e(TAG,"getCommonConfig onError ---> e = " + e); - } - }); + if (strategy != null) { + Logger.d(TAG, + "getCommonConfig onSuccess strategy.open = " + strategy.open); + SharedPrefsMgr.getInstance(getContext()).putBoolean( + "KEY_SERVER_REPORTSTRATEGY_SWITCH", strategy.open); + } else { + Logger.e(TAG, "getCommonConfig onSuccess strategy == null "); + } + } else { + Logger.e(TAG, "getCommonConfig onSuccess config == null"); + } + } + + @Override + public void onError(Throwable e) { + e.printStackTrace(); + Logger.e(TAG, "getCommonConfig onError ---> e = " + e); + } + }); } private UserInfo userInfo; + public void requestUserInfo() { Map params = new ArrayMap<>(); params.put("sn", Utils.getSn()); @@ -186,7 +205,7 @@ public class EntrancePresenter extends Presenter implements Weathe @Override public void onSuccess(UserInfoResponse userInfoBaseResponse) { userInfo = userInfoBaseResponse.getResult(); - if(isResumed) { + if (isResumed) { if (userInfo != null) { Logger.d(TAG, "获取个人信息成功: " + userInfo); mView.renderUserInfo(userInfo); @@ -222,4 +241,36 @@ public class EntrancePresenter extends Presenter implements Weathe } } + private void requestCarModelList() { + Map params = new HashMap<>(8); + params.put("sn", Utils.getSn()); + mNetWork.create(UserInfoNetApiServices.class, DztHttpConstant.getBaseUrl()). + requestCarModelList(params). + subscribeOn(Schedulers.io()). + observeOn(Schedulers.io()). + subscribe(new SubscribeImpl(RequestOptions.create(context)) { + @Override + public void onSuccess(CarModelListResponse o) { + super.onSuccess(o); + Logger.d(TAG, "请求车模列表成功: " + o); + // todo 保存到sp中 + SharedPrefsMgr.getInstance(context).putString("CAR_MODEL_LIST", + GsonUtil.jsonFromObject(o.getResult())); + } + + @Override + public void onError(Throwable e) { + super.onError(e); + Logger.e(TAG, e, "请求自车模型失败"); + } + + @Override + public void onError(String message, int code) { + super.onError(message, code); + Logger.e(TAG, "请求自车模型失败: " + message); + } + }); + + } + } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/MogoEntranceButtonControllerImpl.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/MogoEntranceButtonControllerImpl.java index 17ee75ccb4..a9b2eea834 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/MogoEntranceButtonControllerImpl.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/MogoEntranceButtonControllerImpl.java @@ -43,4 +43,14 @@ public class MogoEntranceButtonControllerImpl implements IMogoEntranceButtonCont public void init( Context context ) { } + + @Override + public void addLeftFeatureView(View view) { + EntranceViewHolder.getInstance().addLeftFeatureView(view); + } + + @Override + public void removeLeftFeatureView(View view) { + EntranceViewHolder.getInstance().removeLeftFeatureView(view); + } } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java index 192cdfe588..d96ea854c6 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java @@ -34,27 +34,27 @@ public abstract class BaseNaviInfoView { protected void fillNextCrossDistance( TextView target, TextView unit, int distance ) { if ( distance >= 1000 ) { target.setText( String.format( "%.1f", distance / 1000f ) ); - unit.setText( "km" ); + unit.setText( "公里" ); } else { target.setText( distance + "" ); - unit.setText( "m" ); + unit.setText( "米" ); } } protected void fillFormatSurplusDistance( int m, StringBuilder builder ) { if ( m >= 1000 ) { - builder.append( String.format( "%.1fkm", m / 1000f ) ); + builder.append( String.format( "%.1f公里", m / 1000f ) ); } else { - builder.append( m ).append( "m" ); + builder.append( m ).append( "米" ); } } protected String getFormatSurplusDistance( int m ) { if ( m >= 1000 ) { - mFormatSurplusDistanceUnit = "km"; + mFormatSurplusDistanceUnit = "公里"; return String.format( "%.1f", m / 1000f ); } else { - mFormatSurplusDistanceUnit = "m"; + mFormatSurplusDistanceUnit = "米"; return String.format( "%d", m ); } } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DztHttpConstant.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DztHttpConstant.java new file mode 100644 index 0000000000..b79998817e --- /dev/null +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DztHttpConstant.java @@ -0,0 +1,28 @@ +package com.mogo.module.extensions.net; + +import com.mogo.commons.debug.DebugConfig; + +/** + * dzt base url + * + * @author tongchenfei + */ +public class DztHttpConstant { + public static final String HOST_DEV = "http://dzt-test.zhidaozhixing.com"; + public static final String HOST_TEST = "http://dzt-test.zhidaozhixing.com"; + public static final String HOST_DEMO = "http://dzt-show.zhidaozhixing.com"; + public static final String HOST_PRODUCT = "http://dzt.zhidaozhixing.com"; + + public static String getBaseUrl(){ + switch ( DebugConfig.getNetMode() ) { + case DebugConfig.NET_MODE_DEV: + return HOST_DEV; + case DebugConfig.NET_MODE_QA: + return HOST_TEST; + case DebugConfig.NET_MODE_DEMO: + return HOST_DEMO; + default: + return HOST_PRODUCT; + } + } +} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java index c551dff37f..ef6b3bd04c 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java @@ -1,9 +1,11 @@ package com.mogo.module.extensions.net; +import com.mogo.module.extensions.userinfo.CarModelListResponse; import com.mogo.module.extensions.userinfo.UserInfoResponse; import java.util.Map; +import io.reactivex.Observable; import io.reactivex.Single; import retrofit2.http.GET; import retrofit2.http.QueryMap; @@ -21,4 +23,7 @@ public interface UserInfoNetApiServices { */ @GET("carlife/carMachine/getAccountInfo") Single requestUserInfo(@QueryMap Map params); + + @GET("yycp-userDataService/app/enthusiasm/getEnthusiasmInfo/v1") + Observable requestCarModelList(@QueryMap Map params); } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/userinfo/CarModelListInfo.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/userinfo/CarModelListInfo.java new file mode 100644 index 0000000000..109850fae3 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/userinfo/CarModelListInfo.java @@ -0,0 +1,47 @@ +package com.mogo.module.extensions.userinfo; + +import com.mogo.module.common.entity.OwnCarModelEntity; + +import java.util.List; + +public class CarModelListInfo { + private String sn; + /** + * 热心指数 eg: 1 1.5 2 2.5 + */ + private float enthusiasmIndex; + private List imageData; + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } + + public float getEnthusiasmIndex() { + return enthusiasmIndex; + } + + public void setEnthusiasmIndex(float enthusiasmIndex) { + this.enthusiasmIndex = enthusiasmIndex; + } + + public List getImageData() { + return imageData; + } + + public void setImageData(List imageData) { + this.imageData = imageData; + } + + @Override + public String toString() { + return "CarModelListInfo{" + + "sn='" + sn + '\'' + + ", enthusiasmIndex=" + enthusiasmIndex + + ", imageData=" + imageData + + '}'; + } +} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/userinfo/CarModelListResponse.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/userinfo/CarModelListResponse.java new file mode 100644 index 0000000000..ef5e78f3d6 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/userinfo/CarModelListResponse.java @@ -0,0 +1,32 @@ +package com.mogo.module.extensions.userinfo; + +import com.mogo.commons.data.BaseData; +import com.mogo.module.common.entity.OwnCarModelEntity; + +import java.util.List; + +/** + * 请求根据热心指数获取自车图标列表的响应类 + * + * @author tongchenfei + */ +public class CarModelListResponse extends BaseData { + private CarModelListInfo result; + + public CarModelListInfo getResult() { + return result; + } + + public void setResult(CarModelListInfo result) { + this.result = result; + } + + @Override + public String toString() { + return "CarModelListResponse{" + + "result=" + result + + ", code=" + code + + ", msg='" + msg + '\'' + + '}'; + } +} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java index da48584d37..e555039fe0 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java @@ -5,6 +5,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; +import com.mogo.module.extensions.R; import com.mogo.module.extensions.bean.BottomLayerViewWrapper; import com.mogo.utils.logger.Logger; @@ -19,6 +20,7 @@ import java.util.List; public class EntranceViewHolder { private static final String TAG = "EntranceViewHolder"; private List preAddView = new ArrayList<>(); + private List leftFeaturePreAddView = new ArrayList<>(); private EntranceViewHolder(){} private volatile static EntranceViewHolder instance = null; public static EntranceViewHolder getInstance(){ @@ -32,11 +34,13 @@ public class EntranceViewHolder { return instance; } private ViewGroup rootViewGroup = null; + private ViewGroup featureViewGroup = null; public void initRootViewGroup(View rootView) { Logger.i(TAG, "initRootViewGroup=="); if(rootView instanceof ViewGroup) { Logger.d(TAG, "initRootViewGroup 赋值"); rootViewGroup = (ViewGroup) rootView.getParent(); + featureViewGroup = rootView.findViewById(R.id.module_entrance_id_buttons_container); if (!preAddView.isEmpty()) { Logger.d(TAG, "initRootViewGroup 增加底层view: " + preAddView.size()); Iterator iterator = preAddView.iterator(); @@ -46,6 +50,12 @@ public class EntranceViewHolder { iterator.remove(); } } + if (!leftFeaturePreAddView.isEmpty()) { + Logger.d(TAG, "initRootViewGroup 增加左下角FeatureView: " + leftFeaturePreAddView.size()); + for (View view : leftFeaturePreAddView) { + featureViewGroup.addView(view); + } + } } } @@ -79,6 +89,16 @@ public class EntranceViewHolder { return false; } + private boolean containFeatureView(View view) { + int count = featureViewGroup.getChildCount(); + for (int i = 0; i < count; i++) { + if(featureViewGroup.getChildAt(i).equals(view)){ + return true; + } + } + return false; + } + /** * 使用的时候需要预先判断rootViewGroup是否为空,本方法默认rootViewGroup不为空 */ @@ -107,7 +127,36 @@ public class EntranceViewHolder { } } - public void release(){ + public void addLeftFeatureView(View view) { + Logger.d(TAG, "addLeftFeatureView==" + view); + if (featureViewGroup == null) { + // 先缓存起来,等待时机加载 + if(!leftFeaturePreAddView.contains(view)) { + leftFeaturePreAddView.add(view); + } + }else{ + // 直接加载 + if (!containFeatureView(view)) { + featureViewGroup.addView(view); + } + } + } + + public void removeLeftFeatureView(View view) { + if (featureViewGroup != null) { + featureViewGroup.removeView(view); + } + Iterator iterator = leftFeaturePreAddView.iterator(); + while (iterator.hasNext()) { + View wrapper = iterator.next(); + if (wrapper.equals(view)) { + iterator.remove(); + } + } + } + + + public void release(){ rootViewGroup = null; } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/NoMapTopViewShaderHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/NoMapTopViewShaderHelper.java index cc07fa5fae..aad31a512b 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/NoMapTopViewShaderHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/NoMapTopViewShaderHelper.java @@ -6,7 +6,10 @@ import com.mogo.commons.debug.DebugConfig; import com.mogo.utils.logger.Logger; /** + * 没有地图场景下,topView底层蒙版帮助类,因为有两个地方涉及到蒙版的显示隐藏{@link TopViewAnimHelper}和{@link TopViewNoLinkageAnimHelper} + * 为了不冲突,采用显示计数的方式进行兼容 * + * @author tongchenfei */ public class NoMapTopViewShaderHelper { private static final String TAG = "NoMapTopViewShaderHelper"; diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png deleted file mode 100644 index afdc5519bf..0000000000 Binary files a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png and /dev/null differ diff --git a/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml b/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml index 3bea94c0eb..1c0bebfa10 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml @@ -6,7 +6,7 @@ > + + 2px + 0px + -6px + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-mdpi-1920x720/styles.xml b/modules/mogo-module-extensions/src/main/res/values-mdpi-1920x720/styles.xml new file mode 100644 index 0000000000..8fef26eaa9 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/values-mdpi-1920x720/styles.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml index 955ddf2c93..05a6e0ff20 100644 --- a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml @@ -9,4 +9,7 @@ 14px 14px 8px + 1920px + -1 + 0px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-mdpi/styles.xml b/modules/mogo-module-extensions/src/main/res/values-mdpi/styles.xml new file mode 100644 index 0000000000..b92fcf7d00 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/values-mdpi/styles.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml index 25cd518534..549e102b27 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -154,4 +154,8 @@ 8px 21px 31px + 1920px + + -1 + 0px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/styles.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/styles.xml new file mode 100644 index 0000000000..b92fcf7d00 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/styles.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 74e08b7cc3..7f398cd1a2 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -168,4 +168,10 @@ 34px 20px 40px + -1 + 0px + + 20px + 16px + 20px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/styles.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/styles.xml new file mode 100644 index 0000000000..b92fcf7d00 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/styles.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 53fe530624..227b7ec82b 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -55,6 +55,7 @@ 16px 14px 8px + c 82px @@ -111,7 +112,7 @@ 9px 18px 18px - -1px + -1 30px 23px @@ -138,6 +139,7 @@ 142px 66px 66px + 44px 10px 12px 14px @@ -177,4 +179,10 @@ 11px 11px 10px + + -1 + 0px + 0px + 0px + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/styles.xml b/modules/mogo-module-extensions/src/main/res/values/styles.xml new file mode 100644 index 0000000000..b92fcf7d00 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/values/styles.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java index 1b7de74777..fd51a216fa 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java @@ -432,7 +432,6 @@ public class EventDispatchCenter implements @Override public void onLocationChanged( MogoLocation location ) { - final long start = System.currentTimeMillis(); Iterator< IMogoLocationListener > iterator = MogoRegisterCenterHandler.getInstance().getLocationListeners(); if ( iterator == null ) { return; @@ -447,7 +446,6 @@ public class EventDispatchCenter implements } } } - Logger.i( TAG, "onLocationChanged event cost " + ( System.currentTimeMillis() - start ) + "ms" ); } @Override diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java index 91948e0e15..bda89f02ad 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java @@ -39,6 +39,8 @@ public class SchemeIntent implements IMogoStatusChangedListener { public static final String TYPE_SHOW_ONLINE_CAR_PANEL = "showOnlineCarPanel"; public static final String TYPE_SHOW_SHARE_PANEL = "showSharePanel"; + public static final String TYPE_SHOW_HISTORY_PANEL = "showHistoryPanel"; + public static final String TYPE_SHOW_SURROUNDING_PANEL = "showSurroundingPanel"; private IMogoServiceApis mApis; private Context mContext; @@ -49,7 +51,7 @@ public class SchemeIntent implements IMogoStatusChangedListener { public Intent mIntent; public long mDelay = 0L; - public IntentWrapper( Intent intent, long delay ) { + public IntentWrapper(Intent intent, long delay) { this.mIntent = intent; this.mDelay = delay; } @@ -61,9 +63,9 @@ public class SchemeIntent implements IMogoStatusChangedListener { } public static SchemeIntent getInstance() { - if ( sInstance == null ) { - synchronized ( SchemeIntent.class ) { - if ( sInstance == null ) { + if (sInstance == null) { + synchronized (SchemeIntent.class) { + if (sInstance == null) { sInstance = new SchemeIntent(); } } @@ -75,14 +77,14 @@ public class SchemeIntent implements IMogoStatusChangedListener { sInstance = null; } - public void init( Context context, IMogoServiceApis apis ) { + public void init(Context context, IMogoServiceApis apis) { mContext = context; mApis = apis; - mApis.getStatusManagerApi().registerStatusChangedListener( TAG, StatusDescriptor.MAIN_PAGE_RESUME, this ); + mApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_RESUME, this); } public void clear() { - mApis.getStatusManagerApi().unregisterStatusChangedListener( TAG, StatusDescriptor.MAIN_PAGE_RESUME, this ); + mApis.getStatusManagerApi().unregisterStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_RESUME, this); mContext = null; mApis = null; @@ -90,38 +92,39 @@ public class SchemeIntent implements IMogoStatusChangedListener { /** * 处理scheme - * @param intent 跳转的intent + * + * @param intent 跳转的intent * @param isOnNewIntent 根据这个参数判断是从onCreate过来还是从onNewIntent过来,从而可以在{@link #isDelay(Intent, boolean)}里面确定延时逻辑,如果是从onNewIntent过来是不需要延时的 */ - public void handle( Intent intent, boolean isOnNewIntent ) { - if ( intent == null || intent.getData() == null ) { + public void handle(Intent intent, boolean isOnNewIntent) { + if (intent == null || intent.getData() == null) { return; } Uri target = intent.getData(); String path = target.getPath(); - if ( path == null || path.isEmpty() ) { + if (path == null || path.isEmpty()) { return; } - if ( !mApis.getStatusManagerApi().isMainPageOnResume() ) { + if (!mApis.getStatusManagerApi().isMainPageOnResume()) { long delay = 0L; - if ( isDelay( intent, isOnNewIntent ) ) { + if (isDelay(intent, isOnNewIntent)) { delay = 5_000L; } - mNextIntent = new IntentWrapper( intent, delay ); - mApis.getLauncherApi().backToLauncher( mContext ); + mNextIntent = new IntentWrapper(intent, delay); + mApis.getLauncherApi().backToLauncher(mContext); return; } - switch ( path ) { + switch (path) { case "/main/switch2": - handleSwitch2Action( target ); + handleSwitch2Action(target); break; case "/main/share": - Logger.d( TAG, "收到打开分享框的scheme,准备打开分享框" ); - Map< String, Object > properties = new HashMap<>(); - properties.put( "from", "1" ); - mApis.getAnalyticsApi().track( "v2x_share_click", properties ); + Logger.d(TAG, "收到打开分享框的scheme,准备打开分享框"); + Map properties = new HashMap<>(); + properties.put("from", "1"); + mApis.getAnalyticsApi().track("v2x_share_click", properties); mApis.getShareManager().showShareDialog(); break; default: @@ -132,34 +135,38 @@ public class SchemeIntent implements IMogoStatusChangedListener { mNextIntent = null; } - private boolean isDelay(Intent intent, boolean isOnNewIntent ) { - if ( isOnNewIntent || intent == null || intent.getData() == null ) { + private boolean isDelay(Intent intent, boolean isOnNewIntent) { + if (isOnNewIntent || intent == null || intent.getData() == null) { return false; } Uri target = intent.getData(); - String type = target.getQueryParameter( "type" ); + String type = target.getQueryParameter("type"); return TextUtils.equals(TYPE_NAVI, type) || TextUtils.equals(TYPE_SHOW_SHARE_PANEL, type); } - private void handleSwitch2Action( Uri target ) { - String type = target.getQueryParameter( "type" ); - if ( TextUtils.isEmpty( type ) ) { + private void handleSwitch2Action(Uri target) { + String type = target.getQueryParameter("type"); + if (TextUtils.isEmpty(type)) { return; } - switch ( type ) { + switch (type) { case TYPE_NAVI: - handleNaviIntent( target ); + handleNaviIntent(target); break; case TYPE_LAUNCH: - handleLaunchIntent( target ); + handleLaunchIntent(target); break; case TYPE_SEARCH_ROAD_CONDITION: - handleSearchRoadCondition( target ); + handleSearchRoadCondition(target); break; case TYPE_SHOW_ONLINE_CAR_PANEL: - handleShowOnlineCarPanel( target ); + handleShowOnlineCarPanel(target); + case TYPE_SHOW_HISTORY_PANEL: + handleShowSharePanel(0); + case TYPE_SHOW_SURROUNDING_PANEL: + handleShowSharePanel(1); case TYPE_SHOW_SHARE_PANEL: - handleShowSharePanel(); + handleShowSharePanel(2); break; default: break; @@ -167,71 +174,73 @@ public class SchemeIntent implements IMogoStatusChangedListener { } } - private void handleSearchRoadCondition( Uri target ) { - if ( mApis == null ) { + private void handleSearchRoadCondition(Uri target) { + if (mApis == null) { return; } - Log.d("TanluManager", "handleSearchRoadCondition intentStr =" + target.getQueryParameter( "intentStr" ) + ">> data = " + target.getQueryParameter( "data" ) - + "-----city = " + target.getQueryParameter( "city" ) + "----keywords = " + target.getQueryParameter( "keywords" )); - mApis.getTanluUiApi().searchRoadCondition( target.getQueryParameter( "intentStr" ), - target.getQueryParameter( "data" ), target.getQueryParameter( "city" ), - target.getQueryParameter( "keywords" ) ); + Log.d("TanluManager", "handleSearchRoadCondition intentStr =" + target.getQueryParameter("intentStr") + ">> data = " + target.getQueryParameter("data") + + "-----city = " + target.getQueryParameter("city") + "----keywords = " + target.getQueryParameter("keywords")); + mApis.getTanluUiApi().searchRoadCondition(target.getQueryParameter("intentStr"), + target.getQueryParameter("data"), target.getQueryParameter("city"), + target.getQueryParameter("keywords")); } - private void handleNaviIntent( Uri naviUri ) { - if ( mApis == null ) { + private void handleNaviIntent(Uri naviUri) { + if (mApis == null) { return; } - String lon = naviUri.getQueryParameter( "lon" ); - String lat = naviUri.getQueryParameter( "lat" ); + String lon = naviUri.getQueryParameter("lon"); + String lat = naviUri.getQueryParameter("lat"); try { - double dlon = Double.valueOf( lon ); - double dlat = Double.valueOf( lat ); - if ( mApis.getMapServiceApi().getNavi( mContext ).isNaviing() ) { - mApis.getMapServiceApi().getNavi( mContext ).naviTo( new MogoLatLng( dlat, dlon ) ); + double dlon = Double.valueOf(lon); + double dlat = Double.valueOf(lat); + if (mApis.getMapServiceApi().getNavi(mContext).isNaviing()) { + mApis.getMapServiceApi().getNavi(mContext).naviTo(new MogoLatLng(dlat, dlon)); } else { - mApis.getSearchManagerApi().calculatePath( new MogoLatLng( dlat, dlon ) ); + mApis.getSearchManagerApi().calculatePath(new MogoLatLng(dlat, dlon)); } - } catch ( Exception e ) { - TipToast.shortTip( "目的地异常,不能导航" ); - Logger.e( TAG, e, "error." ); + } catch (Exception e) { + TipToast.shortTip("目的地异常,不能导航"); + Logger.e(TAG, e, "error."); } } - private void handleLaunchIntent( Uri uri ) { - String type = uri.getQueryParameter( "channelType" ); - Map< String, Object > properties = new HashMap<>(); - properties.put( "appname", CommonUtils.getAppName( mContext ) ); - properties.put( "appversion", CommonUtils.getVersionName( mContext ) ); - properties.put( "from", type ); - mApis.getAnalyticsApi().track( "appenterfront", properties ); + private void handleLaunchIntent(Uri uri) { + String type = uri.getQueryParameter("channelType"); + Map properties = new HashMap<>(); + properties.put("appname", CommonUtils.getAppName(mContext)); + properties.put("appversion", CommonUtils.getVersionName(mContext)); + properties.put("from", type); + mApis.getAnalyticsApi().track("appenterfront", properties); } - private void handleShowOnlineCarPanel( Uri uri ) { + private void handleShowOnlineCarPanel(Uri uri) { mApis.getOnlineCarPanelApi().showPanel(); } - private void handleShowSharePanel() { - Logger.d(TAG, "handleShowSharePanel"); - // todo 跳转到热心指数 - mApis.getEventPanelManager().showPanelWithSelectedItem(2); + /* + * 语音打开事件面板 + * */ + private void handleShowSharePanel(int item) { + Logger.d(TAG, "语音打开事件面板"); + mApis.getEventPanelManager().showPanelWithSelectedItem(item); } @Override - public void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ) { - if ( descriptor == StatusDescriptor.MAIN_PAGE_RESUME ) { - if ( mNextIntent == null ) { + public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { + if (descriptor == StatusDescriptor.MAIN_PAGE_RESUME) { + if (mNextIntent == null) { return; } - if ( isTrue ) { + if (isTrue) { // 保证回到桌面后在开始该规划路线。 - UiThreadHandler.postDelayed( () -> { - if ( mNextIntent == null ) { + UiThreadHandler.postDelayed(() -> { + if (mNextIntent == null) { return; } - handle( mNextIntent.mIntent, false ); - }, mNextIntent.mDelay ); + handle(mNextIntent.mIntent, false); + }, mNextIntent.mDelay); } } } diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index aa69eb8330..47c99c83a9 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -57,10 +57,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" - android:paddingLeft="@dimen/module_main_apps_fragment_container_padding" - android:paddingRight="@dimen/module_main_apps_fragment_container_padding" - android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop" - android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" /> + android:paddingLeft="@dimen/module_main_event_panel_fragment_paddingLeft" + android:paddingRight="@dimen/module_main_event_panel_fragment_paddingRight" + android:paddingTop="@dimen/module_main_event_panel_fragment_paddingTop" + android:paddingBottom="@dimen/module_main_event_panel_fragment_paddingBottom" /> 658px 8px 2px + 2px + 1920px + 0px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml index 34395c22d7..a65f5d7496 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -27,5 +27,8 @@ 1263px 20px 20px + 20px + 1920px + 0px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index 197f976f30..1e3dc1ca7d 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -27,4 +27,9 @@ 1313px 20px 20px + + 18px + 18px + 18px + 18px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index 86cd80d7b8..9221b7081d 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -27,5 +27,12 @@ 658px 8px 8px - + 2px + 1920px + 0px + + 2px + 2px + 0px + 0px \ No newline at end of file diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java index bc1fa9ac87..e4257b5efc 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java @@ -52,8 +52,6 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener { int type = intent.getIntExtra( "EXTRA_TYPE", -1 ); int operaType = intent.getIntExtra( "EXTRA_OPERA", -1 ); - Logger.d( TAG, "action = %s, keyType=%s, type=%s, operType=%s", action, keyType, type, operaType ); - if ( !TextUtils.equals( action, AUTONAVI_STANDARD_BROADCAST_RECV ) && !TextUtils.equals( action, AUTONAVI_STANDARD_BROADCAST_SEND ) ) { return; diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java index b93b485722..42f21c56a1 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java @@ -2,8 +2,8 @@ package com.mogo.module.media.constants; public interface BaseUrlConstants { String DEV_BASE_URL = "http://dzt-dev.zhidaohulian.com"; - String QA_BASE_URL = "http://dzt-test.zhidaohulian.com"; - String SHOW_BASE_URL = "http://dzt-show.zhidaohulian.com"; + String QA_BASE_URL = "http://dzt-test.zhidaozhixing.com"; + String SHOW_BASE_URL = "http://dzt-show.zhidaozhixing.com"; String RELEASE_BASE_URL = "http://dzt.zhidaohulian.com"; diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java index 5e1e24e273..446ccee4e0 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java @@ -12,6 +12,7 @@ import android.widget.TextView; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.voice.AIAssist; import com.mogo.commons.voice.IMogoVoiceCmdCallBack; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.glide.SkinAbleBitmapTarget; import com.mogo.module.media.MediaConstants; import com.mogo.module.media.R; @@ -269,6 +270,8 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { if (mCircleImg != null) { mCircleImg.startAnim(); } + + MogoApisHandler.getInstance().getApis().getStatusManagerApi().setMediaPlayStatus(TAG, true); } @Override @@ -282,6 +285,8 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { if (mCircleImg != null) { mCircleImg.stopAnim(); } + + MogoApisHandler.getInstance().getApis().getStatusManagerApi().setMediaPlayStatus(TAG,false); } @Override @@ -296,7 +301,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { mCircleImg.stopAnim(); } - + MogoApisHandler.getInstance().getApis().getStatusManagerApi().setMediaPlayStatus(TAG,false); } @Override diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index cf8436d75e..4a3099736a 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -16,6 +16,7 @@ import android.view.MotionEvent; import androidx.annotation.NonNull; +import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.ParamsProvider; import com.mogo.commons.network.SubscribeImpl; @@ -34,6 +35,7 @@ import com.mogo.map.navi.IMogoNaviListener; import com.mogo.map.navi.MogoCongestionInfo; import com.mogo.map.navi.MogoTraffic; import com.mogo.map.uicontroller.IMogoMapUIController; +import com.mogo.module.carchattingprovider.ICarsChattingProvider; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; @@ -46,6 +48,7 @@ import com.mogo.module.service.launchercard.LauncherCardRefresher; import com.mogo.module.service.marker.MapMarkerManager; import com.mogo.module.service.network.RefreshCallback; import com.mogo.module.service.network.RefreshModel; +import com.mogo.module.service.ttsConfig.TtsConfigModleData; import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushData; import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushResponse; import com.mogo.module.service.onlinecar.panel.NavigationTargetInfo; @@ -54,10 +57,7 @@ import com.mogo.module.service.refresh.AutoRefreshStrategy; import com.mogo.module.service.refresh.CustomRefreshStrategy; import com.mogo.module.service.refresh.RefreshObject; import com.mogo.module.service.strategy.CarIconDisplayStrategy; -import com.mogo.service.IMogoServiceApis; import com.mogo.service.adas.IMogoADASController; -import com.mogo.service.cardmanager.IMogoCardManager; -import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.service.fragmentmanager.FragmentStackTransactionListener; import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.intent.IMogoIntentListener; @@ -76,6 +76,7 @@ import com.mogo.utils.WorkThreadHandler; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; import com.mogo.utils.network.utils.GsonUtil; +import com.zhidao.carchattingprovider.CallChattingProviderConstant; import com.zhidao.smartv2x.common.utils.LoggerUtils; import org.json.JSONObject; @@ -108,6 +109,7 @@ public class MogoServices implements IMogoMapListener, IDestroyable { private boolean mInternalUnWakeupRegisterStatus = false; + private ICarsChattingProvider carsChattingProvider; private MogoServices() { // private constructor @@ -154,6 +156,7 @@ public class MogoServices implements IMogoMapListener, private CustomRefreshStrategy mCustomRefreshStrategy = new CustomRefreshStrategy(); private float mLastZoomLevel = 0; private RefreshModel mRefreshModel; + private TtsConfigModleData mTtsModle; private long mRefreshRemainingTime = Long.MAX_VALUE; // 上次手动操作的中心点坐标 private MogoLatLng mLastCustomRefreshCenterLocation; @@ -166,7 +169,6 @@ public class MogoServices implements IMogoMapListener, private IMogoLauncher mLauncher; private IMogoFragmentManager mFragmentManager; private IMogoNavi mNavi; - private IMogoRegisterCenter mRegisterCenter; /** @@ -181,35 +183,35 @@ public class MogoServices implements IMogoMapListener, */ private boolean mLoopRequest = false; - private Handler mHandler = new Handler( Looper.getMainLooper() ) { + private Handler mHandler = new Handler(Looper.getMainLooper()) { @Override - public void handleMessage( @NonNull Message msg ) { - super.handleMessage( msg ); - switch ( msg.what ) { + public void handleMessage(@NonNull Message msg) { + super.handleMessage(msg); + switch (msg.what) { case ServiceConst.MSG_TYPE_REFRESH_DECREASE: - if ( mStatusManager.isSearchUIShow() || mStatusManager.isV2XShow() ) { + if (mStatusManager.isSearchUIShow() || mStatusManager.isV2XShow()) { invokeAutoRefreshStrategy(); return; } mRefreshRemainingTime -= ServiceConst.DECREASE_INTERVAL; - if ( mRefreshRemainingTime <= 0 ) { - Logger.d( TAG, "move to center and refresh data." ); + if (mRefreshRemainingTime <= 0) { + Logger.d(TAG, "move to center and refresh data."); invokeAutoRefresh(); } else { - mHandler.sendEmptyMessageDelayed( msg.what, ServiceConst.DECREASE_INTERVAL ); + mHandler.sendEmptyMessageDelayed(msg.what, ServiceConst.DECREASE_INTERVAL); } break; case ServiceConst.MSG_LOOP_REQUEST: - if ( mStatusManager.isSearchUIShow() || mStatusManager.isV2XShow() ) { + if (mStatusManager.isSearchUIShow() || mStatusManager.isV2XShow()) { return; } - if ( mLoopRequest ) { - Logger.d( TAG, "补偿刷新触发" ); + if (mLoopRequest) { + Logger.d(TAG, "补偿刷新触发"); invokeAutoRefresh(); } break; case ServiceConst.MSG_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH: - handleCalculationNotHomeCompanyDistanceForPush( msg.arg1 ); + handleCalculationNotHomeCompanyDistanceForPush(msg.arg1); break; } } @@ -220,17 +222,17 @@ public class MogoServices implements IMogoMapListener, * 自动刷新:锁车、缩放比例:16、半径 2KM */ private void invokeAutoRefresh() { - if ( mStatusManager.isSearchUIShow() || mStatusManager.isV2XShow() ) { - mStatusManager.setUserInteractionStatus( TAG, true, false ); + if (mStatusManager.isSearchUIShow() || mStatusManager.isV2XShow()) { + mStatusManager.setUserInteractionStatus(TAG, true, false); mUiController.recoverLockMode(); return; } - mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, true, false ); - mUiController.changeZoom( ServiceConst.DEFAULT_LOCK_CAR_ZOOM_LEVEL ); + mStatusManager.setUserInteractionStatus(ServiceConst.TYPE, true, false); + mUiController.changeZoom(ServiceConst.DEFAULT_LOCK_CAR_ZOOM_LEVEL); // mUiController.setLockZoom( ServiceConst.DEFAULT_LOCK_CAR_ZOOM_LEVEL ); - mStatusManager.setUserInteractionStatus( TAG, true, false ); + mStatusManager.setUserInteractionStatus(TAG, true, false); mUiController.recoverLockMode(); - notifyRefreshData( mLastAutoRefreshLocation, ServiceConst.DEFAULT_AUTO_REFRESH_DATA_RADIUS, mAutoRefreshCallback ); + notifyRefreshData(mLastAutoRefreshLocation, ServiceConst.DEFAULT_AUTO_REFRESH_DATA_RADIUS, mAutoRefreshCallback); } private Context mContext; @@ -266,20 +268,19 @@ public class MogoServices implements IMogoMapListener, /** * 自动刷新回调 */ - private RefreshCallback mAutoRefreshCallback = new RefreshCallback< MarkerResponse >() { + private RefreshCallback mAutoRefreshCallback = new RefreshCallback() { @Override - public void onSuccess( MarkerResponse o ) { - MapMarkerManager.getInstance().onSyncMarkerResponse( o ); + public void onSuccess(MarkerResponse o) { + MapMarkerManager.getInstance().onSyncMarkerResponse(o); mLoopRequest = false; - Logger.d( TAG, "request Success." ); invokeAutoRefreshStrategy(); } @Override public void onFail() { - if ( mLoopRequest ) { - Logger.d( TAG, "onFail and loop" ); - mHandler.sendEmptyMessageDelayed( ServiceConst.MSG_LOOP_REQUEST, ServiceConst.LOOP_INTERVAL ); + if (mLoopRequest) { + Logger.d(TAG, "onFail and loop"); + mHandler.sendEmptyMessageDelayed(ServiceConst.MSG_LOOP_REQUEST, ServiceConst.LOOP_INTERVAL); } else { invokeAutoRefreshStrategy(); } @@ -287,7 +288,7 @@ public class MogoServices implements IMogoMapListener, }; private void invokeAutoRefreshStrategy() { - restartAutoRefreshAtTime( mAutoRefreshStrategy.getInterval() ); + restartAutoRefreshAtTime(mAutoRefreshStrategy.getInterval()); } private Handler mThreadHandler; @@ -303,34 +304,39 @@ public class MogoServices implements IMogoMapListener, private IMogoStatusChangedListener statusChangedListener = new StatusChangedAdapter() { @Override - public void onUserInteracted( boolean userInteracted ) { - if ( userInteracted ) { - restartAutoRefreshAtTime( ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT ); + public void onUserInteracted(boolean userInteracted) { + if (userInteracted) { + restartAutoRefreshAtTime(ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT); } } @Override - public void onSearchUIShow( boolean visible ) { - if ( visible ) { + public void onSearchUIShow(boolean visible) { + if (visible) { // 搜索时,不在自动刷新打点策略 stopAutoRefreshStrategy(); } else { // 搜索后,打开打点策略 - if ( mAutoRefreshCallback != null ) { - mAutoRefreshCallback.onSuccess( null ); + if (mAutoRefreshCallback != null) { + mAutoRefreshCallback.onSuccess(null); } } } @Override - public void onMainPageResumeStatusChanged( boolean resume ) { - if ( resume ) { + public void onMainPageResumeStatusChanged(boolean resume) { + if (resume) { registerInternalUnWakeupWords(); - if ( !mIsMainPageFirstResume ) { - restartAutoRefreshAtTime( 2_000L ); + if (!mIsMainPageFirstResume) { + restartAutoRefreshAtTime(2_000L); } mIsMainPageFirstResume = false; - LauncherCardRefresher.getInstance( mContext ).stop(); + LauncherCardRefresher.getInstance(mContext).stop(); + + mTtsModle.playTts(); +// playAppTts(); + + } else { unregisterInternalUnWakeupWords(); stopAutoRefreshStrategy(); @@ -339,44 +345,54 @@ public class MogoServices implements IMogoMapListener, } @Override - public void onSeekHelpingStatusChanged( boolean isSeekingHelping ) { - CarIconDisplayStrategy.getInstance().changeCarIconStatus( isSeekingHelping ); - notifySeekHelpingStatusChanged( isSeekingHelping ); + public void onSeekHelpingStatusChanged(boolean isSeekingHelping) { + CarIconDisplayStrategy.getInstance().changeCarIconStatus(isSeekingHelping); + notifySeekHelpingStatusChanged(isSeekingHelping); } @Override - public void onAccStatusChanged( boolean accOn ) { - if ( accOn ) { - if ( mIsFirstAccOn ) { + public void onAccStatusChanged(boolean accOn) { + if (accOn) { + if (mIsFirstAccOn) { mIsFirstAccOn = false; return; } - initLocationServiceProcess( mContext ); + initLocationServiceProcess(mContext); mADASController.showADAS(); - MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( mContext ).start(); - MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager( mContext ).removeMarkers(); - UiThreadHandler.postDelayed( () -> { + MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient(mContext).start(); + MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager(mContext).removeMarkers(); + UiThreadHandler.postDelayed(() -> { refreshStrategy(); - }, 3_000L ); + }, 3_000L); } else { - MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( mContext ).stop(); - MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager( mContext ).removeMarkers(); + MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient(mContext).stop(); + MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager(mContext).removeMarkers(); } } @Override - public void onTopViewStatusChanged( boolean visible ) { - if ( visible ) { + public void onTopViewStatusChanged(boolean visible) { + if (visible) { return; } try { MapMarkerManager.getInstance().onCloseCurrentSelectedMarker(); - } catch ( Exception e ) { - Logger.e( TAG, e, "onTopViewStatusChanged" ); + } catch (Exception e) { + Logger.e(TAG, e, "onTopViewStatusChanged"); } } }; + /** + * 每次onResume的时候 在独立app里面播放系统配置的tts语音 + */ + private void playAppTts() { + if (DebugConfig.isLauncher()) { + return; + } + + } + /** * 关闭所有模块的控制面板 */ @@ -384,86 +400,89 @@ public class MogoServices implements IMogoMapListener, LoggerUtils.log("zy=======stop"); MogoApisHandler.getInstance().getApis().getShareManager().dismissShareDialog(); MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel(); - MogoApisHandler.getInstance().getApis().getAdasControllerApi().closeADAS(); + MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false); + MogoApisHandler.getInstance().getApis().getEventPanelManager().hidePanel(); + carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); + carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, null); } - public void init( Context context ) { + public void init(Context context) { mContext = context; initWorkThread(); - - mRefreshModel = new RefreshModel( context ); + mRefreshModel = new RefreshModel(context); + mTtsModle = new TtsConfigModleData(); mMogoMapService = MarkerServiceHandler.getMapService(); mUiController = mMogoMapService.getMapUIController(); - mNavi = mMogoMapService.getNavi( context ); + mNavi = mMogoMapService.getNavi(context); mStatusManager = MarkerServiceHandler.getMogoStatusManager(); - mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.USER_INTERACTED, statusChangedListener ); - mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.SEARCH_UI, statusChangedListener ); - mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.MAIN_PAGE_RESUME, statusChangedListener ); - mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.SEEK_HELPING, statusChangedListener ); - mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.ACC_STATUS, statusChangedListener ); - mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.TOP_VIEW, statusChangedListener ); - mStatusManager.setAIAssistReady( TAG, AIAssist.getInstance( mContext ).hasFlush() ); + mStatusManager.registerStatusChangedListener(ServiceConst.TYPE, StatusDescriptor.USER_INTERACTED, statusChangedListener); + mStatusManager.registerStatusChangedListener(ServiceConst.TYPE, StatusDescriptor.SEARCH_UI, statusChangedListener); + mStatusManager.registerStatusChangedListener(ServiceConst.TYPE, StatusDescriptor.MAIN_PAGE_RESUME, statusChangedListener); + mStatusManager.registerStatusChangedListener(ServiceConst.TYPE, StatusDescriptor.SEEK_HELPING, statusChangedListener); + mStatusManager.registerStatusChangedListener(ServiceConst.TYPE, StatusDescriptor.ACC_STATUS, statusChangedListener); + mStatusManager.registerStatusChangedListener(ServiceConst.TYPE, StatusDescriptor.TOP_VIEW, statusChangedListener); + mStatusManager.setAIAssistReady(TAG, AIAssist.getInstance(mContext).hasFlush()); - registerMogoReceiver( context ); + registerMogoReceiver(context); registerInternalUnWakeupWords(); mRegisterCenter = MarkerServiceHandler.getRegisterCenter(); - mRegisterCenter.registerMogoLocationListener( ServiceConst.TYPE, this ); - mRegisterCenter.registerMogoNaviListener( ServiceConst.TYPE, this ); - mRegisterCenter.registerMogoMapListener( ServiceConst.TYPE, this ); - mRegisterCenter.registerMogoAimlessModeListener( ServiceConst.TYPE, this ); - mRegisterCenter.registerCarLocationChangedListener( ServiceConst.TYPE, this ); + mRegisterCenter.registerMogoLocationListener(ServiceConst.TYPE, this); + mRegisterCenter.registerMogoNaviListener(ServiceConst.TYPE, this); + mRegisterCenter.registerMogoMapListener(ServiceConst.TYPE, this); + mRegisterCenter.registerMogoAimlessModeListener(ServiceConst.TYPE, this); + mRegisterCenter.registerCarLocationChangedListener(ServiceConst.TYPE, this); mActionManager = MarkerServiceHandler.getActionManager(); mIntentManager = MarkerServiceHandler.getIntentManager(); - mIntentManager.registerIntentListener( MogoReceiver.ACTIION_ADAS, this ); - mIntentManager.registerIntentListener( MogoReceiver.ACTION_VOICE_UI, this ); - mIntentManager.registerIntentListener( ServiceConst.COMMAND_NEXT, this ); - mIntentManager.registerIntentListener( ServiceConst.COMMAND_PREVIOUS, this ); - mIntentManager.registerIntentListener( ServiceConst.COMMAND_SWITCH_CARD, this ); - mIntentManager.registerIntentListener( ServiceConst.COMMAND_MY_LOCATION, this ); - mIntentManager.registerIntentListener( MogoReceiver.ACTION_ADAS_STATUS, this ); - mIntentManager.registerIntentListener( ServiceConst.COMMAND_OPERATION, this ); - mIntentManager.registerIntentListener( MogoReceiver.ACTION_VOICE_READY, this ); - mIntentManager.registerIntentListener( MogoReceiver.ACTION_MOCK, this ); - mIntentManager.registerIntentListener( ServiceConst.COMMAND_ZHIDAO_NEARBY_CAR_ONLINE, this ); - mIntentManager.registerIntentListener( ServiceConst.COMMAND_ZHIDAO_NEARBY_FRIEND_ONLINE, this ); - mIntentManager.registerIntentListener( ServiceConst.COMMAND_ZHIDAO_NEARBY_FRIEND, this ); - mIntentManager.registerIntentListener( ServiceConst.COMMAND_ZHIDAO_NEARBY_USER_ONLINE, this ); - mIntentManager.registerIntentListener( ServiceConst.COMMAND_ZHIDAO_NEARBY_FRIEND_BYLOCATION, this ); - mIntentManager.registerIntentListener( ServiceConst.COMMAND_BACK, this ); - mIntentManager.registerIntentListener( MogoReceiver.ACTION_AUTO_NAVI_RECEIVER, this ); - mIntentManager.registerIntentListener( MogoReceiver.ACTION_AUTO_NAVI_SEND, this ); - mIntentManager.registerIntentListener( MogoReceiver.ACTION_MOGO, this ); - mIntentManager.registerIntentListener( ServiceConst.COMMAND_ONLINE_CAR_PANEL, this ); - mIntentManager.registerIntentListener( ConnectivityManager.CONNECTIVITY_ACTION, this ); + mIntentManager.registerIntentListener(MogoReceiver.ACTIION_ADAS, this); + mIntentManager.registerIntentListener(MogoReceiver.ACTION_VOICE_UI, this); + mIntentManager.registerIntentListener(ServiceConst.COMMAND_NEXT, this); + mIntentManager.registerIntentListener(ServiceConst.COMMAND_PREVIOUS, this); + mIntentManager.registerIntentListener(ServiceConst.COMMAND_SWITCH_CARD, this); + mIntentManager.registerIntentListener(ServiceConst.COMMAND_MY_LOCATION, this); + mIntentManager.registerIntentListener(MogoReceiver.ACTION_ADAS_STATUS, this); + mIntentManager.registerIntentListener(ServiceConst.COMMAND_OPERATION, this); + mIntentManager.registerIntentListener(MogoReceiver.ACTION_VOICE_READY, this); + mIntentManager.registerIntentListener(MogoReceiver.ACTION_MOCK, this); + mIntentManager.registerIntentListener(ServiceConst.COMMAND_ZHIDAO_NEARBY_CAR_ONLINE, this); + mIntentManager.registerIntentListener(ServiceConst.COMMAND_ZHIDAO_NEARBY_FRIEND_ONLINE, this); + mIntentManager.registerIntentListener(ServiceConst.COMMAND_ZHIDAO_NEARBY_FRIEND, this); + mIntentManager.registerIntentListener(ServiceConst.COMMAND_ZHIDAO_NEARBY_USER_ONLINE, this); + mIntentManager.registerIntentListener(ServiceConst.COMMAND_ZHIDAO_NEARBY_FRIEND_BYLOCATION, this); + mIntentManager.registerIntentListener(ServiceConst.COMMAND_BACK, this); + mIntentManager.registerIntentListener(MogoReceiver.ACTION_AUTO_NAVI_RECEIVER, this); + mIntentManager.registerIntentListener(MogoReceiver.ACTION_AUTO_NAVI_SEND, this); + mIntentManager.registerIntentListener(MogoReceiver.ACTION_MOGO, this); + mIntentManager.registerIntentListener(ServiceConst.COMMAND_ONLINE_CAR_PANEL, this); + mIntentManager.registerIntentListener(ConnectivityManager.CONNECTIVITY_ACTION, this); mADASController = MarkerServiceHandler.getADASController(); mLauncher = MarkerServiceHandler.getLauncher(); mFragmentManager = MarkerServiceHandler.getFragmentManager(); - mFragmentManager.addMainFragmentStackTransactionListener( this ); + mFragmentManager.addMainFragmentStackTransactionListener(this); - CarIconDisplayStrategy.getInstance().changeCarIconStatus( mStatusManager.isSeekHelping() ); + CarIconDisplayStrategy.getInstance().changeCarIconStatus(mStatusManager.isSeekHelping()); - if ( DebugConfig.isLaunchLocationService() ) { - initLocationServiceProcess( context ); + if (DebugConfig.isLaunchLocationService()) { + initLocationServiceProcess(context); } AutoPilotRemoteController.getInstance().start(); } - private void initLocationServiceProcess( Context context ) { + private void initLocationServiceProcess(Context context) { try { Intent intent = new Intent(); - intent.setAction( "com.zhidao.locationinfo.service.uploaddataservice" ); - ComponentName cn = new ComponentName( "com.zhidao.locationinfo", "com.zhidao.locationinfo.service.UploadDataService" ); - intent.setComponent( cn ); - context.startService( intent ); - } catch ( Exception e ) { - Logger.e( TAG, e, "start location service error." ); + intent.setAction("com.zhidao.locationinfo.service.uploaddataservice"); + ComponentName cn = new ComponentName("com.zhidao.locationinfo", "com.zhidao.locationinfo.service.UploadDataService"); + intent.setComponent(cn); + context.startService(intent); + } catch (Exception e) { + Logger.e(TAG, e, "start location service error."); } } @@ -472,7 +491,6 @@ public class MogoServices implements IMogoMapListener, @Override public void handleMessage( Message msg ) { super.handleMessage( msg ); - Logger.d( TAG, "current thread: %s, msg = %s", Thread.currentThread(), msg.what ); if ( msg.what == ServiceConst.MSG_MAP_CHANGED ) { if ( msg.obj instanceof RefreshObject ) { RefreshObject ro = ( ( RefreshObject ) msg.obj ); @@ -523,24 +541,24 @@ public class MogoServices implements IMogoMapListener, filter.addAction( module.getBroadcastAction() ); } } - filter.addAction( MogoReceiver.VOICE_ACTION ); - filter.addAction( MogoReceiver.ACTIION_ADAS ); + filter.addAction(MogoReceiver.VOICE_ACTION); + filter.addAction(MogoReceiver.ACTIION_ADAS); // 小智语音 - filter.addAction( MogoReceiver.ACTION_VOICE_UI ); - filter.addAction( MogoReceiver.ACTION_ADAS_STATUS ); - filter.addAction( MogoReceiver.ACTION_VOICE_READY ); - filter.addAction( MogoReceiver.ACTION_MOCK ); - filter.addAction( Intent.ACTION_CLOSE_SYSTEM_DIALOGS ); - filter.addAction( MogoReceiver.ACTION_AUTO_NAVI_RECEIVER ); - filter.addAction( MogoReceiver.ACTION_AUTO_NAVI_SEND ); - filter.addAction( MogoReceiver.ACTION_MOGO ); - filter.addAction( MogoReceiver.ACTION_TXZ_BLOCK_SEARCH ); - filter.addAction( ConnectivityManager.CONNECTIVITY_ACTION ); + filter.addAction(MogoReceiver.ACTION_VOICE_UI); + filter.addAction(MogoReceiver.ACTION_ADAS_STATUS); + filter.addAction(MogoReceiver.ACTION_VOICE_READY); + filter.addAction(MogoReceiver.ACTION_MOCK); + filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); + filter.addAction(MogoReceiver.ACTION_AUTO_NAVI_RECEIVER); + filter.addAction(MogoReceiver.ACTION_AUTO_NAVI_SEND); + filter.addAction(MogoReceiver.ACTION_MOGO); + filter.addAction(MogoReceiver.ACTION_TXZ_BLOCK_SEARCH); + filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); try { - context.getApplicationContext().registerReceiver( mAIAssistReceiver, filter ); - Logger.i( TAG, "register voice receiver." ); - } catch ( Exception e ) { - Logger.e( TAG, e, "error. " ); + context.getApplicationContext().registerReceiver(mAIAssistReceiver, filter); + Logger.i(TAG, "register voice receiver."); + } catch (Exception e) { + Logger.e(TAG, e, "error. "); } } @@ -550,16 +568,16 @@ public class MogoServices implements IMogoMapListener, } private void initMapStatus() { - if ( mIsMapStatusOk ) { + if (mIsMapStatusOk) { return; } try { float width = getMapCameraFactWidth(); float height = getMapCameraFactHeight(); mIsVertical = width < height; - Logger.i( TAG, "map status is vertical : " + mIsVertical ); + Logger.i(TAG, "map status is vertical : " + mIsVertical); mIsMapStatusOk = true; - } catch ( Exception e ) { + } catch (Exception e) { e.printStackTrace(); } } @@ -569,8 +587,8 @@ public class MogoServices implements IMogoMapListener, */ private float getMapCameraFactWidth() { try { - return Utils.calculateLineDistance( mCameraNorthEastPosition, new MogoLatLng( mCameraNorthEastPosition.lat, mCameraSouthWestPosition.lng ) ); - } catch ( Exception e ) { + return Utils.calculateLineDistance(mCameraNorthEastPosition, new MogoLatLng(mCameraNorthEastPosition.lat, mCameraSouthWestPosition.lng)); + } catch (Exception e) { return ServiceConst.DEFAULT_AUTO_REFRESH_DATA_RADIUS; } } @@ -580,25 +598,25 @@ public class MogoServices implements IMogoMapListener, */ private float getMapCameraFactHeight() { try { - return Utils.calculateLineDistance( mCameraSouthWestPosition, new MogoLatLng( mCameraNorthEastPosition.lat, mCameraSouthWestPosition.lng ) ); - } catch ( Exception e ) { + return Utils.calculateLineDistance(mCameraSouthWestPosition, new MogoLatLng(mCameraNorthEastPosition.lat, mCameraSouthWestPosition.lng)); + } catch (Exception e) { return ServiceConst.DEFAULT_AUTO_REFRESH_DATA_RADIUS; } } @Override - public void onTouch( MotionEvent motionEvent ) { - switch ( motionEvent.getActionMasked() ) { + public void onTouch(MotionEvent motionEvent) { + switch (motionEvent.getActionMasked()) { case MotionEvent.ACTION_DOWN: - if ( mLastZoomLevel == 0 ) { + if (mLastZoomLevel == 0) { mLastZoomLevel = mUiController.getZoomLevel(); - Logger.i( TAG, "初始化缩放级别 为:%f", mLastZoomLevel ); + Logger.i(TAG, "初始化缩放级别 为:%f", mLastZoomLevel); } break; case MotionEvent.ACTION_UP: - restartAutoRefreshAtTime( ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT, false ); - mThreadHandler.removeMessages( ServiceConst.MSG_LOCK_CAR ); - mThreadHandler.sendEmptyMessageDelayed( ServiceConst.MSG_LOCK_CAR, ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT ); + restartAutoRefreshAtTime(ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT, false); + mThreadHandler.removeMessages(ServiceConst.MSG_LOCK_CAR); + mThreadHandler.sendEmptyMessageDelayed(ServiceConst.MSG_LOCK_CAR, ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT); break; } } @@ -608,10 +626,8 @@ public class MogoServices implements IMogoMapListener, } private void stopAutoRefreshStrategy( boolean stopOnlineCarRefresh ) { - Logger.d( TAG, "stop auto refresh strategy" ); mHandler.removeMessages( ServiceConst.MSG_TYPE_REFRESH_DECREASE ); if ( stopOnlineCarRefresh ) { - Logger.d( TAG, "stop online car auto refresh" ); MapMarkerManager.getInstance().stopAutoRefresh(); } } @@ -662,23 +678,23 @@ public class MogoServices implements IMogoMapListener, return; } - Logger.d( TAG, "mLastZoomLevel = %s, zoom = %s", mLastZoomLevel, zoom ); + Logger.d(TAG, "mLastZoomLevel = %s, zoom = %s", mLastZoomLevel, zoom); // 手动刷新触发 - if ( mLastZoomLevel - zoom > mCustomRefreshStrategy.getZoomOutLevel() ) { + if (mLastZoomLevel - zoom > mCustomRefreshStrategy.getZoomOutLevel()) { // 缩放级别缩小 - notifyRefreshData( latLng, getQueryRadius(), mCustomRefreshCallback ); + notifyRefreshData(latLng, getQueryRadius(), mCustomRefreshCallback); mLastCustomRefreshCenterLocation = latLng; mLastZoomLevel = zoom; - } else if ( mLastZoomLevel - zoom < 0 ) { + } else if (mLastZoomLevel - zoom < 0) { mLastZoomLevel = zoom; - } else if ( mLastZoomLevel == zoom ) { + } else if (mLastZoomLevel == zoom) { // 手动平移 Message msg = Message.obtain(); msg.what = ServiceConst.MSG_MAP_CHANGED; - msg.obj = new RefreshObject( mCustomRefreshCallback, getQueryRadius(), latLng, 0 ); - mThreadHandler.sendMessage( msg ); - Logger.d( TAG, "平移触发" ); + msg.obj = new RefreshObject(mCustomRefreshCallback, getQueryRadius(), latLng, 0); + mThreadHandler.sendMessage(msg); + Logger.d(TAG, "平移触发"); } } @@ -686,12 +702,12 @@ public class MogoServices implements IMogoMapListener, mCameraSouthWestPosition = mUiController.getCameraSouthWestPosition(); mCameraNorthEastPosition = mUiController.getCameraNorthEastPosition(); int radius = 0; - if ( mIsVertical ) { - radius = ( ( int ) ( getMapCameraFactWidth() / 2 ) ); + if (mIsVertical) { + radius = ((int) (getMapCameraFactWidth() / 2)); } else { - radius = ( ( int ) ( getMapCameraFactHeight() / 2 ) ); + radius = ((int) (getMapCameraFactHeight() / 2)); } - if ( radius < 1000 ) { + if (radius < 1000) { return 1_000; } return radius; @@ -700,63 +716,63 @@ public class MogoServices implements IMogoMapListener, /** * 平移地图刷新策略 */ - private boolean invokeRefreshWhenTranslationByUser( MogoLatLng latLng ) { + private boolean invokeRefreshWhenTranslationByUser(MogoLatLng latLng) { try { float factor = 0.0f; - if ( mIsVertical ) { + if (mIsVertical) { factor = getMapCameraFactWidth(); } else { factor = getMapCameraFactHeight(); } - if ( factor == 0.0f ) { + if (factor == 0.0f) { return false; } - float distance = Utils.calculateLineDistance( latLng, mLastCustomRefreshCenterLocation ); - Logger.d( TAG, "move distance = %s, factor = %s", distance, ( factor / 2 ) ); - return distance > ( factor / 2 ); - } catch ( Exception e ) { - Logger.e( TAG, e, "warming. " ); + float distance = Utils.calculateLineDistance(latLng, mLastCustomRefreshCenterLocation); + Logger.d(TAG, "move distance = %s, factor = %s", distance, (factor / 2)); + return distance > (factor / 2); + } catch (Exception e) { + Logger.e(TAG, e, "warming. "); return false; } } @Override - public void onLocationChanged( MogoLocation location ) { + public void onLocationChanged(MogoLocation location) { - if ( !DebugConfig.isMapBased() ) { + if (!DebugConfig.isMapBased()) { return; } - if ( !mStatusManager.isMainPageLaunched() ) { + if (!mStatusManager.isMainPageLaunched()) { return; } - if ( mStatusManager.isV2XShow() ) { + if (mStatusManager.isV2XShow()) { return; } - if ( mStatusManager.isSearchUIShow() ) { + if (mStatusManager.isSearchUIShow()) { return; } - if ( location == null ) { + if (location == null) { return; } // 自动刷新触发 - final MogoLatLng point = new MogoLatLng( location.getLatitude(), location.getLongitude() ); - if ( mLastAutoRefreshLocation == null ) { - startFirstLocationRequest( point ); + final MogoLatLng point = new MogoLatLng(location.getLatitude(), location.getLongitude()); + if (mLastAutoRefreshLocation == null) { + startFirstLocationRequest(point); return; } - float distance = Utils.calculateLineDistance( mLastAutoRefreshLocation, point ); - if ( distance > mAutoRefreshStrategy.getDistance() ) { - mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, true, false ); + float distance = Utils.calculateLineDistance(mLastAutoRefreshLocation, point); + if (distance > mAutoRefreshStrategy.getDistance()) { + mStatusManager.setUserInteractionStatus(ServiceConst.TYPE, true, false); mUiController.recoverLockMode(); - mStatusManager.setUserInteractionStatus( TAG, true, false ); - mUiController.changeZoom( ServiceConst.DEFAULT_ZOOM_LEVEL ); + mStatusManager.setUserInteractionStatus(TAG, true, false); + mUiController.changeZoom(ServiceConst.DEFAULT_ZOOM_LEVEL); mLastAutoRefreshLocation = point; - notifyRefreshData( mLastAutoRefreshLocation, getQueryRadius(), mAutoRefreshCallback ); + notifyRefreshData(mLastAutoRefreshLocation, getQueryRadius(), mAutoRefreshCallback); } } @@ -765,150 +781,150 @@ public class MogoServices implements IMogoMapListener, * * @param point */ - private void startFirstLocationRequest( MogoLatLng point ) { + private void startFirstLocationRequest(MogoLatLng point) { mLastAutoRefreshLocation = point; mLoopRequest = true; - notifyRefreshData( mLastAutoRefreshLocation, getQueryRadius(), mAutoRefreshCallback ); + notifyRefreshData(mLastAutoRefreshLocation, getQueryRadius(), mAutoRefreshCallback); } @Override - public void onCarLocationChanged2( Location latLng ) { - if ( latLng == null ) { + public void onCarLocationChanged2(Location latLng) { + if (latLng == null) { return; } // poi 定位无法获取时,使用该定位 - if ( mLastAutoRefreshLocation == null ) { - MogoLatLng point = new MogoLatLng( latLng.getLatitude(), latLng.getLongitude() ); - startFirstLocationRequest( point ); + if (mLastAutoRefreshLocation == null) { + MogoLatLng point = new MogoLatLng(latLng.getLatitude(), latLng.getLongitude()); + startFirstLocationRequest(point); } } @Override - public void onCarLocationChanged( MogoLatLng latLng ) { + public void onCarLocationChanged(MogoLatLng latLng) { } /** * 刷新数据 */ - private void notifyRefreshData( MogoLatLng latLng, int radius, RefreshCallback callback ) { + private void notifyRefreshData(MogoLatLng latLng, int radius, RefreshCallback callback) { - if ( !DebugConfig.isMapBased() ) { + if (!DebugConfig.isMapBased()) { return; } - if ( !mStatusManager.isMainPageLaunched() ) { + if (!mStatusManager.isMainPageLaunched()) { return; } - if ( !mStatusManager.isMainPageOnResume() ) { + if (!mStatusManager.isMainPageOnResume()) { return; } - if ( mStatusManager.isSearchUIShow() ) { + if (mStatusManager.isSearchUIShow()) { return; } - Logger.d( TAG, mAutoRefreshCallback == callback ? "触发自动刷新" : "触发手动刷新" ); + Logger.d(TAG, mAutoRefreshCallback == callback ? "触发自动刷新" : "触发手动刷新"); int amount = 20; Message msg = Message.obtain(); msg.what = ServiceConst.MSG_REQUEST_DATA; - msg.obj = new RefreshObject( callback, radius, latLng, amount ); - mThreadHandler.sendMessage( msg ); + msg.obj = new RefreshObject(callback, radius, latLng, amount); + mThreadHandler.sendMessage(msg); } - private void notifySeekHelpingStatusChanged( boolean seekHelpingStatus ) { - Intent intent = new Intent( "com.mogo.launcher.adas.app" ); + private void notifySeekHelpingStatusChanged(boolean seekHelpingStatus) { + Intent intent = new Intent("com.mogo.launcher.adas.app"); try { JSONObject data = new JSONObject(); - data.put( "object", "辅助驾驶" ); - data.put( "action", seekHelpingStatus ? "2" : "1" ); - data.put( "des", "自身故障报警" ); - data.put( "v2x_warning_type", "20007" );// 后台返回 - intent.putExtra( "data", data.toString() ); - mContext.sendBroadcast( intent ); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + data.put("object", "辅助驾驶"); + data.put("action", seekHelpingStatus ? "2" : "1"); + data.put("des", "自身故障报警"); + data.put("v2x_warning_type", "20007");// 后台返回 + intent.putExtra("data", data.toString()); + mContext.sendBroadcast(intent); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } - public void restartAutoRefreshAtTime( long time ) { - restartAutoRefreshAtTime( time, true ); + public void restartAutoRefreshAtTime(long time) { + restartAutoRefreshAtTime(time, true); } public void clearAllData() { try { - MarkerServiceHandler.getMapService().getMarkerManager( mContext ).removeMarkers(); - } catch ( Exception e ) { + MarkerServiceHandler.getMapService().getMarkerManager(mContext).removeMarkers(); + } catch (Exception e) { e.printStackTrace(); } } - private void restartAutoRefreshAtTime( long time, boolean stopOnlineCarRefresh ) { - if ( time < 0 ) { - Logger.w( TAG, "refresh request case time < 0, set to 0 and go on." ); + private void restartAutoRefreshAtTime(long time, boolean stopOnlineCarRefresh) { + if (time < 0) { + Logger.w(TAG, "refresh request case time < 0, set to 0 and go on."); time = 0; } - stopAutoRefreshStrategy( stopOnlineCarRefresh ); + stopAutoRefreshStrategy(stopOnlineCarRefresh); mRefreshRemainingTime = time; long delay = ServiceConst.DECREASE_INTERVAL; - if ( mRefreshRemainingTime < ServiceConst.DECREASE_INTERVAL ) { + if (mRefreshRemainingTime < ServiceConst.DECREASE_INTERVAL) { delay = mRefreshRemainingTime; } - if ( time == 0 ) { - Logger.d( TAG, "立即刷新" ); + if (time == 0) { + Logger.d(TAG, "立即刷新"); invokeAutoRefresh(); } else { - mHandler.sendEmptyMessageDelayed( ServiceConst.MSG_TYPE_REFRESH_DECREASE, delay ); + mHandler.sendEmptyMessageDelayed(ServiceConst.MSG_TYPE_REFRESH_DECREASE, delay); } - Logger.i( TAG, "下次刷新时间:%sms后", mRefreshRemainingTime ); + Logger.i(TAG, "下次刷新时间:%sms后", mRefreshRemainingTime); } public void refreshStrategy() { - Logger.d( TAG, "move to center and refresh data." ); - mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, true, false ); + Logger.d(TAG, "move to center and refresh data."); + mStatusManager.setUserInteractionStatus(ServiceConst.TYPE, true, false); mUiController.recoverLockMode();// 锁车代替移到中心点 - restartAutoRefreshAtTime( 0 ); + restartAutoRefreshAtTime(0); } @Override - public void onUpdateTraffic2( MogoTraffic traffic ) { + public void onUpdateTraffic2(MogoTraffic traffic) { - if ( traffic == null ) { + if (traffic == null) { return; } - if ( mCurrentLimit == traffic.getSpeedLimit() ) { + if (mCurrentLimit == traffic.getSpeedLimit()) { return; } mCurrentLimit = traffic.getSpeedLimit(); - Logger.i( TAG, "speed = %d, desc = %s", traffic.getSpeedLimit(), traffic.getDesc() ); + Logger.i(TAG, "speed = %d, desc = %s", traffic.getSpeedLimit(), traffic.getDesc()); // 发送当前限速到 adas - Intent intent = new Intent( "com.mogo.launcher.adas" ); - intent.putExtra( "adas_speed_limit", traffic.getSpeedLimit() ); - mContext.sendBroadcast( intent ); + Intent intent = new Intent("com.mogo.launcher.adas"); + intent.putExtra("adas_speed_limit", traffic.getSpeedLimit()); + mContext.sendBroadcast(intent); } @Override - public void onUpdateCongestion( MogoCongestionInfo info ) { + public void onUpdateCongestion(MogoCongestionInfo info) { } @Override - public void onIntentReceived( String command, Intent intent ) { + public void onIntentReceived(String command, Intent intent) { - if ( ServiceConst.COMMAND_NEXT.equals( command ) ) { - onActionDone( MogoAction.Next ); - } else if ( ServiceConst.COMMAND_PREVIOUS.equals( command ) ) { - onActionDone( MogoAction.Prev ); + if (ServiceConst.COMMAND_NEXT.equals(command)) { + onActionDone(MogoAction.Next); + } else if (ServiceConst.COMMAND_PREVIOUS.equals(command)) { + onActionDone(MogoAction.Prev); } else { - if ( TextUtils.equals( command, ConnectivityManager.CONNECTIVITY_ACTION ) - && NetworkUtils.isConnected( mContext ) ) { - mIntentManager.unregisterIntentListener( ConnectivityManager.CONNECTIVITY_ACTION, this ); + if (TextUtils.equals(command, ConnectivityManager.CONNECTIVITY_ACTION) + && NetworkUtils.isConnected(mContext)) { + mIntentManager.unregisterIntentListener(ConnectivityManager.CONNECTIVITY_ACTION, this); } - IntentHandlerFactory.getInstance().handle( mContext, command, intent ); + IntentHandlerFactory.getInstance().handle(mContext, command, intent); } } @@ -916,102 +932,102 @@ public class MogoServices implements IMogoMapListener, * 注册桌面免唤醒指令 */ private void registerInternalUnWakeupWords() { - if ( mInternalUnWakeupRegisterStatus ) { + if (mInternalUnWakeupRegisterStatus) { return; } mInternalUnWakeupRegisterStatus = true; // AIAssist.getInstance( mContext ).registerUnWakeupCommand( ServiceConst.CMD_UN_WAKE_PREV,ServiceConst.CMD_UN_WAKE_PREV_UN_WAKE_WORDS, this ); // AIAssist.getInstance( mContext ).registerUnWakeupCommand( ServiceConst.CMD_UN_WAKE_NEXT,ServiceConst.CMD_UN_WAKE_NEXT_UN_WAKE_WORDS, this ); - AIAssist.getInstance( mContext ).registerUnWakeupCommand( ServiceConst.CMD_UN_WAKEUP_MY_LOCATION, ServiceConst.CMD_UN_WAKEUP_WORDS_MY_LOCATION, this ); + AIAssist.getInstance(mContext).registerUnWakeupCommand(ServiceConst.CMD_UN_WAKEUP_MY_LOCATION, ServiceConst.CMD_UN_WAKEUP_WORDS_MY_LOCATION, this); } /** * 注销桌面免唤醒指令 */ private void unregisterInternalUnWakeupWords() { - if ( !mInternalUnWakeupRegisterStatus ) { + if (!mInternalUnWakeupRegisterStatus) { return; } mInternalUnWakeupRegisterStatus = false; // AIAssist.getInstance( mContext ).unregisterUnWakeupCommand( ServiceConst.CMD_UN_WAKE_PREV, this ); // AIAssist.getInstance( mContext ).unregisterUnWakeupCommand( ServiceConst.CMD_UN_WAKE_NEXT, this ); - AIAssist.getInstance( mContext ).unregisterUnWakeupCommand( ServiceConst.CMD_UN_WAKEUP_MY_LOCATION, this ); + AIAssist.getInstance(mContext).unregisterUnWakeupCommand(ServiceConst.CMD_UN_WAKEUP_MY_LOCATION, this); } @Override - public void onCmdSelected( String cmd ) { - if ( TextUtils.equals( ServiceConst.CMD_UN_WAKE_PREV, cmd ) ) { - onActionDone( MogoAction.Prev ); - } else if ( TextUtils.equals( ServiceConst.CMD_UN_WAKE_NEXT, cmd ) ) { - onActionDone( MogoAction.Next ); - } else if ( TextUtils.equals( ServiceConst.CMD_UN_WAKEUP_MY_LOCATION, cmd ) ) { - if ( mStatusManager.isMainPageOnResume() ) { + public void onCmdSelected(String cmd) { + if (TextUtils.equals(ServiceConst.CMD_UN_WAKE_PREV, cmd)) { + onActionDone(MogoAction.Prev); + } else if (TextUtils.equals(ServiceConst.CMD_UN_WAKE_NEXT, cmd)) { + onActionDone(MogoAction.Next); + } else if (TextUtils.equals(ServiceConst.CMD_UN_WAKEUP_MY_LOCATION, cmd)) { + if (mStatusManager.isMainPageOnResume()) { mUiController.recoverLockMode(); } - } else if ( TextUtils.equals( ServiceConst.CMD_BACK, cmd ) ) { + } else if (TextUtils.equals(ServiceConst.CMD_BACK, cmd)) { mFragmentManager.clearAll(); } } - private void onActionDone( MogoAction action ) { - if ( !mStatusManager.isMainPageOnResume() ) { + private void onActionDone(MogoAction action) { + if (!mStatusManager.isMainPageOnResume()) { return; } - if ( mStatusManager.isV2XShow() ) { + if (mStatusManager.isV2XShow()) { // 分发到V2X - mActionManager.invoke( "V2X_UI", action ); + mActionManager.invoke("V2X_UI", action); } else { String biz = MapMarkerManager.getInstance().getCurrentModuleName(); - mActionManager.invoke( biz, action ); + mActionManager.invoke(biz, action); } } @Override - public void onTransaction( int size ) { - if ( size == 0 ) { - mUiController.showMyLocation( true ); - AIAssist.getInstance( mContext ).unregisterUnWakeupCommand( ServiceConst.CMD_BACK ); - if ( mStatusManager.isSearchUIShow() ) { - mStatusManager.setSearchUIShow( TAG, false ); + public void onTransaction(int size) { + if (size == 0) { + mUiController.showMyLocation(true); + AIAssist.getInstance(mContext).unregisterUnWakeupCommand(ServiceConst.CMD_BACK); + if (mStatusManager.isSearchUIShow()) { + mStatusManager.setSearchUIShow(TAG, false); } - if ( mNavi.isNaviing() ) { - MapCenterPointStrategy.setMapCenterPointByScene( mUiController, Scene.NAVI ); + if (mNavi.isNaviing()) { + MapCenterPointStrategy.setMapCenterPointByScene(mUiController, Scene.NAVI); } else { - MapCenterPointStrategy.setMapCenterPointByScene( mUiController, Scene.AIMLESS ); + MapCenterPointStrategy.setMapCenterPointByScene(mUiController, Scene.AIMLESS); } mUiController.recoverLockMode(); mADASController.showADAS(); } else { - mUiController.showMyLocation( false ); - AIAssist.getInstance( mContext ).registerUnWakeupCommand( ServiceConst.CMD_BACK, ServiceConst.CMD_BACK_WORDS, this ); + mUiController.showMyLocation(false); + AIAssist.getInstance(mContext).registerUnWakeupCommand(ServiceConst.CMD_BACK, ServiceConst.CMD_BACK_WORDS, this); } } @Override public void onStartNavi() { - if ( DebugConfig.isIsScheduleCalculateNotHomeCompanyDistanceForPush() ) { - Logger.d( TAG, "onStartNavi: scheduleCalculationNotHomeCompanyDistanceForPush" ); - scheduleCalculationNotHomeCompanyDistanceForPush( 1, ServiceConst.INTERVAL_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH ); + if (DebugConfig.isIsScheduleCalculateNotHomeCompanyDistanceForPush()) { + Logger.d(TAG, "onStartNavi: scheduleCalculationNotHomeCompanyDistanceForPush"); + scheduleCalculationNotHomeCompanyDistanceForPush(1, ServiceConst.INTERVAL_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH); } else { - Logger.d( TAG, "onStartNavi: scheduleCalculationNotHomeCompanyDistanceForPush un support" ); + Logger.d(TAG, "onStartNavi: scheduleCalculationNotHomeCompanyDistanceForPush un support"); } } @Override public void onStopNavi() { - SpStorage.setNavigationTarget( "" ); - Logger.d( TAG, "onStopNavi: remove MSG_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH msg" ); - mHandler.removeMessages( ServiceConst.MSG_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH ); + SpStorage.setNavigationTarget(""); + Logger.d(TAG, "onStopNavi: remove MSG_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH msg"); + mHandler.removeMessages(ServiceConst.MSG_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH); } /** * 延时一分钟发起计算导航目的地推送策略 */ - private void scheduleCalculationNotHomeCompanyDistanceForPush( int time, long delay ) { + private void scheduleCalculationNotHomeCompanyDistanceForPush(int time, long delay) { Message msg = Message.obtain(); msg.what = ServiceConst.MSG_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH; msg.arg1 = time; - mHandler.sendMessageDelayed( msg, delay ); + mHandler.sendMessageDelayed(msg, delay); } /** @@ -1019,50 +1035,50 @@ public class MogoServices implements IMogoMapListener, * * @param time 第x次重试 */ - private void handleCalculationNotHomeCompanyDistanceForPush( final int time ) { - if ( time > 3 ) { + private void handleCalculationNotHomeCompanyDistanceForPush(final int time) { + if (time > 3) { return; } String json = SpStorage.getNavigationTarget(); - if ( !TextUtils.isEmpty( json ) ) { + if (!TextUtils.isEmpty(json)) { try { - NavigationTargetInfo info = GsonUtil.objectFromJson( json, NavigationTargetInfo.class ); + NavigationTargetInfo info = GsonUtil.objectFromJson(json, NavigationTargetInfo.class); - Logger.d( TAG, "info = %s", info ); + Logger.d(TAG, "info = %s", info); HomeCompanyDistanceForPushData data = new HomeCompanyDistanceForPushData(); - data.lat = Double.valueOf( info.getToPoiLatitude() ); - data.lon = Double.valueOf( info.getToPoiLongitude() ); + data.lat = Double.valueOf(info.getToPoiLatitude()); + data.lon = Double.valueOf(info.getToPoiLongitude()); - final Map< String, Object > query = new ParamsProvider.Builder( mContext ).build(); - query.put( "data", GsonUtil.jsonFromObject( data ) ); - mRefreshModel.getRefreshApiService().calculationNotHomeCompanyDistanceForPush( query ) - .subscribeOn( Schedulers.io() ) - .observeOn( AndroidSchedulers.mainThread() ) - .subscribe( new SubscribeImpl< HomeCompanyDistanceForPushResponse >( RequestOptions.create( mContext ) ) { + final Map query = new ParamsProvider.Builder(mContext).build(); + query.put("data", GsonUtil.jsonFromObject(data)); + mRefreshModel.getRefreshApiService().calculationNotHomeCompanyDistanceForPush(query) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new SubscribeImpl(RequestOptions.create(mContext)) { @Override - public void onSuccess( HomeCompanyDistanceForPushResponse o ) { - super.onSuccess( o ); - if ( o != null && o.result != null ) { - Logger.d( TAG, "calculationNotHomeCompanyDistanceForPush result %s", o.result.pushFlag ); + public void onSuccess(HomeCompanyDistanceForPushResponse o) { + super.onSuccess(o); + if (o != null && o.result != null) { + Logger.d(TAG, "calculationNotHomeCompanyDistanceForPush result %s", o.result.pushFlag); } } @Override - public void onError( Throwable e ) { - super.onError( e ); - Logger.d( TAG, "re scheduleCalculationNotHomeCompanyDistanceForPush after 30s" ); + public void onError(Throwable e) { + super.onError(e); + Logger.d(TAG, "re scheduleCalculationNotHomeCompanyDistanceForPush after 30s"); // 延时30s重试 - scheduleCalculationNotHomeCompanyDistanceForPush( time + 1, 30_000L ); + scheduleCalculationNotHomeCompanyDistanceForPush(time + 1, 30_000L); } @Override - public void onError( String message, int code ) { - super.onError( message, code ); + public void onError(String message, int code) { + super.onError(message, code); } - } ); - } catch ( Exception e ) { - Logger.e( TAG, e, "handleCalculationNotHomeCompanyDistanceForPush" ); + }); + } catch (Exception e) { + Logger.e(TAG, e, "handleCalculationNotHomeCompanyDistanceForPush"); } } @@ -1070,6 +1086,6 @@ public class MogoServices implements IMogoMapListener, @Override public void destroy() { - Logger.d( TAG, "MogoServices do nothings." ); + Logger.d(TAG, "MogoServices do nothings."); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java index 1fb0c5cdf2..1a0020979f 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java @@ -18,6 +18,11 @@ public class ServiceConst { */ public static final String PATH_REFRESH_STRATEGY = "/strategy/refresh"; + /** + * tts语音配置 + */ + public static final String PATH_TTS_CONFIG = "/ttsserver/tts"; + /** * 倒计时消息 */ diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/ADASStatusIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/ADASStatusIntentHandler.java index aa5c6c8161..ecd894836c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/ADASStatusIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/ADASStatusIntentHandler.java @@ -54,17 +54,19 @@ class ADASStatusIntentHandler implements IntentHandler { } int status = intent.getIntExtra( MogoReceiver.PARAM_ADAS_STATUS, 0 ); MarkerServiceHandler.getMogoStatusManager().setADASUIShow( ServiceConst.TYPE, status == 1 ); - } else { - String msg = intent.getStringExtra( "adasMsg" ); - if ( TextUtils.isEmpty( msg ) ) { - return; - } - CarStateInfo stateInfo = GsonUtil.objectFromJson( msg, CarStateInfo.class ); - if ( stateInfo != null ) { - changeCarHeadstockDirection( context, stateInfo.getValues().getHeading() ); - // changeMyLocation( stateInfo.getValues() ); - } } + // 由于adas可能调高此处的调用频率,存在anr风险,且此处没有作用,所以暂时注释掉 +// else { +// String msg = intent.getStringExtra( "adasMsg" ); +// if ( TextUtils.isEmpty( msg ) ) { +// return; +// } +// CarStateInfo stateInfo = GsonUtil.objectFromJson( msg, CarStateInfo.class ); +// if ( stateInfo != null ) { +// changeCarHeadstockDirection( context, stateInfo.getValues().getHeading() ); +// // changeMyLocation( stateInfo.getValues() ); +// } +// } } private void changeCarHeadstockDirection( final Context context, final double degree ) { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java index 270dcf35d3..51e40bf2b9 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java @@ -17,6 +17,5 @@ public class EmptyIntentHandler implements IntentHandler { @Override public void handle( Context context, Intent intent ) { - Logger.w( TAG, "空实现. %s", intent.getAction() ); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshStrategy.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshStrategy.java index 47bb59f3a8..7a04b6b9c6 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshStrategy.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshStrategy.java @@ -3,7 +3,6 @@ package com.mogo.module.service.launchercard; public class LauncherCardRefreshStrategy { private long interval; // 间隔时间 - private LauncherCardRefreshType type = LauncherCardRefreshType.OnlineCar; private LauncherCardRefreshStrategy next; @@ -15,10 +14,6 @@ public class LauncherCardRefreshStrategy { this.msgType = msgType; } - public void setType( LauncherCardRefreshType type ) { - this.type = type; - } - public int getMsgType() { return msgType; } @@ -27,31 +22,6 @@ public class LauncherCardRefreshStrategy { return interval; } - public LauncherCardRefreshType getType() { - return type; - } - - public LauncherCardRefreshType getNextType() { - if ( type == LauncherCardRefreshType.ExploreWay ) { - type = LauncherCardRefreshType.OnlineCar; - } else { - type = LauncherCardRefreshType.ExploreWay; - } - return type; - } - - public void next(){ - getNextType(); - } - - public int getLimit() { - return type.limit; - } - - public String getDesc() { - return type.desc; - } - public int getRadius() { return 2_000; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshType.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshType.java index 4cf2aa21d6..27d5712049 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshType.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshType.java @@ -2,14 +2,33 @@ package com.mogo.module.service.launchercard; public enum LauncherCardRefreshType { - ExploreWay( 50, "道路事件" ), - OnlineCar( 20, "车友" ); - public int limit; - public String desc; + Weather( "News", "weather", "天气" ), + News( "NearRoads", "news", "新闻" ), + NearRoads( "ExplorerWay", "nearRoads", "近路" ), + // TrafficRestriction( "NearRoads", "trafficRestriction" ), + ExplorerWay( "OnlineCar", "friendAndPois", "道路事件" ), + OnlineCar( "Weather", "friendAndPois", "车友" ); - LauncherCardRefreshType( int limit, String desc ) { - this.limit = limit; + private String next; + private String val; + private String desc; + + LauncherCardRefreshType( String next, String val, String desc ) { + this.next = next; + this.val = val; this.desc = desc; } + + public String getNext() { + return next; + } + + public String getVal() { + return val; + } + + public String getDesc() { + return desc; + } } \ No newline at end of file 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 a8f01b72d5..6aae344515 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 @@ -10,21 +10,25 @@ import android.text.TextUtils; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.ParamsProvider; import com.mogo.commons.network.SubscribeImpl; +import com.mogo.commons.network.Utils; import com.mogo.commons.voice.AIAssist; import com.mogo.map.MogoLatLng; import com.mogo.map.location.MogoLocation; -import com.mogo.module.common.entity.MarkerResponse; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.R; -import com.mogo.module.service.network.RefreshCallback; import com.mogo.module.service.network.RefreshModel; import com.mogo.module.service.network.ZhidaoRefreshModel; import com.mogo.module.service.network.bean.LauncherCardAdvertisementData; +import com.mogo.module.service.network.bean.TtsConfigBody; +import com.mogo.module.service.network.bean.TtsConfigData; import com.mogo.service.passport.IMogoTicketCallback; import com.mogo.utils.AppUtils; import com.mogo.utils.NetworkUtils; +import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; +import com.mogo.utils.network.utils.GsonUtil; import com.mogo.utils.storage.SharedPrefsMgr; import java.util.ArrayList; @@ -49,15 +53,10 @@ class LauncherCardRefresher { public static final String KEY_LauncherCardTipCounter = "LauncherCardTipCounter"; public static final String KEY_LauncherCardTipLastTipTime = "LauncherCardTipLastTipTime"; - public static final String KEY_LauncherCardExplorerWayAndOnlineCarTipCounter = "LauncherCardExplorerWayAndOnlineCarTipCounter"; - public static final String KEY_LauncherCardExplorerWayAndOnlineCarTipLastTipTime = "LauncherCardExplorerWayAndOnlineCarTipLastTipTime"; - public static final String KEY_LauncherCardExplorerWayAndOnlineCarTipLastTipType = "LauncherCardExplorerWayAndOnlineCarTipLastTipType"; - + public static final String KEY_LAST_LOAD_TTS_TYPE = "keyLastLoadTtsType"; private static volatile LauncherCardRefresher sInstance; - // 刷新道路事件/车友 - public static final int MSG_EXPLORER_WAY_OR_ONLINE_CAR_DATA = 2020; // 开始引导策略 public static final int MSG_INDUCE = 2019; // 刷新卡片默认显示内容 @@ -68,6 +67,10 @@ class LauncherCardRefresher { public static final int MSG_LOAD_NET_CONFIG = 2023; // 默认播报 public static final int MSG_START_LOOP_DEFAULT_CARD = 2024; + // 等待网络 + public static final int MSG_WAIT_NETWORK = 2025; + + public static final long ONE_SECOND = 1000L; public static final long ONE_MINUTE = 60 * 1000L; public static final long ONE_DAY = 24 * 60 * ONE_MINUTE; private String mLaunchTTSText; @@ -80,11 +83,6 @@ class LauncherCardRefresher { */ private int mDefaultConfigCounter = 0; - /** - * 事件/车友播报次数 - */ - private int mMsgExplorerWayOrOnlineCarDataCounter = 0; - /** * 因为缓存ticket失效导致失败的情况,需要重新请求ticket然后再次获取数据,这里重试3次 */ @@ -124,6 +122,8 @@ class LauncherCardRefresher { return; } switch ( msg.what ) { + case MSG_WAIT_NETWORK: + trtRequestNetworkConfigStrategy(); case MSG_LOAD_NET_CONFIG: loadNetworkConfigStrategy(); break; @@ -135,13 +135,6 @@ class LauncherCardRefresher { case MSG_INDUCE: handleInduceStrategy(); break; - case MSG_EXPLORER_WAY_OR_ONLINE_CAR_DATA: - try { - handleRefreshExplorerWayOrOnlineCarMsg(); - } catch ( Exception e ) { - Logger.e( TAG, e, "error when refresh launcher card." ); - } - break; case MSG_START_LOOP_DEFAULT_CARD: renderDefaultLauncherCardConfig( false ); break; @@ -159,14 +152,8 @@ class LauncherCardRefresher { private RefreshModel mRefreshModel; private ZhidaoRefreshModel mZhidaoRefreshModel; - private LauncherCardRefreshStrategy mExplorerWayOrOnlineCarDataStrategy = new LauncherCardRefreshStrategy( - 18 * ONE_MINUTE, null, MSG_EXPLORER_WAY_OR_ONLINE_CAR_DATA - ); - private LauncherCardRefreshStrategy mInduceStrategy = new LauncherCardRefreshStrategy( - 18 * ONE_MINUTE, mExplorerWayOrOnlineCarDataStrategy, MSG_INDUCE - ); private LauncherCardRefreshStrategy mLauncherCardConfigStrategy = new LauncherCardRefreshStrategy( - 2 * ONE_MINUTE, mExplorerWayOrOnlineCarDataStrategy, MSG_REFRESH_DEFAULT_CARD + 2 * ONE_MINUTE, null, MSG_REFRESH_DEFAULT_CARD ); private LauncherCardRefreshStrategy mRefreshStrategy = mLauncherCardConfigStrategy; @@ -178,24 +165,32 @@ class LauncherCardRefresher { return; } Logger.d( TAG, "start" ); - mLaunchTTSText = mContext.getString( R.string.module_service_open_app_tip ); mDefaultConfigCounter = 0; mRefreshTicketCounter = 0; - mMsgExplorerWayOrOnlineCarDataCounter = 0; mRefreshStrategy = mLauncherCardConfigStrategy; - // 延时加载数据,已保证accOn之后网络恢复正常 - long delay = ONE_MINUTE; - if ( NetworkUtils.isConnected( mContext ) ) { - delay = 0L; - } - mHandler.sendEmptyMessageDelayed( MSG_LOAD_NET_CONFIG, delay ); + trtRequestNetworkConfigStrategy(); startInduceStrategy(); } + private void trtRequestNetworkConfigStrategy() { + if ( NetworkUtils.isConnected( mContext ) && MogoApisHandler.getInstance() + .getApis() + .getMapServiceApi() + .getSingletonLocationClient( mContext ) + .getLastKnowLocation() != null ) { + mHandler.sendEmptyMessageDelayed( MSG_LOAD_NET_CONFIG, 0L ); + } else { + mHandler.sendEmptyMessageDelayed( MSG_WAIT_NETWORK, 10 * ONE_SECOND ); + } + } + /** * 引导策略:本地策略 & 网络策略 */ private void startInduceStrategy() { + if ( mRefreshStrategy == null ) { + return; + } mHandler.sendEmptyMessageDelayed( mRefreshStrategy.getMsgType(), mRefreshStrategy.getInterval() ); mRefreshStop = false; mStart = true; @@ -205,11 +200,11 @@ class LauncherCardRefresher { mRefreshStop = true; mStart = false; mHandler.removeMessages( MSG_INDUCE ); - mHandler.removeMessages( MSG_EXPLORER_WAY_OR_ONLINE_CAR_DATA ); mHandler.removeMessages( MSG_REFRESH_DEFAULT_CARD ); mHandler.removeMessages( MSG_START_LOOP_DEFAULT_CARD ); mHandler.removeMessages( MSG_REFRESH_ADVERTISEMENT ); mHandler.removeMessages( MSG_LOAD_NET_CONFIG ); + mHandler.removeMessages( MSG_WAIT_NETWORK ); Logger.d( TAG, "stop" ); } @@ -234,8 +229,6 @@ class LauncherCardRefresher { if ( mAdvertisements != null && !mAdvertisements.isEmpty() ) { loopRenderAdvertisements( 0 ); startNextRefreshStrategy(); - } else { - handleRefreshExplorerWayOrOnlineCarMsg(); } } @@ -246,104 +239,10 @@ class LauncherCardRefresher { restart(); } - private void handleRefreshExplorerWayOrOnlineCarMsg() { - - int counter = SharedPrefsMgr.getInstance( mContext ).getInt( KEY_LauncherCardExplorerWayAndOnlineCarTipCounter, 0 ); - if ( counter >= 1 ) { - long lastTipTime = SharedPrefsMgr.getInstance( mContext ).getLong( KEY_LauncherCardExplorerWayAndOnlineCarTipLastTipTime, 0L ); - if ( System.currentTimeMillis() - lastTipTime < 3 * ONE_DAY ) { - return; - } else { - SharedPrefsMgr.getInstance( mContext ).putInt( KEY_LauncherCardExplorerWayAndOnlineCarTipCounter, 0 ); - counter = 0; - SharedPrefsMgr.getInstance( mContext ).putLong( KEY_LauncherCardExplorerWayAndOnlineCarTipLastTipTime, 0L ); - } - } - SharedPrefsMgr.getInstance( mContext ).putInt( KEY_LauncherCardExplorerWayAndOnlineCarTipCounter, ++counter ); - SharedPrefsMgr.getInstance( mContext ).putLong( KEY_LauncherCardExplorerWayAndOnlineCarTipLastTipTime, System.currentTimeMillis() ); - - MogoLocation location = MarkerServiceHandler.getMogoLocationClient().getLastKnowLocation(); - if ( location == null ) { - restart(); - return; - } - mMsgExplorerWayOrOnlineCarDataCounter++; - if ( mMsgExplorerWayOrOnlineCarDataCounter > 1 ) { - return; - } - - String type = SharedPrefsMgr.getInstance( mContext ).getString( KEY_LauncherCardExplorerWayAndOnlineCarTipLastTipType, LauncherCardRefreshType.ExploreWay.name() ); - LauncherCardRefreshType strategy = LauncherCardRefreshType.valueOf( type ); - mRefreshStrategy.setType( strategy ); - SharedPrefsMgr.getInstance( mContext ).putString( KEY_LauncherCardExplorerWayAndOnlineCarTipLastTipType, mRefreshStrategy.getNextType().name() ); - - MogoLatLng latLng = new MogoLatLng( location.getLatitude(), location.getLongitude() ); - handleRefreshExplorerWayOrOnlineCarData( latLng, mRefreshStrategy.getType() ); - } - - private void handleRefreshExplorerWayOrOnlineCarData( MogoLatLng latLng, LauncherCardRefreshType type ) { - mRefreshModel.refreshLauncherCardDataSync( latLng, - mRefreshStrategy.getRadius(), - mRefreshStrategy.getLimit(), - new RefreshCallback< MarkerResponse >() { - @Override - public void onSuccess( MarkerResponse response ) { - notifyRefreshChanged( type, response ); - startNextRefreshStrategy(); - } - - @Override - public void onFail() { - startNextRefreshStrategy(); - } - } ); - } - - - private boolean notifyRefreshChanged( LauncherCardRefreshType type, MarkerResponse response ) { - if ( response == null || response.getResult() == null ) { - return false; - } - String tts = mContext.getString( R.string.module_service_launcher_card_tips ); - String info = mContext.getString( R.string.module_service_launcher_card_info ); - - LauncherCardRefreshType target = null; - int size = 0; - if ( type == LauncherCardRefreshType.ExploreWay ) { - if ( response.getResult().getExploreWay() != null && !response.getResult().getExploreWay().isEmpty() ) { - target = type; - size = response.getResult().getExploreWay().size(); - } else if ( response.getResult().getOnlineCar() != null && !response.getResult().getOnlineCar().isEmpty() ) { - target = LauncherCardRefreshType.OnlineCar; - size = response.getResult().getOnlineCar().size(); - } - } else if ( type == LauncherCardRefreshType.OnlineCar ) { - if ( response.getResult().getOnlineCar() != null && !response.getResult().getOnlineCar().isEmpty() ) { - target = type; - size = response.getResult().getOnlineCar().size(); - } else if ( response.getResult().getExploreWay() != null && !response.getResult().getExploreWay().isEmpty() ) { - target = LauncherCardRefreshType.ExploreWay; - size = response.getResult().getExploreWay().size(); - } - } - - Logger.d( TAG, "返回数据情况:道路事件:%s, 车友: %s", response.getResult().getExploreWay() == null ? 0 : response.getResult().getExploreWay().size(), - response.getResult().getOnlineCar() == null ? 0 : response.getResult().getOnlineCar().size() ); - - if ( size == 0 ) { - return false; - } - - if ( target != type ) { - mRefreshStrategy.next();// 本次请求到的数据类型和播报类型不一致,则下次再次请求本次类型~ - } - - speakTTS( tts = String.format( tts, size, target.desc ), true ); - notifyRefreshChanged( String.format( info, size, target.desc ), size, tts ); - return true; - } - private void speakTTS( String msg, boolean checkAppForeground ) { + if ( TextUtils.isEmpty( msg ) ) { + return; + } if ( checkAppForeground ) { if ( AppUtils.isAppForeground( mContext ) ) { return; @@ -427,6 +326,14 @@ class LauncherCardRefresher { * 请求广告数据 */ private void loadNetworkConfigStrategy() { + loadAdvertisementConfig(); + requestTtsStrategyConfig(); + } + + /** + * 请求广告数据 + */ + private void loadAdvertisementConfig() { final Map< String, Object > query = new ParamsProvider.Builder( mContext ) .append( "modelType", 30 ) .build(); @@ -460,9 +367,238 @@ class LauncherCardRefresher { Logger.e( TAG, "获取配置失败 msg = %s, code = %s", message, code ); } } ); - } + /** + * 请求花式的tts播报内容 + */ + private void requestTtsStrategyConfig() { + + String name = SharedPrefsMgr.getInstance( mContext ).getString( KEY_LAST_LOAD_TTS_TYPE, LauncherCardRefreshType.Weather.name() ); + LauncherCardRefreshType type = LauncherCardRefreshType.valueOf( name ); + + MogoLocation location = MogoApisHandler.getInstance().getApis().getMapServiceApi().getSingletonLocationClient( mContext ).getLastKnowLocation(); + TtsConfigBody body = new TtsConfigBody() + .addType( LauncherCardRefreshType.NearRoads.getVal() ) + .addType( LauncherCardRefreshType.News.getVal() ) + .addType( LauncherCardRefreshType.ExplorerWay.getVal() ) + .addType( LauncherCardRefreshType.Weather.getVal() ) + .sn( Utils.getSn() ) + .location( new MogoLatLng( location.getLatitude(), location.getLongitude() ) ); + final Map< String, Object > query = new ParamsProvider.Builder( mContext ) + .append( "data", GsonUtil.jsonFromObject( body ) ) + .build(); + mRefreshModel.getRefreshApiService().queryBroadCastInfo( query ) + .subscribeOn( Schedulers.io() ) + .observeOn( AndroidSchedulers.mainThread() ) + .subscribe( new SubscribeImpl< TtsConfigData >( RequestOptions.create( mContext ) ) { + @Override + public void onError( Throwable e ) { + super.onError( e ); + } + + @Override + public void onSuccess( TtsConfigData data ) { + super.onSuccess( data ); + if ( data == null || data.result == null ) { + Logger.d( TAG, "获取数据为空" ); + return; + } + handleTtsConfig( data, type ); + } + + @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 ); + } + } ); + } + + + /** + * 策略: + * 优先车辆限行 + * 剩下的按顺序播报 + * + * @param data + */ + private void handleTtsConfig( TtsConfigData data, LauncherCardRefreshType type ) { + List< TtsConfigData.TrafficRestriction > trafficRestrictions = data.result.trafficRestriction; + if ( trafficRestrictions != null && !trafficRestrictions.isEmpty() ) { + for ( TtsConfigData.TrafficRestriction trafficRestriction : trafficRestrictions ) { + if ( trafficRestriction == null || TextUtils.isEmpty( trafficRestriction.tts ) ) { + continue; + } + speakTTS( trafficRestriction.tts, false ); + return; + } + } + + TtsConfigNode weather = new TtsConfigNode( data.result.weather, LauncherCardRefreshType.Weather ); + TtsConfigNode news = new TtsConfigNode( data.result.news, LauncherCardRefreshType.News ); + TtsConfigNode nearRoads = new TtsConfigNode( data.result.nearRoads, LauncherCardRefreshType.NearRoads ); + TtsConfigNode explorerWay = new TtsConfigNode( data.result.friendAndPois, LauncherCardRefreshType.ExplorerWay ); + TtsConfigNode onlineCar = new TtsConfigNode( data.result.friendAndPois, LauncherCardRefreshType.OnlineCar ); + + weather.next = news; + news.next = nearRoads; + nearRoads.next = explorerWay; + explorerWay.next = onlineCar; + onlineCar.next = weather; + + TtsConfigNode header = null; + switch ( type ) { + case News: + header = news; + break; + case NearRoads: + header = nearRoads; + break; + case OnlineCar: + header = onlineCar; + break; + case Weather: + header = weather; + break; + case ExplorerWay: + header = explorerWay; + break; + } + + TtsConfigNode pointer = header; + + do { + if ( handleTtsNode( pointer ) ) { + writeNextLoadType( pointer.type ); + return; + } + pointer = pointer.next; + } while ( pointer != header ); + } + + /** + * 处理每个配置项 + * + * @param node + * @return + */ + private boolean handleTtsNode( TtsConfigNode node ) { + if ( node.data == null || node.data.isEmpty() ) { + return false; + } + for ( Object datum : node.data ) { + boolean result = false; + if ( datum instanceof TtsConfigData.Weather ) { + result = handleWeatherTtsConfig( ( ( TtsConfigData.Weather ) datum ) ); + } else if ( datum instanceof TtsConfigData.News ) { + result = handleNewsTtsConfig( ( ( TtsConfigData.News ) datum ) ); + } else if ( datum instanceof TtsConfigData.NearRoads ) { + result = handleNearRoadsTtsConfig( ( ( TtsConfigData.NearRoads ) datum ) ); + } else if ( datum instanceof TtsConfigData.OnlineCarVsExplorerWay ) { + result = handleExplorerWayTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + if ( !result ) { + result = handleOnlineCarTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + } + } + if ( result ) { + return true; + } + } + + return false; + } + + /** + * 天气 + * + * @param weather + * @return + */ + private boolean handleWeatherTtsConfig( TtsConfigData.Weather weather ) { + if ( weather == null ) { + return false; + } + speakTTS( weather.tts, false ); + return true; + } + + /** + * 新闻 + * + * @param news + * @return + */ + private boolean handleNewsTtsConfig( TtsConfigData.News news ) { + if ( news == null ) { + return false; + } + speakTTS( news.tts, false ); + return true; + } + + /** + * 常走道路 + * + * @param nearRoads + * @return + */ + private boolean handleNearRoadsTtsConfig( TtsConfigData.NearRoads nearRoads ) { + if ( nearRoads == null ) { + return false; + } + speakTTS( nearRoads.tts, false ); + return true; + } + + /** + * 道路事件 + * + * @param explorerWay + * @return + */ + private boolean handleExplorerWayTtsConfig( TtsConfigData.OnlineCarVsExplorerWay explorerWay ) { + if ( explorerWay == null || explorerWay.pois == 0 ) { + return false; + } + String tts = mContext.getString( R.string.module_service_launcher_card_tips ); + String info = mContext.getString( R.string.module_service_launcher_card_info ); + speakTTS( String.format( tts, explorerWay.pois, LauncherCardRefreshType.ExplorerWay.getDesc() ), false ); + notifyRefreshChanged( String.format( info, explorerWay.pois, LauncherCardRefreshType.ExplorerWay ), explorerWay.pois, tts ); + return true; + } + + /** + * 车友 + * + * @param onlineCar + * @return + */ + private boolean handleOnlineCarTtsConfig( TtsConfigData.OnlineCarVsExplorerWay onlineCar ) { + if ( onlineCar == null || onlineCar.friends == 0 ) { + return false; + } + String tts = mContext.getString( R.string.module_service_launcher_card_tips ); + String info = mContext.getString( R.string.module_service_launcher_card_info ); + speakTTS( String.format( tts, onlineCar.friends, LauncherCardRefreshType.OnlineCar.getDesc() ), false ); + notifyRefreshChanged( String.format( info, onlineCar.friends, LauncherCardRefreshType.OnlineCar ), onlineCar.friends, tts ); + return true; + } + + /** + * 保存下次需要首先播报的内容类型 + * + * @param type + */ + private void writeNextLoadType( LauncherCardRefreshType type ) { + SharedPrefsMgr.getInstance( mContext ).putString( KEY_LAST_LOAD_TTS_TYPE, type.getNext() ); + Logger.d( TAG, "本次播报:%s,下次播报:%s", type.getVal(), LauncherCardRefreshType.valueOf( type.getNext() ).getVal() ); + } + + private void refreshTicket() { mRefreshTicketCounter++; Logger.d( TAG, "刷新ticket" ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/TtsConfigNode.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/TtsConfigNode.java new file mode 100644 index 0000000000..49a036fb8d --- /dev/null +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/TtsConfigNode.java @@ -0,0 +1,22 @@ +package com.mogo.module.service.launchercard; + +import java.util.List; + +public +/** + * @author congtaowang + * @since 2020/11/17 + *

+ * 描述 + */ +class TtsConfigNode { + + public List data; + public LauncherCardRefreshType type; + public TtsConfigNode next; + + public TtsConfigNode( List data, LauncherCardRefreshType type ) { + this.data = data; + this.type = type; + } +} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index ef33efad2a..973f050324 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -288,7 +288,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } // 解析不同的Marker类型,然后对应的进行绘制 - Logger.d( TAG, "draw marker" ); mLastDataResult = response.getResult(); UiThreadHandler.post( () -> { @@ -419,7 +418,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, String sn = getPrimaryKeyFromEntity( markerExploreWay ); IMogoMarker mogoMarker = existCarMap.get( sn ); if ( mogoMarker == null || mogoMarker.isDestroyed() ) { - Logger.d( TAG, "draw road condition, sn = %s", sn ); try { if ( DebugConfig.isRoadEventAnimated() ) { post2AddAndStartAnimation( markerShowEntity, i * 100L ); @@ -472,7 +470,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, */ private Map< String, IMogoMarker > purgeMarkerData( List newList, String markerType ) { - final long start = System.currentTimeMillis(); Map< String, IMogoMarker > existMap = new HashMap<>(); List< IMogoMarker > allCarsList = MarkerServiceHandler.getMarkerManager().getMarkers( markerType ); if ( allCarsList == null || allCarsList.isEmpty() ) { @@ -501,7 +498,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } } allMap.clear(); - Logger.i( "timer", "purge data cost " + ( System.currentTimeMillis() - start ) + "ms" ); return existMap; } @@ -742,7 +738,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if ( ignoreDrawRequest() ) { return; } - Logger.d( TAG, "接收到了地图大而全数据" ); runOnTargetThread( () -> { drawMapMarker( response ); } ); @@ -776,7 +771,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, private Runnable runnable = new Runnable() { @Override public void run() { - Logger.d( TAG, "内部 - 自动刷新在线车辆" ); getOnlineCarDataImpl( mCarLatLng, false, false, ServiceConst.ONLINE_SEARCH_LIMIT, ServiceConst.ONLINE_SEARCH_RADIUS, false ); } }; @@ -813,20 +807,15 @@ public class MapMarkerManager implements IMogoMarkerClickListener, mCarLatLng = latLng; } - Logger.d( TAG, "内部 - 请求执行" ); - if ( latLng == null ) { - Logger.d( TAG, "内部 - 定位为空" ); return; } if ( ignoreOnlineCarRequest() ) { - Logger.d( TAG, "内部 - 忽略请求" ); removeCarMarkers(); return; } - Logger.d( TAG, "内部 - 请求开始" ); mRefreshModel.queryOnLineCarWithRoute( latLng, onlyFocus, onlySameCity, radius, limit, false, new RefreshCallback() { @Override public void onSuccess( Object o ) { @@ -851,9 +840,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, ); } - Logger.d( TAG, "内部 - 请求完毕" ); runOnTargetThread( () -> { - Logger.d( TAG, "内部 - 请求完毕开始处理" ); trackData( size ); drawOnlineCarMarkers( onlineCarList, Integer.MAX_VALUE, fitBounds, fitBounds, mMarkerDisplayBounds, latLng ); UiThreadHandler.postDelayed( runnable, SMOOTH_DURATION * 1000 ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshApiService.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshApiService.java index 3076af4be6..9827e26941 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshApiService.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshApiService.java @@ -4,6 +4,7 @@ import com.mogo.commons.data.BaseData; import com.mogo.module.common.entity.MarkerResponse; import com.mogo.module.service.network.bean.DemoUserInfoEntity; import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushResponse; +import com.mogo.module.service.network.bean.TtsConfigData; import java.util.Map; @@ -40,6 +41,10 @@ public interface RefreshApiService { Observable< DemoUserInfoEntity > getMockUsers(); @FormUrlEncoded - @POST("/yycp-travel-condition/trajectoryPrediction/calculationNotHomeCompanyDistanceForPush") - Observable< HomeCompanyDistanceForPushResponse > calculationNotHomeCompanyDistanceForPush( @FieldMap Map< String, Object > parameters); + @POST( "/yycp-travel-condition/trajectoryPrediction/calculationNotHomeCompanyDistanceForPush" ) + Observable< HomeCompanyDistanceForPushResponse > calculationNotHomeCompanyDistanceForPush( @FieldMap Map< String, Object > parameters ); + + @FormUrlEncoded + @POST( "/yycp-launcherSnapshot/appCard/queryBroadCastInfo" ) + Observable< TtsConfigData > queryBroadCastInfo( @FieldMap Map< String, Object > parameters ); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java index a5e0c91888..0d5ef1a795 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java @@ -34,10 +34,10 @@ public class RefreshModel { private static final String TAG = "RefreshModel"; - public static final String HOST_DEV = "http://dzt-test.zhidaohulian.com"; - public static final String HOST_TEST = "http://dzt-test.zhidaohulian.com"; - public static final String HOST_DEMO = "http://dzt-show.zhidaohulian.com"; - public static final String HOST_PRODUCT = "https://dzt.zhidaohulian.com"; + public static final String HOST_DEV = "http://dzt-test.zhidaozhixing.com"; + public static final String HOST_TEST = "http://dzt-test.zhidaozhixing.com"; + public static final String HOST_DEMO = "http://dzt-show.zhidaozhixing.com"; + public static final String HOST_PRODUCT = "http://dzt.zhidaozhixing.com"; private final Context mContext; private RefreshApiService mRefreshApiService; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigBody.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigBody.java new file mode 100644 index 0000000000..fe77070090 --- /dev/null +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigBody.java @@ -0,0 +1,75 @@ +package com.mogo.module.service.network.bean; + +import android.os.Parcel; +import android.os.Parcelable; + +import com.mogo.map.MogoLatLng; + +import java.util.ArrayList; +import java.util.List; + +public +/** + * @author congtaowang + * @since 2020/11/17 + * + * 请求参数 + */ +class TtsConfigBody implements Parcelable { + + private MogoLatLng location; + private List< String > dataType; + private String sn; + + public TtsConfigBody addType( String type ) { + if ( dataType == null ) { + dataType = new ArrayList<>(); + } + dataType.add( type ); + return this; + } + + public TtsConfigBody sn( String sn ) { + this.sn = sn; + return this; + } + + public TtsConfigBody location( MogoLatLng location ) { + this.location = location; + return this; + } + + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel( Parcel dest, int flags ) { + dest.writeParcelable( this.location, flags ); + dest.writeStringList( this.dataType ); + dest.writeString( this.sn ); + } + + public TtsConfigBody() { + } + + protected TtsConfigBody( Parcel in ) { + this.location = in.readParcelable( MogoLatLng.class.getClassLoader() ); + this.dataType = in.createStringArrayList(); + this.sn = in.readString(); + } + + public static final Creator< TtsConfigBody > CREATOR = new Creator< TtsConfigBody >() { + @Override + public TtsConfigBody createFromParcel( Parcel source ) { + return new TtsConfigBody( source ); + } + + @Override + public TtsConfigBody[] newArray( int size ) { + return new TtsConfigBody[size]; + } + }; +} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigData.java new file mode 100644 index 0000000000..43cac9bf43 --- /dev/null +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigData.java @@ -0,0 +1,89 @@ +package com.mogo.module.service.network.bean; + +import com.google.gson.annotations.SerializedName; +import com.mogo.commons.data.BaseData; + +import java.util.List; + +public +/** + * @author congtaowang + * @since 2020/11/17 + * + * 描述 + */ +class TtsConfigData extends BaseData { + + public Result result; + + public static class Result { + public String sn; + public List< String > dataType; + public List< Weather > weather; + public List< News > news; + public List< NearRoads > nearRoads; + public List< TrafficRestriction > trafficRestriction; + public List< OnlineCarVsExplorerWay > friendAndPois; + } + + public static class BaseConfig { + public String tts; + } + + public static class Weather extends BaseConfig { + + public String time; + public String date; + public String ymd; + public String week; + public String sunrise; + public String high; + public String low; + public String sunset; + public int aqi; + public String fx; + public String fl; + public String type; + public String notice; + } + + public static class News extends BaseConfig { + + public String title; + public String content; + @SerializedName( "img_width" ) + public String imgWidth; + @SerializedName( "full_title" ) + public String fullTitle; + @SerializedName( "pdate" ) + public String time; + public String src; + @SerializedName( "img_length" ) + public String imgLength; + public String img; + public String url; + @SerializedName( "pdate_src" ) + public String date; + } + + public static class NearRoads extends BaseConfig { + + } + + public static class TrafficRestriction extends BaseConfig { + } + + public static class OnlineCarVsExplorerWay extends BaseConfig { + + /** + * 车友数量 + */ + public int friends; + + /** + * 道路事件数量 + */ + public int pois; + } + +} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigEntity.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigEntity.java new file mode 100644 index 0000000000..7d79407bb7 --- /dev/null +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigEntity.java @@ -0,0 +1,32 @@ +package com.mogo.module.service.network.bean; + +import com.mogo.commons.data.BaseData; + +/** + * @author :zhuangyan + * @date : 2020/11/17 11:43 + * @desc :分体机tts播报信息返回 + */ +public class TtsConfigEntity extends BaseData { + public Result result; + + public Result getResult() { + return result; + } + + public void setResult(Result result) { + this.result = result; + } + + public static class Result { + private String word; + + public String getWord() { + return word; + } + + public void setWord(String word) { + this.word = word; + } + } +} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java index 55da33b57a..4826a8689c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java @@ -9,12 +9,15 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import com.alibaba.android.arouter.launcher.ARouter; import com.bumptech.glide.request.RequestOptions; import com.mogo.map.location.MogoLocation; +import com.mogo.module.carchattingprovider.ICarsChattingProvider; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.api.CallChatApi; import com.mogo.module.common.entity.MarkerLocation; import com.mogo.module.common.entity.MarkerOnlineCar; +import com.mogo.module.common.entity.MarkerUserInfo; import com.mogo.module.common.glide.SkinAbleBitmapTarget; import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.R; @@ -23,8 +26,11 @@ import com.mogo.utils.ResourcesHelper; import com.mogo.utils.WindowUtils; import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; +import com.zhidao.carchattingprovider.CallChattingProviderConstant; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @author congtaowang @@ -32,34 +38,50 @@ import java.util.List; *

* 描述 */ -class OnlineCarPanelAdapter extends RecyclerView.Adapter< OnlineCarPanelAdapter.VH > { +class OnlineCarPanelAdapter extends RecyclerView.Adapter { private static final String TAG = "OnlineCarPanelAdapter"; - private List< MarkerOnlineCar > mDatums; + private List mDatums; private double mToLon; private double mToLat; - public OnlineCarPanelAdapter( List< MarkerOnlineCar > mDatums, double mToLon, double mToLat ) { + public OnlineCarPanelAdapter(List mDatums, double mToLon, double mToLat) { this.mDatums = mDatums; this.mToLon = mToLon; this.mToLat = mToLat; } - public void setDatums( List< MarkerOnlineCar > mDatums ) { + public void setDatums(List mDatums) { this.mDatums = mDatums; notifyDataSetChanged(); } @NonNull @Override - public OnlineCarPanelAdapter.VH onCreateViewHolder( @NonNull ViewGroup parent, int viewType ) { - return new VH( LayoutInflater.from( parent.getContext() ).inflate( R.layout.module_services_online_car_panel_item, null ) ); + public OnlineCarPanelAdapter.VH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new VH(LayoutInflater.from(parent.getContext()).inflate(R.layout.module_services_online_car_panel_item, null)); } @Override - public void onBindViewHolder( @NonNull OnlineCarPanelAdapter.VH holder, int position ) { - holder.bind( mDatums.get( position ), mToLon, mToLat ); + public void onBindViewHolder(@NonNull OnlineCarPanelAdapter.VH holder, int position) { + holder.bind(mDatums.get(position), mToLon, mToLat); + holder.call.setOnClickListener(view -> { + //TODO 拨打电话 + Map params = new HashMap<>(); + MarkerUserInfo userInfo = mDatums.get(position).getUserInfo(); + params.put(CallChattingProviderConstant.CCPROVIDER_SN, userInfo.getSn()); + params.put(CallChattingProviderConstant.CCPROVIDER_USER_IMG, userInfo.getUserHead()); + params.put(CallChattingProviderConstant.CCPROVIDER_USER_AGE, userInfo.getAgeNumber() + ""); + params.put(CallChattingProviderConstant.CCPROVIDER_NICK_NAME, userInfo.getUserName()); + params.put(CallChattingProviderConstant.CCPROVIDER_USER_SEX, userInfo.getGender() + ""); + MarkerLocation location = mDatums.get(position).getLocation(); + params.put(CallChattingProviderConstant.CCPROVIDER_ADDRESS, location.getAddress()); + params.put(CallChattingProviderConstant.CCPROVIDER_LAT, location.getLat() + ""); + params.put(CallChattingProviderConstant.CCPROVIDER_LON, location.getLon() + ""); + ICarsChattingProvider carChatting = MarkerServiceHandler.getCarChatting(); + carChatting.call(params); + }); } @Override @@ -73,43 +95,50 @@ class OnlineCarPanelAdapter extends RecyclerView.Adapter< OnlineCarPanelAdapter. private TextView nickname; private TextView distance; private TextView detail; + private TextView call; - public VH( @NonNull View itemView ) { - super( itemView ); - RecyclerView.LayoutParams params = new RecyclerView.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT ); - params.bottomMargin = ResourcesHelper.getDimensionPixelSize( itemView.getContext(), R.dimen.module_services_panel_item_marginBottom ); - itemView.setLayoutParams( params ); - avatar = itemView.findViewById( R.id.module_services_id_panel_item_avatar ); - nickname = itemView.findViewById( R.id.module_services_id_panel_item_nickname ); - distance = itemView.findViewById( R.id.module_services_id_panel_item_distance ); - detail = itemView.findViewById( R.id.module_services_id_panel_item_detail ); + public VH(@NonNull View itemView) { + super(itemView); + RecyclerView.LayoutParams params = new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); + params.bottomMargin = ResourcesHelper.getDimensionPixelSize(itemView.getContext(), R.dimen.module_services_panel_item_marginBottom); + itemView.setLayoutParams(params); + avatar = itemView.findViewById(R.id.module_services_id_panel_item_avatar); + nickname = itemView.findViewById(R.id.module_services_id_panel_item_nickname); + distance = itemView.findViewById(R.id.module_services_id_panel_item_distance); + detail = itemView.findViewById(R.id.module_services_id_panel_item_detail); + call = itemView.findViewById(R.id.module_services_id_panel_item_call); } - public void bind( MarkerOnlineCar car, double lon, double lat ) { - RequestOptions options = new RequestOptions().circleCrop().placeholder( R.drawable.module_common_default_user_head ).error( R.drawable.module_common_default_user_head ); - GlideApp.with( itemView.getContext() ).asBitmap().apply( options ).load( car.getUserInfo().getUserHead() ).into( new SkinAbleBitmapTarget( avatar, options ) ); - nickname.setText( car.getUserInfo().getUserName() ); - String content = getDistanceStr( car.getLocation(), lon, lat ); - distance.setText( content ); - detail.setOnClickListener( view -> { - MogoApisHandler.getInstance().getApis().getAnalyticsApi().track( "Mogoer_List_click", null ); + public void bind(MarkerOnlineCar car, double lon, double lat) { + RequestOptions options = new RequestOptions().circleCrop().placeholder(R.drawable.module_common_default_user_head).error(R.drawable.module_common_default_user_head); + GlideApp.with(itemView.getContext()).asBitmap().apply(options).load(car.getUserInfo().getUserHead()).into(new SkinAbleBitmapTarget(avatar, options)); + nickname.setText(car.getUserInfo().getUserName()); + String content = getDistanceStr(car.getLocation(), lon, lat); + distance.setText(content); + detail.setOnClickListener(view -> { + MogoApisHandler.getInstance().getApis().getAnalyticsApi().track("Mogoer_List_click", null); try { - CallChatApi.getInstance().showUserWindow( itemView.getContext(), car ); - } catch ( Exception e ) { - Logger.e( TAG, e, "detail.OnClick" ); + CallChatApi.getInstance().showUserWindow(itemView.getContext(), car); + } catch (Exception e) { + Logger.e(TAG, e, "detail.OnClick"); } - } ); + }); +// call.setOnClickListener(view -> { +// //TODO 拨打电话 +// +// +// }); } - private String getDistanceStr( MarkerLocation location, double lon, double lat ) { - if ( location == null ) { + private String getDistanceStr(MarkerLocation location, double lon, double lat) { + if (location == null) { return "未知"; } - float distance = Utils.calculateLineDistance( location.getLon(), location.getLat(), lon, lat ); - if ( distance >= 1000 ) { - return String.format( "%.1fKM", distance / 1000 ); + float distance = Utils.calculateLineDistance(location.getLon(), location.getLat(), lon, lat); + if (distance >= 1000) { + return String.format("%.1f千米", distance / 1000); } else { - return String.format( "%.1fM", distance ); + return String.format("%.1f米", distance); } } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java index 1c69e2f5ed..8ae15c040c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java @@ -104,16 +104,17 @@ public class CarIconDisplayStrategy { private static volatile CarIconDisplayStrategy sInstance; private IMogoMarker mSeekHelpingMarker; - private ArrayList< Bitmap > mBitmapFrames = new ArrayList<>(); + private ArrayList mBitmapFrames = new ArrayList<>(); private CarIconDisplayStrategy() { - mOption = new CarCursorOption.Builder().carCursorRes( R.drawable.module_service_ic_seek_helping ).build(); + mOption = + new CarCursorOption.Builder().carCursorRes(R.drawable.module_service_ic_seek_helping).build(); } public static CarIconDisplayStrategy getInstance() { - if ( sInstance == null ) { - synchronized ( CarIconDisplayStrategy.class ) { - if ( sInstance == null ) { + if (sInstance == null) { + synchronized (CarIconDisplayStrategy.class) { + if (sInstance == null) { sInstance = new CarIconDisplayStrategy(); } } @@ -127,19 +128,41 @@ public class CarIconDisplayStrategy { private Handler mSeekHelpingHandler; private CarCursorOption mOption; + private MogoMarkerOptions seekHelpMarkerOptions; +// private IMogoMarker seekHelpMarker; - public void changeCarIconStatus( boolean seekHelpingStatus ) { - if ( CarSeries.isF8xxSeries() ) { - if ( seekHelpingStatus ) { + + public void changeCarIconStatus(boolean seekHelpingStatus) { + if (CarSeries.isF8xxSeries()) { + if (seekHelpingStatus) { playSeekHelpingAnim(); } else { stopSeekHelpingAnim(); } } else { - if ( seekHelpingStatus ) { - MarkerServiceHandler.getMapUIController().setCarCursorOption( mOption ); + if (seekHelpingStatus) { + MarkerServiceHandler.getMapUIController().showMyLocation(false); + mSeekHelpingMarker = MarkerServiceHandler.getMarkerManager().addMarker( + TAG, + new MogoMarkerOptions() + .icon(BitmapFactory.decodeResource(AbsMogoApplication.getApp().getResources(), R.drawable.module_service_ic_seek_helping)) + .period(1) + .zIndex(1000) + .autoManager(false) + .anchor(0.5f, 0.5f) + .position(MarkerServiceHandler.getMapService().getNavi(AbsMogoApplication.getApp()).getCarLocation2())); +// MarkerServiceHandler.getMapUIController().setCarCursorOption( mOption ); } else { - MarkerServiceHandler.getMapUIController().setCarCursorOption( null ); + MarkerServiceHandler.getMapUIController().showMyLocation(true); + try { + if (mSeekHelpingMarker != null) { + mSeekHelpingMarker.destroy(); + mSeekHelpingMarker = null; + } + } catch (Exception e) { + e.printStackTrace(); + } +// MarkerServiceHandler.getMapUIController().setCarCursorOption(null); } } } @@ -148,29 +171,29 @@ public class CarIconDisplayStrategy { initHandler(); Message msg = Message.obtain(); msg.what = MSG_SEEK_HELPING_ANIM; - mSeekHelpingHandler.sendMessageDelayed( msg, 0 ); + mSeekHelpingHandler.sendMessageDelayed(msg, 0); } private void initHandler() { - if ( mSeekHelpingHandler != null ) { + if (mSeekHelpingHandler != null) { return; } - mSeekHelpingHandler = new Handler( WorkThreadHandler.getInstance().getLooper() ) { + mSeekHelpingHandler = new Handler(WorkThreadHandler.getInstance().getLooper()) { @Override - public void handleMessage( Message msg ) { - super.handleMessage( msg ); - switch ( msg.what ) { + public void handleMessage(Message msg) { + super.handleMessage(msg); + switch (msg.what) { case MSG_SEEK_HELPING_ANIM: try { playAnim(); - } catch ( Exception e ) { + } catch (Exception e) { e.printStackTrace(); } break; case MSG_STOP_SEEK_HELPING_ANIM: try { stopAnim(); - } catch ( Exception e ) { + } catch (Exception e) { e.printStackTrace(); } break; @@ -183,48 +206,59 @@ public class CarIconDisplayStrategy { initHandler(); Message msg = Message.obtain(); msg.what = MSG_STOP_SEEK_HELPING_ANIM; - mSeekHelpingHandler.sendMessageDelayed( msg, 0 ); + mSeekHelpingHandler.sendMessageDelayed(msg, 0); } private void playAnim() { try { - for ( int i : sFrame ) { - mBitmapFrames.add( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), i ) ); + for (int i : sFrame) { + mBitmapFrames.add(BitmapFactory.decodeResource(AbsMogoApplication.getApp().getResources(), i)); } - mSeekHelpingMarker = MarkerServiceHandler.getMarkerManager().addMarker( TAG, new MogoMarkerOptions() - .icons( mBitmapFrames ) - .period( 1 ) - .zIndex( 1000 ) - .autoManager( false ) - .anchor( 0.5f, 0.5f ) - .position( MarkerServiceHandler.getMapService().getNavi( AbsMogoApplication.getApp() ).getCarLocation2() ) ); - } catch ( Exception e ) { - MarkerServiceHandler.getMapUIController().setCarCursorOption( new CarCursorOption.Builder().carCursorRes( R.drawable.module_service_ic_seek_helping_00036 ).build() ); + mSeekHelpingMarker = MarkerServiceHandler.getMarkerManager().addMarker(TAG, + new MogoMarkerOptions() + .icons(mBitmapFrames) + .period(1) + .zIndex(1000) + .autoManager(false) + .anchor(0.5f, 0.5f) + .position(MarkerServiceHandler.getMapService().getNavi(AbsMogoApplication.getApp()).getCarLocation2())); + } catch (Exception e) { + e.printStackTrace(); + mSeekHelpingMarker = MarkerServiceHandler.getMarkerManager().addMarker( + TAG, + new MogoMarkerOptions() + .icon(BitmapFactory.decodeResource(AbsMogoApplication.getApp().getResources(), R.drawable.module_service_ic_seek_helping)) + .period(1) + .zIndex(1000) + .autoManager(false) + .anchor(0.5f, 0.5f) + .position(MarkerServiceHandler.getMapService().getNavi(AbsMogoApplication.getApp()).getCarLocation2())); +// MarkerServiceHandler.getMapUIController().setCarCursorOption(new CarCursorOption.Builder().carCursorRes(R.drawable.module_service_ic_seek_helping_00036).build()); } - MarkerServiceHandler.getMapUIController().showMyLocation( false ); + MarkerServiceHandler.getMapUIController().showMyLocation(false); } private void stopAnim() { try { - if ( mSeekHelpingMarker != null ) { + if (mSeekHelpingMarker != null) { mSeekHelpingMarker.destroy(); mSeekHelpingMarker = null; } - } catch ( Exception e ) { + } catch (Exception e) { } try { - if ( !mBitmapFrames.isEmpty() ) { - for ( Bitmap bitmapFrame : mBitmapFrames ) { - if ( bitmapFrame != null && !bitmapFrame.isRecycled() ) { + if (!mBitmapFrames.isEmpty()) { + for (Bitmap bitmapFrame : mBitmapFrames) { + if (bitmapFrame != null && !bitmapFrame.isRecycled()) { bitmapFrame.recycle(); } } mBitmapFrames.clear(); } - } catch ( Exception e ) { + } catch (Exception e) { } - MarkerServiceHandler.getMapUIController().showMyLocation( true ); + MarkerServiceHandler.getMapUIController().showMyLocation(true); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java new file mode 100644 index 0000000000..bc153322dd --- /dev/null +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java @@ -0,0 +1,26 @@ +package com.mogo.module.service.ttsConfig; + +import com.mogo.commons.data.BaseData; +import com.mogo.module.service.network.bean.TtsConfigEntity; + +import java.util.Map; + +import io.reactivex.Observable; +import retrofit2.http.FieldMap; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; +import retrofit2.http.POST; + +/** + * @author :zhuangyan + * @date : 2020/11/16 15:09 + * @desc : + */ +public interface TtsConfigApiService { + /** + * 查询语音Tts 的 + * + */ + @GET("/yycp-carDataService/car/ttsWord/no/getTTSWord/v1") + Observable inquireForTts(); +} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java new file mode 100644 index 0000000000..f8c20811d4 --- /dev/null +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java @@ -0,0 +1,71 @@ +package com.mogo.module.service.ttsConfig; + +import android.text.TextUtils; +import android.util.Log; + +import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.commons.debug.DebugConfig; +import com.mogo.commons.network.SubscribeImpl; +import com.mogo.commons.voice.AIAssist; +import com.mogo.module.service.network.RefreshModel; +import com.mogo.module.service.network.bean.TtsConfigEntity; +import com.mogo.service.MogoServicePaths; +import com.mogo.service.network.IMogoNetwork; +import com.mogo.utils.network.RequestOptions; + +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.schedulers.Schedulers; + +import static com.mogo.commons.AbsMogoApplication.getApp; + +/** + * @author :zhuangyan + * @date : 2020/11/16 15:04 + * @desc : + */ +public class TtsConfigModleData { + private static final String TAG = "TrafficModelData"; + private final TtsConfigApiService mTtsConfigApiService; + + + public TtsConfigModleData() { + IMogoNetwork network = (IMogoNetwork) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_NETWORK).navigation(getApp().getApplicationContext()); + mTtsConfigApiService = network.create(TtsConfigApiService.class, RefreshModel.getNetHost()); + } + + /** + * 独立app根据后台配置 播放tts + * + * @param + * @param + * @param + */ + public void playTts() { + + if (DebugConfig.isLauncher()) { + return; + } + mTtsConfigApiService.inquireForTts() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new SubscribeImpl(RequestOptions.create(getApp().getApplicationContext())) { + @Override + public void onError(Throwable e) { + super.onError(e); + Log.e("zytest", e.toString()); + + } + + @Override + public void onSuccess(TtsConfigEntity o) { + super.onSuccess(o); + Log.e("zytest", "播放语音了====" + o.getResult().getWord()); + if (!TextUtils.isEmpty(o.getResult().getWord())) { + AIAssist.getInstance(getApp().getApplicationContext()).speakTTSVoice(o.getResult().getWord()); + } + } + }); + + } + +} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java new file mode 100644 index 0000000000..9e546142c0 --- /dev/null +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java @@ -0,0 +1,35 @@ +package com.mogo.module.service.ttsConfig; + +import android.content.Context; +import android.text.TextUtils; +import android.util.Log; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.alibaba.android.arouter.facade.template.IProvider; +import com.mogo.commons.voice.AIAssist; +import com.mogo.module.service.ServiceConst; +import com.mogo.module.service.network.RefreshCallback; +import com.mogo.module.service.network.bean.TtsConfigEntity; + +/** + * @author :zhuangyan + * @date : 2020/11/16 15:01 + * @desc :进入页面的时候 根据配置 播放tts语音 + */ +@Route(path = ServiceConst.PATH_TTS_CONFIG) +public class TtsConfigProvider implements IProvider { + private final String TAG = "TtsConfigProvider"; + private Context mContext; + private TtsConfigModleData mTtsModleData; + + @Override + public void init(Context context) { + mContext = context; + Log.d(TAG, "TtsConfigProvider provider init……"); + if (mTtsModleData == null) { + mTtsModleData = new TtsConfigModleData(); + } + + mTtsModleData.playTts(); + } +} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeConst.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeConst.java index fd85c4e3f7..e9360d6663 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeConst.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeConst.java @@ -37,6 +37,14 @@ public class GlobalUnwakeConst { */ public static final String UNWAKE_UPLOAD_REAL_TIME_TRAFFIC = "command_upload_real_time_traffic"; + /** + * 唤醒词查询出行动态 + */ + public static final String VOICE_QUERY_HISTORY_INDEX = "com.zhidao.query.trip.event"; + /** + * 唤醒词查询周边事件 + */ + public static final String VOICE_QUERY_SURROUNDING_INDEX = "com.zhidao.query.nearby.event"; /** * 唤醒词查询热心指数 */ diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java index 97c26a9ab8..b16b7957e7 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java @@ -23,6 +23,8 @@ import static com.mogo.module.service.unwake.GlobalUnwakeConst.VOICE_CMD_PUB_ROA import static com.mogo.module.service.unwake.GlobalUnwakeConst.VOICE_CMD_PUB_TROUBLE_HELP; import static com.mogo.module.service.unwake.GlobalUnwakeConst.VOICE_CMD_SHARE_DIALOG_CLOSE; import static com.mogo.module.service.unwake.GlobalUnwakeConst.VOICE_QUERY_HEART_INDEX; +import static com.mogo.module.service.unwake.GlobalUnwakeConst.VOICE_QUERY_HISTORY_INDEX; +import static com.mogo.module.service.unwake.GlobalUnwakeConst.VOICE_QUERY_SURROUNDING_INDEX; /** * 全局免唤醒管理 @@ -48,6 +50,8 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog intentManager.registerIntentListener(VOICE_CMD_NO_REPLY_SHARE_DIALOG_CLOSE, this); intentManager.registerIntentListener(UNWAKE_UPLOAD_ROAD_CONDITION, this); intentManager.registerIntentListener(VOICE_QUERY_HEART_INDEX, this); + intentManager.registerIntentListener(VOICE_QUERY_HISTORY_INDEX, this); + intentManager.registerIntentListener(VOICE_QUERY_SURROUNDING_INDEX, this); // 免唤醒词注册,全局免唤醒 AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_REAL_TIME_TRAFFIC, @@ -68,6 +72,16 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog case UNWAKE_UPLOAD_ROAD_CONDITION: MogoApisHandler.getInstance().getApis().getShareManager().onGlobalUnwake(intentStr, intent); break; + case VOICE_QUERY_HISTORY_INDEX: + Intent startForHis = new Intent( Intent.ACTION_VIEW ); + startForHis.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); + startForHis.setData( Uri.parse( "mogo://launcher/main/switch2?type=showHistoryPanel" ) ); + context.startActivity( startForHis ); + case VOICE_QUERY_SURROUNDING_INDEX: + Intent startForSurrounding = new Intent( Intent.ACTION_VIEW ); + startForSurrounding.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); + startForSurrounding.setData( Uri.parse( "mogo://launcher/main/switch2?type=showSurroundingPanel" ) ); + context.startActivity( startForSurrounding ); case VOICE_QUERY_HEART_INDEX: Intent start = new Intent( Intent.ACTION_VIEW ); start.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml index 04abbaae72..2b4ceea7d2 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml @@ -74,7 +74,7 @@ android:textColor="@color/module_services_empty_tip_textColor" android:textSize="@dimen/module_services_empty_tip_textSize" android:textStyle="bold" - tools:text="很抱歉,目的地10km内未找到车友" /> + tools:text="很抱歉,目的地10公里内未找到车友" /> + + 你的周围有%d个%s,请点击查看,你也可以对我说打开蘑菇出行 周围有%d个%s 亲,建议您使用蘑菇出行 - 扩大到20KM半径 - 扩大到40KM半径 + 扩大到20公里半径 + 扩大到40公里半径 距离导航目的地 查看车友信息 + 电话 很抱歉,目的地%dKM内未找到车友 目的地车友 加载失败,请点击重试 diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt index 14604e5d95..497a1dd160 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt @@ -5,14 +5,11 @@ import com.mogo.commons.debug.DebugConfig class HttpConstant { companion object { - const val HOST_DEV = "http://dzt-test.zhidaohulian.com" - const val HOST_TEST = "http://dzt-test.zhidaohulian.com" - const val HOST_DEMO = "http://dzt-show.zhidaohulian.com" - const val HOST_PRODUCT = "https://dzt.zhidaohulian.com" + const val HOST_DEV = "http://dzt-test.zhidaozhixing.com" + const val HOST_TEST = "http://dzt-test.zhidaozhixing.com" + const val HOST_DEMO = "http://dzt-show.zhidaozhixing.com" + const val HOST_PRODUCT = "http://dzt.zhidaozhixing.com" - const val TMC_HOST_TEST="http://dzt-test.zhidaozhixing.com" - const val TMC_HOST_DEMO="http://dzt-show.zhidaozhixing.com" - const val TMC_HOST_PRODUCT="http://dzt.zhidaozhixing.com" @JvmStatic fun getNetHost(): String { @@ -23,16 +20,6 @@ class HttpConstant { else -> HOST_PRODUCT } } - - @JvmStatic - fun getTMCHost(): String { - return when (DebugConfig.getNetMode()) { - DebugConfig.NET_MODE_DEV -> TMC_HOST_TEST - DebugConfig.NET_MODE_QA -> TMC_HOST_TEST - DebugConfig.NET_MODE_DEMO -> TMC_HOST_DEMO - else -> TMC_HOST_PRODUCT - } - } } } \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java index 538648e22f..aab4efa8d0 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java @@ -29,7 +29,7 @@ public class TrafficModelData { public TrafficModelData() { IMogoNetwork network = (IMogoNetwork) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_NETWORK).navigation(getApp().getApplicationContext()); - mTrafficApiService = network.create(TrafficApiService.class, HttpConstant.getTMCHost()); + mTrafficApiService = network.create(TrafficApiService.class, HttpConstant.getNetHost()); } /** diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt index cc1e9bdbdc..9f7b9cc036 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt @@ -112,7 +112,7 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService /** * 距离策略上报 * - * 1. 过去3分钟,行驶距离<1km + * 1. 过去3分钟,行驶距离<1km,大于30m * 2. 前车距离<5m,获取不到前车距离时,默认此项满足 * 3. 当前车速<40km/h * diff --git a/modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.java b/modules/mogo-module-tanlu/build/generated/ap_generated_sources/release/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.java similarity index 100% rename from modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.java rename to modules/mogo-module-tanlu/build/generated/ap_generated_sources/release/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.java diff --git a/modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduletanlu.java b/modules/mogo-module-tanlu/build/generated/ap_generated_sources/release/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduletanlu.java similarity index 100% rename from modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduletanlu.java rename to modules/mogo-module-tanlu/build/generated/ap_generated_sources/release/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduletanlu.java diff --git a/modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduletanlu.java b/modules/mogo-module-tanlu/build/generated/ap_generated_sources/release/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduletanlu.java similarity index 100% rename from modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduletanlu.java rename to modules/mogo-module-tanlu/build/generated/ap_generated_sources/release/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduletanlu.java diff --git a/modules/mogo-module-tanlu/build/generated/source/buildConfig/debug/com/mogo/module/tanlu/BuildConfig.java b/modules/mogo-module-tanlu/build/generated/source/buildConfig/release/com/mogo/module/tanlu/BuildConfig.java similarity index 74% rename from modules/mogo-module-tanlu/build/generated/source/buildConfig/debug/com/mogo/module/tanlu/BuildConfig.java rename to modules/mogo-module-tanlu/build/generated/source/buildConfig/release/com/mogo/module/tanlu/BuildConfig.java index 4e3edc1eb7..bfe42b3348 100644 --- a/modules/mogo-module-tanlu/build/generated/source/buildConfig/debug/com/mogo/module/tanlu/BuildConfig.java +++ b/modules/mogo-module-tanlu/build/generated/source/buildConfig/release/com/mogo/module/tanlu/BuildConfig.java @@ -4,15 +4,15 @@ package com.mogo.module.tanlu; public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); + public static final boolean DEBUG = false; public static final String LIBRARY_PACKAGE_NAME = "com.mogo.module.tanlu"; /** * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME */ @Deprecated public static final String APPLICATION_ID = "com.mogo.module.tanlu"; - public static final String BUILD_TYPE = "debug"; + public static final String BUILD_TYPE = "release"; public static final String FLAVOR = ""; public static final int VERSION_CODE = 1; - public static final String VERSION_NAME = "2.0.0"; + public static final String VERSION_NAME = "2.0.1"; } diff --git a/modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json b/modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json deleted file mode 100644 index 6d165b24ab..0000000000 --- a/modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"2.0.0","enabled":true,"outputFile":"mogo-module-tanlu-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.mogo.module.tanlu","split":""}}] \ No newline at end of file diff --git a/modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml b/modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml similarity index 98% rename from modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml rename to modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml index 89704b0b51..c4015340a8 100644 --- a/modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml +++ b/modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="2.0.1" > - \ No newline at end of file diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/mergeDebugShaders/merger.xml b/modules/mogo-module-tanlu/build/intermediates/incremental/mergeDebugShaders/merger.xml deleted file mode 100644 index 0387e18b14..0000000000 --- a/modules/mogo-module-tanlu/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml b/modules/mogo-module-tanlu/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml new file mode 100644 index 0000000000..e8624ae4c6 --- /dev/null +++ b/modules/mogo-module-tanlu/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/mergeReleaseShaders/merger.xml b/modules/mogo-module-tanlu/build/intermediates/incremental/mergeReleaseShaders/merger.xml new file mode 100644 index 0000000000..4500c7afaf --- /dev/null +++ b/modules/mogo-module-tanlu/build/intermediates/incremental/mergeReleaseShaders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugAssets/merger.xml b/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugAssets/merger.xml deleted file mode 100644 index 719c15763e..0000000000 --- a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/compile-file-map.properties deleted file mode 100644 index fb5dd2c179..0000000000 --- a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ /dev/null @@ -1,135 +0,0 @@ -#Fri Nov 13 11:02:48 CST 2020 -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/icon_window_close_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_window_close_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/icon_heart_like_bg.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_heart_like_bg.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/main_video_pause_btn_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_video_pause_btn_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/module_tanlu_upload_success.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/module_tanlu_upload_success.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_chat_press.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_chat_press.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_right_bg.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_button_right_bg.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_chat.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_chat.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_tanlu_top_bg.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/icon_window_close_press.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/icon_window_close_press.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/share_failed_icon.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/share_failed_icon.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/icon_window_close_press.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_window_close_press.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_video_refresh_btn.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_video_refresh_btn.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/main_video_play_btn_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_video_play_btn_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/icon_heart_like.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_heart_like.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_video_cover_media.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_item_video_cover_media.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bg.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_bg.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_like.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_like.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_head_image.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_head_image.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/icon_heart_like.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_heart_like.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_cutom_layout.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_dialog_cutom_layout.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/icon_window_close_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_window_close_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_view_empty_bg.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/main_view_empty_bg.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_neterror_layout.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_dialog_neterror_layout.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_head_image.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_head_image.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/icon_heart_unlike_bg.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_heart_unlike_bg.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_main_media_recycler.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/main_video_refresh_btn.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_video_refresh_btn.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/anim/v2x_unlike_heart_animation.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/anim/v2x_unlike_heart_animation.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_normal_image.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_normal_image.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_right_page_up_press.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_solid_right_page_up_press.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_gradual_change_bg.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_gradual_change_bg.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_play.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_btn_play.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/main_solid_left_page_up_press.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_solid_left_page_up_press.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_video_pause_btn_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_video_pause_btn_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_type_button_blue_bg.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_type_button_blue_bg.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/icon_heart_like_bg.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_heart_like_bg.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/main_solid_right_page_up_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_solid_right_page_up_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/media_previous.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/media_previous.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_navi.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_navi.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_head_image.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_head_image.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/module_tanlu_upload_success.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/module_tanlu_upload_success.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_top_bg.9.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_top_bg.9.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/small_video_seekbar_style.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/small_video_seekbar_style.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/main_solid_right_page_up_press.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_solid_right_page_up_press.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_solid_left_page_up.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_solid_left_page_up.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_icon_logo.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_icon_logo.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_solid_right_page_up.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_solid_right_page_up.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_logo.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_logo.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/share_failed_icon.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/share_failed_icon.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/selector_btn_close.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_btn_close.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_left_page_up_press.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_solid_left_page_up_press.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_view_empty_bg.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_view_empty_bg.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/icon_heart_like.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_heart_like.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/public_arrow_back_iv.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/public_arrow_back_iv.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/icon_window_close_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_window_close_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/main_video_pause_btn_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/main_video_pause_btn_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_head_image.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_head_image.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_like.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_like.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_normal_image.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_normal_image.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/icon_window_close_press.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_window_close_press.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/icon_window_close_press.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_window_close_press.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg_light.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_tanlu_top_bg_light.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_neterror_button_bg.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_neterror_button_bg.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/module_tanlu_upload_fail.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/module_tanlu_upload_fail.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/main_video_play_btn_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/main_video_play_btn_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/icon_heart_unlike_bg.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_heart_unlike_bg.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_upload.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_btn_upload.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/icon_heart_unlike_bg.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_heart_unlike_bg.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_icon_logo.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/icon_heart_unlike.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_heart_unlike.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/app_icon.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/app_icon.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_navi.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_navi.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/media_previous.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/media_previous.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/icon_heart_like_bg.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_heart_like_bg.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_icon_logo.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_icon_logo.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/layout/tanlu_fullscreen_video_view_pager.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_fullscreen_video_view_pager.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/icon_heart_unlike.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_heart_unlike.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_item_main_media_recycler_new.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/module_tanlu_upload_success.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/module_tanlu_upload_success.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_chat_nomal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_chat_nomal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_navi.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_navi.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_main_media_recycler_new.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bottom_button_right_bg.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_bottom_button_right_bg.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_222533.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_left_page_up_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_solid_left_page_up_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_chat_nomal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_chat_nomal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_solid_right_page_up_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_solid_right_page_up_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/public_arrow_back_iv.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/public_arrow_back_iv.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_video_play_btn_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_video_play_btn_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_logo.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_logo.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_next.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/media_next.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_top_bg.9.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_top_bg.9.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_upload_press.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_upload_press.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_bottom.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_222533_6px_bottom.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/main_view_empty_bg.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/main_view_empty_bg.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/icon_window_close_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/icon_window_close_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_logo.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_logo.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/share_failed_icon.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/share_failed_icon.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/main_solid_left_page_up_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_solid_left_page_up_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_activity_media_full.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/app_icon.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/app_icon.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_normal_image.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_normal_image.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/module_tanlu_upload_fail.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/module_tanlu_upload_fail.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_navi.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_navi.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/media_next.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/media_next.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_video_cover.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_item_video_cover.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_chat.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_chat.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_chat_press.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_chat_press.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/media_next.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/media_next.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_99191c25_4px.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_99191c25_4px.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_video_pause_btn_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/main_video_pause_btn_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_event_type_red_bg.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_event_type_red_bg.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_icon_logo.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_icon_logo.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_upload_222533.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_upload_222533.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_logo.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_logo.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_previous.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/media_previous.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_item_main_media_recycler.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/selector_chat_btn.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_chat_btn.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_alert_window_bg.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/anim/v2x_like_heart_animation.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/anim/v2x_like_heart_animation.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_chat_nomal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_chat_nomal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/icon_heart_unlike.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_heart_unlike.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/module_tanlu_upload_fail.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/module_tanlu_upload_fail.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_pause.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_btn_pause.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/loading_bg.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/loading_bg.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_chat_press.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_chat_press.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_previous.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/media_previous.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/main_view_empty_bg.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_view_empty_bg.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_normal_image.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_normal_image.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_9px.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_222533_9px.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_bg.xml=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_button_bg.xml -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/main_video_play_btn_normal.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_next.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/media_next.png -/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/share_failed_icon.png=/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/share_failed_icon.png diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merger.xml b/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merger.xml deleted file mode 100644 index 7628cd2d88..0000000000 --- a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merger.xml +++ /dev/null @@ -1,26 +0,0 @@ - -98px98px48px48px72px5px106px106px96px96px100px700px12px135px50px50px30px92px40px800px11px28px4px32px255px82px2px205px20px40px60px50px32px40px50px10px750px270px120px60px488px82px34px24px28px26px30px790px524px130px40px66px36px59px44px105px44px20px16px1060px330px306px421px290px80px19px13px24px15px9px27px46px4px50px98px10px30px#000000#000000#1F7FFF#FFFFFF#80FFFFFF#1E212C#1F7FFF#171F7FFF#4d191C25#99191C25#222533#303447#323131#4B5369#9A9A9A#A2A2A2#5a979797#80FFFFFF#00FFFFFF#b3000000#0DFFFFFF#000000#69718B#213142#33FFFFFF#B3000000#0091FF#d9000000#FF1B1B#F8F8F8#333333#DADAE2#545362#99191C25#99666666#999999#99FFFFFF#99FFFFFF#59FFFFFF#FFFFFF#FFFFFF#3F4057#2A2B38#FFFFFF#FFFFFF#3E7FFC#5CC1FF#50526E#5E6079#3F4057#555A75#F5F5F552px52px48px48px72px5px56px56px96px96px90px700px10px72px25px25px16px48px22px700px5px15px2px19px136px44px2px109px10px23px30px28px16px22px26px6px400px150px80px32px260px44px18px14px15px13px16px418px278px69px22px36px18px32px20px56px23px10px8px642px186px176px250px158px45px13px8px7px17px3px18px26px4px28px56px6px16px - - tanlu返回取消授权《探路共享计划》已同意探路共享计划 >> 探路APP用户服务协议未找到其他用户分享的拥堵信息,
您可以试试分享拥堵]]>
未找到其他用户分享的路况未知区域上报路况正在更新情报数据欢迎使用探路,您可以在探路内查看到周边的实时路况,也可以通过关键词“上报路况”来分享一段视频给其他车主您还可以试试语音上报为您找到%s条路况信息开启小智车联共享计划上一条下一条已分享成功,你分享的内容将帮助%s位车友上传失败将为您播放上报路况为你查询到导航路线沿途的路况信息,可以对我说上一条、下一条来查看取消(%s)好的(%s) - 正在为您搜索路况 - 探路系统正在为您搜索 - 小智这就去查,您稍等一下 - - 找不到相关地址 - 找不到地址,是小智不好 - 未找到其他车主分享的路况信息 -
52px52px48px48px72px5px56px56px96px96px90px700px10px72px25px25px16px48px22px700px5px15px2px19px136px44px2px109px10px23px30px28px16px22px26px6px400px150px80px32px260px44px18px14px15px13px16px418px278px69px22px36px18px32px20px56px23px10px8px642px186px176px250px158px45px13px6px13px17px3px18px26px4px28px56px6px16px98px98px48px48px72px5px106px106px96px96px100px700px12px135px50px50px30px92px40px800px11px28px4px32px255px82px2px205px20px40px60px50px32px40px50px10px750px270px120px60px488px82px34px24px28px26px30px790px524px130px40px66px36px59px44px105px44px20px16px1233px326px306px480px290px80px19px12px24px30px9px27px46px4px50px90px10px30px
- -
\ No newline at end of file diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseAssets/merger.xml b/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseAssets/merger.xml new file mode 100644 index 0000000000..89f57c7394 --- /dev/null +++ b/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseAssets/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties new file mode 100644 index 0000000000..c578288807 --- /dev/null +++ b/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties @@ -0,0 +1,165 @@ +#Wed Nov 18 18:46:24 CST 2020 +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_chat_nomal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\tanlu_chat_nomal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\tanlu_normal_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\tanlu_normal_image.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\main_video_pause_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\main_video_pause_btn_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_bg_upload_press.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\shape_bg_upload_press.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\icon_heart_unlike_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\icon_heart_unlike_bg.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\main_video_play_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\main_video_play_btn_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_btn_close.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\selector_btn_close.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\icon_window_close_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\icon_window_close_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_type_button_blue_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\tanlu_type_button_blue_bg.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\icon_heart_like.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\icon_heart_like.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\icon_window_close_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\icon_window_close_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_navi.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\tanlu_navi.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_like.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\tanlu_like.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_chat.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\tanlu_chat.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\icon_window_close_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\icon_window_close_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\icon_window_close_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\icon_window_close_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\icon_window_close_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\icon_window_close_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_dialog_neterror_button_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\tanlu_dialog_neterror_button_bg.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\icon_heart_like_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\icon_heart_like_bg.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_chat_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\tanlu_chat_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\tanlu_logo.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_solid_right_page_up_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\main_solid_right_page_up_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_icon_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\tanlu_icon_logo.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\tanlu_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\tanlu_logo.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_video_pause_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\main_video_pause_btn_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\icon_heart_unlike.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\icon_heart_unlike.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_solid_right_page_up_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\main_solid_right_page_up_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\media_previous.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\media_previous.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\icon_heart_unlike.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\icon_heart_unlike.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\tanlu_like.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\tanlu_like.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_view_empty_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\main_view_empty_bg.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_item_video_cover_media.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\layout\\tanlu_item_video_cover_media.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_solid_left_page_up_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\main_solid_left_page_up_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_chat_nomal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\tanlu_chat_nomal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_bg_222533.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\shape_bg_222533.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\module_tanlu_upload_fail.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\module_tanlu_upload_fail.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_alert_window_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\tanlu_alert_window_bg.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_head_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\tanlu_head_image.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\main_video_pause_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\main_video_pause_btn_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\icon_heart_like_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\icon_heart_like_bg.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\main_solid_right_page_up_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\main_solid_right_page_up_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\icon_window_close_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\icon_window_close_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_normal_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\tanlu_normal_image.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_bg_solid_right_page_up.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\selector_bg_solid_right_page_up.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\share_failed_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\share_failed_icon.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_video_pause_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\main_video_pause_btn_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\share_failed_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\share_failed_icon.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\public_arrow_back_iv.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\public_arrow_back_iv.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\public_arrow_back_iv.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\public_arrow_back_iv.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_solid_right_page_up_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\main_solid_right_page_up_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\media_next.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\media_next.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_item_main_media_recycler_new.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\layout\\tanlu_item_main_media_recycler_new.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\icon_heart_unlike_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\icon_heart_unlike_bg.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\main_view_empty_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\main_view_empty_bg.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\icon_heart_unlike_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\icon_heart_unlike_bg.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_dialog_bottom_button_right_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\tanlu_dialog_bottom_button_right_bg.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\main_video_refresh_btn.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\main_video_refresh_btn.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\media_next.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\media_next.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\media_next.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\media_next.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\icon_heart_unlike_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\icon_heart_unlike_bg.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\app_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\app_icon.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_activity_media_full.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\layout\\tanlu_activity_media_full.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\main_video_play_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\main_video_play_btn_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_gradual_change_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\tanlu_gradual_change_bg.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_item_main_media_recycler.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\layout\\tanlu_item_main_media_recycler.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\tanlu_chat_nomal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\tanlu_chat_nomal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\icon_heart_like.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\icon_heart_like.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\icon_heart_like_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\icon_heart_like_bg.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_bg_222533_9px.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\shape_bg_222533_9px.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\main_solid_right_page_up_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\main_solid_right_page_up_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\tanlu_normal_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\tanlu_normal_image.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_bg_99191c25_4px.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\shape_bg_99191c25_4px.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_solid_left_page_up_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\main_solid_left_page_up_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\tanlu_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\tanlu_logo.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\media_previous.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\media_previous.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_chat_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\tanlu_chat_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\main_solid_left_page_up_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\main_solid_left_page_up_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_icon_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\tanlu_icon_logo.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\main_view_empty_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\main_view_empty_bg.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\small_video_seekbar_style.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\small_video_seekbar_style.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\icon_window_close_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\icon_window_close_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\tanlu_logo.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_dialog_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\tanlu_dialog_bg.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_like.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\tanlu_like.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\module_tanlu_upload_fail.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\module_tanlu_upload_fail.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\icon_heart_like.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\icon_heart_like.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\icon_window_close_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\icon_window_close_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\tanlu_top_bg.9.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\tanlu_top_bg.9.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\module_tanlu_upload_success.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\module_tanlu_upload_success.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_chat.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\tanlu_chat.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_navi.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\tanlu_navi.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\tanlu_logo.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_solid_right_page_up_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\main_solid_right_page_up_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\app_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\app_icon.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\tanlu_navi.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\tanlu_navi.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_head_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\tanlu_head_image.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\share_failed_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\share_failed_icon.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_icon_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\tanlu_icon_logo.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\share_failed_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\share_failed_icon.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\anim\\v2x_unlike_heart_animation.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\anim\\v2x_unlike_heart_animation.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_solid_left_page_up_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\main_solid_left_page_up_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_chat_nomal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\tanlu_chat_nomal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_bg_222533_6px_bottom.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\shape_bg_222533_6px_bottom.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_chat_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\tanlu_chat_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\icon_heart_like_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\icon_heart_like_bg.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\icon_window_close_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\icon_window_close_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_solid_left_page_up_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\main_solid_left_page_up_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_main_media_recycler_new.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\layout\\tanlu_main_media_recycler_new.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\icon_window_close_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\icon_window_close_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\tanlu_head_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\tanlu_head_image.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\module_tanlu_upload_success.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\module_tanlu_upload_success.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\tanlu_chat.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\tanlu_chat.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\media_previous.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\media_previous.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\share_failed_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\share_failed_icon.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_normal_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\tanlu_normal_image.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\module_tanlu_upload_fail.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\module_tanlu_upload_fail.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_video_refresh_btn.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\main_video_refresh_btn.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_dialog_cutom_layout.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\layout\\tanlu_dialog_cutom_layout.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_view_empty_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\main_view_empty_bg.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_dialog_button_right_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\tanlu_dialog_button_right_bg.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\icon_heart_like.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\icon_heart_like.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_bg_btn_upload.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\selector_bg_btn_upload.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\icon_heart_unlike.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\icon_heart_unlike.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\main_video_pause_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\main_video_pause_btn_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_video_play_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\main_video_play_btn_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\app_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\app_icon.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_bg_btn_pause.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\selector_bg_btn_pause.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\tanlu_chat_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\tanlu_chat_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_normal_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\tanlu_normal_image.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_head_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\tanlu_head_image.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\module_tanlu_upload_fail.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\module_tanlu_upload_fail.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\media_previous.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\media_previous.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_chat_btn.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\selector_chat_btn.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\tanlu_icon_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\tanlu_icon_logo.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_fullscreen_video_view_pager.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\layout\\tanlu_fullscreen_video_view_pager.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\icon_heart_unlike.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\icon_heart_unlike.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\module_tanlu_upload_success.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\module_tanlu_upload_success.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_event_type_red_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\tanlu_event_type_red_bg.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\module_tanlu_upload_success.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\module_tanlu_upload_success.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\main_video_play_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\main_video_play_btn_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\anim\\v2x_like_heart_animation.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\anim\\v2x_like_heart_animation.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_main_media_recycler.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\layout\\tanlu_main_media_recycler.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\media_next.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\media_next.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\media_previous.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\media_previous.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_bg_solid_left_page_up.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\selector_bg_solid_left_page_up.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_video_play_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-ldpi-v4\\main_video_play_btn_normal.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\main_view_empty_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\main_view_empty_bg.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_tanlu_top_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\shape_tanlu_top_bg.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_bg_upload_222533.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\shape_bg_upload_222533.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_item_video_cover.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\layout\\tanlu_item_video_cover.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_bg_btn_play.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\selector_bg_btn_play.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_dialog_button_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\tanlu_dialog_button_bg.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\tanlu_navi.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\tanlu_navi.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_top_bg.9.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\tanlu_top_bg.9.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\loading_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\loading_bg.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_tanlu_top_bg_light.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable\\shape_tanlu_top_bg_light.xml +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\tanlu_icon_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-1920x1000-v4\\tanlu_icon_logo.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_navi.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\tanlu_navi.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\main_solid_left_page_up_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\main_solid_left_page_up_press.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\tanlu_head_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\tanlu_head_image.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\media_next.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\media_next.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_video_refresh_btn.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\main_video_refresh_btn.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi-1920x720\\public_arrow_back_iv.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-1920x720-v4\\public_arrow_back_iv.png +F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_dialog_neterror_layout.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\release\\layout\\tanlu_dialog_neterror_layout.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merged.dir/values-mdpi-1920x720-v4/values-mdpi-1920x720-v4.xml b/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merged.dir/values-mdpi-1920x720-v4/values-mdpi-1920x720-v4.xml new file mode 100644 index 0000000000..f1267e1e69 --- /dev/null +++ b/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merged.dir/values-mdpi-1920x720-v4/values-mdpi-1920x720-v4.xml @@ -0,0 +1,12 @@ + + + 19px + 198px + 176px + 7px + 170px + 319px + 642px + 23px + 14px + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values-mdpi-v4/values-mdpi-v4.xml b/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merged.dir/values-mdpi-v4/values-mdpi-v4.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values-mdpi-v4/values-mdpi-v4.xml rename to modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merged.dir/values-mdpi-v4/values-mdpi-v4.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values-xhdpi-1920x1000-v4/values-xhdpi-1920x1000-v4.xml b/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merged.dir/values-xhdpi-1920x1000-v4/values-xhdpi-1920x1000-v4.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values-xhdpi-1920x1000-v4/values-xhdpi-1920x1000-v4.xml rename to modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merged.dir/values-xhdpi-1920x1000-v4/values-xhdpi-1920x1000-v4.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values-xhdpi-v4/values-xhdpi-v4.xml b/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merged.dir/values-xhdpi-v4/values-xhdpi-v4.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values-xhdpi-v4/values-xhdpi-v4.xml rename to modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merged.dir/values-xhdpi-v4/values-xhdpi-v4.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml b/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merged.dir/values/values.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml rename to modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merged.dir/values/values.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merger.xml b/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merger.xml new file mode 100644 index 0000000000..46ea9e7504 --- /dev/null +++ b/modules/mogo-module-tanlu/build/intermediates/incremental/packageReleaseResources/merger.xml @@ -0,0 +1,26 @@ + +#000000#000000#1F7FFF#FFFFFF#80FFFFFF#1E212C#1F7FFF#171F7FFF#4d191C25#99191C25#222533#303447#323131#4B5369#9A9A9A#A2A2A2#5a979797#80FFFFFF#00FFFFFF#b3000000#0DFFFFFF#000000#69718B#213142#33FFFFFF#B3000000#0091FF#d9000000#FF1B1B#F8F8F8#333333#DADAE2#545362#99191C25#99666666#999999#99FFFFFF#99FFFFFF#59FFFFFF#FFFFFF#FFFFFF#3F4057#2A2B38#FFFFFF#FFFFFF#3E7FFC#5CC1FF#50526E#5E6079#3F4057#555A75#F5F5F552px52px48px48px72px5px56px56px96px96px90px700px10px72px25px25px16px48px22px700px5px15px2px19px136px44px2px109px10px23px30px28px16px22px26px6px400px150px80px32px260px44px18px14px15px13px16px418px278px69px22px36px18px32px20px56px23px10px8px642px186px176px250px158px45px13px8px7px17px3px18px26px4px28px56px6px16pxtanlu返回取消授权《探路共享计划》已同意探路共享计划 >> 探路APP用户服务协议未找到其他用户分享的拥堵信息,
您可以试试分享拥堵]]>
未找到其他用户分享的路况未知区域上报路况正在更新情报数据欢迎使用探路,您可以在探路内查看到周边的实时路况,也可以通过关键词“上报路况”来分享一段视频给其他车主您还可以试试语音上报为您找到%s条路况信息开启小智车联共享计划上一条下一条已分享成功,你分享的内容将帮助%s位车友上传失败将为您播放上报路况为你查询到导航路线沿途的路况信息,可以对我说上一条、下一条来查看取消(%s)好的(%s) + 正在为您搜索路况 + 探路系统正在为您搜索 + 小智这就去查,您稍等一下 + + 找不到相关地址 + 找不到地址,是小智不好 + 未找到其他车主分享的路况信息 +
+ + 52px52px48px48px72px5px56px56px96px96px90px700px10px72px25px25px16px48px22px700px5px15px2px19px136px44px2px109px10px23px30px28px16px22px26px6px400px150px80px32px260px44px18px14px15px13px16px418px278px69px22px36px18px32px20px56px23px10px8px642px186px176px250px158px45px13px6px13px17px3px18px26px4px28px56px6px16px642px198px176px319px170px23px14px19px7px98px98px48px48px72px5px106px106px96px96px100px700px12px135px50px50px30px92px40px800px11px28px4px32px255px82px2px205px20px40px60px50px32px40px50px10px750px270px120px60px488px82px34px24px28px26px30px790px524px130px40px66px36px59px44px105px44px20px16px1060px330px306px421px290px80px19px13px24px15px9px27px46px4px50px98px10px30px98px98px48px48px72px5px106px106px96px96px100px700px12px135px50px50px30px92px40px800px11px28px4px32px255px82px2px205px20px40px60px50px32px40px50px10px750px270px120px60px488px82px34px24px28px26px30px790px524px130px40px66px36px59px44px105px44px20px16px1233px326px306px480px290px80px19px12px24px30px9px27px46px4px50px90px10px30px
+ +
\ No newline at end of file diff --git a/libraries/mogo-tanlu-api/build/intermediates/incremental/debug-mergeNativeLibs/merge-state b/modules/mogo-module-tanlu/build/intermediates/incremental/release-mergeNativeLibs/merge-state similarity index 78% rename from libraries/mogo-tanlu-api/build/intermediates/incremental/debug-mergeNativeLibs/merge-state rename to modules/mogo-module-tanlu/build/intermediates/incremental/release-mergeNativeLibs/merge-state index b8a7669af8..0b93e39cb7 100644 Binary files a/libraries/mogo-tanlu-api/build/intermediates/incremental/debug-mergeNativeLibs/merge-state and b/modules/mogo-module-tanlu/build/intermediates/incremental/release-mergeNativeLibs/merge-state differ diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/BuildConfig.class b/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/BuildConfig.class deleted file mode 100644 index 48c9cc8d96..0000000000 Binary files a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/BuildConfig.class and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduletanlu.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduletanlu.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduletanlu.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduletanlu.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduletanlu.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduletanlu.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduletanlu.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduletanlu.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/BuildConfig.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/BuildConfig.class new file mode 100644 index 0000000000..414342f926 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/BuildConfig.class differ diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/AlongTheWayCallback.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/AlongTheWayCallback.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/AlongTheWayCallback.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/AlongTheWayCallback.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter$1.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter$1.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter$1.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter$1.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter$InstanceHolder.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter$InstanceHolder.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter$InstanceHolder.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter$InstanceHolder.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/NaviCallback.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/NaviCallback.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/NaviCallback.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/NaviCallback.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/RoadLineCallback.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/RoadLineCallback.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/RoadLineCallback.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/RoadLineCallback.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/UploadShareCallback.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/UploadShareCallback.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/UploadShareCallback.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/UploadShareCallback.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/VoiceSearchCallback.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/VoiceSearchCallback.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/VoiceSearchCallback.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/callback/VoiceSearchCallback.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/constant/HttpConst.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/constant/HttpConst.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/constant/HttpConst.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/constant/HttpConst.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/constant/TanluConstants.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/constant/TanluConstants.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/constant/TanluConstants.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/constant/TanluConstants.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluCardViewProvider.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluCardViewProvider.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluCardViewProvider.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluCardViewProvider.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$1.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$1.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$1.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$1.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$10.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$10.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$10.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$10.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$11.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$11.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$11.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$11.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$12.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$12.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$12.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$12.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$13.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$13.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$13.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$13.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$14.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$14.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$14.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$14.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$15.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$15.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$15.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$15.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$16.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$16.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$16.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$16.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$17.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$17.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$17.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$17.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$18.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$18.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$18.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$18.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$19.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$19.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$19.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$19.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$2.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$2.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$2.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$2.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$20.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$20.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$20.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$20.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$3$1.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$3$1.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$3$1.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$3$1.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$3.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$3.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$3.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$3.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$4.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$4.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$4.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$4.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$5.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$5.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$5.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$5.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$6.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$6.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$6.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$6.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$7.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$7.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$7.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$7.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$8.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$8.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$8.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$8.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$9.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$9.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow$9.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow$9.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluListWindow.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluListWindow.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluServiceManager.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluServiceManager.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/TanluServiceManager.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/TanluServiceManager.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$1.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$1.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$1.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$1.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$2.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$2.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$2.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$2.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$3.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$3.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$3.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$3.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$4$1$1.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$4$1$1.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$4$1$1.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$4$1$1.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$4$1.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$4$1.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$4$1.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$4$1.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$4.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$4.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$4.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$4.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$5.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$5.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$5.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew$5.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideViewHolderNew.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideViewHolderNew.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideViewHolderNew.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/fragment/recycler/TanluSlideViewHolderNew.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/End.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/End.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/End.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/End.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/Information$1.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/Information$1.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/Information$1.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/Information$1.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/Information.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/Information.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/Information.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/Information.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/InformationAndLiveCarResult.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/InformationAndLiveCarResult.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/InformationAndLiveCarResult.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/InformationAndLiveCarResult.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/NaviLatLng.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/NaviLatLng.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/NaviLatLng.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/NaviLatLng.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/NaviLatLngInfo.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/NaviLatLngInfo.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/NaviLatLngInfo.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/NaviLatLngInfo.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/NaviResult$Result.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/NaviResult$Result.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/NaviResult$Result.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/NaviResult$Result.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/NaviResult.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/NaviResult.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/NaviResult.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/NaviResult.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/NaviRoadRequest.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/NaviRoadRequest.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/NaviRoadRequest.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/NaviRoadRequest.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/PathLineResult$PathResult.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/PathLineResult$PathResult.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/PathLineResult$PathResult.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/PathLineResult$PathResult.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/PathLineResult.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/PathLineResult.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/PathLineResult.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/PathLineResult.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/Result.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/Result.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/Result.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/Result.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/Start.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/Start.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/Start.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/Start.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$1.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$1.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$1.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$1.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$10.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$10.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$10.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$10.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$11.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$11.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$11.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$11.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$12.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$12.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$12.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$12.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$2.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$2.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$2.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$2.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$3.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$3.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$3.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$3.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$4.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$4.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$4.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$4.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$5.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$5.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$5.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$5.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$6.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$6.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$6.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$6.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$7.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$7.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$7.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$7.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$8.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$8.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$8.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$8.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$9.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$9.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData$9.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData$9.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/TanluModelData.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/TanluModelData.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/Test.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/Test.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/Test.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/Test.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/UploadErrorDataInfo.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/UploadErrorDataInfo.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/UploadErrorDataInfo.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/UploadErrorDataInfo.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/UploadShareRoadInfo.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/UploadShareRoadInfo.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/UploadShareRoadInfo.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/UploadShareRoadInfo.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/VoiceSearchResult$Result.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/VoiceSearchResult$Result.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/VoiceSearchResult$Result.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/VoiceSearchResult$Result.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/VoiceSearchResult.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/VoiceSearchResult.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/VoiceSearchResult.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/VoiceSearchResult.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/CloseWindowInfo.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/CloseWindowInfo.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/CloseWindowInfo.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/CloseWindowInfo.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/ControlClickUpInfo.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/ControlClickUpInfo.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/ControlClickUpInfo.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/ControlClickUpInfo.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/DataErrorInfo.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/DataErrorInfo.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/DataErrorInfo.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/DataErrorInfo.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/EmptyData.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/EmptyData.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/EmptyData.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/EmptyData.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/GetInfoError.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/GetInfoError.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/GetInfoError.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/GetInfoError.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/MarkerInfo.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/MarkerInfo.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/MarkerInfo.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/MarkerInfo.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/PushTypeInfo.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/PushTypeInfo.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/PushTypeInfo.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/PushTypeInfo.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/SharedialogEvent.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/SharedialogEvent.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/SharedialogEvent.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/SharedialogEvent.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/StartPlayInfo.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/StartPlayInfo.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/StartPlayInfo.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/StartPlayInfo.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/TanluMarkerEvent.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/TanluMarkerEvent.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/TanluMarkerEvent.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/TanluMarkerEvent.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/VoiceControlUpInfo.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/VoiceControlUpInfo.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/model/event/VoiceControlUpInfo.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/model/event/VoiceControlUpInfo.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/net/TanluApiService.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/net/TanluApiService.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/net/TanluApiService.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/net/TanluApiService.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/receiver/DataErrorReceiver.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/receiver/DataErrorReceiver.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/receiver/DataErrorReceiver.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/receiver/DataErrorReceiver.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/receiver/ShareDialogReceiver.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/receiver/ShareDialogReceiver.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/receiver/ShareDialogReceiver.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/receiver/ShareDialogReceiver.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/ActivityStatusUtil.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/ActivityStatusUtil.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/ActivityStatusUtil.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/ActivityStatusUtil.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/ChartUtil$1.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/ChartUtil$1.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/ChartUtil$1.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/ChartUtil$1.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/ChartUtil$2.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/ChartUtil$2.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/ChartUtil$2.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/ChartUtil$2.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/ChartUtil$ChartStatusListener.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/ChartUtil$ChartStatusListener.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/ChartUtil$ChartStatusListener.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/ChartUtil$ChartStatusListener.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/ChartUtil.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/ChartUtil.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/ChartUtil.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/ChartUtil.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/GlideRoundTransform.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/GlideRoundTransform.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/GlideRoundTransform.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/GlideRoundTransform.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/LocationUtils.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/LocationUtils.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/LocationUtils.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/LocationUtils.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/NetworkUtil.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/NetworkUtil.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/NetworkUtil.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/NetworkUtil.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/Utils.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/Utils.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/util/Utils.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/util/Utils.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$1.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$1.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$1.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$1.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$2.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$2.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$2.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$2.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$3.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$3.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$3.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$3.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$4.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$4.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$4.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$4.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$OnZoomListener.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$OnZoomListener.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$OnZoomListener.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/AutoZoomInImageView$OnZoomListener.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/AutoZoomInImageView.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/AutoZoomInImageView.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/AutoZoomInImageView.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/AutoZoomInImageView.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/NetErrorDialog$1.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/NetErrorDialog$1.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/NetErrorDialog$1.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/NetErrorDialog$1.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/NetErrorDialog$2.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/NetErrorDialog$2.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/NetErrorDialog$2.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/NetErrorDialog$2.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/NetErrorDialog.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/NetErrorDialog.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/NetErrorDialog.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/NetErrorDialog.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/RoundLayout.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/RoundLayout.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/RoundLayout.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/RoundLayout.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/UploadFailedDialog$1.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/UploadFailedDialog$1.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/UploadFailedDialog$1.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/UploadFailedDialog$1.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/UploadFailedDialog$2.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/UploadFailedDialog$2.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/UploadFailedDialog$2.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/UploadFailedDialog$2.class diff --git a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/UploadFailedDialog.class b/modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/UploadFailedDialog.class similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/view/UploadFailedDialog.class rename to modules/mogo-module-tanlu/build/intermediates/javac/release/classes/com/mogo/module/tanlu/view/UploadFailedDialog.class diff --git a/modules/mogo-module-tanlu/build/intermediates/library_java_res/debug/res.jar b/modules/mogo-module-tanlu/build/intermediates/library_java_res/debug/res.jar deleted file mode 100644 index df0140a143..0000000000 Binary files a/modules/mogo-module-tanlu/build/intermediates/library_java_res/debug/res.jar and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/intermediates/library_java_res/release/res.jar b/modules/mogo-module-tanlu/build/intermediates/library_java_res/release/res.jar new file mode 100644 index 0000000000..278411735e Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/library_java_res/release/res.jar differ diff --git a/modules/mogo-module-tanlu/build/intermediates/library_manifest/debug/AndroidManifest.xml b/modules/mogo-module-tanlu/build/intermediates/library_manifest/release/AndroidManifest.xml similarity index 98% rename from modules/mogo-module-tanlu/build/intermediates/library_manifest/debug/AndroidManifest.xml rename to modules/mogo-module-tanlu/build/intermediates/library_manifest/release/AndroidManifest.xml index 89704b0b51..c4015340a8 100644 --- a/modules/mogo-module-tanlu/build/intermediates/library_manifest/debug/AndroidManifest.xml +++ b/modules/mogo-module-tanlu/build/intermediates/library_manifest/release/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="2.0.1" > -2 -6 -7 /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml -9 android:targetSdkVersion="22" /> -9-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml -10 -11 -11-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:4:5-78 -11-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:4:22-75 -12 -13 -13-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:5:5-45:19 -14 /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:6:9-9:20 -15 android:name="com.mogo.module.tanlu.video.FullMediaActivity" -15-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:7:13-52 -16 android:hardwareAccelerated="true" > -16-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:8:13-47 -17 -18 -19 -19-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:11:9-16:20 -19-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:11:19-62 -20 -20-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:12:13-15:29 -21 -21-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:13:17-79 -21-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:13:25-76 -22 -23 -23-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:14:17-73 -23-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:14:27-70 -24 -25 -26 -26-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:18:9-23:20 -26-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:18:19-65 -27 -27-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:19:13-22:29 -28 -28-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:20:17-82 -28-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:20:25-79 -29 -30 -30-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:14:17-73 -30-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:14:27-70 -31 -32 -33 -33-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:25:9-30:20 -33-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:25:19-56 -34 -34-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:26:13-29:29 -35 -35-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:27:17-73 -35-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:27:25-70 -36 -37 -37-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:14:17-73 -37-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:14:27-70 -38 -39 -40 -40-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:32:9-37:20 -40-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:32:19-63 -41 -41-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:33:13-36:29 -42 -42-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:34:17-65 -42-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:34:25-62 -43 -44 -44-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:14:17-73 -44-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:14:27-70 -45 -46 -47 -47-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:39:9-44:20 -47-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:39:19-61 -48 -48-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:40:13-43:29 -49 -49-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:41:17-69 -49-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:41:25-66 -50 -51 -51-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:14:17-73 -51-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:14:27-70 -52 -53 -54 -55 -56 diff --git a/modules/mogo-module-tanlu/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt b/modules/mogo-module-tanlu/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt new file mode 100644 index 0000000000..0eb8a349c5 --- /dev/null +++ b/modules/mogo-module-tanlu/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt @@ -0,0 +1,99 @@ +1 +2 +6 +7 F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml +9 android:targetSdkVersion="22" /> +9-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml +10 +11 +11-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:4:5-78 +11-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:4:22-75 +12 +13 +13-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:5:5-45:19 +14 F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:6:9-9:20 +15 android:name="com.mogo.module.tanlu.video.FullMediaActivity" +15-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:7:13-52 +16 android:hardwareAccelerated="true" > +16-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:8:13-47 +17 +18 +19 +19-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:11:9-16:20 +19-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:11:19-62 +20 +20-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:12:13-15:29 +21 +21-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:13:17-79 +21-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:13:25-76 +22 +23 +23-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:14:17-73 +23-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:14:27-70 +24 +25 +26 +26-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:18:9-23:20 +26-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:18:19-65 +27 +27-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:19:13-22:29 +28 +28-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:20:17-82 +28-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:20:25-79 +29 +30 +30-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:14:17-73 +30-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:14:27-70 +31 +32 +33 +33-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:25:9-30:20 +33-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:25:19-56 +34 +34-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:26:13-29:29 +35 +35-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:27:17-73 +35-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:27:25-70 +36 +37 +37-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:14:17-73 +37-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:14:27-70 +38 +39 +40 +40-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:32:9-37:20 +40-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:32:19-63 +41 +41-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:33:13-36:29 +42 +42-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:34:17-65 +42-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:34:25-62 +43 +44 +44-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:14:17-73 +44-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:14:27-70 +45 +46 +47 +47-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:39:9-44:20 +47-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:39:19-61 +48 +48-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:40:13-43:29 +49 +49-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:41:17-69 +49-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:41:25-66 +50 +51 +51-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:14:17-73 +51-->F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:14:27-70 +52 +53 +54 +55 +56 diff --git a/modules/mogo-module-tanlu/build/intermediates/merged_java_res/debug/out.jar b/modules/mogo-module-tanlu/build/intermediates/merged_java_res/debug/out.jar deleted file mode 100644 index 44fea5e3f2..0000000000 Binary files a/modules/mogo-module-tanlu/build/intermediates/merged_java_res/debug/out.jar and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/intermediates/merged_manifests/debug/output.json b/modules/mogo-module-tanlu/build/intermediates/merged_manifests/debug/output.json deleted file mode 100644 index e3a098c2ae..0000000000 --- a/modules/mogo-module-tanlu/build/intermediates/merged_manifests/debug/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"2.0.0","enabled":true,"outputFile":"mogo-module-tanlu-debug.aar","fullName":"debug","baseName":"debug"},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.mogo.module.tanlu","split":""}}] \ No newline at end of file diff --git a/modules/mogo-module-tanlu/build/intermediates/merged_manifests/release/output.json b/modules/mogo-module-tanlu/build/intermediates/merged_manifests/release/output.json new file mode 100644 index 0000000000..8b9b295a15 --- /dev/null +++ b/modules/mogo-module-tanlu/build/intermediates/merged_manifests/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"2.0.1","enabled":true,"outputFile":"mogo-module-tanlu-release.aar","fullName":"release","baseName":"release"},"path":"..\\..\\library_manifest\\release\\AndroidManifest.xml","properties":{"packageId":"com.mogo.module.tanlu","split":""}}] \ No newline at end of file diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged-classes/debug/classes.jar b/modules/mogo-module-tanlu/build/intermediates/packaged-classes/debug/classes.jar deleted file mode 100644 index d5605cbf1f..0000000000 Binary files a/modules/mogo-module-tanlu/build/intermediates/packaged-classes/debug/classes.jar and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/anim/v2x_like_heart_animation.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/anim/v2x_like_heart_animation.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/anim/v2x_like_heart_animation.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/anim/v2x_like_heart_animation.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/anim/v2x_unlike_heart_animation.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/anim/v2x_unlike_heart_animation.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/anim/v2x_unlike_heart_animation.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/anim/v2x_unlike_heart_animation.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/app_icon.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/app_icon.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/app_icon.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/app_icon.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_heart_like.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/icon_heart_like.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_heart_like.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/icon_heart_like.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_heart_like_bg.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/icon_heart_like_bg.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_heart_like_bg.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/icon_heart_like_bg.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_heart_unlike.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/icon_heart_unlike.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_heart_unlike.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/icon_heart_unlike.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_heart_unlike_bg.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/icon_heart_unlike_bg.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_heart_unlike_bg.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/icon_heart_unlike_bg.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_window_close_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/icon_window_close_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_window_close_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/icon_window_close_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_window_close_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/icon_window_close_press.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/icon_window_close_press.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/icon_window_close_press.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_solid_left_page_up_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_solid_left_page_up_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_solid_left_page_up_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_solid_left_page_up_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_solid_left_page_up_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_solid_left_page_up_press.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_solid_left_page_up_press.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_solid_left_page_up_press.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_solid_right_page_up_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_solid_right_page_up_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_solid_right_page_up_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_solid_right_page_up_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_solid_right_page_up_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_solid_right_page_up_press.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_solid_right_page_up_press.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_solid_right_page_up_press.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_video_pause_btn_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_video_pause_btn_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_video_pause_btn_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_video_pause_btn_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_video_play_btn_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_video_play_btn_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_video_play_btn_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_video_play_btn_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_video_refresh_btn.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_video_refresh_btn.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_video_refresh_btn.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_video_refresh_btn.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_view_empty_bg.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_view_empty_bg.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/main_view_empty_bg.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/main_view_empty_bg.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/media_next.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/media_next.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/media_next.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/media_next.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/media_previous.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/media_previous.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/media_previous.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/media_previous.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/module_tanlu_upload_fail.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/module_tanlu_upload_fail.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/module_tanlu_upload_fail.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/module_tanlu_upload_fail.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/module_tanlu_upload_success.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/module_tanlu_upload_success.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/module_tanlu_upload_success.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/module_tanlu_upload_success.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/public_arrow_back_iv.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/public_arrow_back_iv.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/public_arrow_back_iv.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/public_arrow_back_iv.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/share_failed_icon.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/share_failed_icon.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/share_failed_icon.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/share_failed_icon.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_chat.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_chat.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_chat.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_chat.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_chat_nomal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_chat_nomal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_chat_nomal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_chat_nomal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_chat_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_chat_press.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_chat_press.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_chat_press.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_head_image.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_head_image.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_head_image.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_head_image.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_icon_logo.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_icon_logo.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_icon_logo.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_icon_logo.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_like.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_like.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_like.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_like.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_logo.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_logo.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_logo.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_logo.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_navi.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_navi.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_navi.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_navi.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_normal_image.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_normal_image.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-ldpi-v4/tanlu_normal_image.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-ldpi-v4/tanlu_normal_image.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/app_icon.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/app_icon.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/app_icon.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/app_icon.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_heart_like.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/icon_heart_like.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_heart_like.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/icon_heart_like.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_heart_like_bg.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/icon_heart_like_bg.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_heart_like_bg.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/icon_heart_like_bg.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_heart_unlike.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/icon_heart_unlike.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_heart_unlike.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/icon_heart_unlike.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_heart_unlike_bg.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/icon_heart_unlike_bg.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_heart_unlike_bg.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/icon_heart_unlike_bg.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_window_close_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/icon_window_close_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_window_close_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/icon_window_close_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_window_close_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/icon_window_close_press.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/icon_window_close_press.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/icon_window_close_press.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_solid_left_page_up_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_solid_left_page_up_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_solid_left_page_up_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_solid_left_page_up_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_solid_left_page_up_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_solid_left_page_up_press.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_solid_left_page_up_press.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_solid_left_page_up_press.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_solid_right_page_up_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_solid_right_page_up_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_solid_right_page_up_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_solid_right_page_up_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_solid_right_page_up_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_solid_right_page_up_press.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_solid_right_page_up_press.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_solid_right_page_up_press.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_video_pause_btn_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_video_pause_btn_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_video_pause_btn_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_video_pause_btn_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_video_play_btn_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_video_play_btn_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_video_play_btn_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_video_play_btn_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_video_refresh_btn.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_video_refresh_btn.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_video_refresh_btn.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_video_refresh_btn.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_view_empty_bg.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_view_empty_bg.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/main_view_empty_bg.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/main_view_empty_bg.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/media_next.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/media_next.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/media_next.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/media_next.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/media_previous.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/media_previous.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/media_previous.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/media_previous.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/module_tanlu_upload_fail.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/module_tanlu_upload_fail.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/module_tanlu_upload_fail.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/module_tanlu_upload_fail.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/module_tanlu_upload_success.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/module_tanlu_upload_success.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/module_tanlu_upload_success.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/module_tanlu_upload_success.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/public_arrow_back_iv.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/public_arrow_back_iv.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/public_arrow_back_iv.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/public_arrow_back_iv.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/share_failed_icon.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/share_failed_icon.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/share_failed_icon.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/share_failed_icon.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_chat.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_chat.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_chat.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_chat.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_chat_nomal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_chat_nomal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_chat_nomal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_chat_nomal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_chat_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_chat_press.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_chat_press.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_chat_press.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_head_image.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_head_image.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_head_image.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_head_image.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_icon_logo.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_icon_logo.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_icon_logo.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_icon_logo.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_like.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_like.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_like.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_like.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_logo.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_logo.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_logo.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_logo.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_navi.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_navi.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_navi.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_navi.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_normal_image.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_normal_image.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-mdpi-v4/tanlu_normal_image.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-1920x720-v4/tanlu_normal_image.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/app_icon.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/app_icon.png new file mode 100644 index 0000000000..c97be4be12 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/app_icon.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_heart_like.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_heart_like.png new file mode 100644 index 0000000000..3ce8b5d793 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_heart_like.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_heart_like_bg.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_heart_like_bg.png new file mode 100644 index 0000000000..95f8552545 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_heart_like_bg.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_heart_unlike.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_heart_unlike.png new file mode 100644 index 0000000000..2df4d5ba5d Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_heart_unlike.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_heart_unlike_bg.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_heart_unlike_bg.png new file mode 100644 index 0000000000..66a3d308ca Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_heart_unlike_bg.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/icon_window_close_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_window_close_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/icon_window_close_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_window_close_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/icon_window_close_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_window_close_press.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/icon_window_close_press.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/icon_window_close_press.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_solid_left_page_up_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_solid_left_page_up_normal.png new file mode 100644 index 0000000000..9c1a2a4aea Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_solid_left_page_up_normal.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_solid_left_page_up_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_solid_left_page_up_press.png new file mode 100644 index 0000000000..d927b18877 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_solid_left_page_up_press.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_solid_right_page_up_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_solid_right_page_up_normal.png new file mode 100644 index 0000000000..dda526f475 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_solid_right_page_up_normal.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_solid_right_page_up_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_solid_right_page_up_press.png new file mode 100644 index 0000000000..2289209d9a Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_solid_right_page_up_press.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_video_pause_btn_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_video_pause_btn_normal.png new file mode 100644 index 0000000000..90b401f17f Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_video_pause_btn_normal.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_video_play_btn_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_video_play_btn_normal.png new file mode 100644 index 0000000000..a30cf8591a Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_video_play_btn_normal.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_video_refresh_btn.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_video_refresh_btn.png new file mode 100644 index 0000000000..7f021fc1a9 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_video_refresh_btn.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_view_empty_bg.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_view_empty_bg.png new file mode 100644 index 0000000000..627aab9957 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/main_view_empty_bg.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/media_next.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/media_next.png new file mode 100644 index 0000000000..339d7731ec Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/media_next.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/media_previous.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/media_previous.png new file mode 100644 index 0000000000..7c0e9618fb Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/media_previous.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/module_tanlu_upload_fail.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/module_tanlu_upload_fail.png new file mode 100644 index 0000000000..f11f2cb3cd Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/module_tanlu_upload_fail.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/module_tanlu_upload_success.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/module_tanlu_upload_success.png new file mode 100644 index 0000000000..19829a2454 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/module_tanlu_upload_success.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/public_arrow_back_iv.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/public_arrow_back_iv.png new file mode 100644 index 0000000000..cd7159e219 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/public_arrow_back_iv.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/share_failed_icon.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/share_failed_icon.png new file mode 100644 index 0000000000..38609be713 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/share_failed_icon.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_chat.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_chat.png new file mode 100644 index 0000000000..89ae31e528 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_chat.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_chat_nomal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_chat_nomal.png new file mode 100644 index 0000000000..151904c2d9 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_chat_nomal.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_chat_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_chat_press.png new file mode 100644 index 0000000000..8da24b97ee Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_chat_press.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_head_image.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_head_image.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_head_image.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_head_image.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_icon_logo.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_icon_logo.png new file mode 100644 index 0000000000..5480b6d165 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_icon_logo.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_like.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_like.png new file mode 100644 index 0000000000..0f1c0132e1 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_like.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_logo.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_logo.png new file mode 100644 index 0000000000..1fc2152cd5 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_logo.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_navi.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_navi.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_navi.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_navi.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_normal_image.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_normal_image.png new file mode 100644 index 0000000000..4be775c67e Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-mdpi-v4/tanlu_normal_image.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_window_close_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/icon_window_close_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_window_close_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/icon_window_close_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_window_close_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/icon_window_close_press.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_window_close_press.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/icon_window_close_press.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/main_video_pause_btn_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/main_video_pause_btn_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/main_video_pause_btn_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/main_video_pause_btn_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/main_video_play_btn_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/main_video_play_btn_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/main_video_play_btn_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/main_video_play_btn_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/main_view_empty_bg.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/main_view_empty_bg.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/main_view_empty_bg.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/main_view_empty_bg.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/media_next.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/media_next.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/media_next.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/media_next.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/media_previous.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/media_previous.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/media_previous.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/media_previous.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/share_failed_icon.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/share_failed_icon.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/share_failed_icon.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/share_failed_icon.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_head_image.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/tanlu_head_image.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_head_image.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/tanlu_head_image.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_icon_logo.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/tanlu_icon_logo.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_icon_logo.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/tanlu_icon_logo.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_logo.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/tanlu_logo.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_logo.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/tanlu_logo.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_navi.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/tanlu_navi.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_navi.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/tanlu_navi.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_normal_image.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/tanlu_normal_image.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_normal_image.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/tanlu_normal_image.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_top_bg.9.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/tanlu_top_bg.9.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/tanlu_top_bg.9.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-1920x1000-v4/tanlu_top_bg.9.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_heart_like.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_heart_like.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_heart_like.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_heart_like.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_heart_like_bg.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_heart_like_bg.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_heart_like_bg.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_heart_like_bg.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_heart_unlike.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_heart_unlike.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_heart_unlike.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_heart_unlike.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_heart_unlike_bg.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_heart_unlike_bg.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_heart_unlike_bg.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_heart_unlike_bg.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_window_close_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_window_close_normal.png new file mode 100644 index 0000000000..e99eeaf974 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_window_close_normal.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_window_close_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_window_close_press.png new file mode 100644 index 0000000000..095574d6e2 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/icon_window_close_press.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/main_video_pause_btn_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/main_video_pause_btn_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/main_video_pause_btn_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/main_video_pause_btn_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/main_video_play_btn_normal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/main_video_play_btn_normal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/main_video_play_btn_normal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/main_video_play_btn_normal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/main_view_empty_bg.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/main_view_empty_bg.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/main_view_empty_bg.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/main_view_empty_bg.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/media_next.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/media_next.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/media_next.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/media_next.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/media_previous.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/media_previous.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/media_previous.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/media_previous.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/module_tanlu_upload_fail.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/module_tanlu_upload_fail.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/module_tanlu_upload_fail.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/module_tanlu_upload_fail.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/module_tanlu_upload_success.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/module_tanlu_upload_success.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/module_tanlu_upload_success.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/module_tanlu_upload_success.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/share_failed_icon.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/share_failed_icon.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/share_failed_icon.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/share_failed_icon.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_chat_nomal.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_chat_nomal.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_chat_nomal.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_chat_nomal.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_chat_press.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_chat_press.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_chat_press.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_chat_press.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_head_image.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_head_image.png new file mode 100644 index 0000000000..a6fba691bb Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_head_image.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_icon_logo.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_icon_logo.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_icon_logo.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_icon_logo.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_logo.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_logo.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_logo.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_logo.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_navi.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_navi.png new file mode 100644 index 0000000000..db15c8c987 Binary files /dev/null and b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_navi.png differ diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_normal_image.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_normal_image.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_normal_image.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_normal_image.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_top_bg.9.png b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_top_bg.9.png similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/tanlu_top_bg.9.png rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable-xhdpi-v4/tanlu_top_bg.9.png diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/loading_bg.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/loading_bg.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/loading_bg.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/loading_bg.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_btn_pause.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_bg_btn_pause.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_btn_pause.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_bg_btn_pause.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_btn_play.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_bg_btn_play.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_btn_play.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_bg_btn_play.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_btn_upload.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_bg_btn_upload.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_btn_upload.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_bg_btn_upload.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_solid_left_page_up.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_bg_solid_left_page_up.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_solid_left_page_up.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_bg_solid_left_page_up.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_solid_right_page_up.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_bg_solid_right_page_up.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_solid_right_page_up.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_bg_solid_right_page_up.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_btn_close.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_btn_close.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_btn_close.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_btn_close.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_chat_btn.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_chat_btn.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_chat_btn.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/selector_chat_btn.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_222533.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_bg_222533.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_222533.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_bg_222533.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_222533_6px_bottom.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_bg_222533_6px_bottom.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_222533_6px_bottom.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_bg_222533_6px_bottom.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_222533_9px.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_bg_222533_9px.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_222533_9px.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_bg_222533_9px.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_99191c25_4px.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_bg_99191c25_4px.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_99191c25_4px.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_bg_99191c25_4px.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_upload_222533.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_bg_upload_222533.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_upload_222533.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_bg_upload_222533.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_upload_press.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_bg_upload_press.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_upload_press.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_bg_upload_press.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_tanlu_top_bg.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_tanlu_top_bg.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_tanlu_top_bg.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_tanlu_top_bg.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_tanlu_top_bg_light.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_tanlu_top_bg_light.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_tanlu_top_bg_light.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/shape_tanlu_top_bg_light.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/small_video_seekbar_style.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/small_video_seekbar_style.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/small_video_seekbar_style.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/small_video_seekbar_style.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_alert_window_bg.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_alert_window_bg.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_alert_window_bg.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_alert_window_bg.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_bg.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_dialog_bg.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_bg.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_dialog_bg.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_bottom_button_right_bg.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_dialog_bottom_button_right_bg.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_bottom_button_right_bg.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_dialog_bottom_button_right_bg.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_button_bg.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_dialog_button_bg.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_button_bg.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_dialog_button_bg.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_button_right_bg.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_dialog_button_right_bg.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_button_right_bg.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_dialog_button_right_bg.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_neterror_button_bg.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_dialog_neterror_button_bg.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_dialog_neterror_button_bg.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_dialog_neterror_button_bg.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_event_type_red_bg.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_event_type_red_bg.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_event_type_red_bg.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_event_type_red_bg.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_gradual_change_bg.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_gradual_change_bg.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_gradual_change_bg.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_gradual_change_bg.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_type_button_blue_bg.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_type_button_blue_bg.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_type_button_blue_bg.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/drawable/tanlu_type_button_blue_bg.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_activity_media_full.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_activity_media_full.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_activity_media_full.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_activity_media_full.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_dialog_cutom_layout.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_dialog_cutom_layout.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_dialog_cutom_layout.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_dialog_cutom_layout.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_dialog_neterror_layout.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_dialog_neterror_layout.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_dialog_neterror_layout.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_dialog_neterror_layout.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_fullscreen_video_view_pager.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_fullscreen_video_view_pager.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_fullscreen_video_view_pager.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_fullscreen_video_view_pager.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_item_main_media_recycler.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_item_main_media_recycler.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_item_main_media_recycler.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_item_main_media_recycler.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_item_main_media_recycler_new.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_item_main_media_recycler_new.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_item_main_media_recycler_new.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_item_main_media_recycler_new.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_item_video_cover.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_item_video_cover.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_item_video_cover.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_item_video_cover.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_item_video_cover_media.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_item_video_cover_media.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_item_video_cover_media.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_item_video_cover_media.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_main_media_recycler.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_main_media_recycler.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_main_media_recycler.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_main_media_recycler.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_main_media_recycler_new.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_main_media_recycler_new.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/layout/tanlu_main_media_recycler_new.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/layout/tanlu_main_media_recycler_new.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/values-mdpi-1920x720-v4/values-mdpi-1920x720-v4.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/values-mdpi-1920x720-v4/values-mdpi-1920x720-v4.xml new file mode 100644 index 0000000000..f1267e1e69 --- /dev/null +++ b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/values-mdpi-1920x720-v4/values-mdpi-1920x720-v4.xml @@ -0,0 +1,12 @@ + + + 19px + 198px + 176px + 7px + 170px + 319px + 642px + 23px + 14px + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/values-mdpi-v4/values-mdpi-v4.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/values-mdpi-v4/values-mdpi-v4.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/values-mdpi-v4/values-mdpi-v4.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/values-mdpi-v4/values-mdpi-v4.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/values-xhdpi-1920x1000-v4/values-xhdpi-1920x1000-v4.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/values-xhdpi-1920x1000-v4/values-xhdpi-1920x1000-v4.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/values-xhdpi-1920x1000-v4/values-xhdpi-1920x1000-v4.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/values-xhdpi-1920x1000-v4/values-xhdpi-1920x1000-v4.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/values-xhdpi-v4/values-xhdpi-v4.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/values-xhdpi-v4/values-xhdpi-v4.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/values-xhdpi-v4/values-xhdpi-v4.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/values-xhdpi-v4/values-xhdpi-v4.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/values/values.xml b/modules/mogo-module-tanlu/build/intermediates/packaged_res/release/values/values.xml similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/values/values.xml rename to modules/mogo-module-tanlu/build/intermediates/packaged_res/release/values/values.xml diff --git a/modules/mogo-module-tanlu/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt b/modules/mogo-module-tanlu/build/intermediates/res/symbol-table-with-package/release/package-aware-r.txt similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt rename to modules/mogo-module-tanlu/build/intermediates/res/symbol-table-with-package/release/package-aware-r.txt diff --git a/modules/mogo-module-tanlu/build/intermediates/compile_library_classes/debug/classes.jar b/modules/mogo-module-tanlu/build/intermediates/runtime_library_classes/release/classes.jar similarity index 68% rename from modules/mogo-module-tanlu/build/intermediates/compile_library_classes/debug/classes.jar rename to modules/mogo-module-tanlu/build/intermediates/runtime_library_classes/release/classes.jar index ccc39a3fdc..0f28dd56ce 100644 Binary files a/modules/mogo-module-tanlu/build/intermediates/compile_library_classes/debug/classes.jar and b/modules/mogo-module-tanlu/build/intermediates/runtime_library_classes/release/classes.jar differ diff --git a/modules/mogo-module-tanlu/build/intermediates/symbols/debug/R.txt b/modules/mogo-module-tanlu/build/intermediates/symbols/release/R.txt similarity index 100% rename from modules/mogo-module-tanlu/build/intermediates/symbols/debug/R.txt rename to modules/mogo-module-tanlu/build/intermediates/symbols/release/R.txt diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/build-history.bin b/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/build-history.bin deleted file mode 100644 index 8087e55143..0000000000 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/build-history.bin and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream deleted file mode 100644 index 8d242650ff..0000000000 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len deleted file mode 100644 index 608ec9f703..0000000000 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at deleted file mode 100644 index 6903da86f4..0000000000 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at deleted file mode 100644 index 3081867c74..0000000000 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at deleted file mode 100644 index 32bc594364..0000000000 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream deleted file mode 100644 index eb49ac4ea8..0000000000 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len deleted file mode 100644 index c470da4ab0..0000000000 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream deleted file mode 100644 index f746740023..0000000000 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len deleted file mode 100644 index 608ec9f703..0000000000 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at deleted file mode 100644 index fef4f011bc..0000000000 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/build-history.bin b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/build-history.bin new file mode 100644 index 0000000000..16e92dff9f Binary files /dev/null and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/build-history.bin differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab similarity index 93% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab index 514e348fa9..662a7e55ef 100644 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab.keystream new file mode 100644 index 0000000000..dba07b4f98 Binary files /dev/null and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab.keystream differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len new file mode 100644 index 0000000000..2989e5d5c2 Binary files /dev/null and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab.values.at new file mode 100644 index 0000000000..34eeeca128 Binary files /dev/null and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab.values.at differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab_i similarity index 94% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab_i index bcdc53484f..d7b92ba5c1 100644 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab_i differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab_i.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/inputs/source-to-output.tab_i.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab similarity index 92% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab index 33fa57c9a7..fd6c7fd2ca 100644 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at new file mode 100644 index 0000000000..e289c75456 Binary files /dev/null and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab_i similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab_i diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab similarity index 92% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab index 5166501e4c..a700a99638 100644 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at new file mode 100644 index 0000000000..60eabf42d6 Binary files /dev/null and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.values.at similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.values.at rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.values.at diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab similarity index 92% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab index ab6bbaab8a..e2201ec781 100644 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at similarity index 85% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at index 9f84c141eb..58f3f5aca7 100644 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab_i similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab_i diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab similarity index 93% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab index c78b541760..c4a241d2f8 100644 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream new file mode 100644 index 0000000000..4c0243349c Binary files /dev/null and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len new file mode 100644 index 0000000000..7a2a2f2bb1 Binary files /dev/null and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i similarity index 94% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i index 49ac69118d..ec36a28f13 100644 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/counters.tab similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/counters.tab diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab similarity index 93% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab index 9bbfc89006..825321c33a 100644 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab.keystream new file mode 100644 index 0000000000..732a3f9120 Binary files /dev/null and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab.keystream differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len new file mode 100644 index 0000000000..2989e5d5c2 Binary files /dev/null and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab.values.at similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab.values.at diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab_i similarity index 94% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab_i index 54488c26e8..a1617581d1 100644 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab_i differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab_i.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/file-to-id.tab_i.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab similarity index 93% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab index 42534ba698..ab0f048261 100644 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab.keystream similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab.keystream diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab.values.at new file mode 100644 index 0000000000..683378b9e5 Binary files /dev/null and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab.values.at differ diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab_i similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab_i diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab_i.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/id-to-file.tab_i.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab.keystream similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab.keystream diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab.keystream.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab.keystream.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.at b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab.values.at similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.at rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab.values.at diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab_i similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab_i diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i.len b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab_i.len similarity index 100% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i.len rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab_i.len diff --git a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/last-build.bin b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/last-build.bin similarity index 79% rename from modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/last-build.bin rename to modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/last-build.bin index 2cb80ca8b0..10dbba28ae 100644 Binary files a/modules/mogo-module-tanlu/build/kotlin/compileDebugKotlin/last-build.bin and b/modules/mogo-module-tanlu/build/kotlin/compileReleaseKotlin/last-build.bin differ diff --git a/modules/mogo-module-tanlu/build/outputs/aar/mogo-module-tanlu-debug.aar b/modules/mogo-module-tanlu/build/outputs/aar/mogo-module-tanlu-debug.aar deleted file mode 100644 index ecae709b54..0000000000 Binary files a/modules/mogo-module-tanlu/build/outputs/aar/mogo-module-tanlu-debug.aar and /dev/null differ diff --git a/modules/mogo-module-tanlu/build/outputs/logs/manifest-merger-debug-report.txt b/modules/mogo-module-tanlu/build/outputs/logs/manifest-merger-debug-report.txt deleted file mode 100644 index 29327f1f52..0000000000 --- a/modules/mogo-module-tanlu/build/outputs/logs/manifest-merger-debug-report.txt +++ /dev/null @@ -1,103 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:1:1-47:12 -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:1:1-47:12 -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:1:1-47:12 -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:1:1-47:12 -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:1:1-47:12 -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:1:1-47:12 -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:1:1-47:12 - package - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:2:5-36 - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml - android:versionName - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:1:1-47:12 - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml - android:versionCode - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:1:1-47:12 - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml - xmlns:android - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:1:11-69 -uses-permission#android.permission.SYSTEM_ALERT_WINDOW -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:4:5-78 - android:name - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:4:22-75 -application -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:5:5-45:19 -activity#com.mogo.module.tanlu.video.FullMediaActivity -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:6:9-9:20 - android:hardwareAccelerated - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:8:13-47 - android:name - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:7:13-52 -receiver#com.mogo.module.tanlu.receiver.MarkerInfoReceiver -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:11:9-16:20 - android:name - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:11:19-62 -intent-filter#action:name:com.zhidao.roadcondition.marker.info+category:name:android.intent.category.HOME -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:12:13-15:29 -action#com.zhidao.roadcondition.marker.info -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:13:17-79 - android:name - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:13:25-76 -category#android.intent.category.HOME -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:14:17-73 - android:name - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:14:27-70 -receiver#com.mogo.module.tanlu.receiver.GetInfoFailedReceiver -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:18:9-23:20 - android:name - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:18:19-65 -intent-filter#action:name:com.zhidao.roadcondition.getinfo.failed+category:name:android.intent.category.HOME -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:19:13-22:29 -action#com.zhidao.roadcondition.getinfo.failed -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:20:17-82 - android:name - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:20:25-79 -receiver#com.mogo.module.tanlu.receiver.PushReceiver -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:25:9-30:20 - android:name - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:25:19-56 -intent-filter#action:name:com.zhidao.roadcondition.split+category:name:android.intent.category.HOME -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:26:13-29:29 -action#com.zhidao.roadcondition.split -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:27:17-73 - android:name - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:27:25-70 -receiver#com.mogo.module.tanlu.receiver.ShareDialogReceiver -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:32:9-37:20 - android:name - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:32:19-63 -intent-filter#action:name:com.zhidao.sharedialog+category:name:android.intent.category.HOME -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:33:13-36:29 -action#com.zhidao.sharedialog -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:34:17-65 - android:name - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:34:25-62 -receiver#com.mogo.module.tanlu.receiver.DataErrorReceiver -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:39:9-44:20 - android:name - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:39:19-61 -intent-filter#action:name:com.zhidao.tanlu.dataerror+category:name:android.intent.category.HOME -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:40:13-43:29 -action#com.zhidao.tanlu.dataerror -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:41:17-69 - android:name - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml:41:25-66 -uses-sdk -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml reason: use-sdk injection requested -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml - android:targetSdkVersion - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml - android:minSdkVersion - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/AndroidManifest.xml diff --git a/modules/mogo-module-tanlu/build/outputs/logs/manifest-merger-release-report.txt b/modules/mogo-module-tanlu/build/outputs/logs/manifest-merger-release-report.txt new file mode 100644 index 0000000000..8b6ac935fb --- /dev/null +++ b/modules/mogo-module-tanlu/build/outputs/logs/manifest-merger-release-report.txt @@ -0,0 +1,103 @@ +-- Merging decision tree log --- +manifest +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:1:1-47:12 +INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:1:1-47:12 +INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:1:1-47:12 +INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:1:1-47:12 +INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:1:1-47:12 +INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:1:1-47:12 +INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:1:1-47:12 + package + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:2:5-36 + INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml + INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml + android:versionName + INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:1:1-47:12 + INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml + android:versionCode + INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:1:1-47:12 + INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml + xmlns:android + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:1:11-69 +uses-permission#android.permission.SYSTEM_ALERT_WINDOW +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:4:5-78 + android:name + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:4:22-75 +application +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:5:5-45:19 +activity#com.mogo.module.tanlu.video.FullMediaActivity +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:6:9-9:20 + android:hardwareAccelerated + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:8:13-47 + android:name + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:7:13-52 +receiver#com.mogo.module.tanlu.receiver.MarkerInfoReceiver +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:11:9-16:20 + android:name + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:11:19-62 +intent-filter#action:name:com.zhidao.roadcondition.marker.info+category:name:android.intent.category.HOME +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:12:13-15:29 +action#com.zhidao.roadcondition.marker.info +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:13:17-79 + android:name + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:13:25-76 +category#android.intent.category.HOME +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:14:17-73 + android:name + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:14:27-70 +receiver#com.mogo.module.tanlu.receiver.GetInfoFailedReceiver +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:18:9-23:20 + android:name + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:18:19-65 +intent-filter#action:name:com.zhidao.roadcondition.getinfo.failed+category:name:android.intent.category.HOME +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:19:13-22:29 +action#com.zhidao.roadcondition.getinfo.failed +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:20:17-82 + android:name + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:20:25-79 +receiver#com.mogo.module.tanlu.receiver.PushReceiver +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:25:9-30:20 + android:name + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:25:19-56 +intent-filter#action:name:com.zhidao.roadcondition.split+category:name:android.intent.category.HOME +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:26:13-29:29 +action#com.zhidao.roadcondition.split +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:27:17-73 + android:name + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:27:25-70 +receiver#com.mogo.module.tanlu.receiver.ShareDialogReceiver +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:32:9-37:20 + android:name + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:32:19-63 +intent-filter#action:name:com.zhidao.sharedialog+category:name:android.intent.category.HOME +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:33:13-36:29 +action#com.zhidao.sharedialog +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:34:17-65 + android:name + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:34:25-62 +receiver#com.mogo.module.tanlu.receiver.DataErrorReceiver +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:39:9-44:20 + android:name + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:39:19-61 +intent-filter#action:name:com.zhidao.tanlu.dataerror+category:name:android.intent.category.HOME +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:40:13-43:29 +action#com.zhidao.tanlu.dataerror +ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:41:17-69 + android:name + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml:41:25-66 +uses-sdk +INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml +INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml +INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml +INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml + android:targetSdkVersion + INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml + INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml + android:minSdkVersion + INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml + ADDED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml + INJECTED from F:\Station\Launcher\modules\mogo-module-tanlu\src\main\AndroidManifest.xml diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/META-INF/mogo-module-tanlu_debug.kotlin_module b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/META-INF/mogo-module-tanlu_release.kotlin_module similarity index 100% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/META-INF/mogo-module-tanlu_debug.kotlin_module rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/META-INF/mogo-module-tanlu_release.kotlin_module diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/callback/IThumbsUpCallback.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/callback/IThumbsUpCallback.class similarity index 81% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/callback/IThumbsUpCallback.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/callback/IThumbsUpCallback.class index e1ccf000ad..c413dfe795 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/callback/IThumbsUpCallback.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/callback/IThumbsUpCallback.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/callback/RoadInfoCallback.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/callback/RoadInfoCallback.class similarity index 87% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/callback/RoadInfoCallback.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/callback/RoadInfoCallback.class index b1a1878ec9..95c34e1e46 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/callback/RoadInfoCallback.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/callback/RoadInfoCallback.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/constant/ConstKt.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/constant/ConstKt.class similarity index 94% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/constant/ConstKt.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/constant/ConstKt.class index 388f2f95dc..8d1fd6db74 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/constant/ConstKt.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/constant/ConstKt.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/BaseDataCompat.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/BaseDataCompat.class similarity index 92% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/BaseDataCompat.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/BaseDataCompat.class index abec5c2867..a61b53fd03 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/BaseDataCompat.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/BaseDataCompat.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/CarsLive.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/CarsLive.class similarity index 91% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/CarsLive.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/CarsLive.class index 33aec8224a..e0f8da1bb9 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/CarsLive.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/CarsLive.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Center.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Center.class similarity index 90% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Center.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Center.class index cee39acb17..8636f5c798 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Center.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Center.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Items$CREATOR.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Items$CREATOR.class similarity index 88% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Items$CREATOR.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Items$CREATOR.class index 1809b90d4c..76460c737b 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Items$CREATOR.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Items$CREATOR.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Items.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Items.class similarity index 93% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Items.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Items.class index d63a205004..cff6723110 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Items.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Items.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Location.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Location.class similarity index 91% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Location.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Location.class index 8d024447fd..53b6bd9380 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Location.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Location.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/LocationCarsWithRadius.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/LocationCarsWithRadius.class similarity index 92% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/LocationCarsWithRadius.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/LocationCarsWithRadius.class index ac769d995b..3b756792d8 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/LocationCarsWithRadius.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/LocationCarsWithRadius.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/NaviLatLngInfo1.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/NaviLatLngInfo1.class similarity index 89% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/NaviLatLngInfo1.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/NaviLatLngInfo1.class index 38530e91f1..33b55fcfea 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/NaviLatLngInfo1.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/NaviLatLngInfo1.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/NaviLatLngInfoKt.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/NaviLatLngInfoKt.class similarity index 89% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/NaviLatLngInfoKt.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/NaviLatLngInfoKt.class index 93f1b14197..90227cbea8 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/NaviLatLngInfoKt.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/NaviLatLngInfoKt.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/RoadInfoRequest.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/RoadInfoRequest.class similarity index 95% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/RoadInfoRequest.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/RoadInfoRequest.class index 68a094fdd3..ef04741ce9 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/RoadInfoRequest.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/RoadInfoRequest.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/RoadInfos.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/RoadInfos.class similarity index 91% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/RoadInfos.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/RoadInfos.class index 69d19810e8..db297b7d82 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/RoadInfos.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/RoadInfos.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/SearchOnlineInfo.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/SearchOnlineInfo.class similarity index 94% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/SearchOnlineInfo.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/SearchOnlineInfo.class index b50404845a..ddf82ad862 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/SearchOnlineInfo.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/SearchOnlineInfo.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Sns.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Sns.class similarity index 93% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Sns.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Sns.class index 6152d7506d..ec31023359 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/Sns.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/Sns.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/ThumbsUpRequest.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/ThumbsUpRequest.class similarity index 94% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/ThumbsUpRequest.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/ThumbsUpRequest.class index d96d49802d..faa5283804 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/ThumbsUpRequest.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/ThumbsUpRequest.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/VoiceCmdData.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/VoiceCmdData.class similarity index 93% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/VoiceCmdData.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/VoiceCmdData.class index 27865677a0..b5ed294929 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/VoiceCmdData.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/VoiceCmdData.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/global/GlobalSharedInformation.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/global/GlobalSharedInformation.class similarity index 94% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/global/GlobalSharedInformation.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/global/GlobalSharedInformation.class index dcb561a7a2..7246d33957 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/model/global/GlobalSharedInformation.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/model/global/GlobalSharedInformation.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/receiver/GetInfoFailedReceiver.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/receiver/GetInfoFailedReceiver.class similarity index 90% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/receiver/GetInfoFailedReceiver.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/receiver/GetInfoFailedReceiver.class index afa4875d87..7907440085 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/receiver/GetInfoFailedReceiver.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/receiver/GetInfoFailedReceiver.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.class similarity index 85% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.class index d0f5c84712..dd04f5dd16 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/receiver/PushReceiver.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/receiver/PushReceiver.class similarity index 91% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/receiver/PushReceiver.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/receiver/PushReceiver.class index 259f3a809c..84e5168718 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/receiver/PushReceiver.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/receiver/PushReceiver.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/receiver/SearchTrafficInfoReceiver.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/receiver/SearchTrafficInfoReceiver.class similarity index 93% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/receiver/SearchTrafficInfoReceiver.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/receiver/SearchTrafficInfoReceiver.class index 304a04f815..092cbaeae6 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/receiver/SearchTrafficInfoReceiver.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/receiver/SearchTrafficInfoReceiver.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/DoubleCheckUtilKt.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/DoubleCheckUtilKt.class similarity index 89% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/DoubleCheckUtilKt.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/DoubleCheckUtilKt.class index 06fdae587e..003a29e2d5 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/DoubleCheckUtilKt.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/DoubleCheckUtilKt.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/HideControl$Companion.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/HideControl$Companion.class similarity index 78% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/HideControl$Companion.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/HideControl$Companion.class index 3244eb1035..3d965054c3 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/HideControl$Companion.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/HideControl$Companion.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/HideControl$HideHandler.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/HideControl$HideHandler.class similarity index 89% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/HideControl$HideHandler.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/HideControl$HideHandler.class index 951ac8be31..c8cd1235b5 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/HideControl$HideHandler.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/HideControl$HideHandler.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/HideControl$hideRunable$1.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/HideControl$hideRunable$1.class similarity index 100% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/HideControl$hideRunable$1.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/HideControl$hideRunable$1.class diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/HideControl.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/HideControl.class similarity index 95% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/HideControl.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/HideControl.class index 93c5e71d38..cf4fba772b 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/HideControl.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/HideControl.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/StringUitlKt.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/StringUitlKt.class similarity index 90% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/StringUitlKt.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/StringUitlKt.class index 82e7be781b..1283c0d202 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/util/StringUitlKt.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/util/StringUitlKt.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/FullMediaActivity$Companion.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/FullMediaActivity$Companion.class similarity index 91% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/FullMediaActivity$Companion.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/FullMediaActivity$Companion.class index d8459a8dd4..26f98d0a29 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/FullMediaActivity$Companion.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/FullMediaActivity$Companion.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/FullMediaActivity$setListener$1.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/FullMediaActivity$setListener$1.class similarity index 86% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/FullMediaActivity$setListener$1.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/FullMediaActivity$setListener$1.class index 9cf32bc36e..ad000f891b 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/FullMediaActivity$setListener$1.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/FullMediaActivity$setListener$1.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/FullMediaActivity$setListener$2.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/FullMediaActivity$setListener$2.class similarity index 84% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/FullMediaActivity$setListener$2.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/FullMediaActivity$setListener$2.class index 85d1b87ea1..092f8f8ad0 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/FullMediaActivity$setListener$2.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/FullMediaActivity$setListener$2.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/FullMediaActivity.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/FullMediaActivity.class similarity index 97% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/FullMediaActivity.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/FullMediaActivity.class index 051692dd06..80c13b79d3 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/FullMediaActivity.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/FullMediaActivity.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/MediaCoverVideoPlayer$CompletionListener.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/MediaCoverVideoPlayer$CompletionListener.class similarity index 71% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/MediaCoverVideoPlayer$CompletionListener.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/MediaCoverVideoPlayer$CompletionListener.class index 6d242206f4..c44fb5c9c6 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/MediaCoverVideoPlayer$CompletionListener.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/MediaCoverVideoPlayer$CompletionListener.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/MediaCoverVideoPlayer$SingleClickListener.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/MediaCoverVideoPlayer$SingleClickListener.class similarity index 70% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/MediaCoverVideoPlayer$SingleClickListener.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/MediaCoverVideoPlayer$SingleClickListener.class index 173985fbfe..ed6e9b7d42 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/MediaCoverVideoPlayer$SingleClickListener.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/MediaCoverVideoPlayer$SingleClickListener.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.class similarity index 97% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.class index 5141bd5e2c..e6bb688ab6 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer$Companion.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer$Companion.class similarity index 77% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer$Companion.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer$Companion.class index 2c46546f4a..0f1c1dea80 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer$Companion.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer$Companion.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.class similarity index 98% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.class index e6320e652f..9f27d61e06 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.class differ diff --git a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/VideoInitKt.class b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/VideoInitKt.class similarity index 92% rename from modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/VideoInitKt.class rename to modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/VideoInitKt.class index ddc22c9ff7..ad2afb8450 100644 Binary files a/modules/mogo-module-tanlu/build/tmp/kotlin-classes/debug/com/mogo/module/tanlu/video/VideoInitKt.class and b/modules/mogo-module-tanlu/build/tmp/kotlin-classes/release/com/mogo/module/tanlu/video/VideoInitKt.class differ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java index fff99105fd..2fefe935c1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java @@ -10,11 +10,9 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; import com.mogo.module.common.entity.MarkerPoiTypeEnum; -import com.mogo.module.common.glide.SkinAbleBitmapTarget; import com.mogo.module.v2x.R; +import com.mogo.module.v2x.adapter.holder.V2XSurroundingViewHolder; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; import com.mogo.module.v2x.listener.SurroundingItemClickListener; @@ -76,7 +74,7 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter { + private List markerExploreWays; + private Context mContext; + private ImageView mTypeImageView; + private TextView mTypeTv; + private TextView mAddressTv; + private TextView mTimeTv; + + + public V2XSurroundingDetailAdapter(Context context, List list) { + mContext = context; + markerExploreWays = list; + } + + @Override + public int getItemViewType(int position) { + return super.getItemViewType(position); + } + + @NonNull + @Override + public V2XSurroundingDetailVH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View inflate = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.module_v2x_event_surrounding_detail_item, parent, false); + return new V2XSurroundingDetailVH(inflate); + } + + @Override + public void onBindViewHolder(@NonNull V2XSurroundingDetailVH holder, final int position) { + final MarkerExploreWay exploreWay = markerExploreWays.get(position); + if (exploreWay == null) { + return; + } + +// mTypeImageView = holder.itemView.findViewById(R.id.iv_event_type); + mTypeTv = holder.itemView.findViewById(R.id.surrounding_road_type); + mAddressTv = holder.itemView.findViewById(R.id.surrounding_road_type_address); + mTimeTv = holder.itemView.findViewById(R.id.surrounding_time); + + mTypeTv.setText(getTypeName(exploreWay.getPoiType())); + mAddressTv.setText(exploreWay.getAddr()); + mTimeTv.setText(DateTimeUtils.getTimeText(exploreWay.getGenerateTime(), DateTimeUtils.MM_Yue_dd_Ri_HH_mm)); + +// mTypeImageView.setBackgroundResource(getTypeSmallRes(surroundingConstruction.getPoiType())); + } + + + @Override + public int getItemCount() { + return markerExploreWays == null ? 0 : markerExploreWays.size(); + } + + private String getTypeName(String type) { + String typeName = ""; + switch (type) { + case MarkerPoiTypeEnum.ROAD_CLOSED: + typeName = "封路"; + break; + case MarkerPoiTypeEnum.FOURS_ICE: + typeName = "道路结冰"; + break; + case MarkerPoiTypeEnum.FOURS_FOG: + typeName = "浓雾"; + break; + case MarkerPoiTypeEnum.TRAFFIC_CHECK: + typeName = "交通检查"; + break; + case MarkerPoiTypeEnum.FOURS_ACCIDENT: + typeName = "交通事故"; + break; + case MarkerPoiTypeEnum.FOURS_BLOCK_UP: + typeName = "拥堵"; + break; + case MarkerPoiTypeEnum.FOURS_ROAD_WORK: + typeName = "施工"; + break; + case MarkerPoiTypeEnum.FOURS_PONDING: + typeName = "道路积水"; + break; + case MarkerPoiTypeEnum.FOURS_LIVING: + typeName = "实时路况"; + break; + default: + typeName = "实时路况"; + break; + } + return typeName; + } + + +} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java index f3d5c12454..2da020805c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java @@ -99,7 +99,7 @@ public class V2XFatigueDrivingVH extends V2XBaseViewHolder { SpanUtils.with(mTvAddressDistance) .append("" + (int) mV2XPushMessageEntity.getDistance()) .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text)) - .append("m") + .append("米") .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title)) .create(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java index 97910f7114..18aeb96303 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java @@ -181,14 +181,14 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { SpanUtils.with(tvDistance) .append("" + (int) mV2XPushMessageEntity.getDistance() / 1000) .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text)) - .append("km") + .append("公里") .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title)) .create(); } else { SpanUtils.with(tvDistance) .append("" + (int) mV2XPushMessageEntity.getDistance()) .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text)) - .append("m") + .append("米") .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title)) .create(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java index 19376eb451..d9448a9c36 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java @@ -230,7 +230,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { tvEventTypeTitle.setBackgroundResource(EventTypeUtils.getPoiTypeBg(mNoveltyInfo.getPoiType())); } tvEventAddress.setText(mNoveltyInfo.getAddr()); - tvEventDistance.setText("距离 " + (int) mNoveltyInfo.getDistance() + "M"); + tvEventDistance.setText("距离 " + (int) mNoveltyInfo.getDistance() + "米"); Calendar c = Calendar.getInstance(); c.setTimeInMillis(mNoveltyInfo.getGenerateTime()); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java index a8189bcc72..15c5cae0c4 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java @@ -90,14 +90,14 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder { @@ -255,11 +263,13 @@ class V2XEventPanelFragment : MvpFragment 0) { + AIAssist.getInstance(V2XUtils.getApp()). + speakTTSVoice("为您找到以下动态请查看", null); + } else { + AIAssist.getInstance(V2XUtils.getApp()). + speakTTSVoice("今天暂无出行动态,试试对我说分享拥堵给其他车友吧", null); + } + } + @Override public void onResume() { super.onResume(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index 066ed9fba2..9e0574e707 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -138,7 +138,7 @@ public class V2XShareEventsFragment extends MvpFragment implements SurroundingEventView, View.OnClickListener, SurroundingItemClickListener { private static final String TAG = "SurroundingFragment"; + private RelativeLayout mSurroundingLayout; private RecyclerView mRecyclerView; private TextView mTotalTv; private RelativeLayout mTopLayout; @@ -76,10 +82,17 @@ public class V2XSurroundingFragment extends MvpFragment markerExploreWays = new ArrayList<>(); + + @Override protected int getLayoutId() { - Log.d(TAG, "getLayoutId --------> "); return R.layout.module_event_panel_fragment_surrounding; } @@ -92,7 +105,7 @@ public class V2XSurroundingFragment extends MvpFragment "); + mSurroundingLayout = findViewById(R.id.layout_surrounding_event); mRecyclerView = findViewById(R.id.surrounding_recycleview); mTotalTv = findViewById(R.id.tv_brief); mTopLayout = findViewById(R.id.layout_top); @@ -105,6 +118,13 @@ public class V2XSurroundingFragment extends MvpFragment"); - } @Override @@ -147,6 +174,8 @@ public class V2XSurroundingFragment extends MvpFragment 0) { + AIAssist.getInstance(V2XUtils.getApp()). + speakTTSVoice("为您找到周边以下事件请查看", null); + } else { + AIAssist.getInstance(V2XUtils.getApp()). + speakTTSVoice("周边5公里内无事件,试试对我说分享路况给其他车友吧", null); + } + } + + private Map getPoiTypeMap(List list) { Map mPoiTypeMarkers = new HashMap<>(); for (int i = 0; i < list.size(); i++) { @@ -278,71 +321,99 @@ public class V2XSurroundingFragment extends MvpFragment exploreWayList = construction.getConstrutList(); - Logger.d(TAG, "onItemClickListener exploreWayList.size() = " + exploreWayList.size()); - if (exploreWayList != null && exploreWayList.size() > 0) { - for (int i = 0; i < exploreWayList.size(); i++) { - MarkerExploreWay exploreWay = exploreWayList.get(i); - MarkerShowEntity markerShowEntity = new MarkerShowEntity(); - markerShowEntity.setBindObj(exploreWay); - markerShowEntity.setChecked(false); - markerShowEntity.setTextContent(exploreWay.getAddr()); - markerShowEntity.setMarkerLocation(exploreWay.getLocation()); - markerShowEntity.setMarkerType(ServiceConst.CARD_TYPE_ROAD_CONDITION); - - WorkThreadHandler.getInstance().postDelayed(() -> { - IMogoMarker mogoMarker = V2XServiceManager.getIMogoMarkerService().drawMarker(markerShowEntity); - // 点击监听,天际弹窗展示详情 - if (mogoMarker != null) { - mogoMarker.startScaleAnimation(0, 1.2f, 0, 1.2f, 300, new AccelerateInterpolator(), new OnMarkerAnimationListener() { - @Override - public void onAnimStart() { - Logger.d(TAG, " onItemClickListener onAnimStart -----> "); - } - - @Override - public void onAnimEnd() { - if (mogoMarker.isDestroyed()) { - return; - } - Logger.d(TAG, " onItemClickListener onAnimEnd ------> "); - mogoMarker.startScaleAnimation(1.2f, 1, 1.2f, 1, 100, new LinearInterpolator(), null); - } - }); - mogoMarker.setOwner(markerShowEntity.getMarkerType()); - mogoMarker.setObject(markerShowEntity); - } - }, i * 100L); - } - - //自适应显示 - showBonndsRoadtion(exploreWayList); - } else { - Logger.e(TAG, "onItemClickListener exploreWayList == null"); - } - } catch (Exception e) { - e.printStackTrace(); - } + String brief = String.format(getContext().getResources().getString(R.string.v2x_surrounding_detail_top_brief), markerExploreWays.size()); + mBriefTv.setText(brief + poiType); + Logger.d(TAG, "onItemClickListener markerExploreWays.size() = " + markerExploreWays.size()); } } + +// @Override +// public void onItemClickListener(View v, int position, SurroundingConstruction construction) { +// if (construction != null) { +// //卡片消失 +// V2XEventPanelFragment.Companion.getInstance().hidePanel(); +// //清除道路事件 +// V2XServiceManager.getMarkerManager().removeMarkers(ServiceConst.CARD_TYPE_ROAD_CONDITION); +// +// try { +// //处理 marker的显示 +// List exploreWayList = construction.getConstrutList(); +// Logger.d(TAG, "onItemClickListener exploreWayList.size() = " + exploreWayList.size()); +// if (exploreWayList != null && exploreWayList.size() > 0) { +// for (int i = 0; i < exploreWayList.size(); i++) { +// MarkerExploreWay exploreWay = exploreWayList.get(i); +// MarkerShowEntity markerShowEntity = new MarkerShowEntity(); +// markerShowEntity.setBindObj(exploreWay); +// markerShowEntity.setChecked(false); +// markerShowEntity.setTextContent(exploreWay.getAddr()); +// markerShowEntity.setMarkerLocation(exploreWay.getLocation()); +// markerShowEntity.setMarkerType(ServiceConst.CARD_TYPE_ROAD_CONDITION); +// +// WorkThreadHandler.getInstance().postDelayed(() -> { +// IMogoMarker mogoMarker = V2XServiceManager.getIMogoMarkerService().drawMarker(markerShowEntity); +// // 点击监听,天际弹窗展示详情 +// if (mogoMarker != null) { +// mogoMarker.startScaleAnimation(0, 1.2f, 0, 1.2f, 300, new AccelerateInterpolator(), new OnMarkerAnimationListener() { +// @Override +// public void onAnimStart() { +// Logger.d(TAG, " onItemClickListener onAnimStart -----> "); +// } +// +// @Override +// public void onAnimEnd() { +// if (mogoMarker.isDestroyed()) { +// return; +// } +// Logger.d(TAG, " onItemClickListener onAnimEnd ------> "); +// mogoMarker.startScaleAnimation(1.2f, 1, 1.2f, 1, 100, new LinearInterpolator(), null); +// } +// }); +// mogoMarker.setOwner(markerShowEntity.getMarkerType()); +// mogoMarker.setObject(markerShowEntity); +// } +// }, i * 100L); +// } +// +// //自适应显示 +// showBonndsRoadtion(exploreWayList); +// } else { +// Logger.e(TAG, "onItemClickListener exploreWayList == null"); +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +// } + + /** * 自适应显示 * diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/SurroundingItemClickListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/SurroundingItemClickListener.java index 3ebf7bccf3..83eef72f09 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/SurroundingItemClickListener.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/SurroundingItemClickListener.java @@ -10,5 +10,5 @@ import com.mogo.module.v2x.entity.panel.SurroundingConstruction; * @since 2020/8/10 */ public interface SurroundingItemClickListener { - void onItemClickListener(View v, int position, SurroundingConstruction construction); + void onItemClickListener(View v, int position, SurroundingConstruction construction, String poiType); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/HttpConstant.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/HttpConstant.kt index dcc0b492d6..ae8d8350b1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/HttpConstant.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/HttpConstant.kt @@ -5,10 +5,10 @@ import com.mogo.commons.debug.DebugConfig class HttpConstant { companion object { - const val HOST_DEV = "http://dzt-test.zhidaohulian.com" - const val HOST_TEST = "http://dzt-test.zhidaohulian.com" - const val HOST_DEMO = "http://dzt-show.zhidaohulian.com" - const val HOST_PRODUCT = "https://dzt.zhidaohulian.com" + const val HOST_DEV = "http://dzt-test.zhidaozhixing.com" + const val HOST_TEST = "http://dzt-test.zhidaozhixing.com" + const val HOST_DEMO = "http://dzt-show.zhidaozhixing.com" + const val HOST_PRODUCT = "http://dzt.zhidaozhixing.com" fun getNetHost(): String { return when (DebugConfig.getNetMode()) { diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/v2x_cancel_help.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-mdpi/v2x_cancel_help.9.png rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png deleted file mode 100644 index 11049bacf3..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_cancel_help.9.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.9.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_cancel_help.9.png rename to modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.9.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png deleted file mode 100644 index 3dab9ec629..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png deleted file mode 100644 index 1923804913..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_cancel_help.9.png b/modules/mogo-module-v2x/src/main/res/drawable/v2x_cancel_help.9.png deleted file mode 100644 index e73d76936f..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable/v2x_cancel_help.9.png and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index 220d67496e..b2df95c2a1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -5,138 +5,190 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + - + + - - - - - - - - - - - - - + android:layout_height="match_parent"> + + + + + + + + + + android:layout_below="@+id/layout_top" + android:layout_marginBottom="@dimen/module_v2x_panel_surrounding_marginbottom"> - - - - - + android:visibility="visible" /> + + android:layout_centerHorizontal="true" + android:gravity="center_horizontal" + android:visibility="gone"> + + - - + android:id="@+id/tv_main_empty_1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@+id/iv_empty" + android:layout_centerHorizontal="true" + android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top" + android:gravity="center_horizontal" + android:text="周边5公里,暂无交通事件" + android:textColor="@color/v2x_FFF_333" + android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> + android:id="@+id/tv_main_empty_2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@+id/tv_main_empty_1" + android:layout_centerHorizontal="true" + android:layout_marginTop="1px" + android:gravity="center_horizontal" + android:text="你可以试着分享一个事件给其他车主" + android:textColor="@color/v2x_FFF_333" + android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml index 900f3b0c19..6d3d72c99b 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml @@ -17,7 +17,7 @@ android:alpha="0.8" android:gravity="center" android:paddingLeft="20px" - android:paddingTop="@dimen/dp_25" + android:paddingTop="@dimen/dp_26" android:text="小窍门:分享路况,点赞其他车主,有助于提高热心指数" android:textColor="@color/v2x_share_des_title_color" android:textSize="@dimen/share_top_text_size"> @@ -27,7 +27,7 @@ + android:paddingTop="14px"> @@ -83,7 +83,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal|top" - android:paddingBottom="22px" + android:paddingBottom="@dimen/des_text_margin_bottom" android:text="车友认同次数" android:textColor="#FFFFFF" android:textSize="@dimen/share_index_des_size" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index 6bf0a69a87..f656dd22e9 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -9,43 +9,28 @@ android:layout_marginBottom="@dimen/dp_14" android:background="@drawable/bg_v2x_event_list_item"> - - + android:textSize="@dimen/share_item_text_size" /> + android:paddingRight="5px" + android:src="@drawable/v2x_share_item_unlike" /> + android:textSize="@dimen/share_item_text_size" /> + android:paddingRight="5px" + android:src="@drawable/v2x_share_item_like" /> + android:textSize="@dimen/share_item_address" + android:textStyle="bold" /> + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml new file mode 100644 index 0000000000..075ce59f72 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml @@ -0,0 +1,53 @@ + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml index 8c05ab84b4..d097e0e44c 100644 --- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml @@ -61,6 +61,7 @@ 17px 14px 36px + 22px 16px 20px 34px diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index 03bc2597eb..eafb0c59f3 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -62,6 +62,7 @@ 17px 14px 36px + 22px 16px 20px 34px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index cfe362711a..5b9f3c3410 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -58,11 +58,12 @@ 100px 28px 26px - 67.5px - 30px + 64px + 48px + 28px 40px 60px - 31px + 22px 54px -10px 114px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index cfd4c1b19f..4b859dcf2e 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -56,6 +56,7 @@ 17px 14px 36px + 22px 16px 20px 34px diff --git a/modules/mogo-module-v2x/src/main/res/values/strings.xml b/modules/mogo-module-v2x/src/main/res/values/strings.xml index 2413b8f3d5..fb1828d09f 100644 --- a/modules/mogo-module-v2x/src/main/res/values/strings.xml +++ b/modules/mogo-module-v2x/src/main/res/values/strings.xml @@ -6,6 +6,7 @@ 已提交 感谢已送达 周围5公里,共 %d 条交通信息 + 周围5公里,共 %d 条 去分享 刷新 diff --git a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java index f7fc67fe67..66d798f936 100644 --- a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java +++ b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java @@ -83,7 +83,6 @@ class AutoNaviIntentHandler implements IMogoVoiceCmdCallBack { public void handle( Context context, Intent intent ) { int keyType = intent.getIntExtra( "KEY_TYPE", 0 ); - Logger.d( TAG, "KEY_TYPE = " + keyType ); switch ( keyType ) { case 10021: closeEntrance(); diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java index 4962a7599e..5cc6cba1d2 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java @@ -155,6 +155,8 @@ public class MogoServicePaths { @Deprecated public static final String PATH_REFRESH_STRATEGY_API = "/refreshstrategy/api"; + + /** * 刷新策略控制 */ @@ -225,7 +227,7 @@ public class MogoServicePaths { * 授权服务 */ @Deprecated - public static final String PATH_AGREEMENT = "/agreement/showFragment"; + public static final String PATH_AGREEMENT = "/agreement/showFragment"; /** * 日志上传 diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/entrance/IMogoEntranceButtonController.java b/services/mogo-service-api/src/main/java/com/mogo/service/entrance/IMogoEntranceButtonController.java index e57e039459..637ea09cfb 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/entrance/IMogoEntranceButtonController.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/entrance/IMogoEntranceButtonController.java @@ -41,4 +41,16 @@ public interface IMogoEntranceButtonController extends IProvider { * @param view 待移除view */ void removeBottomLayerView(View view); + + /** + * 添加左下角功能View,按顺序添加到最底端 + * @param view 待添加view + */ + void addLeftFeatureView(View view); + + /** + * 移除左下角功能按钮 + * @param view 待移除view + */ + void removeLeftFeatureView(View view); } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java index 7c7600e155..f4655180d0 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java @@ -116,6 +116,19 @@ public interface IMogoStatusManager extends IProvider { */ boolean isMainPageLaunched(); + /** + * 媒体是否正在播放 + * @return true - 正在播放 false - 没有播放 + */ + boolean isMediaPlaying(); + + /** + * 设置媒体播放状态 + * @param tag 业务类型 + * @param status true - 正在播放 false - 未在播放 + */ + void setMediaPlayStatus(String tag, boolean status); + /** * 设置topView展示状态 * @param tag 业务类型 diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java index b128676fdc..42d71b3283 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java @@ -82,5 +82,9 @@ public enum StatusDescriptor { /** * topView展示状态 */ - TOP_VIEW + TOP_VIEW, + /** + * 媒体播放状态 + */ + MEDIA_PLAYER_STATUS } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 7079caffe6..7770ed5df4 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -1,16 +1,14 @@ package com.mogo.service.impl.adas; -import android.app.ActivityManager; import android.app.Application; import android.content.Context; import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.AbsMogoApplication; -import com.mogo.commons.debug.DebugConfig; +import com.mogo.commons.context.ContextHolderUtil; import com.mogo.map.uicontroller.EnumMapUI; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.utils.CarSeries; import com.mogo.service.MogoServicePaths; import com.mogo.service.adas.IMogoADASController; @@ -94,11 +92,35 @@ public class MogoADASController implements IMogoADASController { } } ); invokeShowADASOperation(); + AutopilotServiceManage.getInstance().registerAutopilotDataListener(new IAutopolitDataCallBack() { + @Override + public void sendMsg(String msg) { + Logger.d(TAG, "收到adas数据回调: " + msg); + for (IMogoAdasDataCallback callback : adasDataCallbackList) { + callback.onAdasDataCallback(msg); + } + } - AutopilotServiceManage.getInstance().registerAutopilotDataListener(msg -> { - Logger.d(TAG, "收到adas数据回调: " + msg); - for (IMogoAdasDataCallback callback : adasDataCallbackList) { - callback.onAdasDataCallback(msg); + @Override + public void cameraEyeDetectResult(String detectResult) { + + } + + @Override + public void selectCarModelUrl(String carStyleUrl) { + Logger.d(TAG,"selectCarModelUrl: "+carStyleUrl); + // todo 修改自车图标展示 + SharedPrefsMgr.getInstance(context).putString("MY_LOCATION_CONFIG", carStyleUrl); + MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().setCarCursorOption(null); +// MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().showMyLocation(); + } + + @Override + public void requestGetCarModelListInfo() { + Logger.d(TAG, "requestGetCarModelListInfo"); + // 向adas发送车模list + AutopilotServiceManage.getInstance().settingCarModelListInfo(SharedPrefsMgr.getInstance(context).getString( + "CAR_MODEL_LIST", "default-value")); } }); } @@ -164,9 +186,11 @@ public class MogoADASController implements IMogoADASController { app.sendBroadcast( intent ); } + private Context context; @Override public void init( Context context ) { AutopilotServiceManage.getInstance().init( context ); + this.context = context; mIsReleased = false; } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java index 4b6a9a09de..62c6076ff4 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java @@ -127,6 +127,16 @@ public class MogoStatusManager implements IMogoStatusManager { return get_bool_val(StatusDescriptor.TOP_VIEW); } + @Override + public boolean isMediaPlaying() { + return get_bool_val( StatusDescriptor.MEDIA_PLAYER_STATUS ); + } + + @Override + public void setMediaPlayStatus(String tag, boolean status) { + doSetStatus(tag, StatusDescriptor.MEDIA_PLAYER_STATUS, status); + } + private boolean get_bool_val(StatusDescriptor descriptor ) { Boolean val = mStatus.get( descriptor ); return val == null ? false : val; diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/v2x_cancel_help_light.9.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/v2x_cancel_help_light.9.png deleted file mode 100644 index a4979dd265..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/v2x_cancel_help_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/v2x_cancel_help_light.9.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/v2x_cancel_help_light.9.png deleted file mode 100644 index f68dcac5f8..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/v2x_cancel_help_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/v2x_cancel_help_light.9.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/v2x_cancel_help_light.9.png deleted file mode 100644 index 9947fa9c1a..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable/v2x_cancel_help_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png deleted file mode 100644 index 5ff5526ff8..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png deleted file mode 100644 index 9954c018db..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png deleted file mode 100644 index 61d0b6c1d5..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png and /dev/null differ