发布优化

app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

@@ -26,6 +26,7 @@ import android.support.v4.app.ActivityCompat;
import android.support.v7.app.AlertDialog;
import android.telephony.TelephonyManager;
import android.text.Editable;
import android.text.Html;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.Log;
@@ -257,14 +258,13 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
//                    ToastUtil.showToast(getApplicationContext(), "输入字数不能超过500", Toast.LENGTH_SHORT);
//                    return;
//                }
                if (!s.trim().isEmpty() && s.length() > 0 && null != Bimp.tempSelectBitmap && Bimp.tempSelectBitmap.size() > 0) {
                    tv_right.setEnabled(true);
//					tv_right.setTextColor(getResources().getColor(R.color.lvse));
                    tv_right.setBackgroundColor(Color.parseColor("#02b637"));
                } else {
                    tv_right.setEnabled(false);
                    tv_right.setBackgroundColor(Color.parseColor("#9ed3ae"));
                }
//                if (!s.trim().isEmpty() && s.length() > 0 && null != Bimp.tempSelectBitmap && Bimp.tempSelectBitmap.size() > 0) {
//                    tv_right.setEnabled(true);
//                    tv_right.setBackgroundColor(Color.parseColor("#02b637"));
//                } else {
//                    tv_right.setEnabled(false);
//                    tv_right.setBackgroundColor(Color.parseColor("#9ed3ae"));
//                }
                if (TextUtils.isEmpty(s))
                    publishtopic_word_num.setText("0");
@@ -324,7 +324,6 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_SHORT);
                } else {
                    uploadDialog.dismiss();
                    uploadDialog.cancel();
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_SHORT);
                }
            }
@@ -339,12 +338,12 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
    @Override
    public void onClick(View v) {
        switch (v.getId()) {
            case R.id.publishtopic_choose_topic_de:
            case R.id.publishtopic_choose_topic_de: // 取消选择的话题
                mPublishtopicChooseTopic.setText("# 选择话题");
                mPublishTopicDe.setVisibility(View.GONE);
                talkRecommendBean = null;
                chatRecommendBean = null;
                break;
            case R.id.publishtopic_choose_topic:
            case R.id.publishtopic_choose_topic: // 选择话题
                startActivityForResult(new Intent(this, TopicActivity.class), reqTopic);
                break;
            case R.id.iv_back:
@@ -355,13 +354,11 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
                    }
                }
                showDialogToExit();
//                finish();
                break;
        }
    }
    TalkRecommendBean talkRecommendBean = null;
    ChatRecommendBean chatRecommendBean = null;
    @Override
    protected void onPause() {
@@ -504,11 +501,10 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
    @Override
    protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
        super.onActivityResult(requestCode, resultCode, data);
        if (requestCode == 100 && resultCode == -100) {
            talkRecommendBean = (TalkRecommendBean) data.getSerializableExtra("topic");
            if (talkRecommendBean != null) {
                mPublishtopicChooseTopic.setText("# " + talkRecommendBean.topicName);
                topicId = talkRecommendBean.topicId + "";
        if (requestCode == reqTopic && resultCode == -100) {
            chatRecommendBean = (ChatRecommendBean) data.getSerializableExtra("topic");
            if (chatRecommendBean != null) {
                mPublishtopicChooseTopic.setText(Html.fromHtml(chatRecommendBean.name));
                mPublishTopicDe.setVisibility(View.VISIBLE);
            }
        }
@@ -550,13 +546,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
                        subscriber.onNext(imagePath);
                    }
                    subscriber.onComplete();
                    if (null != photos && photos.size() > 0 && !TextUtils.isEmpty(et_context.getText().toString().trim())) {
                        tv_right.setEnabled(true);
                        tv_right.setBackgroundColor(Color.parseColor("#02b637"));
                    } else {
                        tv_right.setEnabled(false);
                        tv_right.setBackgroundColor(Color.parseColor("#9ed3ae"));
                    }
                } catch (Exception e) {
                    e.printStackTrace();
                    subscriber.onError(e);
@@ -698,6 +688,13 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
            public void handleMessage(Message msg) {
                switch (msg.what) {
                    case 1:
                        if (null != Bimp.tempSelectBitmap && Bimp.tempSelectBitmap.size() > 0) {
                            tv_right.setEnabled(true);
                            tv_right.setBackgroundColor(Color.parseColor("#02b637"));
                        } else {
                            tv_right.setEnabled(false);
                            tv_right.setBackgroundColor(Color.parseColor("#9ed3ae"));
                        }
                        adapter.notifyDataSetChanged();
                        break;
                }
@@ -902,10 +899,11 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
        Map<String, String> map = new HashMap<>();
        map.put("content", et_context.getText().toString());
        map.put("urls", urls);
        map.put("topicId", topicId);
        map.put("targetType", "24");
        if (chatRecommendBean != null) {
            map.put("topicId", chatRecommendBean.targetId + "");
        }
        map.put("targetType", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
        map.put("coverImgUrl", "");
        map.put("appToken", ProfileManager.getInstance().getKeyMessageToken(getApplicationContext()));
        CommonParams.addCommonParams(map);
        OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
@@ -928,6 +926,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
                String desc = JsonUtils.getKeyResult(response, "desc");
                if ("1000".equals(code)) {
                    ToastUtil.showToast(getApplicationContext(), "发布成功", Toast.LENGTH_SHORT);
                    startActivity(new Intent(getApplicationContext(), ChatActivity.class));
                } else {
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_SHORT);
                }

app/src/main/java/com/electric/chargingpile/activity/PublishVideoTopicActivity.java

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

app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@@ -73,10 +73,10 @@ public class MainApplication extends MultiDexApplication {
    public static String firstPoint = "";
    public static Boolean firstSsyd;
    public static String password = "";
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
//    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
    public static String url = "http://59.110.68.162";// 充电桩测试环境
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
//    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
    //	public static String url = "https://cdz.d1ev.com";
    public static String build_flag = "0";

app/src/main/res/layout/activity_publish_picture_content.xml

@@ -42,7 +42,7 @@
            android:layout_alignParentEnd="true"
            android:layout_centerHorizontal="true"
            android:layout_marginTop="@dimen/ui_10_dip"
            android:layout_marginEnd="25dp"
            android:layout_marginEnd="15dp"
            android:background="#9ed3ae"
            android:enabled="false"
            android:gravity="center"

app/src/main/res/layout/activity_publishtopic.xml

@@ -28,7 +28,7 @@
        android:layout_alignParentEnd="true"
        android:layout_centerHorizontal="true"
        android:layout_marginTop="@dimen/ui_10_dip"
        android:layout_marginEnd="25dp"
        android:layout_marginEnd="15dp"
        android:background="#9ed3ae"
        android:enabled="false"
        android:gravity="center"

app/src/main/res/layout/viewpager_guide_four.xml

@@ -11,7 +11,7 @@
        android:layout_centerHorizontal="true"
        android:contentDescription="@null"
        android:src="@drawable/bg_w_41" />
        android:src="@drawable/bg_w_4" />
    <ImageView
        android:layout_width="200dp"

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

@@ -475,7 +475,7 @@ public class PicturePreviewActivity extends PictureBaseActivity implements View.
            rlSelectBarLayout.setVisibility(View.VISIBLE);
            if (media.getDuration() > 15 * 1000) {
            if (media.getDuration() > 120 * 1000) {
                video_layout.setVisibility(View.GONE);
                video_layout10.setVisibility(View.VISIBLE);

videolibrary/picture_library/src/main/res/layout/picture_preview.xml

@@ -38,6 +38,7 @@
                    android:layout_centerVertical="true"
                    android:padding="10dp"
                    android:text="编辑"
                    android:visibility="gone"
                    android:textColor="@color/color_13bfb1"
                    android:textSize="15sp" />
@@ -66,7 +67,7 @@
                    android:layout_height="wrap_content"
                    android:layout_centerVertical="true"
                    android:padding="10dp"
                    android:text="只能分享15秒内视频，需要进行编辑"
                    android:text="只能分享120秒内视频，需要进行编辑"
                    android:textColor="@color/color_69"
                    android:textSize="12sp" />