站点列表修改

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

@@ -330,7 +330,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    private TextView tv_tishi, paoName, paoName1, paoAddress, paoCostWay, paoDaohang, paoDistance,
            paoFast, paoSlow, paoAlter, paoTotal, tingche, fuwu, dian, tv_grade, tv_shaixuan, tv_recommend_tip,
            tv_daohang, tvOne, tvTwo, tv_num, tvThree, tv_sortDistance, tv_sortStarLevel, iv_list, tv_sortFreeTime;
    private ImageView recommend_more_detail;
    public static TextView tv_atCity;
    public static RelativeLayout paoRl;
    public static LinearLayout rl_control;
@@ -1407,14 +1406,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        //站点地图列表切换按钮
        iv_list = (TextView) findViewById(R.id.iv_list);
        iv_list.setOnClickListener(this);
        recommend_more_detail = findViewById(R.id.recommend_more_detail);
        recommend_more_detail.setOnClickListener(this);
        SharedPreferencesUtil sharedPreferencesUtil = new SharedPreferencesUtil(getApplication());
        if (sharedPreferencesUtil.hasKey("cdz_recommend_more_detail")) {
            recommend_more_detail.setVisibility(View.GONE);
        } else {
            recommend_more_detail.setVisibility(View.VISIBLE);
        }
        //站点列表
        lvZhan = (ListView) findViewById(R.id.lv_zhan_list);
        adapter = new ZhanAdapter();
@@ -2635,13 +2627,9 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                aMap.moveCamera(CameraUpdateFactory.zoomOut());
                controlZoomShow();
                break;
            case R.id.recommend_more_detail:
                break;
            //地图&列表切换按钮
            case R.id.iv_list:
                recommend_more_detail.setVisibility(View.GONE);
                sharedPreferencesUtil.putBoolean("cdz_recommend_more_detail", true);
                String jing, wei;
                if (MainApplication.search_jing != 0.0 && MainApplication.search_wei != 0.0) {
                    Log.e(TAG, "onClick: 有搜索");
@@ -2861,7 +2849,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
            }
            MainApplication.isMap = false;
            //显示列表站点
            iv_list.setText("地图");
            lvZhan.setVisibility(View.VISIBLE);
            isListShow = true;
            if (list.size() > 0) {
@@ -2886,7 +2873,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        } else {
            //显示地图站点
            MainApplication.isMap = true;
            iv_list.setText("推荐");
            lvZhan.setVisibility(View.GONE);
            rl_mapList.setVisibility(View.GONE);
            tv_tishi.setVisibility(View.GONE);
@@ -2915,7 +2901,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    private void showUi(boolean status) {
        if (status == true) {
            iv_list.setText("推荐");
            lvZhan.setVisibility(View.GONE);
            rl_mapList.setVisibility(View.GONE);
            tv_tishi.setVisibility(View.GONE);
@@ -2931,7 +2916,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
            iv_roadCondition.setVisibility(View.VISIBLE);
            iv_example.setVisibility(View.VISIBLE);
        } else {
            iv_list.setText("地图");
            lvZhan.setVisibility(View.VISIBLE);
            if (list.size() > 0) {
                rl_mapList.setVisibility(View.VISIBLE);

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

@@ -8,11 +8,15 @@ import android.graphics.Color;
import android.graphics.drawable.BitmapDrawable;
import android.os.Handler;
import android.os.Message;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -78,7 +82,7 @@ public class RecommendChargingStationActivity extends AppCompatActivity implemen
    private TextView first_condition_text;
    private ImageView first_condition_image;
    private int firstCondition = 1;
    private int firstCondition = 3;
    private TextView first_can_charging;
    private TextView first_free_parking;
    private TextView first_quick_charging;
@@ -107,7 +111,12 @@ public class RecommendChargingStationActivity extends AppCompatActivity implemen
        BarColorUtil.initStatusBarColor(RecommendChargingStationActivity.this);
        initView();
        MobclickAgent.onEvent(getApplicationContext(), "1136");
        recommendChargingStationFunc();
        if (zhanList.size() == 0) {
            loadingDialog.show();
            ete("{\"fun\":\"timer\"}");
        } else {
            filterChargingStation();
        }
    }
    private void initView() {
@@ -591,7 +600,7 @@ public class RecommendChargingStationActivity extends AppCompatActivity implemen
                holder.window_tv_fast_free_num.setText(recommendZhan.getFast_able_num());
                holder.window_tv_slow_free_num.setText(recommendZhan.getSlow_able_num());
                holder.window_tv_fast_total_num.setText("".equals(recommendZhan.getFast_num()) ? "0" : "/" + recommendZhan.getFast_num());
                holder.window_tv_slow_total_num.setText("".equals(recommendZhan.getSlow_num()) ? "0" : "/" +  recommendZhan.getSlow_num());
                holder.window_tv_slow_total_num.setText("".equals(recommendZhan.getSlow_num()) ? "0" : "/" + recommendZhan.getSlow_num());
            }
            holder.fenshi_info_textview.setText("");
@@ -1169,8 +1178,7 @@ public class RecommendChargingStationActivity extends AppCompatActivity implemen
                    socket.setReceiveBufferSize(99999);  //  接收缓冲大小
                    socket.setSendBufferSize(99999);
                    // 向服务器发送消息
                    PrintWriter out = new PrintWriter(new BufferedWriter(
                            new OutputStreamWriter(socket.getOutputStream())), true);
                    PrintWriter out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(socket.getOutputStream())), true);
                    out.println(params);
                    // 接收来自服务器的消息
                    BufferedReader br = new BufferedReader(new InputStreamReader(

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

@@ -131,7 +131,7 @@
            android:paddingTop="5dp"
            android:paddingRight="10px"
            android:paddingBottom="5dp"
            android:text="推荐"
            android:text="列表"
            android:textColor="@color/lvse"
            android:textSize="15sp" />
@@ -1540,17 +1540,6 @@
            android:paddingRight="15dp"
            android:src="@drawable/icon_example_main" />
    </LinearLayout>
    <!-- 推荐更详细哦 -->
    <ImageView
        android:id="@+id/recommend_more_detail"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_alignParentRight="true"
        android:layout_marginTop="44dp"
        android:layout_marginRight="5dp"
        android:src="@drawable/recommend_remind"
        android:visibility="gone"
        tools:visibility="visible" />
    <LinearLayout
        android:id="@+id/rl_control"

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

@@ -31,7 +31,7 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:gravity="center"
            android:text="推荐站点"
            android:text="站点列表"
            android:textColor="#222222"
            android:textSize="18sp" />
@@ -71,7 +71,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:gravity="center"
                    android:text="智能推荐"
                    android:text="距离最近"
                    android:textColor="#2fc45b"
                    android:textSize="12sp" />
@@ -191,12 +191,12 @@
                android:orientation="horizontal">
                <Button
                    android:id="@+id/second_1"
                    android:id="@+id/second_3"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:background="@drawable/recommend_btn_selected"
                    android:text="智能推荐"
                    android:text="距离最近"
                    android:textColor="#ffffff"
                    android:textSize="12sp" />
@@ -219,12 +219,12 @@
                    android:layout_height="match_parent" />
                <Button
                    android:id="@+id/second_3"
                    android:id="@+id/second_1"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:background="@drawable/recommend_btn_normal"
                    android:text="距离最近"
                    android:text="智能推荐"
                    android:textColor="#2FC45B"
                    android:textSize="12sp" />