提交

app/src/main/java/com/electric/chargingpile/cluster/ClusterOverlay.java

@@ -283,7 +283,8 @@ public class ClusterOverlay implements AMap.OnCameraChangeListener,
        removeMarkers.addAll(mAddMarkers);
        AlphaAnimation alphaAnimation = new AlphaAnimation(1, 0);
        MyAnimationListener myAnimationListener = new MyAnimationListener(removeMarkers);
        for (Marker marker : removeMarkers) {
        for (int i = 0; i < removeMarkers.size(); i++) {
            Marker marker = removeMarkers.get(i);
            marker.setAnimation(alphaAnimation);
            marker.setAnimationListener(myAnimationListener);
            marker.startAnimation();

app/src/main/res/layout/activity_chat.xml

@@ -47,7 +47,7 @@
                android:gravity="center"
                android:paddingLeft="5dp"
                android:paddingRight="5dp"
                android:text="互助"
                android:text="@string/string_tab_qa"
                android:textColor="@color/ui_68"
                android:textSize="18sp" />

zxing/src/main/AndroidManifest.xml

@@ -8,7 +8,6 @@
    <uses-permission android:name="android.permission.FLASHLIGHT"/>
    <uses-permission android:name="android.permission.READ_CONTACTS"/>
    <!-- unavailable in API 23 -->
    <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>