yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据测试反馈修改帮助反馈问题

Browse Source 
新增小游戏跳一跳回血和必中的回调
新增关闭发红包页面后自动打开礼物栏的功能
调整小游戏跳一跳回调防抖
This commit is contained in:
zlzw
2024-04-26 10:08:19 +08:00
parent 1c9493d7c8
commit 1f12187766
20 changed files with 271 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/src/main/java/com/yunbao/main/activity/FeedbackActivity.java
View File

@@ -1,10 +1,13 @@
package com.yunbao.main.activity;
import android.app.Dialog;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.HttpCallbackModel;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
@@ -25,17 +28,29 @@ public class FeedbackActivity extends AbsActivity {
setTitle(WordUtil.getNewString(R.string.activity_feedback_top_title));
setTitleBold(true);
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.btn_cs), new ViewClicksAntiShake.ViewClicksCallBack() {
Dialog loading;
@Override
public void onViewClicks() {
//TODO 客服
loading= DialogUitl.loadingDialog(mContext);
loading.show();
MainHttpUtil.getCustomerService(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
loading.dismiss();
loading=null;
if (info.length == 1) {
String url = info[0];
RouteUtil.forwardCustomerService(url);
}
}
@Override
public void onError() {
super.onError();
loading.dismiss();
loading=null;
}
});
}

68
main/src/main/java/com/yunbao/main/activity/FeedbackEditActivity.java
View File

@@ -4,6 +4,7 @@ import android.app.Dialog;
import android.graphics.Color;
import android.text.Editable;
import android.text.InputFilter;
import android.text.Spanned;
import android.text.TextWatcher;
import android.util.SparseArray;
import android.view.View;
@@ -32,6 +33,8 @@ import com.yunbao.main.R;
import java.io.File;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@Route(path = RouteUtil.PATH_FEEDBACK_EDIT_ACTIVITY)
public class FeedbackEditActivity extends AbsActivity {
@@ -58,8 +61,20 @@ public class FeedbackEditActivity extends AbsActivity {
setTitleBold(true);
initView();
imageUtil = new ProcessImageUtil(this);
feedbackEdit.setFilters(new InputFilter[]{new InputFilter.LengthFilter(500)});
ciEdit.setFilters(new InputFilter[]{new InputFilter.LengthFilter(30)});
feedbackEdit.setFilters(new InputFilter[]{new InputFilter.LengthFilter(501)});
ciEdit.setFilters(new InputFilter[]{new InputFilter.LengthFilter(30), new InputFilter() {
@Override
public CharSequence filter(CharSequence charSequence, int i, int i1, Spanned spanned, int i2, int i3) {
/* String regex = "[A-Za-z0-9]+"; // 正则表达式
Pattern pattern = Pattern.compile(regex);
Matcher matcher = pattern.matcher(charSequence.toString());
if (matcher.matches()) {
return null;
}
return "";*/
return null;
}
}});
feedbackEdit.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
@@ -68,18 +83,22 @@ public class FeedbackEditActivity extends AbsActivity {
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
if (charSequence.length() == 500) {
ToastUtil.show(R.string.activity_feedback_edit_submit_tip2);
if (charSequence.length() >= 500) {
editNumber.setTextColor(Color.parseColor("#FF5656"));
} else {
editNumber.setTextColor(Color.parseColor("#333333"));
}
editNumber.setText(String.format(Locale.getDefault(), "%d", charSequence.length()));
}
@Override
public void afterTextChanged(Editable editable) {
if (editable.length() > 500) {
ToastUtil.show(R.string.activity_feedback_edit_submit_tip2);
feedbackEdit.setText(editable.toString().substring(0, 500));
feedbackEdit.setSelection(feedbackEdit.getText().length());
}
}
});
ViewClicksAntiShake.clicksAntiShake(img1, () -> {
@@ -122,13 +141,13 @@ public class FeedbackEditActivity extends AbsActivity {
}
JSONArray images = new JSONArray();
if (img1.getTag() != null) {
images.add((String) img1.getTag());
images.add(((String) img1.getTag()).replace("https://downs.yaoulive.com/" ,""));
}
if (img2.getTag() != null) {
images.add((String) img2.getTag());
images.add(((String) img2.getTag()).replace("https://downs.yaoulive.com/" ,""));
}
if (img3.getTag() != null) {
images.add((String) img3.getTag());
images.add(((String) img3.getTag()).replace("https://downs.yaoulive.com/" ,""));
}
LiveNetManager.get(mContext)
.feedback(feedbackEdit.getText().toString(),
@@ -150,15 +169,15 @@ public class FeedbackEditActivity extends AbsActivity {
});
img1.setOnLongClickListener(view -> {
ToastUtil.show("1");
ToastUtil.showDebug("1");
return true;
});
img2.setOnLongClickListener(view -> {
ToastUtil.show("2");
ToastUtil.showDebug("2");
return true;
});
img3.setOnLongClickListener(view -> {
ToastUtil.show("3");
ToastUtil.showDebug("3");
return true;
});
imageUtil.setImageResultCallback(new ImageResultCallback() {
@@ -166,7 +185,7 @@ public class FeedbackEditActivity extends AbsActivity {
@Override
public void onSuccess(File file) {
ToastUtil.show("图片地址:" + file.getAbsolutePath());
ToastUtil.showDebug("图片地址:" + file.getAbsolutePath());
onSuccessToQiNiuUrl(mContext, file, new OnItemClickListener<String>() {
@Override
public void onItemClick(String bean, int position) {
@@ -177,7 +196,7 @@ public class FeedbackEditActivity extends AbsActivity {
switch (clickImage) {
case 101:
case 112:
setShowImage(img1,img1Del,bean);
setShowImage(img1, img1Del, bean);
if (img2.getTag() == null) {
setDefImage(img2, img2Del, img2Layout);
} else if (img3.getTag() == null) {
@@ -186,14 +205,14 @@ public class FeedbackEditActivity extends AbsActivity {
break;
case 201:
case 212:
setShowImage(img2,img2Del,bean);
setShowImage(img2, img2Del, bean);
if (img3.getTag() == null) {
setDefImage(img3, img3Del, img3Layout);
}
break;
case 301:
case 312:
setShowImage(img3,img3Del,bean);
setShowImage(img3, img3Del, bean);
break;
}
}
@@ -271,9 +290,22 @@ public class FeedbackEditActivity extends AbsActivity {
loadingDialog.dismiss();
loadingDialog = null;
}
loadingDialog = DialogUitl.loadingDialog(mContext);
loadingDialog.show();
imageUtil.getImageByAlumb(false);
SparseArray<String> array = new SparseArray<>();
array.put(1, WordUtil.getNewString(R.string.activity_feedback_edit_img_select));
array.put(2, WordUtil.getNewString(R.string.activity_feedback_edit_img_camera));
DialogUitl.showStringArrayDialog(mContext, array, new DialogUitl.StringArrayDialogCallback() {
@Override
public void onItemClick(String text, int tag) {
loadingDialog = DialogUitl.loadingDialog(mContext);
loadingDialog.show();
if (tag == 1) {
imageUtil.getImageByAlumb(false);
} else {
imageUtil.getImageByCamera(false);
}
}
});
}
private void deleteImage(int index) {

13
main/src/main/java/com/yunbao/main/activity/SettingActivity.java
View File

@@ -285,9 +285,9 @@ public class SettingActivity extends AbsActivity implements OnItemClickListener<
} else {
ImgLoader.display(mContext, com.yunbao.common.R.mipmap.special_icon_on, studioRideEffects);
}
if(IMLoginManager.get(mContext).isLiveNotifySettings()){
if (IMLoginManager.get(mContext).isLiveNotifySettings()) {
ImgLoader.display(mContext, com.yunbao.common.R.mipmap.special_icon_on, liveNotifySettings);
}else{
} else {
ImgLoader.display(mContext, com.yunbao.common.R.mipmap.special_icon_off, liveNotifySettings);
}
}
@@ -316,15 +316,16 @@ public class SettingActivity extends AbsActivity implements OnItemClickListener<
.show();
}
}else if(bean.getId()==17){
} else if (bean.getId() == 17 || bean.getId() == 26) {
RouteUtil.forwardActivity(RouteUtil.PATH_FEEDBACK_ACTIVITY);
}
} else {
if (bean.getId() == 17) {//意见反馈要在url上加版本号和设备号
if (bean.getId() == 17 || bean.getId() == 26) {//意见反馈要在url上加版本号和设备号
href += "&version=" + android.os.Build.VERSION.RELEASE + "&model=" + android.os.Build.MODEL;
RouteUtil.forwardActivity(RouteUtil.PATH_FEEDBACK_ACTIVITY);
} else {
WebViewActivity.forward(mContext, href, false);
}
// WebViewActivity.forward(mContext, href,false);
RouteUtil.forwardActivity(RouteUtil.PATH_FEEDBACK_ACTIVITY);
}
}

2
main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
View File

@@ -510,7 +510,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
if (bean.getId() == 24) {
MobclickAgent.onEvent(mContext, "my_pack", "个人中心点包裹");
}
if (bean.getId() == 17) {
if (bean.getId() == 17 || bean.getId() == 26) {
RouteUtil.forwardActivity(RouteUtil.PATH_FEEDBACK_ACTIVITY);
} else
WebViewActivity.forward(mContext, url, false);

1
main/src/main/res/layout/activity_feedback.xml
View File

@@ -53,6 +53,7 @@
android:layout_width="165dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:textAllCaps="false"
android:background="#F7F7F7"
android:text="@string/activity_feedback_feedback"
android:textColor="#333333"

15
main/src/main/res/layout/activity_feedback_edit.xml
View File

@@ -239,7 +239,13 @@
android:layout_marginBottom="130dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="*"
android:textColor="#FF5656"
android:textSize="11sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -248,13 +254,6 @@
android:textColor="#777777"
android:textSize="11sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="*"
android:textColor="#FF5656"
android:textSize="11sp" />
</LinearLayout>
</LinearLayout>
</ScrollView>

2
main/src/main/res/values-zh/strings.xml
View File

@@ -39,4 +39,6 @@
<string name="activity_feedback_edit_submit_tip1">請描述您的問題</string>
<string name="activity_feedback_edit_submit_tip2">超過字數要求</string>
<string name="activity_feedback_edit_submit_tip3">今日反饋次數已用完</string>
<string name="activity_feedback_edit_img_select">從相冊選取</string>
<string name="activity_feedback_edit_img_camera">拍照</string>
</resources>

2
main/src/main/res/values/strings.xml
View File

@@ -39,4 +39,6 @@
<string name="activity_feedback_edit_submit_tip1">Please describe your problem</string>
<string name="activity_feedback_edit_submit_tip2">Exceeding the word count requirement</string>
<string name="activity_feedback_edit_submit_tip3">Today\'s feedback count has been used up</string>
<string name="activity_feedback_edit_img_select">Select from album</string>
<string name="activity_feedback_edit_img_camera">Photo shoot</string>
</resources>