From e9880f35a311706cc2891d0a83622d77c9c24f70 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 8 Sep 2020 15:33:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=E5=B0=8F=E6=99=BA?= =?UTF-8?q?=E5=8A=A8=E7=94=BB=E5=AE=9E=E7=8E=B0=202.=20=E5=85=A5=E5=8F=A3?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0=E7=99=BD=E5=A4=A9=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E9=98=B4=E5=BD=B1=203.=20=E5=A4=A7=E8=80=8C?= =?UTF-8?q?=E5=85=A8=E6=95=B0=E6=8D=AE=EF=BC=88=E7=9F=AD=E9=93=BE+?= =?UTF-8?q?=E9=95=BF=E9=93=BE=EF=BC=89->=20=E5=8D=95=E7=8B=AC=E7=9F=AD?= =?UTF-8?q?=E9=93=BE=204.=20=E5=86=85=E5=AD=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- config.gradle | 2 +- .../com/mogo/commons/mvp/MvpFragment.java | 2 +- .../mogo/map/impl/amap/AMapViewWrapper.java | 5 +- .../mogo/module/apps/anim/AnimWrapper.java | 13 +---- .../com/mogo/module/apps/anim/OthersAnim.java | 44 ++++++++++++----- .../src/main/res/values-xhdpi/dimens.xml | 1 + .../src/main/res/values/dimens.xml | 1 + .../drawable-ldpi/module_ext_ic_message2.png | Bin 0 -> 668 bytes .../drawable-ldpi/module_ext_shadow_bkg.9.png | Bin 0 -> 2460 bytes .../drawable-mdpi/module_ext_ic_message2.png | Bin 0 -> 668 bytes .../drawable-mdpi/module_ext_shadow_bkg.9.png | Bin 0 -> 2460 bytes .../drawable-xhdpi/module_ext_ic_message2.png | Bin 1152 -> 1088 bytes .../module_ext_shadow_bkg.9.png | Bin 0 -> 3928 bytes .../res/drawable/module_ext_shadow_bkg.9.png | Bin 0 -> 2460 bytes .../layout/module_ext_layout_extensions.xml | 25 +++++----- .../src/main/res/values-mdpi/dimens.xml | 4 ++ .../res/values-xhdpi-1920x1000/dimens.xml | 3 +- .../src/main/res/values-xhdpi/dimens.xml | 3 +- .../src/main/res/values/dimens.xml | 3 +- .../com/mogo/module/service/MogoServices.java | 13 +++-- .../service/marker/MapMarkerManager.java | 14 +++++- .../module/service/network/RefreshModel.java | 45 ++++++++++++++++++ .../module_ext_shadow_bkg_light.9.png | Bin 0 -> 2778 bytes .../module_ext_shadow_bkg_light.9.png | Bin 0 -> 2778 bytes .../module_ext_shadow_bkg_light.9.png | Bin 0 -> 4650 bytes .../module_ext_shadow_bkg_light.9.png | Bin 0 -> 2778 bytes 27 files changed, 131 insertions(+), 49 deletions(-) create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_message2.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_shadow_bkg.9.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_ic_message2.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_shadow_bkg.9.png mode change 100644 => 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_message2.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable/module_ext_shadow_bkg.9.png create mode 100644 modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_shadow_bkg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_shadow_bkg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_shadow_bkg_light.9.png diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/config.gradle b/config.gradle index 0a9540a611..8a952748cd 100644 --- a/config.gradle +++ b/config.gradle @@ -160,7 +160,7 @@ targetSdkVersion : 22, gpssimulatornoop : "com.mogo.module:module-gps-simulator-noop:${MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION}", adasapi : "com.zhidao.autopilot.support:adas:1.0.1", - adasconfigapi : "com.zhidao.adasconfig:adasconfig:1.0.8", + adasconfigapi : "com.zhidao.adasconfig:adasconfig:1.0.9", // 个人中心的SDK personalsdk : "com.zhidaoauto.person.info:data:1.0.1", diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java index 5d299590a0..b7f21772f4 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java @@ -47,7 +47,6 @@ public abstract class MvpFragment> exten @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - initViews(savedInstanceState); } /** @@ -61,6 +60,7 @@ public abstract class MvpFragment> exten public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); initViews(); + initViews(savedInstanceState); mPresenter = createPresenter(); getViewLifecycleOwner().getLifecycle().addObserver(mPresenter); } 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 b84a513112..922690857b 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 @@ -70,7 +70,7 @@ public class AMapViewWrapper implements IMogoMapView, AMap.OnCameraChangeListener, AMap.OnMyLocationChangeListener { - private static final String TAG = "AMapNaviViewWrapper"; + private static final String TAG = "AMapViewWrapper"; private final MapView mMapView; private IMogoMap mIMap; @@ -243,6 +243,9 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onLowMemory() { + if ( mMapView != null ) { + mMapView.onLowMemory(); + } Logger.d( TAG, "map onLowMemory" ); } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java index bf38719907..aad3f187c8 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java @@ -28,17 +28,8 @@ public class AnimWrapper implements Anim { public void initAnim( ImageView target ) { mTarget = target; if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) { - ThreadPoolService.execute( () -> { - final AnimationDrawable drawable = new AnimationDrawable(); - for ( int i = 0; i < AnimRes.sRes.length; i++ ) { - drawable.addFrame( target.getResources().getDrawable( AnimRes.sRes[i] ), 100 ); - } - UiThreadHandler.post( () -> { - target.setBackground( drawable ); - mDelegate = new OthersAnim( drawable ); - start(); - } ); - } ); + mDelegate = new OthersAnim( target ); + start(); } else { mTarget.setImageResource( R.drawable.mogo_tts_icon_00000 ); } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/OthersAnim.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/OthersAnim.java index 13156b1e7c..aa7259c6ae 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/OthersAnim.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/OthersAnim.java @@ -1,6 +1,9 @@ package com.mogo.module.apps.anim; -import android.graphics.drawable.AnimationDrawable; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; +import android.widget.ImageView; /** * @author congtaowang @@ -8,25 +11,44 @@ import android.graphics.drawable.AnimationDrawable; *

* 描述 */ -public class OthersAnim implements Anim{ +public class OthersAnim implements Anim { - private AnimationDrawable mDrawable; + private int mStartIndex = 0; - public OthersAnim( AnimationDrawable drawable ) { - this.mDrawable = drawable; + private final static int MSG_LOOP = 3003; + public static final long INTERVAL = 100L; + private boolean mStarted = false; + + private final ImageView mImageView; + + private Handler mHandler = new Handler( Looper.getMainLooper() ) { + @Override + public void handleMessage( Message msg ) { + super.handleMessage( msg ); + switch ( msg.what ) { + case MSG_LOOP: + if ( mStarted ) { + mImageView.setImageResource( AnimRes.sRes[mStartIndex++ % AnimRes.sRes.length] ); + mHandler.sendEmptyMessageDelayed( MSG_LOOP, INTERVAL ); + } + break; + } + } + }; + + public OthersAnim( ImageView imageView ) { + this.mImageView = imageView; } @Override public void start() { - if ( mDrawable != null ) { - mDrawable.start(); - } + mStarted = true; + mHandler.sendEmptyMessage( MSG_LOOP ); } @Override public void stop() { - if ( mDrawable != null ) { - mDrawable.stop(); - } + mStarted = false; + mHandler.removeMessages( MSG_LOOP ); } } 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 17412b24d7..1770c16984 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 @@ -1052,5 +1052,6 @@ 40px 42px 48px + -10px diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml index 111cf6ee25..1e2c7b1cdc 100644 --- a/modules/mogo-module-common/src/main/res/values/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values/dimens.xml @@ -1043,4 +1043,5 @@ 21.8750px 22.9688px 26.2500px + -8px diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_message2.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_message2.png new file mode 100755 index 0000000000000000000000000000000000000000..b6f6c4dd2597f38f6d0be04bb9518bf5195cb352 GIT binary patch literal 668 zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P3?%12mYf5m{s;JkxPs^r41RCD@CO(KAtgb6 z!3>N{%am@4pt4HYuR_KRjI=Lo80e zoe~**$U&fGr;5UYJ560D6u;NbJW;E`<>7Sc|Nrd?P5ef?+seD@X3kxgzdCL8w&O{b z)|?M#tb4Il^2>)^haGQycxitk?BW6+_FZcC9WEa{erm$!L+^iTeQsr&zAJd@Z~NSg zRu=y3#Wh#JQ#eI#-r zb%k{0bMkJMf*t;zwl^CNJmOIUpyT>QNCR+ z$jx_Q`m_Tk&-TrKG+Q~h?WU^ErjKu!CfzmpDtB>4%$GSg_^zdR=culIzWv)bt`-ZA UhIDU6U>GoXy85}Sb4q9e065;bHvj+t literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_shadow_bkg.9.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_shadow_bkg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..a4c313e3539f580612c42321cdfe7a77c7a37284 GIT binary patch literal 2460 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 UhIDU6U>GoXy85}Sb4q9e065;bHvj+t literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_shadow_bkg.9.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_shadow_bkg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..e73d76936fb2cbb1cac1aef6225df8a4dfad0202 GIT binary patch literal 2460 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 ZS~751)RKiP&7I^Pk~OrO^4W zY!?!oi?mt(a8AjR>~Bv#(6d&$={X0(V|j+x+uz@fMg pWB#}P`l|Ti!#n?3{*jMixE-N(^`hfz6JT0n@O1TaS?83{1OPrM$xr|Q literal 1152 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_shadow_bkg.9.png b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_shadow_bkg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..a4c313e3539f580612c42321cdfe7a77c7a37284 GIT binary patch literal 2460 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 ad;SA-9)l@a{r@Qd0000 - @@ -61,23 +63,20 @@ android:id="@+id/module_ext_id_msg_counter" android:layout_width="@dimen/module_ext_msg_counter_width" android:layout_height="@dimen/module_ext_msg_counter_height" - android:layout_gravity="center" - android:layout_marginLeft="@dimen/module_ext_msg_dot_marginLeft" - android:layout_marginBottom="@dimen/module_ext_msg_dot_marginRight" android:background="@drawable/module_ext_drawable_msg_bkg" android:gravity="center" + android:layout_alignParentRight="true" android:textColor="#FFFFFF" android:textSize="@dimen/module_ext_msg_counter_textSize" tools:text="···" /> - + + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible" /> \ 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 new file mode 100644 index 0000000000..833a7c43be --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml @@ -0,0 +1,4 @@ + + + 26px + \ 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 a532dd0dd9..0304873cfe 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 @@ -55,7 +55,7 @@ 20px - 100px + 120px 60px 60px 32px @@ -145,4 +145,5 @@ 20px 40px + 45px \ 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 00944d0a4f..6e8de9e26f 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 @@ -55,7 +55,7 @@ 20px - 120px + 140px 60px 60px 32px @@ -147,4 +147,5 @@ 34px 175px 30px + 45px \ 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 00d9c62dbf..2f344bce6f 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -56,7 +56,7 @@ 8px - 66px + 82px 32px 32px @@ -152,5 +152,6 @@ 19px 16px + 26px \ No newline at end of file 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 414fce1e7e..4738bc2a10 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 @@ -30,6 +30,7 @@ import com.mogo.map.navi.MogoTraffic; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; +import com.mogo.module.common.entity.MarkerResponse; import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; import com.mogo.module.service.intent.IntentHandlerFactory; @@ -224,9 +225,10 @@ public class MogoServices implements IMogoMapListener, /** * 手动刷新回调 */ - private RefreshCallback mCustomRefreshCallback = new RefreshCallback() { + private RefreshCallback mCustomRefreshCallback = new RefreshCallback< MarkerResponse >() { @Override - public void onSuccess( Object o ) { + public void onSuccess( MarkerResponse o ) { + MapMarkerManager.getInstance().onSyncMarkerResponse( o ); mLoopRequest = false; // 用户手动操作地图刷新成功后，设置状态为 true，引发延时策略 mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, true, true ); @@ -241,9 +243,10 @@ public class MogoServices implements IMogoMapListener, /** * 自动刷新回调 */ - private RefreshCallback mAutoRefreshCallback = new RefreshCallback() { + private RefreshCallback mAutoRefreshCallback = new RefreshCallback() { @Override - public void onSuccess( Object o ) { + public void onSuccess( MarkerResponse o ) { + MapMarkerManager.getInstance().onSyncMarkerResponse( o ); mLoopRequest = false; Logger.d( TAG, "request Success." ); invokeAutoRefreshStrategy(); @@ -436,7 +439,7 @@ public class MogoServices implements IMogoMapListener, Logger.w( TAG, "lonLat is null." ); return; } - mRefreshModel.refreshData( ro.mLonLat, ro.mRadius, ro.mAmount, ro.mCallback ); + mRefreshModel.refreshExplorerWayData( ro.mLonLat, ro.mRadius, ro.mAmount, ro.mCallback ); MapMarkerManager.getInstance().getOnlineCarDataByAutoRefreshStrategy( ro.mLonLat ); Logger.i( TAG, "刷新半径 = %s, 点 = %s, zoomLevel = %s, amount = %s", ro.mRadius, ro.mLonLat, mLastZoomLevel, ro.mAmount ); 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 3621019256..b291ee015f 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 @@ -109,8 +109,8 @@ public class MapMarkerManager implements IMogoMarkerClickListener, mContext = context.getApplicationContext(); mRefreshModel = new RefreshModel( mContext ); - // 长连接 - MarkerServiceHandler.getMogoSocketManager().registerOnMessageListener( 401001, this ); + // 长连接 - 长链变短链 +// MarkerServiceHandler.getMogoSocketManager().registerOnMessageListener( 401001, this ); MarkerServiceHandler.getActionManager().registerBizActionDoneListener( this ); MarkerServiceHandler.getApis().getRegisterCenterApi().registerADASControlStatusChangedListener( TAG, this ); } @@ -703,6 +703,16 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } ); } + public void onSyncMarkerResponse(MarkerResponse response){ + if ( ignoreDrawRequest() ) { + return; + } + Logger.d( TAG, "接收到了地图大而全数据" ); + runOnTargetThread( () -> { + drawMapMarker( response ); + } ); + } + public void syncLocation( double lon, double lat ) { mCarLatLng = new MogoLatLng( lat, lon ); } 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 9cb03e4c88..c368ec6956 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 @@ -110,6 +110,51 @@ public class RefreshModel { } } + public void refreshExplorerWayData( MogoLatLng latLng, int radius, int limit, final RefreshCallback callback ) { + if ( mRefreshApiService != null ) { + final Map< String, Object > query = new ParamsProvider.Builder( mContext ).build(); + final RefreshBody refreshBody = new RefreshBody(); + refreshBody.limit = limit; + refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lng ); + refreshBody.radius = radius; + refreshBody.dataType.add( ServiceConst.CARD_TYPE_ROAD_CONDITION ); + + String data = GsonUtil.jsonFromObject( refreshBody ); + query.put( "data", data ); + Logger.d( TAG, data ); + + + mRefreshApiService.refreshDataSync( query ) + .subscribeOn( Schedulers.io() ) + .observeOn( AndroidSchedulers.mainThread() ) + .subscribe( new SubscribeImpl< MarkerResponse >( RequestOptions.create( mContext ) ) { + @Override + public void onSuccess( MarkerResponse o ) { + super.onSuccess( o ); + if ( callback != null ) { + callback.onSuccess( o ); + } + } + + @Override + public void onError( Throwable e ) { + super.onError( e ); + if ( callback != null ) { + callback.onFail(); + } + } + + @Override + public void onError( String message, int code ) { + super.onError( message, code ); + if ( callback != null ) { + callback.onFail(); + } + } + } ); + } + } + public void refreshDataSync( MogoLatLng latLng, int radius, int limit, final RefreshCallback callback ) { if ( mRefreshApiService != null ) { final Map< String, Object > query = new ParamsProvider.Builder( mContext ).build(); diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_shadow_bkg_light.9.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_shadow_bkg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..36ea7d6655132047f87041b3dc3c33b9cf0d8da9 GIT binary patch literal 2778 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_shadow_bkg_light.9.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_shadow_bkg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..36ea7d6655132047f87041b3dc3c33b9cf0d8da9 GIT binary patch literal 2778 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..38680e4f41dc0f187d5cb293b45918626ab7dd78 GIT binary patch literal 4650 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 literal 0 HcmV?d00001