huyuguo 5 anos atrás
pai
commit
24efa933fc

+ 10 - 3
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

1573
     */
1573
     */
1574
    @Override
1574
    @Override
1575
    protected void onResume() {
1575
    protected void onResume() {
1576
        super.onResume();
1576
        try{
1577
            super.onResume();
1578
        } catch (Exception e) {
1579
            e.printStackTrace();
1580
        }
1581
1577
        if (FindActivity.haveFindMessage == true) {
1582
        if (FindActivity.haveFindMessage == true) {
1578
            iVpoint.setVisibility(View.VISIBLE);
1583
            iVpoint.setVisibility(View.VISIBLE);
1579
        } else {
1584
        } else {
1711
            mLocationOption.setOnceLocation(false);
1716
            mLocationOption.setOnceLocation(false);
1712
1717
1713
            //设置是否强制刷新WIFI,默认为强制刷新
1718
            //设置是否强制刷新WIFI,默认为强制刷新
1714
            mLocationOption.setWifiActiveScan(false);
1719
            //mLocationOption.setWifiActiveScan(false);
1720
            mLocationOption.setWifiScan(true);
1715
            mlocationClient.startLocation();
1721
            mlocationClient.startLocation();
1716
1722
1717
        }
1723
        }
1792
                        public void run() {
1798
                        public void run() {
1793
                            aMap.moveCamera(CameraUpdateFactory.zoomTo(14));
1799
                            aMap.moveCamera(CameraUpdateFactory.zoomTo(14));
1794
                        }
1800
                        }
1795
                    }, 200);
1801
                    }, 2000);
1796
1802
1797
1803
1798
                    //点击定位按钮 能够将地图的中心移动到定位点
1804
                    //点击定位按钮 能够将地图的中心移动到定位点
6015
                aMap.setLocationSource(this);// 设置定位监听
6021
                aMap.setLocationSource(this);// 设置定位监听
6016
                aMap.setMyLocationEnabled(true);// 是否可触发定位并显示定位层
6022
                aMap.setMyLocationEnabled(true);// 是否可触发定位并显示定位层
6017
                aMap.moveCamera(CameraUpdateFactory.zoomTo(14));
6023
                aMap.moveCamera(CameraUpdateFactory.zoomTo(14));
6024
                mlocationClient.setLocationListener(this);
6018
                mlocationClient.startLocation();
6025
                mlocationClient.startLocation();
6019
            }
6026
            }
6020
        }
6027
        }

+ 9 - 2
app/src/main/java/com/electric/chargingpile/adapter/RefundAdapter.java

100
                holder.tv_Status.setTextColor(convertView.getResources().getColor(R.color.lvse));
100
                holder.tv_Status.setTextColor(convertView.getResources().getColor(R.color.lvse));
101
                holder.cancel_refund.setVisibility(View.GONE);
101
                holder.cancel_refund.setVisibility(View.GONE);
102
            } else {
102
            } else {
103
                holder.tv_Status.setText("退款失败\n" + refundData.getRemarks()); // TODO 确认
104
                holder.tv_Status.setTextColor(convertView.getResources().getColor(R.color.ui_fail_red));
103
                if ("取消退款成功".equals(refundData.getRemarks())) {
104
                    holder.tv_Status.setText(refundData.getRemarks());
105
                    holder.tv_Status.setTextColor(convertView.getResources().getColor(R.color.lvse));
106
                } else {
107
                    holder.tv_Status.setText("退款失败\n" + refundData.getRemarks());
108
                    holder.tv_Status.setTextColor(convertView.getResources().getColor(R.color.ui_fail_red));
109
                }
110
111
105
                holder.cancel_refund.setVisibility(View.GONE);
112
                holder.cancel_refund.setVisibility(View.GONE);
106
            }
113
            }
107
114

+ 2 - 2
app/src/main/res/layout/activity_main_map.xml

959
            android:layout_width="match_parent"
959
            android:layout_width="match_parent"
960
            android:layout_height="wrap_content"
960
            android:layout_height="wrap_content"
961
            android:orientation="vertical"
961
            android:orientation="vertical"
962
            android:visibility="visible">
962
            android:visibility="gone">
963
963
964
            <View
964
            <View
965
                android:layout_width="match_parent"
965
                android:layout_width="match_parent"
1561
                android:layout_width="wrap_content"
1561
                android:layout_width="wrap_content"
1562
                android:layout_height="wrap_content"
1562
                android:layout_height="wrap_content"
1563
                android:orientation="vertical"
1563
                android:orientation="vertical"
1564
                tools:visibility="gone">
1564
                tools:visibility="visible">
1565
1565
1566
                <LinearLayout
1566
                <LinearLayout
1567
                    android:id="@+id/ll_inout"
1567
                    android:id="@+id/ll_inout"