Browse Source

发布优化

huyuguo 5 years ago
parent
commit
9c85577f67

+ 29 - 30
app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

26
import android.support.v7.app.AlertDialog;
26
import android.support.v7.app.AlertDialog;
27
import android.telephony.TelephonyManager;
27
import android.telephony.TelephonyManager;
28
import android.text.Editable;
28
import android.text.Editable;
29
import android.text.Html;
29
import android.text.TextUtils;
30
import android.text.TextUtils;
30
import android.text.TextWatcher;
31
import android.text.TextWatcher;
31
import android.util.Log;
32
import android.util.Log;
257
//                    ToastUtil.showToast(getApplicationContext(), "输入字数不能超过500", Toast.LENGTH_SHORT);
258
//                    ToastUtil.showToast(getApplicationContext(), "输入字数不能超过500", Toast.LENGTH_SHORT);
258
//                    return;
259
//                    return;
259
//                }
260
//                }
260
                if (!s.trim().isEmpty() && s.length() > 0 && null != Bimp.tempSelectBitmap && Bimp.tempSelectBitmap.size() > 0) {
261
                    tv_right.setEnabled(true);
262
//					tv_right.setTextColor(getResources().getColor(R.color.lvse));
263
                    tv_right.setBackgroundColor(Color.parseColor("#02b637"));
264
                } else {
265
                    tv_right.setEnabled(false);
266
                    tv_right.setBackgroundColor(Color.parseColor("#9ed3ae"));
267
                }
261
//                if (!s.trim().isEmpty() && s.length() > 0 && null != Bimp.tempSelectBitmap && Bimp.tempSelectBitmap.size() > 0) {
262
//                    tv_right.setEnabled(true);
263
//                    tv_right.setBackgroundColor(Color.parseColor("#02b637"));
264
//                } else {
265
//                    tv_right.setEnabled(false);
266
//                    tv_right.setBackgroundColor(Color.parseColor("#9ed3ae"));
267
//                }
268
268
269
                if (TextUtils.isEmpty(s))
269
                if (TextUtils.isEmpty(s))
270
                    publishtopic_word_num.setText("0");
270
                    publishtopic_word_num.setText("0");
324
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_SHORT);
324
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_SHORT);
325
                } else {
325
                } else {
326
                    uploadDialog.dismiss();
326
                    uploadDialog.dismiss();
327
                    uploadDialog.cancel();
328
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_SHORT);
327
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_SHORT);
329
                }
328
                }
330
            }
329
            }
339
    @Override
338
    @Override
340
    public void onClick(View v) {
339
    public void onClick(View v) {
341
        switch (v.getId()) {
340
        switch (v.getId()) {
342
            case R.id.publishtopic_choose_topic_de:
341
            case R.id.publishtopic_choose_topic_de: // 取消选择的话题
343
                mPublishtopicChooseTopic.setText("# 选择话题");
342
                mPublishtopicChooseTopic.setText("# 选择话题");
344
                mPublishTopicDe.setVisibility(View.GONE);
343
                mPublishTopicDe.setVisibility(View.GONE);
345
                talkRecommendBean = null;
344
                chatRecommendBean = null;
346
                break;
345
                break;
347
            case R.id.publishtopic_choose_topic:
346
            case R.id.publishtopic_choose_topic: // 选择话题
348
                startActivityForResult(new Intent(this, TopicActivity.class), reqTopic);
347
                startActivityForResult(new Intent(this, TopicActivity.class), reqTopic);
349
                break;
348
                break;
350
            case R.id.iv_back:
349
            case R.id.iv_back:
355
                    }
354
                    }
356
                }
355
                }
357
                showDialogToExit();
356
                showDialogToExit();
358
//                finish();
359
                break;
357
                break;
360
        }
358
        }
361
    }
359
    }
362
360
363
    TalkRecommendBean talkRecommendBean = null;
364
361
    ChatRecommendBean chatRecommendBean = null;
365
362
366
    @Override
363
    @Override
367
    protected void onPause() {
364
    protected void onPause() {
504
    @Override
501
    @Override
505
    protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
502
    protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
506
        super.onActivityResult(requestCode, resultCode, data);
503
        super.onActivityResult(requestCode, resultCode, data);
507
        if (requestCode == 100 && resultCode == -100) {
508
            talkRecommendBean = (TalkRecommendBean) data.getSerializableExtra("topic");
509
            if (talkRecommendBean != null) {
510
                mPublishtopicChooseTopic.setText("# " + talkRecommendBean.topicName);
511
                topicId = talkRecommendBean.topicId + "";
504
        if (requestCode == reqTopic && resultCode == -100) {
505
            chatRecommendBean = (ChatRecommendBean) data.getSerializableExtra("topic");
506
            if (chatRecommendBean != null) {
507
                mPublishtopicChooseTopic.setText(Html.fromHtml(chatRecommendBean.name));
512
                mPublishTopicDe.setVisibility(View.VISIBLE);
508
                mPublishTopicDe.setVisibility(View.VISIBLE);
513
            }
509
            }
514
        }
510
        }
550
                        subscriber.onNext(imagePath);
546
                        subscriber.onNext(imagePath);
551
                    }
547
                    }
552
                    subscriber.onComplete();
548
                    subscriber.onComplete();
553
                    if (null != photos && photos.size() > 0 && !TextUtils.isEmpty(et_context.getText().toString().trim())) {
554
                        tv_right.setEnabled(true);
555
                        tv_right.setBackgroundColor(Color.parseColor("#02b637"));
556
                    } else {
557
                        tv_right.setEnabled(false);
558
                        tv_right.setBackgroundColor(Color.parseColor("#9ed3ae"));
559
                    }
549
560
                } catch (Exception e) {
550
                } catch (Exception e) {
561
                    e.printStackTrace();
551
                    e.printStackTrace();
562
                    subscriber.onError(e);
552
                    subscriber.onError(e);
698
            public void handleMessage(Message msg) {
688
            public void handleMessage(Message msg) {
699
                switch (msg.what) {
689
                switch (msg.what) {
700
                    case 1:
690
                    case 1:
691
                        if (null != Bimp.tempSelectBitmap && Bimp.tempSelectBitmap.size() > 0) {
692
                            tv_right.setEnabled(true);
693
                            tv_right.setBackgroundColor(Color.parseColor("#02b637"));
694
                        } else {
695
                            tv_right.setEnabled(false);
696
                            tv_right.setBackgroundColor(Color.parseColor("#9ed3ae"));
697
                        }
701
                        adapter.notifyDataSetChanged();
698
                        adapter.notifyDataSetChanged();
702
                        break;
699
                        break;
703
                }
700
                }
902
        Map<String, String> map = new HashMap<>();
899
        Map<String, String> map = new HashMap<>();
903
        map.put("content", et_context.getText().toString());
900
        map.put("content", et_context.getText().toString());
904
        map.put("urls", urls);
901
        map.put("urls", urls);
905
        map.put("topicId", topicId);
906
        map.put("targetType", "24");
902
        if (chatRecommendBean != null) {
903
            map.put("topicId", chatRecommendBean.targetId + "");
904
        }
905
        map.put("targetType", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
907
        map.put("coverImgUrl", "");
906
        map.put("coverImgUrl", "");
908
        map.put("appToken", ProfileManager.getInstance().getKeyMessageToken(getApplicationContext()));
909
        CommonParams.addCommonParams(map);
907
        CommonParams.addCommonParams(map);
910
908
911
        OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
909
        OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
928
                String desc = JsonUtils.getKeyResult(response, "desc");
926
                String desc = JsonUtils.getKeyResult(response, "desc");
929
                if ("1000".equals(code)) {
927
                if ("1000".equals(code)) {
930
                    ToastUtil.showToast(getApplicationContext(), "发布成功", Toast.LENGTH_SHORT);
928
                    ToastUtil.showToast(getApplicationContext(), "发布成功", Toast.LENGTH_SHORT);
929
                    startActivity(new Intent(getApplicationContext(), ChatActivity.class));
931
                } else {
930
                } else {
932
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_SHORT);
931
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_SHORT);
933
                }
932
                }

+ 3 - 4
app/src/main/java/com/electric/chargingpile/activity/PublishVideoTopicActivity.java

148
    }
148
    }
149
149
150
    private void updatePublishBtn() {
150
    private void updatePublishBtn() {
151
        String s = mPublishtopicCon.getText().toString();
152
        if (!s.trim().isEmpty() && s.length() > 0 && null != media) {
151
        if (null != media) {
153
            mPublishtopicPublish.setEnabled(true);
152
            mPublishtopicPublish.setEnabled(true);
154
            mPublishtopicPublish.setBackgroundColor(Color.parseColor("#02b637"));
153
            mPublishtopicPublish.setBackgroundColor(Color.parseColor("#02b637"));
155
        } else {
154
        } else {
193
                        .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE : PictureConfig.SINGLE
192
                        .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE : PictureConfig.SINGLE
194
                        .previewImage(true)// 是否可预览图片
193
                        .previewImage(true)// 是否可预览图片
195
                        .previewVideo(true)// 是否可预览视频
194
                        .previewVideo(true)// 是否可预览视频
196
                        .enablePreviewAudio(false)// 是否预览音频
195
                        .enablePreviewAudio(true)// 是否预览音频
197
                        .isCamera(true)// 是否显示拍照按钮
196
                        .isCamera(true)// 是否显示拍照按钮
198
                        .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
197
                        .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
199
                        .setOutputCameraPath(IMAGE_CACHE)// 自定义拍照保存路径
198
                        .setOutputCameraPath(IMAGE_CACHE)// 自定义拍照保存路径
205
                        .compressGrade(Luban.CUSTOM_GEAR)
204
                        .compressGrade(Luban.CUSTOM_GEAR)
206
                        .compressMaxKB(1024)//压缩最大值kb compressGrade()为Luban.CUSTOM_GEAR有效
205
                        .compressMaxKB(1024)//压缩最大值kb compressGrade()为Luban.CUSTOM_GEAR有效
207
                        .minimumCompressSize(500) //add by tanhaiqin, 图片大小 <= 500KB(数字可变) 不需要压缩
206
                        .minimumCompressSize(500) //add by tanhaiqin, 图片大小 <= 500KB(数字可变) 不需要压缩
208
                        .videoSecond(5 * 60)//显示多少秒以内的视频
207
                        .videoSecond(2 * 60)// 显示多少秒以内的视频
209
                        .recordVideoSecond(15)//录制视频秒数 默认60秒
208
                        .recordVideoSecond(15)//录制视频秒数 默认60秒
210
                        .forResult(PictureConfig.CHOOSE_REQUEST);
209
                        .forResult(PictureConfig.CHOOSE_REQUEST);
211
                break;
210
                break;

+ 4 - 4
app/src/main/java/com/electric/chargingpile/application/MainApplication.java

73
    public static String firstPoint = "";
73
    public static String firstPoint = "";
74
    public static Boolean firstSsyd;
74
    public static Boolean firstSsyd;
75
    public static String password = "";
75
    public static String password = "";
76
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
77
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78
//    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
79
    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
76
    public static String url = "http://59.110.68.162";// 充电桩测试环境
77
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78
    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
79
//    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
80
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
80
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
81
    //	public static String url = "https://cdz.d1ev.com";
81
    //	public static String url = "https://cdz.d1ev.com";
82
    public static String build_flag = "0";
82
    public static String build_flag = "0";

BIN
app/src/main/res/drawable-xhdpi/bg_w_4.9.png


BIN
app/src/main/res/drawable-xhdpi/bg_w_4.png


BIN
app/src/main/res/drawable-xhdpi/bg_w_41.jpg


+ 1 - 1
app/src/main/res/layout/activity_publish_picture_content.xml

42
            android:layout_alignParentEnd="true"
42
            android:layout_alignParentEnd="true"
43
            android:layout_centerHorizontal="true"
43
            android:layout_centerHorizontal="true"
44
            android:layout_marginTop="@dimen/ui_10_dip"
44
            android:layout_marginTop="@dimen/ui_10_dip"
45
            android:layout_marginEnd="25dp"
45
            android:layout_marginEnd="15dp"
46
            android:background="#9ed3ae"
46
            android:background="#9ed3ae"
47
            android:enabled="false"
47
            android:enabled="false"
48
            android:gravity="center"
48
            android:gravity="center"

+ 1 - 1
app/src/main/res/layout/activity_publishtopic.xml

28
        android:layout_alignParentEnd="true"
28
        android:layout_alignParentEnd="true"
29
        android:layout_centerHorizontal="true"
29
        android:layout_centerHorizontal="true"
30
        android:layout_marginTop="@dimen/ui_10_dip"
30
        android:layout_marginTop="@dimen/ui_10_dip"
31
        android:layout_marginEnd="25dp"
31
        android:layout_marginEnd="15dp"
32
        android:background="#9ed3ae"
32
        android:background="#9ed3ae"
33
        android:enabled="false"
33
        android:enabled="false"
34
        android:gravity="center"
34
        android:gravity="center"

+ 1 - 1
app/src/main/res/layout/viewpager_guide_four.xml

11
        android:layout_centerHorizontal="true"
11
        android:layout_centerHorizontal="true"
12
12
13
        android:contentDescription="@null"
13
        android:contentDescription="@null"
14
        android:src="@drawable/bg_w_41" />
14
        android:src="@drawable/bg_w_4" />
15
15
16
    <ImageView
16
    <ImageView
17
        android:layout_width="200dp"
17
        android:layout_width="200dp"

+ 1 - 1
videolibrary/picture_library/src/main/java/com/luck/picture/lib/PicturePreviewActivity.java

475
475
476
            rlSelectBarLayout.setVisibility(View.VISIBLE);
476
            rlSelectBarLayout.setVisibility(View.VISIBLE);
477
477
478
            if (media.getDuration() > 15 * 1000) {
478
            if (media.getDuration() > 120 * 1000) {
479
                video_layout.setVisibility(View.GONE);
479
                video_layout.setVisibility(View.GONE);
480
                video_layout10.setVisibility(View.VISIBLE);
480
                video_layout10.setVisibility(View.VISIBLE);
481
481

+ 2 - 1
videolibrary/picture_library/src/main/res/layout/picture_preview.xml

38
                    android:layout_centerVertical="true"
38
                    android:layout_centerVertical="true"
39
                    android:padding="10dp"
39
                    android:padding="10dp"
40
                    android:text="编辑"
40
                    android:text="编辑"
41
                    android:visibility="gone"
41
                    android:textColor="@color/color_13bfb1"
42
                    android:textColor="@color/color_13bfb1"
42
                    android:textSize="15sp" />
43
                    android:textSize="15sp" />
43
44
66
                    android:layout_height="wrap_content"
67
                    android:layout_height="wrap_content"
67
                    android:layout_centerVertical="true"
68
                    android:layout_centerVertical="true"
68
                    android:padding="10dp"
69
                    android:padding="10dp"
69
                    android:text="只能分享15秒内视频,需要进行编辑"
70
                    android:text="只能分享120秒内视频,需要进行编辑"
70
                    android:textColor="@color/color_69"
71
                    android:textColor="@color/color_69"
71
                    android:textSize="12sp" />
72
                    android:textSize="12sp" />
72
73