bug修改

app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@@ -1573,7 +1573,12 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
     */
    @Override
    protected void onResume() {
        super.onResume();
        try{
            super.onResume();
        } catch (Exception e) {
            e.printStackTrace();
        }
        if (FindActivity.haveFindMessage == true) {
            iVpoint.setVisibility(View.VISIBLE);
        } else {
@@ -1711,7 +1716,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
            mLocationOption.setOnceLocation(false);
            //设置是否强制刷新WIFI，默认为强制刷新
            mLocationOption.setWifiActiveScan(false);
            //mLocationOption.setWifiActiveScan(false);
            mLocationOption.setWifiScan(true);
            mlocationClient.startLocation();
        }
@@ -1792,7 +1798,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                        public void run() {
                            aMap.moveCamera(CameraUpdateFactory.zoomTo(14));
                        }
                    }, 200);
                    }, 2000);
                    //点击定位按钮 能够将地图的中心移动到定位点
@@ -6015,6 +6021,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                aMap.setLocationSource(this);// 设置定位监听
                aMap.setMyLocationEnabled(true);// 是否可触发定位并显示定位层
                aMap.moveCamera(CameraUpdateFactory.zoomTo(14));
                mlocationClient.setLocationListener(this);
                mlocationClient.startLocation();
            }
        }

app/src/main/java/com/electric/chargingpile/adapter/RefundAdapter.java

@@ -100,8 +100,15 @@ public class RefundAdapter extends BaseAdapter {
                holder.tv_Status.setTextColor(convertView.getResources().getColor(R.color.lvse));
                holder.cancel_refund.setVisibility(View.GONE);
            } else {
                holder.tv_Status.setText("退款失败\n" + refundData.getRemarks()); // TODO 确认
                holder.tv_Status.setTextColor(convertView.getResources().getColor(R.color.ui_fail_red));
                if ("取消退款成功".equals(refundData.getRemarks())) {
                    holder.tv_Status.setText(refundData.getRemarks());
                    holder.tv_Status.setTextColor(convertView.getResources().getColor(R.color.lvse));
                } else {
                    holder.tv_Status.setText("退款失败\n" + refundData.getRemarks());
                    holder.tv_Status.setTextColor(convertView.getResources().getColor(R.color.ui_fail_red));
                }
                holder.cancel_refund.setVisibility(View.GONE);
            }

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

@@ -959,7 +959,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:visibility="visible">
            android:visibility="gone">
            <View
                android:layout_width="match_parent"
@@ -1561,7 +1561,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:orientation="vertical"
                tools:visibility="gone">
                tools:visibility="visible">
                <LinearLayout
                    android:id="@+id/ll_inout"