ソースを参照

motify comment style

1145873331@qq.com 6 年 前
コミット
f422ccf86e
共有29 個のファイルを変更した91 個の追加104 個の削除を含む
  1. 3 11
      app/build.gradle
  2. BIN
      app/libs/ShareSDK-Core-2.5.9.jar
  3. BIN
      app/libs/ShareSDK-QQ-2.5.9.jar
  4. BIN
      app/libs/ShareSDK-QZone-2.5.9.jar
  5. BIN
      app/libs/ShareSDK-ShortMessage-2.5.9.jar
  6. BIN
      app/libs/ShareSDK-SinaWeibo-2.5.9.jar
  7. BIN
      app/libs/ShareSDK-Wechat-2.5.9.jar
  8. BIN
      app/libs/ShareSDK-Wechat-Core-2.5.9.jar
  9. BIN
      app/libs/ShareSDK-Wechat-Moments-2.5.9.jar
  10. BIN
      app/libs/eventbus-2.4.0.jar
  11. BIN
      app/libs/zxing-android-core-3.1.0.jar
  12. BIN
      app/libs/zxing-android-integration-3.1.0.jar
  13. BIN
      app/libs/zxing-core-3.1.0.jar
  14. 2 14
      app/src/main/java/com/electric/chargingpile/activity/ChargingQianDaoActivity.java
  15. 7 6
      app/src/main/java/com/electric/chargingpile/activity/CheXingActivity.java
  16. 4 12
      app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java
  17. 0 10
      app/src/main/java/com/electric/chargingpile/activity/RankingListActivity.java
  18. 2 1
      app/src/main/java/com/electric/chargingpile/activity/SelectPileActivity.java
  19. 1 2
      app/src/main/java/com/electric/chargingpile/activity/UserInfoActivity.java
  20. 0 4
      app/src/main/java/com/electric/chargingpile/activity/VideoDetaislActivity.java
  21. 5 9
      app/src/main/java/com/electric/chargingpile/adapter/BrandAdapter.java
  22. 30 13
      app/src/main/java/com/electric/chargingpile/adapter/VideoCommentAdapter.java
  23. 1 1
      app/src/main/java/com/electric/chargingpile/data/VideoCommentBean.java
  24. 0 5
      app/src/main/java/com/electric/chargingpile/fragment/MonthListFragment.java
  25. 17 2
      app/src/main/java/com/electric/chargingpile/fragment/SvVideoShowView.java
  26. 0 5
      app/src/main/java/com/electric/chargingpile/fragment/TotalListFragment.java
  27. 5 1
      app/src/main/java/com/electric/chargingpile/view/VideoCommentDialog.java
  28. 9 8
      app/src/main/res/layout/item_show_comment.xml
  29. 5 0
      app/src/main/res/layout/view_show_view.xml

+ 3 - 11
app/build.gradle

@ -34,7 +34,9 @@ android {
34 34
        multiDexEnabled true
35 35
//        multiDexKeepProguard file('multiDexKeep.pro')
36 36
37
37
        ndk {
38
            abiFilters "armeabi"
39
        }
38 40
    }
39 41
    lintOptions {
40 42
        checkReleaseBuilds false
@ -229,28 +231,18 @@ MobSDK {
229 231
230 232
dependencies {
231 233
    compile files('libs/mframework.jar')
232
    //    compile files('libs/ShareSDK-Core-2.5.9.jar')
233
    //    compile files('libs/ShareSDK-QQ-2.5.9.jar')
234
    //    compile files('libs/ShareSDK-QZone-2.5.9.jar')
235
    //    compile files('libs/ShareSDK-ShortMessage-2.5.9.jar')
236
    //    compile files('libs/ShareSDK-SinaWeibo-2.5.9.jar')
237
    //    compile files('libs/ShareSDK-Wechat-2.5.9.jar')
238
    //    compile files('libs/ShareSDK-Wechat-Core-2.5.9.jar')
239
    //    compile files('libs/ShareSDK-Wechat-Moments-2.5.9.jar')
240 234
    compile files('libs/xUtils-2.6.14.jar')
241 235
    compile files('libs/picasso-2.5.2.jar')
242 236
    compile files('libs/httpmime-4.3.5.jar')
243 237
    compile files('libs/badgeview.jar')
244 238
    compile project(':autolayout')
245 239
    compile files('libs/universal-image-loader-1.9.1.jar')
246
    compile files('libs/eventbus-2.4.0.jar')
247 240
    //noinspection GradleCompatible
248 241
    //    compile 'com.facebook.fresco:fresco:0.9.0+'
249 242
    //    compile 'com.facebook.fresco:drawee:0.9.0+'
250 243
    compile files('libs/bugly_1.2.9_release.jar')
251 244
    //noinspection GradleCompatible
252 245
    compile files('libs/jg_filter_sdk_1.1.jar')
253
    //    compile files('libs/Xg_sdk_v2.42_20160111_1539.jar')
254 246
    compile files('libs/wup-1.0.0.E-SNAPSHOT.jar')
255 247
    compile files('libs/pinyin4j-2.5.0.jar')
256 248
    compile files('libs/pinyin4android1.0.jar')

BIN
app/libs/ShareSDK-Core-2.5.9.jar


BIN
app/libs/ShareSDK-QQ-2.5.9.jar


BIN
app/libs/ShareSDK-QZone-2.5.9.jar


BIN
app/libs/ShareSDK-ShortMessage-2.5.9.jar


BIN
app/libs/ShareSDK-SinaWeibo-2.5.9.jar


BIN
app/libs/ShareSDK-Wechat-2.5.9.jar


BIN
app/libs/ShareSDK-Wechat-Core-2.5.9.jar


BIN
app/libs/ShareSDK-Wechat-Moments-2.5.9.jar


BIN
app/libs/eventbus-2.4.0.jar


BIN
app/libs/zxing-android-core-3.1.0.jar


BIN
app/libs/zxing-android-integration-3.1.0.jar


BIN
app/libs/zxing-core-3.1.0.jar


+ 2 - 14
app/src/main/java/com/electric/chargingpile/activity/ChargingQianDaoActivity.java

@ -1,14 +1,11 @@
1 1
package com.electric.chargingpile.activity;
2 2
3 3
import android.app.Activity;
4
import android.content.Context;
5 4
import android.content.Intent;
6
import android.content.SharedPreferences;
7 5
import android.graphics.drawable.BitmapDrawable;
8 6
import android.os.Bundle;
9 7
import android.os.Handler;
10 8
import android.os.Message;
11
import android.telephony.TelephonyManager;
12 9
import android.text.Editable;
13 10
import android.text.TextWatcher;
14 11
import android.util.Log;
@ -17,8 +14,6 @@ import android.view.LayoutInflater;
17 14
import android.view.View;
18 15
import android.view.ViewGroup;
19 16
import android.view.animation.AnimationUtils;
20
import android.widget.ArrayAdapter;
21
import android.widget.Button;
22 17
import android.widget.EditText;
23 18
import android.widget.ImageView;
24 19
import android.widget.LinearLayout;
@ -30,9 +25,6 @@ import android.widget.Toast;
30 25
import com.electric.chargingpile.R;
31 26
import com.electric.chargingpile.adapter.QianDaoAdapter;
32 27
import com.electric.chargingpile.application.MainApplication;
33
import com.electric.chargingpile.data.Brand;
34
import com.electric.chargingpile.data.Cars;
35
import com.electric.chargingpile.data.City;
36 28
import com.electric.chargingpile.data.MyOtto;
37 29
import com.electric.chargingpile.data.Province;
38 30
import com.electric.chargingpile.data.RankinglistRefreshEvent;
@ -41,11 +33,8 @@ import com.electric.chargingpile.manager.ProfileManager;
41 33
import com.electric.chargingpile.util.BarColorUtil;
42 34
import com.electric.chargingpile.util.DES3;
43 35
import com.electric.chargingpile.util.JsonUtils;
44
import com.electric.chargingpile.util.LogUtils;
45 36
import com.electric.chargingpile.util.OkHttpUtil;
46
import com.electric.chargingpile.util.StatusConstants;
47 37
import com.electric.chargingpile.util.ToastUtil;
48
import com.electric.chargingpile.util.UploadUtil;
49 38
import com.electric.chargingpile.view.MyListView;
50 39
import com.google.gson.Gson;
51 40
import com.google.gson.reflect.TypeToken;
@ -59,19 +48,17 @@ import com.zhy.view.flowlayout.FlowLayout;
59 48
import com.zhy.view.flowlayout.TagAdapter;
60 49
import com.zhy.view.flowlayout.TagFlowLayout;
61 50
51
import org.greenrobot.eventbus.ThreadMode;
62 52
import org.json.JSONArray;
63 53
import org.json.JSONException;
64 54
import org.json.JSONObject;
65 55
66
import java.io.IOException;
67 56
import java.net.URLEncoder;
68 57
import java.util.ArrayList;
69 58
import java.util.HashMap;
70 59
import java.util.List;
71 60
import java.util.Map;
72
import java.util.Set;
73 61
74
import de.greenrobot.event.EventBus;
75 62
import okhttp3.Call;
76 63
77 64
public class ChargingQianDaoActivity extends Activity implements View.OnClickListener {
@ -171,6 +158,7 @@ public class ChargingQianDaoActivity extends Activity implements View.OnClickLis
171 158
172 159
    }
173 160
161
    @org.greenrobot.eventbus.Subscribe(threadMode = ThreadMode.MAIN)
174 162
    public void onEventMainThread(Province b) {
175 163
        Log.e("ffff", b.getName() + "   " + b.getCities().get(b.getId()).getName());
176 164
        if (null != b.getName() && null != b.getCities().get(b.getId()).getName()) {

+ 7 - 6
app/src/main/java/com/electric/chargingpile/activity/CheXingActivity.java

@ -20,13 +20,13 @@ import com.electric.chargingpile.R;
20 20
import com.electric.chargingpile.data.Province;
21 21
import com.electric.chargingpile.util.BarColorUtil;
22 22
23
import de.greenrobot.event.EventBus;
23
import org.greenrobot.eventbus.EventBus;
24
 
24 25
25 26
public class CheXingActivity extends Activity {
26 27
    /**
27 28
     * 注意本程序没有按通常的写法为Activity加载一个布局文件,
28 29
     * 而是通过setListAdapter(adapter)自动添加一个ListView填充整个ListActivity
29
     *
30 30
     */
31 31
32 32
    ArrayAdapter<String> adapter;
@ -36,11 +36,12 @@ public class CheXingActivity extends Activity {
36 36
37 37
    Province mProvince;
38 38
39
    @Override
39 40
    public void onCreate(Bundle savedInstanceState) {
40 41
        super.onCreate(savedInstanceState);
41 42
        setContentView(R.layout.activity_che_xing);
42 43
        BarColorUtil.initStatusBarColor(CheXingActivity.this);
43
        mProvince=(Province) this.getIntent().getSerializableExtra("citys");
44
        mProvince = (Province) this.getIntent().getSerializableExtra("citys");
44 45
45 46
        listview = (ListView) this.findViewById(R.id.chexing_list);
46 47
@ -66,13 +67,14 @@ public class CheXingActivity extends Activity {
66 67
        listview.setTextFilterEnabled(true);
67 68
        // 设置ListView的监听事件
68 69
        listview.setOnItemClickListener(new OnItemClickListener() {
70
            @Override
69 71
            public void onItemClick(AdapterView<?> parent, View view,
70 72
                                    int position, long id) {
71 73
                String s = ((TextView) view).getText().toString();
72 74
//				Toast.makeText(getApplicationContext(), s+""+pr.get(position).getCities()+"", Toast.LENGTH_SHORT)
73 75
//						.show();
74 76
75
                Intent intent=new Intent(CheXingActivity.this,UserInfoActivity.class);
77
                Intent intent = new Intent(CheXingActivity.this, UserInfoActivity.class);
76 78
                mProvince.setId(position);
77 79
                intent.putExtra("222", mProvince.getCities().get(position).getName());
78 80
                CheXingActivity.this.setResult(55, intent);
@ -85,10 +87,9 @@ public class CheXingActivity extends Activity {
85 87
    }
86 88
87 89
88
89 90
    @Override
90 91
    public boolean onKeyDown(int keyCode, KeyEvent event) {
91
        Intent intent=new Intent();
92
        Intent intent = new Intent();
92 93
        intent.putExtra("222", "22222222");
93 94
        setResult(55, intent);
94 95
        return super.onKeyDown(keyCode, event);

+ 4 - 12
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@ -1794,7 +1794,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
1794 1794
                    Token = getMD5(String.valueOf((System.currentTimeMillis() / 1000 - cha) / 10) + "qwerty");
1795 1795
                    ete2("{\"fun\":\"init\",\"timer\":" + "\"" + Token + "\"" + "}");
1796 1796
                    MainApplication.uptime = ProfileManager.getInstance().getDataUptime(getApplicationContext());
1797
                    LogUtils.e(MainApplication.uptime);
1798 1797
1799 1798
                    newUpdataZhanData(Token, MainApplication.uptime);
1800 1799
                } catch (Exception e) {
@ -1824,7 +1823,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
1824 1823
                    if (EmptyUtils.isNotEmpty(data)) {
1825 1824
                        final List<UpdateZhanDataBean> list = JsonUtils.parseToObjectList(data, UpdateZhanDataBean.class);
1826 1825
                        if (list.size() > 0) {
1827
                            LogUtils.e(list.size());
1828 1826
                            new Thread(new Runnable() {
1829 1827
                                @Override
1830 1828
                                public void run() {
@ -4656,11 +4654,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
4656 4654
4657 4655
//        zhan_lists = zhan_listDao.loadAll();
4658 4656
        zhan_lists = zhan_listDao.queryRaw("where status = ? " + MainApplication.sql, new String[]{"4"});
4659
        LogUtils.e(zhan_lists.size() + "-----");
4660
//        Log.e(TAG, "getZhanData: "+"where status = ? "+MainApplication.sql);
4661
        if (onResumeRefresh == true) {
4662
//            Log.e(TAG, "getZhanData: "+"共" );
4663
            ToastUtil.showToast(getApplicationContext(), "共" + zhan_lists.size() + "个符合条件的站点", Toast.LENGTH_SHORT);
4657
         if (onResumeRefresh == true) {
4658
             ToastUtil.showToast(getApplicationContext(), "共" + zhan_lists.size() + "个符合条件的站点", Toast.LENGTH_SHORT);
4664 4659
//            isShow = false;
4665 4660
        }
4666 4661
//        Log.e(TAG, "getZhanData===" + zhan_lists.size());
@ -5857,14 +5852,12 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
5857 5852
5858 5853
            @Override
5859 5854
            public void onResponse(String response) {
5860
                LogUtils.e(response);
5861 5855
                if (EmptyUtils.isNotEmpty(response)) {
5862 5856
                    String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
5863 5857
                    if ("01".equals(rtnCode)) {
5864 5858
                        String data = JsonUtils.getKeyResult(response, "data");
5865 5859
                        List<FindData> list = JsonUtils.parseToObjectList(data, FindData.class);
5866
                        LogUtils.e(list.size());
5867
                        if (list.size() > 0) {
5860
                         if (list.size() > 0) {
5868 5861
                            for (FindData findData : list) {
5869 5862
                                if (findData.getUnread().equals("0")) {
5870 5863
                                    FindActivity.haveFindMessage = true;
@ -5873,8 +5866,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
5873 5866
                                }
5874 5867
                            }
5875 5868
                        }
5876
                        LogUtils.e("123456");
5877
                    }
5869
                     }
5878 5870
                }
5879 5871
5880 5872
            }

+ 0 - 10
app/src/main/java/com/electric/chargingpile/activity/RankingListActivity.java

@ -1,31 +1,21 @@
1 1
package com.electric.chargingpile.activity;
2 2
3
import android.app.Activity;
4 3
import android.content.Intent;
5 4
import android.os.Bundle;
6 5
import android.support.v4.app.FragmentActivity;
7 6
import android.support.v4.view.ViewPager;
8
import android.util.Log;
9 7
import android.view.View;
10 8
import android.widget.ImageView;
11 9
import android.widget.RelativeLayout;
12 10
import android.widget.TextView;
13
import android.widget.Toast;
14 11
15 12
import com.electric.chargingpile.R;
16 13
import com.electric.chargingpile.adapter.ViewPagerFragmentAdapter;
17
import com.electric.chargingpile.application.MainApplication;
18 14
import com.electric.chargingpile.data.MyOtto;
19 15
import com.electric.chargingpile.data.RankinglistRefreshEvent;
20 16
import com.electric.chargingpile.fragment.MonthListFragment;
21
import com.electric.chargingpile.fragment.MyMessageFragment;
22
import com.electric.chargingpile.fragment.NewMyMessageFragment;
23
import com.electric.chargingpile.fragment.SystemInfoFragment;
24 17
import com.electric.chargingpile.fragment.TotalListFragment;
25 18
import com.electric.chargingpile.util.BarColorUtil;
26
import com.electric.chargingpile.util.ToastUtil;
27
28
import de.greenrobot.event.EventBus;
29 19
30 20
public class RankingListActivity extends FragmentActivity implements View.OnClickListener {
31 21
    private ViewPager viewPager;

+ 2 - 1
app/src/main/java/com/electric/chargingpile/activity/SelectPileActivity.java

@ -35,6 +35,7 @@ import com.zhy.http.okhttp.OkHttpUtils;
35 35
import com.zhy.http.okhttp.callback.StringCallback;
36 36
37 37
import org.greenrobot.eventbus.Subscribe;
38
import org.greenrobot.eventbus.ThreadMode;
38 39
39 40
import java.net.URLEncoder;
40 41
import java.util.List;
@ -286,7 +287,7 @@ public class SelectPileActivity extends Activity implements View.OnClickListener
286 287
        }
287 288
    }
288 289
289
    @Subscribe
290
    @Subscribe(threadMode = ThreadMode.MAIN)
290 291
    public void eventHandler(String pileId){
291 292
        result = pileId;
292 293
    }

+ 1 - 2
app/src/main/java/com/electric/chargingpile/activity/UserInfoActivity.java

@ -68,6 +68,7 @@ import com.squareup.picasso.Picasso;
68 68
import com.squareup.picasso.Target;
69 69
import com.umeng.analytics.MobclickAgent;
70 70
71
import org.greenrobot.eventbus.EventBus;
71 72
import org.json.JSONArray;
72 73
import org.json.JSONException;
73 74
import org.json.JSONObject;
@ -82,7 +83,6 @@ import java.util.HashMap;
82 83
import java.util.List;
83 84
import java.util.Map;
84 85
85
import de.greenrobot.event.EventBus;
86 86
import me.iwf.photopicker.PhotoPicker;
87 87
import pub.devrel.easypermissions.AfterPermissionGranted;
88 88
import pub.devrel.easypermissions.EasyPermissions;
@ -141,7 +141,6 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,E
141 141
    @Override
142 142
    protected void onCreate(Bundle savedInstanceState) {
143 143
        super.onCreate(savedInstanceState);
144
        EventBus.getDefault().register(this);
145 144
        BarColorUtil.initStatusBarColor(UserInfoActivity.this);
146 145
        setContentView(R.layout.activity_user_info);
147 146
        dialog = new LoadingDialog(this);

+ 0 - 4
app/src/main/java/com/electric/chargingpile/activity/VideoDetaislActivity.java

@ -28,13 +28,9 @@ public class VideoDetaislActivity extends Activity implements View.OnClickListen
28 28
29 29
    private MyHandler mHandler = new MyHandler(this);
30 30
31
32
33 31
    int position = 0;
34 32
    List<TalkRecommendBean> talkRecommendBeans;
35 33
36
37
38 34
    static class MyHandler extends Handler {
39 35
        private WeakReference<VideoDetaislActivity> mWeakReference;
40 36

+ 5 - 9
app/src/main/java/com/electric/chargingpile/adapter/BrandAdapter.java

@ -4,14 +4,6 @@ package com.electric.chargingpile.adapter;
4 4
 * Created by Demon on 16/7/13.
5 5
 */
6 6
7
import java.util.List;
8
9
import com.electric.chargingpile.R;
10
import com.electric.chargingpile.data.Brand;
11
import com.electric.chargingpile.data.CarType;
12
import com.electric.chargingpile.data.Province;
13
14
15 7
import android.content.Context;
16 8
import android.view.View;
17 9
import android.view.ViewGroup;
@ -19,7 +11,11 @@ import android.widget.BaseAdapter;
19 11
import android.widget.ImageView;
20 12
import android.widget.LinearLayout;
21 13
import android.widget.TextView;
22
import android.widget.Toast;
14
15
import com.electric.chargingpile.R;
16
import com.electric.chargingpile.data.Brand;
17
18
import java.util.List;
23 19
24 20
public class BrandAdapter extends BaseAdapter {
25 21

+ 30 - 13
app/src/main/java/com/electric/chargingpile/adapter/VideoCommentAdapter.java

@ -3,6 +3,8 @@ package com.electric.chargingpile.adapter;
3 3
import android.content.Context;
4 4
import android.support.annotation.NonNull;
5 5
import android.support.v7.widget.RecyclerView;
6
import android.text.TextUtils;
7
import android.view.LayoutInflater;
6 8
import android.view.View;
7 9
import android.view.ViewGroup;
8 10
import android.widget.ImageView;
@ -16,6 +18,8 @@ import com.electric.chargingpile.application.MainApplication;
16 18
import com.electric.chargingpile.base.RecyclerViewHolder;
17 19
import com.electric.chargingpile.data.FindData;
18 20
import com.electric.chargingpile.data.VideoCommentBean;
21
import com.electric.chargingpile.util.CircleTransform;
22
import com.squareup.picasso.Picasso;
19 23
20 24
import java.util.ArrayList;
21 25
import java.util.List;
@ -35,7 +39,8 @@ public class VideoCommentAdapter extends RecyclerView.Adapter<VideoCommentAdapte
35 39
    @NonNull
36 40
    @Override
37 41
    public VideoCommentViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
38
        return null;
42
        View view = LayoutInflater.from(context).inflate(R.layout.item_show_comment, null);
43
        return new VideoCommentViewHolder(view);
39 44
    }
40 45
41 46
    @Override
@ -51,13 +56,25 @@ public class VideoCommentAdapter extends RecyclerView.Adapter<VideoCommentAdapte
51 56
52 57
        viewHolder.mItemUserLikeCount.setText(videoCommentBean.likeNums + "");
53 58
54
55
        Glide.with(context).load(videoCommentBean.headImgFromUser)
56
                .transition(withCrossFade()).into(viewHolder.mItemUserAvatar);
59
        if (TextUtils.isEmpty(videoCommentBean.headImgFromUser)) {
60
            Picasso.with(context)
61
                    .load(R.drawable.icon_face2_0)
62
                    .placeholder(R.drawable.icon_face2_0)
63
                    .error(R.drawable.icon_face2_0)
64
                    .transform(new CircleTransform())
65
                    .into(viewHolder.mItemUserAvatar);
66
        } else {
67
            Picasso.with(context)
68
                    .load(videoCommentBean.headImgFromUser)
69
                    .placeholder(R.drawable.icon_face2_0)
70
                    .error(R.drawable.icon_face2_0)
71
                    .transform(new CircleTransform())
72
                    .into(viewHolder.mItemUserAvatar);
73
        }
57 74
58 75
        viewHolder.mItemUserName.setText(videoCommentBean.nickNameFromUser);
59 76
60
        viewHolder.mItemUserTime.setText(videoCommentBean.addDate + "");
77
        viewHolder.mItemUserTime.setText(videoCommentBean.addTime + "");
61 78
        viewHolder.mItemUserCon.setText(videoCommentBean.content);
62 79
63 80
//        viewHolder.mItemUserOperation = (LinearLayout) itemView.findViewById(R.id.item_user_operation);
@ -67,19 +84,19 @@ public class VideoCommentAdapter extends RecyclerView.Adapter<VideoCommentAdapte
67 84
        } else {
68 85
            viewHolder.mItemUserReportLl.setVisibility(View.GONE);
69 86
        }
70
        if (MainApplication.isLogin()) {
71
            if (videoCommentBean.userId.equals(MainApplication.userId)) {
72
                viewHolder.mItemUserDelete.setVisibility(View.VISIBLE);
73
            } else {
74
                viewHolder.mItemUserDelete.setVisibility(View.VISIBLE);
75
            }
76
        }
87
//        if (MainApplication.isLogin()) {
88
//            if (videoCommentBean.userId.equals(MainApplication.userId)) {
89
//                viewHolder.mItemUserDelete.setVisibility(View.VISIBLE);
90
//            } else {
91
//                viewHolder.mItemUserDelete.setVisibility(View.VISIBLE);
92
//            }
93
//        }
77 94
78 95
    }
79 96
80 97
    @Override
81 98
    public int getItemCount() {
82
        return 0;
99
        return dataList.size();
83 100
    }
84 101
85 102
    public void cleanData() {

+ 1 - 1
app/src/main/java/com/electric/chargingpile/data/VideoCommentBean.java

@ -17,7 +17,7 @@ public class VideoCommentBean {
17 17
    public String content ;
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>