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

# Conflicts:
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
This commit is contained in:
wangcongtao
2021-01-05 19:27:13 +08:00
570 changed files with 644 additions and 10499 deletions

View File

@@ -1,6 +1,5 @@
package com.mogo.module.extensions.utils;
import android.graphics.Color;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;