class="lines-num lines-num-new"> 
                    if (et_pinglun.getText().toString().equals("#" + MainApplication.huodonglabel + "# ")) {
426 
//                        tv_make_sure.setBackgroundResource(R.color.huise);
427 
//                        tv_make_sure.setEnabled(false);
428 
                        if (!star_level.equals("") && !select_s.equals("")) {
429 
                            tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
430 
                            tv_make_sure.setEnabled(true);
431 
                        } else {
432 
                            tv_make_sure.setTextColor(getResources().getColor(R.color.huise));
433 
                            tv_make_sure.setEnabled(false);
434 
                        }
435 
                    } else {
436 
                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
437 
                        tv_make_sure.setEnabled(true);
438 
                    }
439 405
440 
                }
441 406 
//                Toast.makeText(getApplicationContext(), mVals[position], Toast.LENGTH_SHORT).show();
442 407 
                return true;
443 408 
            }
@ -646,29 +611,6 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
646 611 
                }
647 612 
                Log.e("select===", select_s);
648 613
649
650 
                if (et_pinglun.getText().toString().equals("") && NewZhanDetailsActivity.replaceBlank(et_pinglun.getText().toString()).equals("")) {
651 
                    if (!star_level.equals("") && !select_s.equals("")) {
652 
                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
653 
                        tv_make_sure.setEnabled(true);
654 
                    } else {
655 
                        tv_make_sure.setTextColor(getResources().getColor(R.color.huise));
656 
                        tv_make_sure.setEnabled(false);
657 
                    }
658 
                } else {
659 
                    if (et_pinglun.getText().toString().equals("#" + MainApplication.huodonglabel + "# ")) {
660 
                        if (!star_level.equals("") && !select_s.equals("")) {
661 
                            tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
662 
                            tv_make_sure.setEnabled(true);
663 
                        } else {
664 
                            tv_make_sure.setTextColor(getResources().getColor(R.color.huise));
665 
                            tv_make_sure.setEnabled(false);
666 
                        }
667 
                    } else {
668 
                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
669 
                        tv_make_sure.setEnabled(true);
670 
                    }
671 
                }
672 614 
                return true;
673 615 
            }
674 616 
        });
@ -1223,8 +1165,8 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
1223 1165 
                new Thread(new Runnable() {
1224 1166 
                    @Override
1225 1167 
                    public void run() {
1226 
                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
1227 
                        tv_make_sure.setEnabled(true);
1168 
//                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
1169 
//                        tv_make_sure.setEnabled(true);
1228 1170 
                    }
1229 1171 
                }).start();
1230 1172 
@ -1235,10 +1177,10 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
1235 1177 
    @Override
1236 1178 
    protected void onResume() {
1237 1179 
        super.onResume();
1238 
        if (Bimp.tempSelectBitmap.size() > 0) {
1239 
            tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
1240 
            tv_make_sure.setEnabled(true);
1241 
        }
1180 
//        if (Bimp.tempSelectBitmap.size() > 0) {
1181 
//            tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
1182 
//            tv_make_sure.setEnabled(true);
1183 
//        }
1242 1184 
        mAdapter.notifyDataSetChanged();
1243 1185
1244 1186 
        if (mInsterType == 1 && mAdapter.getItemCount() == 1) {

+ 2 - 2
app/src/main/java/com/electric/chargingpile/adapter/CommentTopicAdapter.java
Parādīt failu 

@ -58,8 +58,8 @@ public class CommentTopicAdapter extends RecyclerView.Adapter<CommentTopicAdapte
58 58
59 59 
        holder.title.setText(data.getMeg());
60 60
61 
        holder.participateText.setText(Util.convetW(data.getPartake_number(),"暂无","车主参与"));
62 
        holder.onlookersText.setText(Util.convetW(data.getLook_number(),"暂无","车主围观"));
61 
        holder.participateText.setText(data.getPartake_number());
62 
        holder.onlookersText.setText(data.getLook_number());
63 63
64 64 
        holder.itemView.setOnClickListener(v->{
65 65 
            if (mListener!=null)

+ 0 - 8
app/src/main/java/com/electric/chargingpile/adapter/NewPingLunAdapter.java
Parādīt failu 

@ -156,14 +156,6 @@ public class NewPingLunAdapter extends BaseAdapter {
156 156 
        {
157 157 
            final View finalConvertView2 = convertView;
158 158 
            try {
159 
                String is_play = TextUtils.isEmpty( datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
160
161 
                if (!TextUtils.isEmpty(is_play) && is_play.equals("1")){
162 
                    convertView.setVisibility(View.VISIBLE);
163 
                }else{
164 
                    convertView.setVisibility(View.GONE);
165 
                }
166
167 159 
//                "fileUrl":"","thumUrl":""
168 160 
                //父级评论图片
169 161 
                String fileUrl = datas.get(position).getString("fileUrl");

+ 1 - 7
app/src/main/java/com/electric/chargingpile/adapter/ZhanCommentsAapter.java
Parādīt failu 

@ -433,13 +433,8 @@ public class ZhanCommentsAapter extends BaseAdapter {
433 433 
                    }
434 434 
                });
435 435
436 
                String is_play = TextUtils.isEmpty( datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
436 
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频，24 图片
437 437
438 
                if (!TextUtils.isEmpty(is_play) && is_play.equals("1")){
439 
                    convertView.setVisibility(View.VISIBLE);
440 
                }else{
441 
                    convertView.setVisibility(View.GONE);
442 
                }
443 438
444 439 
                //父级评论图片
445 440 
                String fileUrl = datas.get(position).getString("fileUrl");
 
@ -448,7 +443,6 @@ public class ZhanCommentsAapter extends BaseAdapter {
448 443 
                fileUrl = fileUrl == null?"":fileUrl;
449 444 
                file2Url= file2Url == null?"":file2Url;
450 445 
                file3Url= file3Url == null?"":file3Url;
451 
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频，24 图片
452 446 
                if (type.equals("23")){
453 447 
                    holder.imgVideo.setVisibility(View.VISIBLE);
454 448 
                    holder.imgStart.setVisibility(View.VISIBLE);

+ 6 - 1
app/src/main/java/com/electric/chargingpile/fragment/NewMyMessageFragment.java
Parādīt failu 

@ -136,7 +136,12 @@ public class NewMyMessageFragment extends Fragment {
136 136 
                                    JSONObject jsonObject4 = (JSONObject) jsonArray
137 137 
                                            .opt(j);
138 138 
                                    String is_play = TextUtils.isEmpty( jsonObject4.getString("is_play"))?"": jsonObject4.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
139 
                                    if (is_play.equals("1")){
139 
                                    String type = TextUtils.isEmpty(jsonObject4.getString("type"))?"":jsonObject4.getString("type"); //23 视频，24 图片
140 
                                    if (type.equals("23")){
141 
                                        if (is_play.equals("1")){
142 
                                            datas.add(jsonObject4);
143 
                                        }
144 
                                    }else{
140 145 
                                        datas.add(jsonObject4);
141 146 
                                    }
142 147 
                                }

+ 14 - 4
app/src/main/java/com/electric/chargingpile/fragment/ZhanCommentFragment.java
Parādīt failu 

@ -229,7 +229,7 @@ public class ZhanCommentFragment extends Fragment {
229 229 
    public void initCommentData(RankinglistRefreshEvent event) {
230 230 
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
231 231 
//        String url = MainApplication.url+"/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
232 
//        Log.e(TAG, "getCommentsData=" + url);
232 
        Log.e(TAG, "getCommentsData=" + url);
233 233 
        OkHttpUtils.get().url(url)
234 234 
                .build().connTimeOut(6000).readTimeOut(6000)
235 235 
                .execute(new StringCallback() {
 
@ -256,7 +256,12 @@ public class ZhanCommentFragment extends Fragment {
256 256 
                                for (int j = 0; j < jsonArray.length(); j++) {
257 257 
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
258 258 
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
259 
                                    if (is_play.equals("1")){
259 
                                    String type = TextUtils.isEmpty(jsonObject.getString("type"))?"":jsonObject.getString("type"); //23 视频，24 图片
260 
                                    if (type.equals("23")){
261 
                                        if (is_play.equals("1")){
262 
                                            datas.add(jsonObject);
263 
                                        }
264 
                                    }else {
260 265 
                                        datas.add(jsonObject);
261 266 
                                    }
262 267 
                                }
 
@ -309,9 +314,14 @@ public class ZhanCommentFragment extends Fragment {
309 314 
                                JSONArray jsonArray = new JSONArray(commentData);
310 315 
                                for (int j = 0; j < jsonArray.length(); j++) {
311 316 
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
312 
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
313 317
314 
                                    if (is_play.equals("1")){
318 
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
319 
                                    String type = TextUtils.isEmpty(jsonObject.getString("type"))?"":jsonObject.getString("type"); //23 视频，24 图片
320 
                                     if (type.equals("23")){
321 
                                        if (is_play.equals("1")){
322 
                                            datas.add(jsonObject);
323 
                                        }
324 
                                    }else{
315 325 
                                        datas.add(jsonObject);
316 326 
                                    }
317 327 
                                }

+ 2 - 0
app/src/main/java/com/electric/chargingpile/util/CarTypeUtil.java
Parādīt failu 

@ -26,6 +26,8 @@ public class CarTypeUtil {
26 26 
                        name0 = strarray[0];
27 27 
                    }
28 28 
                    car = name0 + name1;
29 
                }else{
30 
                    car=s;
29 31 
                }
30 32 
            }
31 33 
        }catch (Exception e) {

+ 45 - 7
app/src/main/java/com/electric/chargingpile/view/SignInDialog.java
Parādīt failu 

@ -1,6 +1,8 @@
1 1 
package com.electric.chargingpile.view;
2 2
3 3 
import android.content.Context;
4 
import android.text.Html;
5 
import android.text.TextUtils;
4 6 
import android.view.Display;
5 7 
import android.view.LayoutInflater;
6 8 
import android.view.View;
 
@ -19,7 +21,7 @@ public class SignInDialog {
19 21 
    private Context context;
20 22 
    private android.app.Dialog dialog;
21 23 
    private Display display;
22 
    private TextView tv_num, tv_third, tv_second, tv_first, tv_now_temperature, tv_du, tv_w, tv_pm, tv_city;
24 
    private TextView tv_num, tv_third, tv_second, tv_first, tv_now_temperature, tv_du, tv_w, tv_pm, tv_city,tv_2;
23 25 
    private LinearLayout dialog_bg;
24 26
25 27 
    public SignInDialog(Context context) {
 
@ -37,6 +39,7 @@ public class SignInDialog {
37 39 
        // 获取自定义Dialog布局中的控件
38 40 
        dialog_bg = (LinearLayout) view.findViewById(R.id.dialog_bg);
39 41 
        tv_num = (TextView) view.findViewById(R.id.tv_num);
42 
        tv_2 = (TextView) view.findViewById(R.id.tv_2);
40 43 
        tv_third = (TextView) view.findViewById(R.id.tv_third);
41 44 
        tv_second = (TextView) view.findViewById(R.id.tv_second);
42 45 
        tv_first = (TextView) view.findViewById(R.id.tv_first);
 
@ -59,13 +62,33 @@ public class SignInDialog {
59 62 
        return this;
60 63 
    }
61 64
62 
    public SignInDialog setTitle(String third, String second, String first, String score, String city) {
63 
        if (score != null && !score.equals("")) {
64 
            tv_num.setText(score);
65 
        } else {
66 
            tv_num.setText("");
65 
    public SignInDialog setTitle(String log_day, String score, String city) {
66 
        String third = "", second = "", first = "";
67 
        if (TextUtils.isEmpty(log_day)){
68 
            log_day="1";
67 69 
        }
68 
        tv_num.setText(score);
70 
        int length = log_day.length();
71
72 
        char words[] = log_day.toCharArray();
73 
        if (length == 1) {
74 
            third = "";
75 
            second = "";
76 
            first = String.valueOf(words[0]);
77 
        } else if (length == 2) {
78 
            third = "";
79 
            second = String.valueOf(words[0]);
80 
            first = String.valueOf(words[1]);
81 
        } else if (length == 3) {
82 
            third = String.valueOf(words[0]);
83 
            second = String.valueOf(words[1]);
84 
            first = String.valueOf(words[2]);
85 
        }
86
87
88
89
90
91
69 92 
        if (third.equals("")) {
70 93 
            tv_third.setText("0");
71 94 
        } else {
 
@ -83,6 +106,21 @@ public class SignInDialog {
83 106 
        } else {
84 107 
            tv_first.setText(first);
85 108 
        }
109
110 
        if (score != null && !score.equals("")) {
111 
            tv_num.setText(Html.fromHtml("今天签到获得 <font color='#01b637'>"+score+"</font> 个充电币"));
112 
            int i = 7 - Integer.parseInt(log_day);
113 
            if (i>=0){
114 
                tv_2.setText("还有"+ i+"天获得充电优惠哦~");
115 
            }
116 
        } else {
117 
            tv_num.setText("");
118 
        }
119
120 
        if (Integer.parseInt(log_day)>= 7){
121 
            tv_num.setText("充电订单折扣优惠券已到账");
122 
            tv_2.setText("充电订单八折");
123 
        }
86 124 
        return this;
87 125 
    }
88 126

BIN
app/src/main/res/drawable-xxhdpi/ic_activity_center.webp
Parādīt failu


BIN
app/src/main/res/drawable-xxhdpi/ic_no_data_search.webp
Parādīt failu


+ 15 - 0
app/src/main/res/layout/activity_main_map.xml
Parādīt failu 

@ -1497,6 +1497,9 @@
1497 1497 
            android:visibility="gone">
1498 1498
1499 1499 
            <TextView
1500 
                android:id="@+id/notificationText"
1501 
                android:maxLines="1"
1502 
                android:ellipsize="end"
1500 1503 
                android:layout_width="match_parent"
1501 1504 
                android:layout_height="27dp"
1502 1505 
                android:drawableLeft="@drawable/icon_main_order"
 
@ -1620,6 +1623,18 @@
1620 1623 
                tools:visibility="visible" />
1621 1624
1622 1625 
            <ImageView
1626 
                android:layout_centerVertical="true"
1627 
                android:id="@+id/imgActivityCenter"
1628 
                android:layout_width="80dp"
1629 
                android:layout_height="80dp"
1630 
                android:layout_alignParentRight="true"
1631 
                android:layout_marginTop="30dp"
1632 
                android:layout_marginRight="12dp"
1633 
                android:src="@drawable/ic_activity_center"
1634 
                android:visibility="gone"
1635 
                tools:visibility="visible" />
1636
1637 
            <ImageView
1623 1638 
                android:id="@+id/iv_route"
1624 1639 
                android:layout_width="wrap_content"
1625 1640 
                android:layout_height="wrap_content"

+ 27 - 10
app/src/main/res/layout/activity_search.xml
Parādīt failu 

@ -1,20 +1,12 @@
1 1 
<?xml version="1.0" encoding="utf-8"?>
2 2 
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 
    xmlns:app="http://schemas.android.com/apk/res-auto"
3 4 
    xmlns:tools="http://schemas.android.com/tools"
4 5 
    android:layout_width="match_parent"
5 6 
    android:layout_height="match_parent">
6 7
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" />
17 8 
    <com.zhy.autolayout.AutoLinearLayout
9 
        android:id="@+id/autoLinearLayout"
18 10 
        android:layout_width="match_parent"
19 11 
        android:layout_height="match_parent"
20 12 
        android:background="@color/activity_bgcolor"

@ -189,5 +181,30 @@
189 181 
            android:listSelector="@color/transparent" />
190 182 
    </com.zhy.autolayout.AutoLinearLayout>
191 183
184 
    <ImageView
185 
        android:id="@+id/imgNoData"
186 
        android:layout_width="wrap_content"
187 
        android:layout_height="wrap_content"
188 
        android:src="@drawable/ic_no_data_search"
189 
        app:layout_constraintBottom_toBottomOf="parent"
190 
        app:layout_constraintEnd_toEndOf="parent"
191 
        app:layout_constraintStart_toStartOf="parent"
192 
        android:visibility="gone"
193 
        app:layout_constraintTop_toTopOf="parent" tools:visibility="visible" />
194
195 
    <TextView
196 
        android:layout_marginTop="28dp"
197 
        android:id="@+id/no_result"
198 
        android:layout_width="wrap_content"
199 
        android:layout_height="wrap_content"
200 
        android:gravity="center"
201 
        android:text="小主没有您要的内容，请重新输入试试"
202 
        android:textColor="#999999"
203 
        android:textSize="16sp"
204 
        android:visibility="gone"
205 
        app:layout_constraintStart_toStartOf="@+id/imgNoData"
206 
        app:layout_constraintEnd_toEndOf="@+id/imgNoData"
207 
        app:layout_constraintTop_toBottomOf="@+id/imgNoData"
208 
        tools:visibility="visible" />
192 209
193 210 
</androidx.constraintlayout.widget.ConstraintLayout>

+ 1 - 1
app/src/main/res/layout/activity_zhan_comment.xml
Parādīt failu 

@ -189,7 +189,7 @@
189 189 
                android:layout_marginBottom="7dp"
190 190 
                android:background="@color/white"
191 191 
                android:gravity="left|top"
192 
                android:hint="对本次充电感受如何？跟其他车友分享一下吧～"
192 
                android:hint="您的充电体验、站点吐槽、充电趣事，来和其他车友分享吧~"
193 193 
                android:paddingLeft="15dp"
194 194 
                android:paddingTop="12dp"
195 195 
                android:paddingRight="15dp"

+ 3 - 19
app/src/main/res/layout/item_signin.xml
Parādīt failu 

@ -158,28 +158,12 @@
158 158 
            android:layout_marginBottom="6dp">
159 159
160 160 
            <TextView
161 
                android:layout_width="wrap_content"
162 
                android:layout_height="wrap_content"
163 
                android:text="今天签到获得"
164 
                android:textSize="16sp"
165 
                android:textColor="@color/ui_62"/>
166
167 
            <TextView
168 161 
                android:id="@+id/tv_num"
169 
                android:layout_width="wrap_content"
162 
                android:layout_width="match_parent"
170 163 
                android:layout_height="wrap_content"
171 164 
                android:text=""
172 
                android:textSize="16sp"
173 
                android:textColor="@color/lvse"/>
174
175 
            <TextView
176 
                android:layout_width="wrap_content"
177 
                android:layout_height="wrap_content"
178 
                android:text="个充电币"
179 
                android:textSize="16sp"
180 
                android:textColor="@color/ui_62"/>
181
182
165 
                android:textColor="@color/ui_62"
166 
                android:textSize="16sp" />
183 167 
        </LinearLayout>
184 168
185 169 
        <TextView

+ 3 - 0
app/src/main/res/layout/item_zhancomments.xml
Parādīt failu 

@ -63,6 +63,7 @@
63 63 
                    android:orientation="horizontal">
64 64
65 65 
                    <TextView
66 
                        android:layout_gravity="center_vertical"
66 67 
                        android:id="@+id/tv_pname"
67 68 
                        android:layout_width="wrap_content"
68 69 
                        android:layout_height="wrap_content"
 
@ -75,6 +76,7 @@
75 76 
                        tools:text="gin" />
76 77
77 78 
                    <ImageView
79 
                        android:layout_gravity="center_vertical"
78 80 
                        android:id="@+id/certified_icon"
79 81 
                        android:layout_width="18dp"
80 82 
                        android:layout_height="18dp"
 
@ -83,6 +85,7 @@
83 85 
                        android:src="@drawable/certified_icon" />
84 86
85 87 
                    <TextView
88 
                        android:layout_gravity="center_vertical"
86 89 
                        android:id="@+id/tv_pcar"
87 90 
                        android:layout_width="match_parent"
88 91 
                        android:layout_height="wrap_content"

+ 1 - 1
app/src/main/res/values/strings.xml
Parādīt failu 

@ -18,7 +18,7 @@
18 18 
    <string name="updated_at">上次更新于%1$s前</string>
19 19 
    <string name="updated_just_now">刚刚更新</string>
20 20 
    <string name="time_error">时间有问题</string>
21 
    <string name="string_tab_qa">社区</string>
21 
    <string name="string_tab_qa">互助</string>
22 22
23 23
24 24 
    <string name="main_name">主界面</string>

Kirjaudu sisään - Gogs: Go Git Service
Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään

Kirjaudu sisään

Unohtuiko salasana?
Tarvitsetko tilin? Rekisteröidy nyt.