huyuguo лет назад: 5
Родитель
Сommit
bdd218f8cd

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

@ -317,6 +317,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
317 317
    private TextView tv_tishi, paoName, paoName1, paoAddress, paoCostWay, paoDaohang, paoDistance,
318 318
            paoFast, paoSlow, paoAlter, paoTotal, tingche, fuwu, dian, tv_grade, tv_shaixuan, tv_recommend_tip,
319 319
            tv_daohang, tvOne, tvTwo, tv_num, tvThree, tv_sortDistance, tv_sortStarLevel, iv_list, tv_sortFreeTime;
320
    private ImageView recommend_more_detail;
320 321
    public static TextView tv_atCity;
321 322
    public static RelativeLayout paoRl;
322 323
    public static LinearLayout rl_control;
@ -1182,7 +1183,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
1182 1183
                }
1183 1184
1184 1185
            }
1185
        }, 4000);
1186
        }, 5000);
1186 1187
1187 1188
        new Handler().postDelayed(new Runnable() {
1188 1189
            @Override
@ -1454,6 +1455,14 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
1454 1455
        //站点地图列表切换按钮
1455 1456
        iv_list = (TextView) findViewById(R.id.iv_list);
1456 1457
        iv_list.setOnClickListener(this);
1458
        recommend_more_detail = findViewById(R.id.recommend_more_detail);
1459
        recommend_more_detail.setOnClickListener(this);
1460
        SharedPreferencesUtil sharedPreferencesUtil = new SharedPreferencesUtil(getApplication());
1461
        if (sharedPreferencesUtil.hasKey("cdz_recommend_more_detail")) {
1462
            recommend_more_detail.setVisibility(View.GONE);
1463
        } else {
1464
            recommend_more_detail.setVisibility(View.VISIBLE);
1465
        }
1457 1466
        //站点列表
1458 1467
        lvZhan = (ListView) findViewById(R.id.lv_zhan_list);
1459 1468
        adapter = new ZhanAdapter();
@ -2702,6 +2711,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
2702 2711
2703 2712
    @Override
2704 2713
    public void onClick(View v) {
2714
        SharedPreferencesUtil sharedPreferencesUtil = new SharedPreferencesUtil(getApplication());
2705 2715
        switch (v.getId()) {
2706 2716
//            case R.id.rl_charging_notice:
2707 2717
//                startActivity(new Intent(getApplicationContext(), com.google.zxing.client.android.CaptureActivity.class));
@ -2856,8 +2866,15 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
2856 2866
                aMap.moveCamera(CameraUpdateFactory.zoomOut());
2857 2867
                controlZoomShow();
2858 2868
                break;
2869
            case R.id.recommend_more_detail:
2870
                recommend_more_detail.setVisibility(View.GONE);
2871
                sharedPreferencesUtil.putBoolean("cdz_recommend_more_detail", true);
2872
                break;
2859 2873
            //地图&列表切换按钮
2860 2874
            case R.id.iv_list:
2875
                recommend_more_detail.setVisibility(View.GONE);
2876
                sharedPreferencesUtil.putBoolean("cdz_recommend_more_detail", true);
2877
2861 2878
                String jing, wei;
2862 2879
                if (MainApplication.search_jing != 0.0 && MainApplication.search_wei != 0.0) {
2863 2880
                    Log.e(TAG, "onClick: 有搜索");
@ -2874,6 +2891,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
2874 2891
                    }
2875 2892
2876 2893
                }
2894
2877 2895
                if (null != jing && null != wei) {
2878 2896
                    MobclickAgent.onEvent(getApplicationContext(), "0109");
2879 2897
                    Intent intent = new Intent(getApplicationContext(), ZhanListActivity.class);
@ -3135,7 +3153,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
3135 3153
        } else {
3136 3154
            //显示地图站点
3137 3155
            MainApplication.isMap = true;
3138
            iv_list.setText("列表");
3156
            iv_list.setText("推荐");
3139 3157
            lvZhan.setVisibility(View.GONE);
3140 3158
            rl_mapList.setVisibility(View.GONE);
3141 3159
            tv_tishi.setVisibility(View.GONE);
@ -3166,7 +3184,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
3166 3184
3167 3185
    private void showUi(boolean status) {
3168 3186
        if (status == true) {
3169
            iv_list.setText("列表");
3187
            iv_list.setText("推荐");
3170 3188
            lvZhan.setVisibility(View.GONE);
3171 3189
            rl_mapList.setVisibility(View.GONE);
3172 3190
            tv_tishi.setVisibility(View.GONE);

BIN
app/src/main/res/drawable-hdpi/recommend_remind.png


BIN
app/src/main/res/drawable-mdpi/recommend_remind.png


BIN
app/src/main/res/drawable-xhdpi/recommend_remind.png


BIN
app/src/main/res/drawable-xxhdpi/recommend_remind.png


BIN
app/src/main/res/drawable-xxxhdpi/recommend_remind.png


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

@ -135,8 +135,8 @@
135 135
            android:paddingTop="5dp"
136 136
            android:paddingRight="10px"
137 137
            android:paddingBottom="5dp"
138
            android:text="列表"
139
            android:textColor="@color/lvse"
138
            android:text="推荐"
139
            android:textColor="@color/ui_62"
140 140
            android:textSize="15sp" />
141 141
142 142
        <ImageView
@ -1546,6 +1546,16 @@
1546 1546
            android:src="@drawable/icon_example_main" />
1547 1547
1548 1548
    </LinearLayout>
1549
    <!-- 推荐更详细哦 -->
1550
    <ImageView
1551
        android:visibility="gone"
1552
        tools:visibility="visible"
1553
        android:id="@+id/recommend_more_detail"
1554
        android:layout_alignParentRight="true"
1555
        android:layout_marginTop="44dp"
1556
        android:layout_marginRight="5dp"
1557
        android:layout_width="wrap_content"
1558
        android:layout_height="wrap_content" android:src="@drawable/recommend_remind"/>
1549 1559
1550 1560
    <LinearLayout
1551 1561
        android:id="@+id/rl_control"