tr class="same-code nl-2 ol-2"> 18 18
    public int likeNums;
19 19
    public int likeFlg;
20
    public long addDate;
20
    public long addTime;
21 21
    public String commentsId;
22 22
    public String commentsId2;
23 23

+ 0 - 5
app/src/main/java/com/electric/chargingpile/fragment/MonthListFragment.java

@ -1,10 +1,8 @@
1 1
package com.electric.chargingpile.fragment;
2 2
3
import android.content.Context;
4 3
import android.content.Intent;
5 4
import android.os.Bundle;
6 5
import android.support.v4.app.Fragment;
7
import android.util.Log;
8 6
import android.view.LayoutInflater;
9 7
import android.view.View;
10 8
import android.view.ViewGroup;
@ -18,14 +16,12 @@ import com.electric.chargingpile.R;
18 16
import com.electric.chargingpile.activity.LoginActivity;
19 17
import com.electric.chargingpile.activity.MainMapActivity;
20 18
import com.electric.chargingpile.adapter.MonthListAdapter;
21
import com.electric.chargingpile.adapter.PingLunAdapter;
22 19
import com.electric.chargingpile.application.MainApplication;
23 20
import com.electric.chargingpile.data.MyOtto;
24 21
import com.electric.chargingpile.data.RankinglistRefreshEvent;
25 22
import com.electric.chargingpile.util.DES3;
26 23
import com.electric.chargingpile.util.JsonUtils;
27 24
import com.electric.chargingpile.util.LoadingDialog;
28
import com.electric.chargingpile.util.PicassoUtil;
29 25
import com.electric.chargingpile.util.ToastUtil;
30 26
import com.electric.chargingpile.util.Util;
31 27
import com.electric.chargingpile.view.CircleImageView;
@ -41,7 +37,6 @@ import org.json.JSONObject;
41 37
import java.net.URLEncoder;
42 38
import java.util.ArrayList;
43 39
44
import de.greenrobot.event.EventBus;
45 40
import okhttp3.Call;
46 41
47 42
public class MonthListFragment extends Fragment {

+ 17 - 2
app/src/main/java/com/electric/chargingpile/fragment/SvVideoShowView.java

@ -1,6 +1,7 @@
1 1
package com.electric.chargingpile.fragment;
2 2
3 3
import android.app.Activity;
4
import android.net.Uri;
4 5
import android.text.TextUtils;
5 6
import android.util.Log;
6 7
import android.view.LayoutInflater;
@ -17,6 +18,7 @@ import com.electric.chargingpile.data.TalkRecommendBean;
17 18
import com.electric.chargingpile.util.CircleTransform;
18 19
import com.electric.chargingpile.util.JsonUtils;
19 20
import com.electric.chargingpile.util.ToastUtil;
21
import com.electric.chargingpile.view.UpVideoView2;
20 22
import com.electric.chargingpile.view.VideoCommentDialog;
21 23
import com.electric.chargingpile.view.VideoPubilshDialog;
22 24
import com.squareup.picasso.Picasso;
@ -36,6 +38,7 @@ public class SvVideoShowView implements View.OnClickListener {
36 38
    private View view;
37 39
    private ViewGroup viewGroup;
38 40
    private TalkRecommendBean talkRecommendBean;
41
    private UpVideoView2 upVideoView2;
39 42
40 43
41 44
    private LinearLayout sv_show_forward, sv_show_comment_count_ll, sv_show_like_ll,
@ -144,6 +147,16 @@ public class SvVideoShowView implements View.OnClickListener {
144 147
                    .into(sv_show_user_avatar);
145 148
        }
146 149
150
        if (talkRecommendBean.targetType == 23) {
151
            String videoUrl = talkRecommendBean.videoUrl;
152
            videoUrl = "http://uprocess.b0.upaiyun.com/demo/short_video/UPYUN_0.flv";
153
            if (!TextUtils.isEmpty(videoUrl)) {
154
                upVideoView2.setVideoPath(videoUrl);
155
            }
156
        } else if (talkRecommendBean.targetType == 24) {
157
158
        }
159
147 160
        if (talkRecommendBean.likeFlg == 1) {
148 161
//            sv_show_like_img  like
149 162
        } else {
@ -221,7 +234,7 @@ public class SvVideoShowView implements View.OnClickListener {
221 234
    }
222 235
223 236
    private void initPlayer(View view) {
224
237
        upVideoView2 = view.findViewById(R.id.view_show_video);
225 238
    }
226 239
227 240
    private void initZoomPhoto(View view) {
@ -259,7 +272,9 @@ public class SvVideoShowView implements View.OnClickListener {
259 272
    }
260 273
261 274
    public void onDestroy() {
262
275
        if (upVideoView2 != null) {
276
            upVideoView2.release(true);
277
        }
263 278
//释放播放资源
264 279
    }
265 280

+ 0 - 5
app/src/main/java/com/electric/chargingpile/fragment/TotalListFragment.java

@ -12,19 +12,15 @@ import android.widget.ListView;
12 12
import android.widget.RelativeLayout;
13 13
import android.widget.TextView;
14 14
15
import com.alipay.security.mobile.module.commonutils.LOG;
16
import com.bumptech.glide.Glide;
17 15
import com.electric.chargingpile.R;
18 16
import com.electric.chargingpile.activity.LoginActivity;
19 17
import com.electric.chargingpile.activity.MainMapActivity;
20
import com.electric.chargingpile.adapter.MonthListAdapter;
21 18
import com.electric.chargingpile.adapter.TotalListAdapter;
22 19
import com.electric.chargingpile.application.MainApplication;
23 20
import com.electric.chargingpile.data.MyOtto;
24 21
import com.electric.chargingpile.data.RankinglistRefreshEvent;
25 22
import com.electric.chargingpile.util.DES3;
26 23
import com.electric.chargingpile.util.JsonUtils;
27
import com.electric.chargingpile.util.PicassoUtil;
28 24
import com.electric.chargingpile.util.Util;
29 25
import com.electric.chargingpile.view.CircleImageView;
30 26
import com.squareup.otto.Subscribe;
@ -39,7 +35,6 @@ import org.json.JSONObject;
39 35
import java.net.URLEncoder;
40 36
import java.util.ArrayList;
41 37
42
import de.greenrobot.event.EventBus;
43 38
import okhttp3.Call;
44 39
45 40
public class TotalListFragment extends Fragment {

+ 5 - 1
app/src/main/java/com/electric/chargingpile/view/VideoCommentDialog.java

@ -4,6 +4,7 @@ import android.app.Dialog;
4 4
import android.content.Context;
5 5
import android.graphics.Color;
6 6
import android.os.Bundle;
7
import android.support.v7.widget.LinearLayoutManager;
7 8
import android.support.v7.widget.RecyclerView;
8 9
import android.text.Editable;
9 10
import android.text.TextUtils;
@ -141,6 +142,9 @@ public class VideoCommentDialog extends Dialog implements View.OnClickListener {
141 142
        showCommentLv = convertView.findViewById(R.id.show_comment_lv);
142 143
        showCommentEd = convertView.findViewById(R.id.show_comment_ed);
143 144
        showCommentPublish = convertView.findViewById(R.id.show_comment_publish);
145
        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context);
146
        linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
147
        showCommentLv.setLayoutManager(linearLayoutManager);
144 148
        convertView.findViewById(R.id.show_comment_network_retry).setOnClickListener(this);
145 149
        show_comment_progress_ll.setVisibility(View.VISIBLE);
146 150
        showCommentPublish.addTextChangedListener(new TextWatcher() {
@ -212,7 +216,7 @@ public class VideoCommentDialog extends Dialog implements View.OnClickListener {
212 216
        }
213 217
214 218
        OkHttpUtils
215
                .get()
219
                .post()
216 220
                .params(map)
217 221
                .url(url)
218 222
                .build()

+ 9 - 8
app/src/main/res/layout/item_show_comment.xml

@ -1,15 +1,14 @@
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3
    android:layout_width="match_parent"
4
    android:layout_height="wrap_content"
5
    android:layout_marginTop="20dp">
4
    android:layout_height="wrap_content">
6 5
7 6
    <LinearLayout
8 7
        android:id="@+id/item_user_comment_like"
9 8
        android:layout_width="wrap_content"
10 9
        android:layout_height="18dp"
11 10
        android:layout_alignParentEnd="true"
12
        android:layout_marginTop="3dp"
11
        android:layout_marginTop="23dp"
13 12
        android:layout_marginEnd="19dp"
14 13
        android:gravity="center_vertical">
15 14
@ -17,7 +16,7 @@
17 16
            android:id="@+id/item_user_like_img"
18 17
            android:layout_width="18dp"
19 18
            android:layout_height="18dp"
20
            android:background="#fff" />
19
            android:background="@drawable/icon_likeed" />
21 20
22 21
        <TextView
23 22
            android:id="@+id/item_user_like_count"
@ -35,8 +34,7 @@
35 34
        android:layout_width="20dp"
36 35
        android:layout_height="20dp"
37 36
        android:layout_marginStart="15dp"
38
        android:layout_marginTop="6dp"
39
        android:background="#3df" />
37
        android:layout_marginTop="26dp" />
40 38
41 39
42 40
    <TextView
@ -44,6 +42,7 @@
44 42
        android:layout_width="wrap_content"
45 43
        android:layout_height="wrap_content"
46 44
        android:layout_marginStart="5dp"
45
        android:layout_marginTop="20dp"
47 46
        android:layout_toEndOf="@+id/item_user_avatar"
48 47
        android:text="12sp12sp12sp"
49 48
        android:textColor="#fff"
@ -77,6 +76,7 @@
77 76
        android:id="@+id/item_user_operation"
78 77
        android:layout_width="wrap_content"
79 78
        android:layout_height="22dp"
79
80 80
        android:layout_below="@+id/item_user_con"
81 81
        android:layout_alignStart="@+id/item_user_name"
82 82
        android:layout_marginTop="10dp"
@ -95,7 +95,7 @@
95 95
                android:layout_width="16dp"
96 96
                android:layout_height="16dp"
97 97
                android:layout_marginStart="9dp"
98
                android:background="#fff" />
98
                android:background="@drawable/icon_comment" />
99 99
100 100
            <TextView
101 101
                android:id="@+id/item_user_report_count"
@ -116,7 +116,8 @@
116 116
            android:gravity="center"
117 117
            android:text="删除"
118 118
            android:textColor="#c2c2c2"
119
            android:textSize="12sp" />
119
            android:textSize="12sp"
120
            android:visibility="gone" />
120 121
    </LinearLayout>
121 122
122 123
    <View

+ 5 - 0
app/src/main/res/layout/view_show_view.xml

@ -8,6 +8,11 @@
8 8
        android:layout_height="match_parent"
9 9
        android:background="#fff0" />
10 10
11
    <com.electric.chargingpile.view.UpVideoView2
12
        android:id="@+id/view_show_video"
13
        android:layout_width="match_parent"
14
        android:layout_height="match_parent"></com.electric.chargingpile.view.UpVideoView2>
15
11 16
    <include layout="@layout/view_show_bottom" />
12 17
13 18
</RelativeLayout>

cdzApp - Gogs: Go Git Service

充电桩app代码

1145873331@qq.com e1cf244fe0 remove Useless dependence 6 years ago
..
src e1cf244fe0 remove Useless dependence 6 years ago
.gitignore 06bd894653 init 6 years ago
build.gradle 06bd894653 init 6 years ago
proguard-rules.pro 06bd894653 init 6 years ago