42 
        // 刷新状态
43 
        this.update();
44 
        // 实例化一个ColorDrawable颜色为半透明
45 
        ColorDrawable dw = new ColorDrawable(0000000000);
46 
        // 点back键和其他地方使其消失,设置了这个才能触发OnDismisslistener ，设置其他控件变化等操作
47 
        this.setBackgroundDrawable(dw);
48 
        // mPopupWindow.setAnimationStyle(android.R.style.Animation_Dialog);
49 
        // 设置SelectPicPopupWindow弹出窗体动画效果
50 
        this.setAnimationStyle(R.style.AnimationPreview);
51
52 
    }
53
54 
    public void setUi(int sort) {
55 
        //排序 ctime为时间顺序，agree为点赞排序
56 
        if (sort == 1) {
57 
            tv1.setTextColor(context.getResources().getColor(R.color.lvse));
58 
            tv2.setTextColor(context.getResources().getColor(R.color.ui_68));
59 
            tv3.setTextColor(context.getResources().getColor(R.color.ui_68));
60 
        } else if(sort == 2){
61 
            tv1.setTextColor(context.getResources().getColor(R.color.ui_68));
62 
            tv2.setTextColor(context.getResources().getColor(R.color.lvse));
63 
            tv3.setTextColor(context.getResources().getColor(R.color.ui_68));
64 
        }else {
65 
            tv1.setTextColor(context.getResources().getColor(R.color.ui_68));
66 
            tv2.setTextColor(context.getResources().getColor(R.color.ui_68));
67 
            tv3.setTextColor(context.getResources().getColor(R.color.lvse));
68 
        }
69 
    }
70
71 
    public void showPopupWindow(View parent, final View.OnClickListener listener) {
72 
        tv1.setOnClickListener(new View.OnClickListener() {
73 
            @Override
74 
            public void onClick(View v) {
75 
                try {
76 
                    listener.onClick(v);
77
78 
                } catch (Exception e) {
79 
                    e.printStackTrace();
80 
                }
81 
            }
82 
        });
83
84 
        tv2.setOnClickListener(new View.OnClickListener() {
85 
            @Override
86 
            public void onClick(View view) {
87 
                try {
88 
                    listener.onClick(view);
89
90 
                } catch (Exception e) {
91 
                    e.printStackTrace();
92 
                }
93 
            }
94 
        });
95 
        if (!this.isShowing()) {
96 
            this.showAsDropDown(parent, parent.getLayoutParams().width / 2, -5);
97
98 
        } else {
99 
            this.dismiss();
100 
        }
101 
    }
102
103
104 
}

+ 108 - 0
app/src/main/java/com/electric/chargingpile/view/footer/LoadMoreFooterView.java
Wyświetl plik 

@ -0,0 +1,108 @@
1 
package com.electric.chargingpile.view.footer;
2
3 
import android.content.Context;
4 
import android.util.AttributeSet;
5 
import android.view.LayoutInflater;
6 
import android.view.View;
7 
import android.widget.FrameLayout;
8
9 
import com.electric.chargingpile.R;
10
11
12 
/**
13 
 * Created by aspsine on 16/3/14.
14 
 */
15 
public class LoadMoreFooterView extends FrameLayout {
16
17 
    private Status mStatus;
18
19 
    private View mLoadingView;
20
21 
    private View mErrorView;
22
23 
    private View mTheEndView;
24
25 
    private OnRetryListener mOnRetryListener;
26
27 
    public LoadMoreFooterView(Context context) {
28 
        this(context, null);
29 
    }
30
31 
    public LoadMoreFooterView(Context context, AttributeSet attrs) {
32 
        this(context, attrs, 0);
33 
    }
34
35 
    public LoadMoreFooterView(Context context, AttributeSet attrs, int defStyleAttr) {
36 
        super(context, attrs, defStyleAttr);
37 
        LayoutInflater.from(context).inflate(R.layout.layout_irecyclerview_load_more_footer_view, this, true);
38
39 
        mLoadingView = findViewById(R.id.loadingView);
40 
        mErrorView = findViewById(R.id.errorView);
41 
        mTheEndView = findViewById(R.id.theEndView);
42
43 
        mErrorView.setOnClickListener(new OnClickListener() {
44 
            @Override
45 
            public void onClick(View v) {
46 
                if (mOnRetryListener != null) {
47 
                    mOnRetryListener.onRetry(LoadMoreFooterView.this);
48 
                }
49 
            }
50 
        });
51
52 
        setStatus(Status.GONE);
53 
    }
54
55 
    public void setOnRetryListener(OnRetryListener listener) {
56 
        this.mOnRetryListener = listener;
57 
    }
58
59 
    public Status getStatus() {
60 
        return mStatus;
61 
    }
62
63 
    public void setStatus(Status status) {
64 
        this.mStatus = status;
65 
        change();
66 
    }
67
68 
    public boolean canLoadMore() {
69 
        return mStatus == Status.GONE || mStatus == Status.ERROR;
70 
    }
71
72 
    private void change() {
73 
        switch (mStatus) {
74 
            case GONE:
75 
                mLoadingView.setVisibility(GONE);
76 
                mErrorView.setVisibility(GONE);
77 
                mTheEndView.setVisibility(GONE);
78 
                break;
79
80 
            case LOADING:
81 
                mLoadingView.setVisibility(VISIBLE);
82 
                mErrorView.setVisibility(GONE);
83 
                mTheEndView.setVisibility(GONE);
84 
                break;
85
86 
            case ERROR:
87 
                mLoadingView.setVisibility(GONE);
88 
                mErrorView.setVisibility(VISIBLE);
89 
                mTheEndView.setVisibility(GONE);
90 
                break;
91
92 
            case THE_END:
93 
                mLoadingView.setVisibility(GONE);
94 
                mErrorView.setVisibility(GONE);
95 
                mTheEndView.setVisibility(VISIBLE);
96 
                break;
97 
        }
98 
    }
99
100 
    public enum Status {
101 
        GONE, LOADING, ERROR, THE_END
102 
    }
103
104 
    public interface OnRetryListener {
105 
        void onRetry(LoadMoreFooterView view);
106 
    }
107
108 
}

BIN
app/src/main/res/drawable-hdpi/app_show_more_content.png
Wyświetl plik


BIN
app/src/main/res/drawable-hdpi/app_topic_detaic_popup_icon.png
Wyświetl plik


+ 27 - 0
app/src/main/res/layout/activity_topic_details_info.xml
Wyświetl plik 

@ -0,0 +1,27 @@
1 
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 
    xmlns:tools="http://schemas.android.com/tools"
3 
    android:layout_width="match_parent"
4 
    android:layout_height="match_parent"
5 
    android:id="@+id/whole_view"
6 
    android:scrollbars="none"
7 
    android:orientation="vertical">
8
9 
    <com.electric.chargingpile.view.PullToZoomScrollView3
10 
        android:id="@+id/scroll_view"
11 
        android:layout_width="match_parent"
12 
        android:layout_height="wrap_content">
13
14 
        <LinearLayout
15 
            android:layout_width="match_parent"
16 
            android:layout_height="wrap_content"
17 
            android:gravity="center_horizontal"
18 
            android:orientation="vertical">
19
20 
            <include layout="@layout/activity_topic_info_top" />
21
22 
            <include layout="@layout/activity_topic_infos_content" />
23 
        </LinearLayout>
24 
    </com.electric.chargingpile.view.PullToZoomScrollView3>
25
26
27 
</RelativeLayout>

+ 85 - 0
app/src/main/res/layout/activity_topic_info_top.xml
Wyświetl plik 

@ -0,0 +1,85 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 
    android:layout_width="match_parent"
4 
    android:layout_height="wrap_content"
5 
    android:id="@+id/top_view">
6
7 
    <RelativeLayout
8 
        android:id="@+id/rl_title"
9 
        android:layout_width="fill_parent"
10 
        android:layout_height="44dp"
11 
        android:background="@color/title_background" >
12
13 
        <ImageView
14 
            android:id="@+id/iv_back"
15 
            android:layout_width="wrap_content"
16 
            android:layout_height="match_parent"
17 
            android:layout_alignParentLeft="true"
18 
            android:layout_centerVertical="true"
19 
            android:contentDescription="@null"
20 
            android:paddingLeft="15dp"
21 
            android:paddingRight="15dp"
22 
            android:src="@drawable/icon_lvback1119" />
23
24 
        <TextView
25 
            android:id="@+id/textview"
26 
            android:layout_width="match_parent"
27 
            android:layout_height="match_parent"
28 
            android:layout_centerInParent="true"
29 
            android:layout_toRightOf="@+id/iv_back"
30 
            android:layout_toLeftOf="@+id/textview_share"
31 
            android:gravity="center"
32 
            android:singleLine="true"
33 
            android:ellipsize="end"
34 
            android:text="@string/about_name"
35 
            android:textColor="#222222"
36 
            android:textSize="16sp" />
37
38 
        <TextView
39 
            android:id="@+id/textview_share"
40 
            android:layout_width="wrap_content"
41 
            android:layout_height="match_parent"
42 
            android:layout_alignParentRight="true"
43 
            android:gravity="center"
44 
            android:padding="15dp"
45 
            android:text="分享"
46 
            android:textColor="#222222"
47 
            android:textSize="15sp"/>
48 
    </RelativeLayout>
49 
    <!--<View-->
50 
        <!--android:id="@+id/view_title"-->
51 
        <!--android:layout_width="match_parent"-->
52 
        <!--android:layout_height="0.5dp"-->
53 
        <!---->
54 
        <!--android:background="@color/ui_titleline" />-->
55
56 
    <LinearLayout
57 
        android:layout_width="match_parent"
58 
        android:layout_height="101dp"
59 
        android:layout_below="@+id/rl_title"
60 
        android:orientation="horizontal"
61 
        android:gravity="center_vertical">
62 
        <ImageView
63 
            android:id="@+id/user_avater"
64 
            android:layout_width="71dp"
65 
            android:layout_height="71dp"
66 
            android:layout_marginLeft="15dp"
67 
            />
68 
        <TextView
69 
            android:id="@+id/topic_title"
70 
            android:layout_width="match_parent"
71 
            android:layout_height="match_parent"
72 
            android:layout_marginLeft="5dp"
73 
            android:layout_marginRight="15dp"
74 
            android:text="111111"
75 
            android:gravity="center_vertical"
76 
            android:maxLines="2"
77 
            android:ellipsize="end"
78 
            android:textSize="17sp"
79 
            android:textColor="#222222"/>
80
81 
    </LinearLayout>
82
83 
    <!--</LinearLayout>-->
84
85 
</RelativeLayout>

+ 128 - 0
app/src/main/res/layout/activity_topic_infos_content.xml
Wyświetl plik 

@ -0,0 +1,128 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 
    android:layout_width="match_parent"
4 
    android:layout_height="match_parent"
5 
    android:id="@+id/content_view"
6 
    xmlns:app="http://schemas.android.com/apk/res-auto"
7 
    android:orientation="vertical">
8
9
10
11 
    <RelativeLayout
12 
        android:layout_width="match_parent"
13 
        android:layout_height="wrap_content"
14 
        android:minHeight="51dp"
15 
        android:orientation="horizontal">
16 
        <TextView
17 
            android:id="@+id/topic_content"
18 
            android:layout_width="match_parent"
19 
            android:layout_height="wrap_content"
20 
            android:layout_marginLeft="15dp"
21 
            android:layout_marginRight="15dp"
22 
            android:text="111111"
23 
            android:textSize="15sp"
24 
            android:textColor="#555555"/>
25
26 
        <ImageView
27 
            android:id="@+id/user_content_more"
28 
            android:layout_width="wrap_content"
29 
            android:layout_height="wrap_content"
30 
            android:layout_below="@+id/topic_content"
31 
            android:layout_marginLeft="15dp"
32 
            android:src="@drawable/app_show_more_content"
33 
            android:layout_alignParentRight="true"
34 
            android:visibility="gone"
35 
            />
36
37 
    </RelativeLayout>
38
39 
    <LinearLayout
40 
        android:layout_width="match_parent"
41 
        android:layout_height="wrap_content"
42 
        android:orientation="horizontal">
43 
        <TextView
44 
            android:layout_width="wrap_content"
45 
            android:layout_height="wrap_content"
46 
            android:layout_marginTop="13dp"
47 
            android:layout_marginBottom="13dp"
48 
            android:layout_marginLeft="15dp"
49 
            android:text="阅读"
50 
            android:textSize="12sp"
51 
            android:textColor="#565656"/>
52
53 
        <TextView
54 
            android:id="@+id/read_data"
55 
            android:layout_width="wrap_content"
56 
            android:layout_height="wrap_content"
57 
            android:layout_marginTop="13dp"
58 
            android:layout_marginBottom="13dp"
59 
            android:layout_marginLeft="5dp"
60 
            android:text=""
61 
            android:textSize="12sp"
62 
            android:textColor="#565656"/>
63
64 
        <TextView
65 
            android:layout_width="wrap_content"
66 
            android:layout_height="wrap_content"
67 
            android:layout_marginTop="13dp"
68 
            android:layout_marginBottom="13dp"
69 
            android:layout_marginLeft="30dp"
70 
            android:text="阅读"
71 
            android:textSize="12sp"
72 
            android:textColor="#565656"/>
73
74 
        <TextView
75 
            android:id="@+id/join_data"
76 
            android:layout_width="wrap_content"
77 
            android:layout_height="wrap_content"
78 
            android:layout_marginTop="13dp"
79 
            android:layout_marginBottom="13dp"
80 
            android:layout_marginLeft="5dp"
81 
            android:text="12"
82 
            android:textSize="12sp"
83 
            android:textColor="#565656"/>
84 
    </LinearLayout>
85
86 
    <View
87 
        android:layout_width="match_parent"
88 
        android:layout_height="10dp"
89 
        android:background="@color/title_line"/>
90
91 
    <LinearLayout
92 
        android:id="@+id/ll_sort_view"
93 
        android:layout_width="match_parent"
94 
        android:layout_height="50dp"
95 
        android:orientation="horizontal"
96 
        android:gravity="center_vertical">
97 
        <TextView
98 
            android:id="@+id/sort_text_info"
99 
            android:layout_width="wrap_content"
100 
            android:layout_height="wrap_content"
101 
            android:layout_marginTop="13dp"
102 
            android:layout_marginBottom="13dp"
103 
            android:layout_marginLeft="15dp"
104 
            android:text="最热发布"
105 
            android:textSize="12sp"
106 
            android:textColor="#02b637"/>
107
108 
        <ImageView
109 
            android:layout_width="16dp"
110 
            android:layout_height="16dp"
111 
            android:layout_marginLeft="5dp"
112 
            android:src="@drawable/app_topic_detaic_popup_icon"
113 
            android:layout_alignParentRight="true"
114 
            />
115 
    </LinearLayout>
116
117 
    <com.aspsine.irecyclerview.IRecyclerView
118 
        android:id="@+id/recyclerView"
119 
        android:layout_width="match_parent"
120 
        android:layout_height="match_parent"
121 
        app:loadMoreEnabled="true"
122 
        app:refreshEnabled="false"
123 
        app:loadMoreFooterLayout="@layout/layout_irecyclerview_load_more_footer"
124 
        android:overScrollMode="never"
125 
        />
126
127
128 
</LinearLayout>

+ 4 - 0
app/src/main/res/layout/layout_irecyclerview_load_more_footer.xml
Wyświetl plik 

@ -0,0 +1,4 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<com.electric.chargingpile.view.footer.LoadMoreFooterView xmlns:android="http://schemas.android.com/apk/res/android"
3 
                                              android:layout_width="match_parent"
4 
                                              android:layout_height="48dp"/>

+ 8 - 0
app/src/main/res/layout/layout_irecyclerview_load_more_footer_error_view.xml
Wyświetl plik 

@ -0,0 +1,8 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
3 
    android:id="@+id/tvError"
4 
    android:layout_width="match_parent"
5 
    android:layout_height="36dp"
6 
    android:gravity="center"
7 
    android:layout_gravity="center"
8 
    android:text="加载失败，请重试..." />

+ 23 - 0
app/src/main/res/layout/layout_irecyclerview_load_more_footer_loading_view.xml
Wyświetl plik 

@ -0,0 +1,23 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 
    android:id="@+id/full_view"
4 
    android:layout_width="match_parent"
5 
    android:layout_height="48dp"
6 
    android:background="@color/color_white"
7 
    android:gravity="center"
8 
    android:orientation="horizontal">
9 
<ProgressBar
10 
    android:id="@+id/progressBar"
11 
    android:indeterminateTint="#cecece"
12 
    android:layout_width="20dp"
13 
    android:layout_height="20dp"
14 
    android:layout_gravity="center" />
15
16 
    <TextView
17 
        android:layout_width="wrap_content"
18 
        android:layout_height="wrap_content"
19 
        android:layout_marginLeft="10dp"
20 
        android:text="加载中…"
21 
        android:textSize="13sp"
22 
        android:textColor="#565656"/>
23 
</LinearLayout>

+ 9 - 0
app/src/main/res/layout/layout_irecyclerview_load_more_footer_the_end_view.xml
Wyświetl plik 

@ -0,0 +1,9 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
3 
    android:id="@+id/tvTheEnd"
4 
    android:layout_width="match_parent"
5 
    android:layout_height="48dp"
6 
    android:gravity="center"
7 
    android:text="已经显示全部了"
8 
    android:layout_gravity="center"
9 
    android:background="@color/color_white"/>

+ 17 - 0
app/src/main/res/layout/layout_irecyclerview_load_more_footer_view.xml
Wyświetl plik 

@ -0,0 +1,17 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<merge xmlns:android="http://schemas.android.com/apk/res/android"
3 
    android:layout_width="match_parent"
4 
    android:layout_height="48dp">
5 
    <include
6 
        android:id="@+id/theEndView"
7 
        layout="@layout/layout_irecyclerview_load_more_footer_the_end_view" />
8
9 
    <include
10 
        android:id="@+id/errorView"
11 
        layout="@layout/layout_irecyclerview_load_more_footer_error_view" />
12
13 
    <include
14 
        android:id="@+id/loadingView"
15 
        layout="@layout/layout_irecyclerview_load_more_footer_loading_view" />
16
17 
</merge>

+ 72 - 0
app/src/main/res/layout/topic_sort_popup_dialog.xml
Wyświetl plik 

@ -0,0 +1,72 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 
    android:orientation="vertical" android:layout_width="match_parent"
4 
    android:layout_height="match_parent">
5
6 
    <RelativeLayout
7 
        android:layout_width="match_parent"
8 
        android:layout_height="wrap_content"
9 
        android:padding="5dp"
10 
        android:background="@drawable/bg_popup_sort">
11
12 
        <LinearLayout
13 
            android:layout_width="match_parent"
14 
            android:layout_height="wrap_content"
15 
            android:padding="5dp"
16 
            android:orientation="vertical">
17
18 
            <TextView
19 
                android:id="@+id/tv_1"
20 
                android:layout_width="match_parent"
21 
                android:layout_height="44dp"
22 
                android:padding="5dp"
23 
                android:gravity="center"
24 
                android:text="最新发布"
25 
                android:textSize="14sp"
26 
                android:textColor="@color/lvse"/>
27
28 
            <View
29 
                android:layout_width="match_parent"
30 
                android:layout_height="0.5dp"
31 
                android:paddingLeft="5dp"
32 
                android:paddingRight="5dp"
33 
                android:background="@color/ui_6d"/>
34
35
36 
            <TextView
37 
                android:id="@+id/tv_2"
38 
                android:layout_width="match_parent"
39 
                android:layout_height="44dp"
40 
                android:padding="5dp"
41 
                android:gravity="center"
42 
                android:text="最后回复"
43 
                android:textSize="14sp"
44 
                android:textColor="@color/ui_68"/>
45
46 
            <View
47 
                android:layout_width="match_parent"
48 
                android:layout_height="0.5dp"
49 
                android:paddingLeft="5dp"
50 
                android:paddingRight="5dp"
51 
                android:background="@color/ui_6d"/>
52
53
54 
            <TextView
55 
                android:id="@+id/tv_3"
56 
                android:layout_width="match_parent"
57 
                android:layout_height="44dp"
58 
                android:padding="5dp"
59 
                android:gravity="center"
60 
                android:text="最热"
61 
                android:textSize="14sp"
62 
                android:textColor="@color/ui_68"/>
63
64
65 
        </LinearLayout>
66
67
68 
    </RelativeLayout>
69
70
71
72 
</LinearLayout>

首页搜索相关问题修复 · da3749f236 - Gogs: Go Git Service
Главная Обзор Помощь
Регистрация Войти
dudu
/
cdzApp
Следить 2
В избранное 1
Ответвить 0
Код Обсуждения 0 Запросы на слияние 0 Коммиты 372 Релизы 18 Вики
Просмотр исходного кода

首页搜索相关问题修复

huyuguo лет назад: 6
Родитель
ea9a7fa213
Сommit
da3749f236
6 измененных файлов с 272 добавлено и 216 удалено
Разделённый вид Показать статистику Diff
  1. 2 2
      app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java
  2. 52 28
      app/src/main/java/com/electric/chargingpile/activity/SearchActivity.java
  3. 31 22
      app/src/main/java/com/electric/chargingpile/activity/SearchAllActivity.java
  4. 6 0
      app/src/main/java/com/electric/chargingpile/util/DBOpenHandler.java
  5. 172 155
      app/src/main/res/layout/activity_search.xml
  6. 9 9
      app/src/main/res/layout/activity_search_all.xml

+ 2 - 2
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java
Просмотреть файл 

@ -1664,7 +1664,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
1664 1664
1665 1665 
        String search_address = ProfileManager.getInstance().getSearchAddress(this);
1666 1666 
        if (search_address.equals("")) {
1667 
            tv_search.setText("请输入要查找的地名");
1667 
            tv_search.setText("请输入地址/关键字");
1668 1668 
            iv_clear_address.setVisibility(View.INVISIBLE);
1669 1669 
        } else {
1670 1670 
            tv_search.setText(search_address);
 
@ -2814,7 +2814,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
2814 2814 
                MobclickAgent.onEvent(context, "0068");
2815 2815 
                break;
2816 2816 
            case R.id.iv_clear_address:
2817 
                tv_search.setText("请输入要查找的地名");
2817 
                tv_search.setText("请输入地址/关键字");
2818 2818 
                iv_clear_address.setVisibility(View.INVISIBLE);
2819 2819 
                ProfileManager.getInstance().setSearchAddress(this, "");
2820 2820 
//                if (search_marker != null){

+ 52 - 28
app/src/main/java/com/electric/chargingpile/activity/SearchActivity.java
Просмотреть файл 

@ -86,8 +86,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
86 86 
    private HistoryInfo history;
87 87
88 88 
    private List<RecommendZhan> pointList = new ArrayList<>();
89 
    private List<RecommendZhan> pointAllList = new ArrayList<>();
90 
    private String pointAllData = "";
89 
    public static List<RecommendZhan> pointAllList = new ArrayList<>();
91 90
92 91 
    private Map<String, String> map;
93 92 


@ -109,6 +108,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
109 108 
    private Button cancleButton;
110 109 
    private TextView tvOne, tvTwo, tvThree;
111 110 
    private Double bd_lon, bd_lat, bd_jing, bd_wei;
111 
    private TextView no_result;
112 112
113 113 
    @Override
114 114 
    protected void onCreate(Bundle savedInstanceState) {

@ -129,6 +129,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
129 129 
        tvSearch.setOnClickListener(this);
130 130 
        ivClear = (ImageView) findViewById(R.id.iv_search_clear);
131 131 
        ivClear.setOnClickListener(this);
132 
        no_result = findViewById(R.id.no_result);
132 133
133 134 
        etSearch = (EditText) findViewById(R.id.et_search);
134 135 
        etSearch.setOnClickListener(new OnClickListener() {

@ -174,7 +175,6 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
174 175 
                    pointList.clear();
175 176 
                    addressAllList.clear();
176 177 
                    pointAllList.clear();
177 
                    pointAllData = "";
178 178 
                    adapter.notifyDataSetChanged();
179 179
180 180 
                } else {

@ -205,9 +205,13 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
205 205 
                        Toast.makeText(SearchActivity.this, "搜索内容不能为空", Toast.LENGTH_SHORT).show();
206 206 
                        addressList.clear();
207 207 
                        addressAllList.clear();
208 
                        pointAllList.clear();
209 
                        pointList.clear();
210 
                        adapter.notifyDataSetChanged();
208 211 
                        historyList.setVisibility(View.VISIBLE);
209 212 
                        lvContent.setVisibility(View.GONE);
210 213 
                    } else {
214 
                        no_result.setVisibility(View.GONE);
211 215 
                        keyWord = s;
212 216 
                        doSearchQuery();
213 217 
                        doPointNameSearchQuery();

@ -298,6 +302,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
298 302 
                values.put("type", addressList.get(position).get("address"));
299 303 
                values.put("jing", addressList.get(position).get("jing"));
300 304 
                values.put("wei", addressList.get(position).get("wei"));
305 
                db.del(addressList.get(position).get("name"), addressList.get(position).get("address"));
301 306 
                db.insert(values);
302 307
303 308 
                Cursor c = db.query();

@ -318,6 +323,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
318 323 
                if (v != null) {
319 324 
                    imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
320 325 
                }
326 
                db.close();
321 327 
                finish();
322 328 
            }
323 329 
        });

@ -474,6 +480,12 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
474 480 
                                });
475 481 
                            }
476 482
483 
                            if (addressList.size() == 0 && pointList.size() == 0) {
484 
                                no_result.setVisibility(View.VISIBLE);
485 
                            } else {
486 
                                no_result.setVisibility(View.GONE);
487 
                            }
488
477 489 
                        } catch (Exception e) {
478 490 
                            e.printStackTrace();
479 491 
                        }

@ -482,6 +494,12 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
482 494 
                        addressList.clear();
483 495 
                        addressAllList.clear();
484 496 
                        adapter.notifyDataSetChanged();
497
498 
                        if (addressList.size() == 0 && pointList.size() == 0) {
499 
                            no_result.setVisibility(View.VISIBLE);
500 
                        } else {
501 
                            no_result.setVisibility(View.GONE);
502 
                        }
485 503 
                    }
486 504 
                }
487 505 
            } else {

@ -624,7 +642,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
624 642 
                @Override
625 643 
                public void onClick(View v) { // 全部目的地
626 644 
                    Intent intent = new Intent();
627 
                    intent.putExtra("key_word",keyWord);
645 
                    intent.putExtra("key_word", keyWord);
628 646 
                    intent.setClass(getApplicationContext(), SearchAllActivity.class);
629 647 
                    Bundle bundle = new Bundle();
630 648 
                    ArrayList arrayList = new ArrayList();

@ -656,7 +674,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
656 674 
                viewHolder.point_header_title.setVisibility(View.GONE);
657 675 
            }
658 676
659 
            if (position == list.size() + pList.size() - 1 && pointAllList.size() > 3) {
677 
            if (position == list.size() + pList.size() - 1 && pointAllList.size() > 5) {
660 678 
                viewHolder.query_all_points.setVisibility(View.VISIBLE);
661 679 
            } else {
662 680 
                viewHolder.query_all_points.setVisibility(View.GONE);

@ -668,7 +686,6 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
668 686 
                    Intent intent = new Intent();
669 687 
                    intent.setClass(getApplicationContext(), SearchAllActivity.class);
670 688 
                    intent.putExtra("title", "全部站点");
671 
                    intent.putExtra("data", pointAllData);
672 689 
                    startActivity(intent);
673 690 
                }
674 691 
            });

@ -741,30 +758,33 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
741 758 
                }
742 759 
            }
743 760
761 
            viewHolder.fenshi_info_textview.setText("");
762
744 763 
            if ("1".equals(point.getFenshi_is())) {
745 
                viewHolder.fenshi_info_textview.setText("");
746 764 
                ArrayList<PileData.FenshiInfoBean> fenshiList = (ArrayList<PileData.FenshiInfoBean>) JsonUtils.parseToObjectList(point.getFenshi_info(), PileData.FenshiInfoBean.class);
747 
                Calendar calendar = Calendar.getInstance();
748 
                int hours = calendar.get(Calendar.HOUR_OF_DAY);
749 
                int minutes = calendar.get(Calendar.MINUTE);
750 
                int totalMinutes = hours * 60 + minutes;
751
752 
                for (PileData.FenshiInfoBean bean : fenshiList) {
753 
                    if (bean.getStartTotalMinutes() > totalMinutes) {
754 
                        double service_free = 0;
755 
                        double charge_free = 0;
756 
                        try {
757 
                            service_free = Double.valueOf(bean.getService_free());
758 
                            charge_free = Double.valueOf(bean.getCharge_free());
759 
                        } catch (Exception e) {
760 
                            e.printStackTrace();
765 
                if (fenshiList.size() == 1) {
766 
                    viewHolder.fenshi_info_textview.setText("全天价格统一");
767 
                } else {
768 
                    Calendar calendar = Calendar.getInstance();
769 
                    int hours = calendar.get(Calendar.HOUR_OF_DAY);
770 
                    int minutes = calendar.get(Calendar.MINUTE);
771 
                    int totalMinutes = hours * 60 + minutes;
772
773 
                    for (PileData.FenshiInfoBean bean : fenshiList) {
774 
                        if (bean.getStartTotalMinutes() > totalMinutes) {
775 
                            double service_free = 0;
776 
                            double charge_free = 0;
777 
                            try {
778 
                                service_free = Double.valueOf(bean.getService_free());
779 
                                charge_free = Double.valueOf(bean.getCharge_free());
780 
                            } catch (Exception e) {
781 
                                e.printStackTrace();
782 
                            }
783 
                            viewHolder.fenshi_info_textview.setText(String.format("%s开始 %.2f元/度", bean.getStart(), service_free + charge_free));
784 
                            break;
761 785 
                        }
762 
                        viewHolder.fenshi_info_textview.setText(String.format("%s开始 %.2f元/度", bean.getStart(), service_free + charge_free));
763 
                        break;
764 786 
                    }
765 787 
                }
766 
            } else {
767 
                viewHolder.fenshi_info_textview.setText("");
768 788 
            }
769 789
770 790 
            viewHolder.iv_label_public.setText(point.getBelong_attribute());

@ -919,12 +939,10 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
919 939 
                    }
920 940 
                    if (null != info_decode && !info_decode.equals("")) {
921 941 
                        pointAllList.clear();
922 
                        pointAllData = "";
923 942 
                        pointList.clear();
924 943
925 944 
                        List<RecommendZhan> list = JsonUtils.parseToObjectList(info_decode, RecommendZhan.class);
926 945 
                        if (list != null) {
927 
                            pointAllData = info_decode;
928 946 
                            for (RecommendZhan point : list) {
929 947 
                                String wei = point.getPoi_wei().trim();
930 948 
                                String jing = point.getPoi_jing().trim();

@ -950,7 +968,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
950 968
951 969 
                            for (RecommendZhan point : pointAllList) {
952 970 
                                pointList.add(point);
953 
                                if (pointList.size() >= 3) {
971 
                                if (pointList.size() >= 5) {
954 972 
                                    break;
955 973 
                                }
956 974 
                            }

@ -961,6 +979,12 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
961 979 
                        }
962 980 
                    }
963 981 
                }
982
983 
                if (addressList.size() == 0 && pointList.size() == 0) {
984 
                    no_result.setVisibility(View.VISIBLE);
985 
                } else {
986 
                    no_result.setVisibility(View.GONE);
987 
                }
964 988 
            }
965 989 
        });
966 990

+ 31 - 22
app/src/main/java/com/electric/chargingpile/activity/SearchAllActivity.java
Просмотреть файл 

@ -61,7 +61,7 @@ public class SearchAllActivity extends AppCompatActivity {
61 61 
        iv_title.setText(title);
62 62
63 63 
        List<Map<String, String>> addressAllList;
64 
        List<RecommendZhan> pointAllList;
64 
        List<RecommendZhan> pointAllList = new ArrayList<>();
65 65 
        if ("全部目的地".equals(title)) {
66 66 
            ArrayList arrayList = getIntent().getExtras().getParcelableArrayList("list");
67 67 
            addressAllList = (List<Map<String, String>>) arrayList.get(0);
 
@ -69,8 +69,7 @@ public class SearchAllActivity extends AppCompatActivity {
69 69 
            pointAllList = new ArrayList<>();
70 70 
        } else {
71 71 
            addressAllList = new ArrayList<>();
72 
            String data = getIntent().getStringExtra("data");
73 
            pointAllList = JsonUtils.parseToObjectList(data, RecommendZhan.class);
72 
            pointAllList.addAll(SearchActivity.pointAllList);
74 73 
        }
75 74
76 75 
@ -94,6 +93,13 @@ public class SearchAllActivity extends AppCompatActivity {
94 93 
            }
95 94 
        });
96 95
96 
        findViewById(R.id.iv_back).setOnClickListener(new View.OnClickListener() {
97 
            @Override
98 
            public void onClick(View v) {
99 
                finish();
100 
            }
101 
        });
102
97 103 
    }
98 104
99 105 
    public class SearchAdapter extends BaseAdapter {
 
@ -293,31 +299,34 @@ public class SearchAllActivity extends AppCompatActivity {
293 299 
                    viewHolder.comment_cnt.setText(point.getComment_cnt() / 10000 + "w+次评论");
294 300 
                }
295 301 
            }
302 
            viewHolder.fenshi_info_textview.setText("");
296 303
297 304 
            if ("1".equals(point.getFenshi_is())) {
298 
                viewHolder.fenshi_info_textview.setText("");
305
299 306 
                ArrayList<PileData.FenshiInfoBean> fenshiList = (ArrayList<PileData.FenshiInfoBean>) JsonUtils.parseToObjectList(point.getFenshi_info(), PileData.FenshiInfoBean.class);
300 
                Calendar calendar = Calendar.getInstance();
301 
                int hours = calendar.get(Calendar.HOUR_OF_DAY);
302 
                int minutes = calendar.get(Calendar.MINUTE);
303 
                int totalMinutes = hours * 60 + minutes;
304
305 
                for (PileData.FenshiInfoBean bean : fenshiList) {
306 
                    if (bean.getStartTotalMinutes() > totalMinutes) {
307 
                        double service_free = 0;
308 
                        double charge_free = 0;
309 
                        try {
310 
                            service_free = Double.valueOf(bean.getService_free());
311 
                            charge_free = Double.valueOf(bean.getCharge_free());
312 
                        } catch (Exception e) {
313 
                            e.printStackTrace();
307 
                if (fenshiList.size() == 1) {
308 
                    viewHolder.fenshi_info_textview.setText("全天价格统一");
309 
                } else {
310 
                    Calendar calendar = Calendar.getInstance();
311 
                    int hours = calendar.get(Calendar.HOUR_OF_DAY);
312 
                    int minutes = calendar.get(Calendar.MINUTE);
313 
                    int totalMinutes = hours * 60 + minutes;
314
315 
                    for (PileData.FenshiInfoBean bean : fenshiList) {
316 
                        if (bean.getStartTotalMinutes() > totalMinutes) {
317 
                            double service_free = 0;
318 
                            double charge_free = 0;
319 
                            try {
320 
                                service_free = Double.valueOf(bean.getService_free());
321 
                                charge_free = Double.valueOf(bean.getCharge_free());
322 
                            } catch (Exception e) {
323 
                                e.printStackTrace();
324 
                            }
325 
                            viewHolder.fenshi_info_textview.setText(String.format("%s开始 %.2f元/度", bean.getStart(), service_free + charge_free));
326 
                            break;
314 327 
                        }
315 
                        viewHolder.fenshi_info_textview.setText(String.format("%s开始 %.2f元/度", bean.getStart(), service_free + charge_free));
316 
                        break;
317 328 
                    }
318 329 
                }
319 
            } else {
320 
                viewHolder.fenshi_info_textview.setText("");
321 330 
            }
322 331
323 332 
            viewHolder.iv_label_public.setText(point.getBelong_attribute());

+ 6 - 0
app/src/main/java/com/electric/chargingpile/util/DBOpenHandler.java
Просмотреть файл 

@ -68,7 +68,13 @@ public class DBOpenHandler extends SQLiteOpenHelper {
68 68 
            // 获取SQLiteDatabase
69 69 
            db = getWritableDatabase();
70 70 
        db.delete(TABLE_NAME_HISTORYINFO, "keyword=?", new String[]{keyword});
71 
    }
71 72
73 
    public void del(String keyword, String type) {
74 
        if (db == null)
75 
            // 获取SQLiteDatabase
76 
            db = getWritableDatabase();
77 
        db.delete(TABLE_NAME_HISTORYINFO, "keyword=? and type=?", new String[]{keyword, type});
72 78 
    }
73 79
74 80 
    // 关闭数据库

+ 172 - 155
app/src/main/res/layout/activity_search.xml
Просмотреть файл 

@ -1,176 +1,193 @@
1 1 
<?xml version="1.0" encoding="utf-8"?>
2 
<com.zhy.autolayout.AutoLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 
    xmlns:tools="http://schemas.android.com/tools"
4 4 
    android:layout_width="match_parent"
5 
    android:layout_height="match_parent"
6 
    android:background="@color/activity_bgcolor"
7 
    android:orientation="vertical">
5 
    android:layout_height="match_parent">
8 6
7 
    <TextView
8 
        android:id="@+id/no_result"
9 
        android:layout_width="match_parent"
10 
        android:layout_height="match_parent"
11 
        android:gravity="center"
12 
        android:text="没有匹配到搜索结果"
13 
        android:textColor="#999999"
14 
        android:visibility="gone"
15 
        tools:visibility="visible"
16 
        android:textSize="16sp" />
9 17 
    <com.zhy.autolayout.AutoLinearLayout
10 18 
        android:layout_width="match_parent"
11 
        android:layout_height="130px"
12 
        android:background="@color/titlebar_color"
13 
        android:orientation="horizontal">
14
15 
        <RelativeLayout
16 
            android:layout_width="0dp"
17 
            android:layout_height="match_parent"
18 
            android:layout_marginLeft="16dp"
19 
            android:layout_marginTop="7dp"
20 
            android:layout_marginBottom="7dp"
21 
            android:layout_weight="5"
22 
            android:background="@drawable/bg">
23
24
25 
            <EditText
26 
                android:id="@+id/et_search"
27 
                android:layout_width="fill_parent"
28 
                android:layout_height="match_parent"
29 
                android:layout_alignParentTop="true"
30 
                android:layout_marginTop="1dp"
31 
                android:layout_marginRight="13dp"
32 
                android:layout_marginBottom="1dp"
33 
                android:layout_toRightOf="@+id/iv_sou"
34 
                android:background="#f1f1f1"
35 
                android:focusable="true"
36 
                android:hint="请输入要查找的地名"
37 
                android:imeOptions="actionSearch"
38 
                android:singleLine="true"
39 
                android:text=""
40 
                android:textColorHint="@color/ui_68"
41 
                android:textCursorDrawable="@drawable/search_biao"
42 
                android:textSize="14sp" />
43
44 
            <ImageView
45 
                android:id="@+id/iv_search_clear"
46 
                android:layout_width="wrap_content"
47 
                android:layout_height="wrap_content"
48 
                android:layout_alignEnd="@+id/et_search"
49 
                android:layout_alignRight="@+id/et_search"
50 
                android:layout_centerVertical="true"
51 
                android:contentDescription="@null"
52 
                android:padding="5dp"
53 
                android:src="@drawable/icon_edit_delete2_0" />
19 
        android:layout_height="match_parent"
20 
        android:background="@color/activity_bgcolor"
21 
        android:orientation="vertical">
54 22
55 
            <ImageView
56 
                android:id="@+id/iv_sou"
57 
                android:layout_width="wrap_content"
58 
                android:layout_height="wrap_content"
59 
                android:layout_centerVertical="true"
60 
                android:layout_marginLeft="42px"
61 
                android:layout_marginRight="15px"
62 
                android:src="@drawable/icon_search1118" />
63 
        </RelativeLayout>
64
65 
        <TextView
66 
            android:id="@+id/tv_search"
67 
            android:layout_width="wrap_content"
68 
            android:layout_height="match_parent"
69 
            android:layout_alignParentRight="true"
70 
            android:layout_centerVertical="true"
71 
            android:contentDescription="@null"
72 
            android:gravity="center"
73 
            android:paddingLeft="16dp"
74 
            android:paddingTop="5dp"
75 
            android:paddingRight="16dp"
76 
            android:paddingBottom="5dp"
77 
            android:text="取消"
78 
            android:textColor="@color/lvse"
79 
            android:textSize="15sp" />
80
81 
        <LinearLayout
82 
            android:id="@+id/ll_menu"
23 
        <com.zhy.autolayout.AutoLinearLayout
83 24 
            android:layout_width="match_parent"
84 
            android:layout_height="50dp"
85 
            android:background="@color/white"
25 
            android:layout_height="130px"
26 
            android:background="@color/titlebar_color"
27 
            android:orientation="horizontal">
28
29 
            <RelativeLayout
30 
                android:layout_width="0dp"
31 
                android:layout_height="match_parent"
32 
                android:layout_marginLeft="16dp"
33 
                android:layout_marginTop="7dp"
34 
                android:layout_marginBottom="7dp"
35 
                android:layout_weight="5"
36 
                android:background="@drawable/bg">
86 37
87 
            android:orientation="vertical"
88 
            android:visibility="gone">
89 38
90 
            <LinearLayout
91 
                android:id="@+id/ll_address"
92 
                android:layout_width="match_parent"
93 
                android:layout_height="0dp"
94 
                android:layout_weight="1">
39 
                <EditText
40 
                    android:id="@+id/et_search"
41 
                    android:layout_width="fill_parent"
42 
                    android:layout_height="match_parent"
43 
                    android:layout_alignParentTop="true"
44 
                    android:layout_marginTop="1dp"
45 
                    android:layout_marginRight="13dp"
46 
                    android:layout_marginBottom="1dp"
47 
                    android:layout_toRightOf="@+id/iv_sou"
48 
                    android:background="#f1f1f1"
49 
                    android:focusable="true"
50 
                    android:hint="请输入地址/关键字"
51 
                    android:imeOptions="actionSearch"
52 
                    android:singleLine="true"
53 
                    android:text=""
54 
                    android:textColorHint="@color/ui_68"
55 
                    android:textCursorDrawable="@drawable/search_biao"
56 
                    android:textSize="14sp" />
95 57
96 58 
                <ImageView
97 
                    android:layout_width="0dp"
98 
                    android:layout_height="match_parent"
99 
                    android:layout_weight="1"
59 
                    android:id="@+id/iv_search_clear"
60 
                    android:layout_width="wrap_content"
61 
                    android:layout_height="wrap_content"
62 
                    android:layout_alignEnd="@+id/et_search"
63 
                    android:layout_alignRight="@+id/et_search"
64 
                    android:layout_centerVertical="true"
65 
                    android:contentDescription="@null"
100 66 
                    android:padding="5dp"
101 
                    android:src="@drawable/icon_screening" />
67 
                    android:src="@drawable/icon_edit_delete2_0" />
102 68
103 
                <TextView
104 
                    android:id="@+id/address_search"
105 
                    android:layout_width="0dp"
106 
                    android:layout_height="match_parent"
107 
                    android:layout_weight="6"
108 
                    android:gravity="center_vertical"
109 
                    android:paddingLeft="5dp"
110 
                    android:text="找地名:"
111 
                    android:textColor="@color/text_light_grey"
112 
                    android:textSize="18sp" />
113 
            </LinearLayout>
114
115 
            <View
116 
                android:layout_width="match_parent"
117 
                android:layout_height="0.5dp"
118 
                android:background="@color/title_line"
119 
                android:visibility="gone" />
69 
                <ImageView
70 
                    android:id="@+id/iv_sou"
71 
                    android:layout_width="wrap_content"
72 
                    android:layout_height="wrap_content"
73 
                    android:layout_centerVertical="true"
74 
                    android:layout_marginLeft="42px"
75 
                    android:layout_marginRight="15px"
76 
                    android:src="@drawable/icon_search1118" />
77 
            </RelativeLayout>
78
79 
            <TextView
80 
                android:id="@+id/tv_search"
81 
                android:layout_width="wrap_content"
82 
                android:layout_height="match_parent"
83 
                android:layout_alignParentRight="true"
84 
                android:layout_centerVertical="true"
85 
                android:contentDescription="@null"
86 
                android:gravity="center"
87 
                android:paddingLeft="16dp"
88 
                android:paddingTop="5dp"
89 
                android:paddingRight="16dp"
90 
                android:paddingBottom="5dp"
91 
                android:text="取消"
92 
                android:textColor="@color/lvse"
93 
                android:textSize="15sp" />
120 94
121 95 
            <LinearLayout
122 
                android:id="@+id/ll_zhan"
96 
                android:id="@+id/ll_menu"
123 97 
                android:layout_width="match_parent"
124 
                android:layout_height="0dp"
125 
                android:layout_weight="1">
126
127 
                <ImageView
128 
                    android:layout_width="0dp"
129 
                    android:layout_height="match_parent"
130 
                    android:layout_weight="1"
131 
                    android:padding="5dp"
132 
                    android:src="@drawable/icon_screening" />
133
134 
                <TextView
135 
                    android:id="@+id/zhan_search"
136 
                    android:layout_width="0dp"
137 
                    android:layout_height="match_parent"
138 
                    android:layout_weight="6"
139 
                    android:gravity="center_vertical"
140 
                    android:paddingLeft="5dp"
141 
                    android:text="找电桩:"
142 
                    android:textColor="@color/text_light_grey"
143 
                    android:textSize="18sp" />
98 
                android:layout_height="50dp"
99 
                android:background="@color/white"
100
101 
                android:orientation="vertical"
102 
                android:visibility="gone">
103
104 
                <LinearLayout
105 
                    android:id="@+id/ll_address"
106 
                    android:layout_width="match_parent"
107 
                    android:layout_height="0dp"
108 
                    android:layout_weight="1">
109
110 
                    <ImageView
111 
                        android:layout_width="0dp"
112 
                        android:layout_height="match_parent"
113 
                        android:layout_weight="1"
114 
                        android:padding="5dp"
115 
                        android:src="@drawable/icon_screening" />
116
117 
                    <TextView
118 
                        android:id="@+id/address_search"
119 
                        android:layout_width="0dp"
120 
                        android:layout_height="match_parent"
121 
                        android:layout_weight="6"
122 
                        android:gravity="center_vertical"
123 
                        android:paddingLeft="5dp"
124 
                        android:text="找地名:"
125 
                        android:textColor="@color/text_light_grey"
126 
                        android:textSize="18sp" />
127 
                </LinearLayout>
128
129 
                <View
130 
                    android:layout_width="match_parent"
131 
                    android:layout_height="0.5dp"
132 
                    android:background="@color/title_line"
133 
                    android:visibility="gone" />
134
135 
                <LinearLayout
136 
                    android:id="@+id/ll_zhan"
137 
                    android:layout_width="match_parent"
138 
                    android:layout_height="0dp"
139 
                    android:layout_weight="1">
140
141 
                    <ImageView
142 
                        android:layout_width="0dp"
143 
                        android:layout_height="match_parent"
144 
                        android:layout_weight="1"
145 
                        android:padding="5dp"
146 
                        android:src="@drawable/icon_screening" />
147
148 
                    <TextView
149 
                        android:id="@+id/zhan_search"
150 
                        android:layout_width="0dp"
151 
                        android:layout_height="match_parent"
152 
                        android:layout_weight="6"
153 
                        android:gravity="center_vertical"
154 
                        android:paddingLeft="5dp"
155 
                        android:text="找电桩:"
156 
                        android:textColor="@color/text_light_grey"
157 
                        android:textSize="18sp" />
158 
                </LinearLayout>
144 159 
            </LinearLayout>
145 
        </LinearLayout>
146 160
161 
        </com.zhy.autolayout.AutoLinearLayout>
162
163 
        <View
164 
            android:layout_width="match_parent"
165 
            android:layout_height="0.5dp"
166 
            android:background="@color/ui_titleline"
167 
            android:visibility="visible" />
168
169 
        <ListView
170 
            android:id="@+id/lv_search_list"
171 
            android:layout_width="fill_parent"
172 
            android:layout_height="0dp"
173 
            android:layout_weight="9.8"
174 
            android:background="@color/white"
175 
            android:cacheColorHint="@color/transparent"
176 
            android:fadingEdge="none"
177 
            android:listSelector="@color/transparent" />
178
179 
        <ListView
180 
            android:id="@+id/lv_history_list"
181 
            android:layout_width="fill_parent"
182 
            android:layout_height="0dp"
183 
            android:layout_weight="9.8"
184 
            android:background="@color/white"
185 
            android:cacheColorHint="@color/transparent"
186 
            android:divider="@drawable/list_item_divider"
187 
            android:dividerHeight="0.5dp"
188 
            android:fadingEdge="none"
189 
            android:listSelector="@color/transparent" />
147 190 
    </com.zhy.autolayout.AutoLinearLayout>
148 191
149 
    <View
150 
        android:layout_width="match_parent"
151 
        android:layout_height="0.5dp"
152 
        android:background="@color/ui_titleline"
153 
        android:visibility="visible" />
154
155 
    <ListView
156 
        android:id="@+id/lv_search_list"
157 
        android:layout_width="fill_parent"
158 
        android:layout_height="0dp"
159 
        android:layout_weight="9.8"
160 
        android:background="@color/white"
161 
        android:cacheColorHint="@color/transparent"
162 
        android:fadingEdge="none"
163 
        android:listSelector="@color/transparent" />
164
165 
    <ListView
166 
        android:id="@+id/lv_history_list"
167 
        android:layout_width="fill_parent"
168 
        android:layout_height="0dp"
169 
        android:layout_weight="9.8"
170 
        android:background="@color/white"
171 
        android:cacheColorHint="@color/transparent"
172 
        android:divider="@drawable/list_item_divider"
173 
        android:dividerHeight="0.5dp"
174 
        android:fadingEdge="none"
175 
        android:listSelector="@color/transparent" />
176 
</com.zhy.autolayout.AutoLinearLayout>
192
193 
</androidx.constraintlayout.widget.ConstraintLayout>

+ 9 - 9
app/src/main/res/layout/activity_search_all.xml
Просмотреть файл 

@ -14,6 +14,15 @@
14 14 
        app:layout_constraintRight_toRightOf="parent"
15 15 
        app:layout_constraintTop_toTopOf="parent">
16 16
17 
        <TextView
18 
            android:id="@+id/iv_title"
19 
            android:layout_width="match_parent"
20 
            android:layout_height="match_parent"
21 
            android:gravity="center"
22 
            android:textColor="#222222"
23 
            android:textSize="18sp"
24 
            tools:text="全部目的地" />
25
17 26 
        <ImageView
18 27 
            android:id="@+id/iv_back"
19 28 
            android:layout_width="wrap_content"
 
@ -26,15 +35,6 @@
26 35 
            app:layout_constraintLeft_toLeftOf="parent"
27 36 
            app:layout_constraintTop_toTopOf="parent" />
28 37
29 
        <TextView
30 
            android:id="@+id/iv_title"
31 
            android:layout_width="match_parent"
32 
            android:layout_height="match_parent"
33 
            android:gravity="center"
34 
            android:textColor="#222222"
35 
            android:textSize="18sp"
36 
            tools:text="全部目的地" />
37
38 38 
        <View
39 39 
            android:layout_width="match_parent"
40 40 
            android:layout_height="0.5dp"

Sign In - Gogs: Go Git Service
Home Explore Help
Register Sign In

Sign In

Forgot password?
Need an account? Sign up now.