fix [修复-]

2024-03-29 11:24:52 +08:00
parent 4725e67c75
commit 7f40b899a9
20 changed files with 108 additions and 48 deletions
--- a/main/src/main/java/com/yunbao/main/activity/CommunityDetailsActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/CommunityDetailsActivity.java
@@ -360,7 +360,7 @@ public class CommunityDetailsActivity extends AbsActivity {
                        }
                    });
                    commentRecyclerView.setAdapter(commentAdapter);
-                    replyCount.setText("评论 " + list.size());
+                    replyCount.setText(getResources().getString(R.string.video_comment) + " " + list.size());
                }
            }
        });
@@ -388,7 +388,7 @@ public class CommunityDetailsActivity extends AbsActivity {
        ImgLoader.display(CommunityDetailsActivity.this, activeBean.getUser_avatar(), avatar);
        name.setText(activeBean.getUser_name());
        time.setText(activeBean.getCreate_time());
-        likeCount.setText(activeBean.getLove_num() + "人觉得很赞");
+        likeCount.setText(activeBean.getLove_num() + getResources().getString(R.string.person_like));
        if (!StringUtil.isEmpty(activeBean.getContent())) {
            content.setText(String.valueOf(JSONObject.parseObject(activeBean.getContent()).get("msg")));
        }
--- a/main/src/main/java/com/yunbao/main/activity/CommunitySendActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/CommunitySendActivity.java
@@ -2,6 +2,7 @@ package com.yunbao.main.activity;

 import android.Manifest;
 import android.annotation.SuppressLint;
+import android.app.Dialog;
 import android.content.ClipData;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -43,6 +44,7 @@ import com.yunbao.common.upload.UploadCallback;
 import com.yunbao.common.upload.UploadQnImpl;
 import com.yunbao.common.utils.ActiveImageAdapter;
 import com.yunbao.common.utils.DateFormatUtil;
+import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.FilesUtils;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.StringUtil;
@@ -86,6 +88,8 @@ public class CommunitySendActivity extends AbsActivity {
    List<NewCommunityType> newCommunityTypeList = new ArrayList<>();
    int talkId;

+    Dialog dialog;
+
    @Override
    protected int getLayoutId() {
        return R.layout.activity_community_send;
@@ -110,6 +114,25 @@ public class CommunitySendActivity extends AbsActivity {
        submit.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
+                if (StringUtil.isEmpty(content.getText().toString())) {
+                    ToastUtil.show(mContext.getResources().getString(com.yunbao.main.R.string.please_input_content));
+                    return;
+                }
+                if (isImage) {
+                    if (imgUrlList.size() == 0) {
+                        ToastUtil.show(mContext.getResources().getString(com.yunbao.main.R.string.please_input_content));
+                        return;
+                    }
+                } else {
+                    if (videoFile == null) {
+                        ToastUtil.show(mContext.getResources().getString(com.yunbao.main.R.string.please_input_content));
+                        return;
+                    }
+                }
+                if (StringUtil.isEmpty(talkContent.getText().toString())) {
+                    ToastUtil.show(mContext.getResources().getString(com.yunbao.main.R.string.please_input_content));
+                    return;
+                }
                List<UploadBean> uploadBeanList = new ArrayList<>();
                if (isImage) {
                    for (int i = 0; i < activeImageAdapter.getImageFileList().size(); i++) {
@@ -222,15 +245,6 @@ public class CommunitySendActivity extends AbsActivity {
    }

    private void submit() {
-        if (isImage) {
-            if (imgUrlList.size() == 0) {
-                return;
-            }
-        } else {
-            if (StringUtil.isEmpty(videoUrl)) {
-                return;
-            }
-        }
        String imgUrl = "";
        if (isImage) {
            imgUrl = new Gson().toJson(imgUrlList);
@@ -244,6 +258,9 @@ public class CommunitySendActivity extends AbsActivity {
        CommonHttpUtil.pushCommunity(isImage, jsonObject.toString(), String.valueOf(talkId), imgUrl, videoUrl, tempTime, new HttpCallback() {
            @Override
            public void onSuccess(int code, String msg, String[] info) {
+                if (dialog != null) {
+                    dialog.dismiss();
+                }
                ToastUtil.show(msg);
                if (code == 0) {
                    finish();
@@ -384,10 +401,14 @@ public class CommunitySendActivity extends AbsActivity {
        if (mUploadStrategy == null) {
            mUploadStrategy = new UploadQnImpl(mContext);
        }
+        dialog = DialogUitl.loadingDialog(mContext, mContext.getResources().getString(com.yunbao.main.R.string.uploading));
+        dialog.show();
        mUploadStrategy.upload(uploadBeans, true, new UploadCallback() {
            @Override
            public void onFinish(List<UploadBean> list, boolean success) {
                if (!success) {
+                    dialog.dismiss();
+                    ToastUtil.show(mContext.getResources().getString(com.yunbao.main.R.string.upload_fail));
                    return;
                }
                if (isImage) {
@@ -402,4 +423,12 @@ public class CommunitySendActivity extends AbsActivity {
            }
        }, isImg);
    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (dialog != null) {
+            dialog.dismiss();
+        }
+    }
 }
--- a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
@@ -248,7 +248,7 @@ public class UserHomeActivity extends AbsActivity {
        likeCount.setText(String.valueOf(userInfo.getUserHomeTopInfo().getUser_love_num()));//关注数量

        if (isMe) {
-            findViewById(R.id.setting).setVisibility(View.VISIBLE);
+            findViewById(R.id.setting).setVisibility(View.INVISIBLE);
            bottomEditLayout.setVisibility(View.VISIBLE);
            imgUp.setVisibility(View.VISIBLE);
            imgLabel.setVisibility(View.VISIBLE);
@@ -307,7 +307,7 @@ public class UserHomeActivity extends AbsActivity {
        if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getAge())) {
            tagList.add(userInfo.getUserHomeTopInfo().getAge() + (WordUtil.isNewZh() ? "歲" : "years old"));
        }
-        if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getHeight())) {
+        if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getHeight()) && !userInfo.getUserHomeTopInfo().getHeight().equals("0")) {
            tagList.add(userInfo.getUserHomeTopInfo().getHeight() + "cm");
        }
        if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getCareer())) {
--- a/main/src/main/java/com/yunbao/main/dialog/ConversationPopuwWindow.java
+++ b/main/src/main/java/com/yunbao/main/dialog/ConversationPopuwWindow.java
@@ -42,7 +42,7 @@ public class ConversationPopuwWindow implements View.OnClickListener {
    private void initView() {
        tvBlack = popupView.findViewById(com.yunbao.live.R.id.tv_black);
        tvBlack.setOnClickListener(this);
-        tvBlack.setText("删除");
+        tvBlack.setText(mContext.getResources().getString(R.string.delete));

    }