diff --git a/app/src/main/java/com/gh/common/util/AskUtils.java b/app/src/main/java/com/gh/common/util/AskUtils.java index 564b530082..06afc35390 100644 --- a/app/src/main/java/com/gh/common/util/AskUtils.java +++ b/app/src/main/java/com/gh/common/util/AskUtils.java @@ -1,6 +1,10 @@ package com.gh.common.util; +import android.text.TextUtils; + import java.text.DecimalFormat; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Created by khy on 27/12/17. @@ -19,4 +23,28 @@ public class AskUtils { return vote; } + public static String stripHtml(String htmlStr) { + + + if (TextUtils.isEmpty(htmlStr)) return ""; + + String regEx_script = "]*?>[\\s\\S]*?<\\/script>"; //定义script的正则表达式 + String regEx_style = "]*?>[\\s\\S]*?<\\/style>"; //定义style的正则表达式 + String regEx_html = "<[^>]+>"; //定义HTML标签的正则表达式 + + Pattern p_script = Pattern.compile(regEx_script, Pattern.CASE_INSENSITIVE); + Matcher m_script = p_script.matcher(htmlStr); + htmlStr = m_script.replaceAll(""); //过滤script标签 + + Pattern p_style = Pattern.compile(regEx_style, Pattern.CASE_INSENSITIVE); + Matcher m_style = p_style.matcher(htmlStr); + htmlStr = m_style.replaceAll(""); //过滤style标签 + + Pattern p_html = Pattern.compile(regEx_html, Pattern.CASE_INSENSITIVE); + Matcher m_html = p_html.matcher(htmlStr); + htmlStr = m_html.replaceAll(""); //过滤html标签 + + return htmlStr.trim(); //返回文本字符串 + } + } diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java index 7aab6d8c32..b503edebc5 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -435,8 +435,6 @@ public class ShareUtils { smsBody = "这个App可以下载各种热门卡牌手游的加速版，绿色安全，超级省心，做日常效率提高3-5倍！光环助手官网地址：" + shareUrl; break; case askInvite: - smsBody = mTitle + " - 光环助手" + shareUrl; - break; case askNormal: smsBody = mTitle + " - 光环助手" + shareUrl; break; @@ -505,7 +503,9 @@ public class ShareUtils { shortMessageSahre(); break; case 6: - if (mShareType != ShareType.shareGh) { + if (mShareType == ShareType.askInvite || mShareType == ShareType.askNormal) { + copyLink(mTitle + " - 光环助手" + shareUrl); + } else if (mShareType != ShareType.shareGh) { copyLink(shareUrl); } else { Intent data = IntentUtils.getEmailToGHIntent(); diff --git a/app/src/main/java/com/gh/common/view/RichEditor.java b/app/src/main/java/com/gh/common/view/RichEditor.java index 75b75b5359..e3226ea06f 100644 --- a/app/src/main/java/com/gh/common/view/RichEditor.java +++ b/app/src/main/java/com/gh/common/view/RichEditor.java @@ -14,6 +14,7 @@ import android.webkit.WebChromeClient; import android.webkit.WebView; import android.webkit.WebViewClient; +import com.gh.common.util.AskUtils; import com.gh.common.util.NetworkUtils; import com.gh.common.util.RichEditorUtils; @@ -23,8 +24,6 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * Copyright (C) 2017 Wasabeef @@ -429,28 +428,7 @@ public class RichEditor extends WebView { public String getText() { - - String htmlStr = mContents; - - if (TextUtils.isEmpty(htmlStr)) return ""; - - String regEx_script = "]*?>[\\s\\S]*?<\\/script>"; //定义script的正则表达式 - String regEx_style = "]*?>[\\s\\S]*?<\\/style>"; //定义style的正则表达式 - String regEx_html = "<[^>]+>"; //定义HTML标签的正则表达式 - - Pattern p_script = Pattern.compile(regEx_script, Pattern.CASE_INSENSITIVE); - Matcher m_script = p_script.matcher(htmlStr); - htmlStr = m_script.replaceAll(""); //过滤script标签 - - Pattern p_style = Pattern.compile(regEx_style, Pattern.CASE_INSENSITIVE); - Matcher m_style = p_style.matcher(htmlStr); - htmlStr = m_style.replaceAll(""); //过滤style标签 - - Pattern p_html = Pattern.compile(regEx_html, Pattern.CASE_INSENSITIVE); - Matcher m_html = p_html.matcher(htmlStr); - htmlStr = m_html.replaceAll(""); //过滤html标签 - - return htmlStr.trim(); //返回文本字符串 + return AskUtils.stripHtml(mContents); } diff --git a/app/src/main/java/com/gh/gamecenter/AskQuestionsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/AskQuestionsDetailActivity.java index 15b2c279f8..05380f8ff5 100644 --- a/app/src/main/java/com/gh/gamecenter/AskQuestionsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AskQuestionsDetailActivity.java @@ -49,7 +49,7 @@ public class AskQuestionsDetailActivity extends BaseActivity implements Fragment protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (requestCode == QUESTIONS_DETAIL_ANSWER_REQUEST) { - if (resultCode == Activity.RESULT_CANCELED) { + if (resultCode == AnswerEditFragment.SAVE_DRAFTS) { mQuestionsDetailFragment.postDraftsSuccess(); } else if (resultCode == Activity.RESULT_OK) { mQuestionsDetailFragment.postAnswerSuccess(); diff --git a/app/src/main/java/com/gh/gamecenter/ask/myask/MyDraftFragment.java b/app/src/main/java/com/gh/gamecenter/ask/myask/MyDraftFragment.java index aba7252459..0858a33b65 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/myask/MyDraftFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/myask/MyDraftFragment.java @@ -5,10 +5,14 @@ import android.content.Intent; import android.os.Bundle; import android.view.View; +import com.gh.common.util.AskLogUtils; +import com.gh.common.util.AskUtils; import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.AskQuestionsDetailActivity; import com.gh.gamecenter.NormalActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.ask.entity.AnswerEntity; +import com.gh.gamecenter.ask.entity.Questions; import com.gh.gamecenter.ask.questionsdetail.AnswerEditFragment; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; @@ -49,8 +53,8 @@ public class MyDraftFragment extends ListFragment { mAdapter.removePosition(mDraftPosition); mDraftPosition = -1; if (mAdapter.getItemCount() == 0) onLoadEmpty(); - } else if (resultCode == Activity.RESULT_CANCELED && data != null) { - mAdapter.answerContentChange(mDraftPosition, data.getStringExtra(EntranceUtils.KEY_ANSWER_CONTENT)); + } else if (resultCode == AnswerEditFragment.SAVE_DRAFTS && data != null) { + mAdapter.answerContentChange(mDraftPosition, AskUtils.stripHtml(data.getStringExtra(EntranceUtils.KEY_ANSWER_CONTENT))); } } } @@ -67,6 +71,7 @@ public class MyDraftFragment extends ListFragment { @Override public void onListClick(View view, int position, Object data) { + AnswerEntity entity; switch (view.getId()) { case R.id.footerview_item: if (mAdapter.isNetworkError()) { @@ -75,14 +80,24 @@ public class MyDraftFragment extends ListFragment { } break; case R.id.ask_answer_item_constraintlayout: + case R.id.ask_answer_item_content: + case R.id.ask_answer_item_img: mDraftPosition = position; - AnswerEntity entity = ((List) data).get(position); + entity = ((List) data).get(position); Bundle bundle = new Bundle(); bundle.putString(EntranceUtils.KEY_QUESTIONS_TITLE, entity.getQuestions().getTitle()); bundle.putString(EntranceUtils.KEY_ANSWER_CONTENT, entity.getBrief()); bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, entity.getQuestions().getId()); NormalActivity.startFragmentForResult(getContext(), AnswerEditFragment.class, bundle, ANSWER_DRAFT_REQUEST); break; + case R.id.ask_answer_item_title: + String tracers = mEntrance + "+(我的草稿)"; + entity = ((List) data).get(position); + Questions questions = entity.getQuestions(); + startActivity(AskQuestionsDetailActivity.getIntent(getContext(), questions.getId(), tracers)); + + AskLogUtils.uploadQuestions(getContext(), tracers, questions); + break; } } } diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerEditFragment.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerEditFragment.java index fa005bb865..16ab9c9ed8 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerEditFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerEditFragment.java @@ -61,6 +61,7 @@ public class AnswerEditFragment extends NormalFragment { @BindView(R.id.answer_edit_img_icon) ImageView mImgIcon; + public final static int SAVE_DRAFTS = 110; private final static String FILE_HOST = "file:///"; private List mImgArr = new ArrayList<>(); @@ -289,7 +290,7 @@ public class AnswerEditFragment extends NormalFragment { if (getActivity() != null && isExit) { Intent data = new Intent(); data.putExtra(EntranceUtils.KEY_ANSWER_CONTENT, editContent); - getActivity().setResult(Activity.RESULT_CANCELED, data); + getActivity().setResult(SAVE_DRAFTS, data); getActivity().finish(); } else if (!isExit) mCacheAnswerContent = editContent; } diff --git a/app/src/main/java/com/gh/gamecenter/entity/MessageUnreadEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/MessageUnreadEntity.kt index 200dee2865..e38b4a589c 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/MessageUnreadEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/MessageUnreadEntity.kt @@ -8,6 +8,7 @@ import com.google.gson.annotations.SerializedName */ class MessageUnreadEntity { + @SerializedName("message") var comment: Int = 0 @SerializedName("service") diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java index 1447c13619..b1026faec0 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java @@ -510,6 +510,7 @@ public class MessageDetailFragment extends BaseFragment implements OnCommentCall Intent intent = new Intent(); intent.putExtra("commentNum", adapter.getConcernEntity().getCommentnum()); getActivity().setResult(Activity.RESULT_OK, intent); + getActivity().finish(); return true; } return false; diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index ba3c59519f..3b25fb7e37 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -348,7 +348,7 @@ public class PersonalFragment extends BaseFragment implements Observer userInfoEntity) { - Utils.log("=======::" + userInfoEntity); +// Utils.log("=======::" + userInfoEntity); UserInfoEntity notifyUserInfo; if (userInfoEntity != null) { notifyUserInfo = userInfoEntity.getData(); diff --git a/app/src/main/res/layout/activity_suggest.xml b/app/src/main/res/layout/activity_suggest.xml index 761252f08d..74d39298d3 100644 --- a/app/src/main/res/layout/activity_suggest.xml +++ b/app/src/main/res/layout/activity_suggest.xml @@ -102,7 +102,8 @@ android:id = "@+id/suggest_pic_rv" android:layout_width = "match_parent" android:layout_height = "60dp" - android:layout_marginBottom = "12dp" /> + android:layout_marginBottom = "12dp" + android:paddingLeft = "20dp" /> @@ -171,7 +172,7 @@ + android:layout_weight = "1" /> - - - - - - + android:layout_height = "wrap_content" + android:paddingTop = "35dp" /> @@ -44,4 +27,16 @@ + + \ No newline at end of file