Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9

modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt

@@ -212,7 +212,7 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService
                         return
                     }
                     if (blockFromSpeed && speedNormalCount < 5) {
-                        Logger.d(TAG, "按速度策略上报早高峰")
+                        Logger.d(TAG, "按速度策略上报一般时段")
                         SharedPrefsMgr.getInstance(context).putInt(SPEED_NORMAL_COUNT, speedNormalCount + 1)
                         p.location = latLonFromSpeed
                         apis.tanluApi.uploadRoadCondition(p)

services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java

@@ -86,7 +86,6 @@ public class MogoADASController implements IMogoADASController {
     private IMogoStatusManager mStatusManager = SingletonsHolder.get( IMogoStatusManager.class );
 
     private boolean mIsReleased = true;
-    private List< IMogoAdasDataCallback > adasDataCallbackList = new ArrayList<>();
 
     private IAutopolitDataCallBack mAutopolitDataCallBack;
 
@@ -245,7 +244,7 @@ public class MogoADASController implements IMogoADASController {
             mAutopolitDataCallBack = new IAutopolitDataCallBack() {
                 @Override
                 public void sendMsg( String msg ) {
-                    for ( IMogoAdasDataCallback callback : adasDataCallbackList ) {
+                    for ( IMogoAdasDataCallback callback : mAdasDataCallbackList ) {
                         try {
                             callback.onAdasDataCallback( msg );
                         } catch ( Exception e ) {