diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 581a9182aa..1a63941d53 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -1,5 +1,6 @@ package com.gh.base; +import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -16,6 +17,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBShowDialog; import com.lightgame.download.FileUtils; import com.lightgame.utils.Utils; +import com.tencent.tauth.Tencent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -57,6 +59,16 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe } + //接收QQ或者QQ空间分享回调 + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == com.tencent.connect.common.Constants.REQUEST_QQ_SHARE + || requestCode == com.tencent.connect.common.Constants.REQUEST_QZONE_SHARE) { + Tencent.onActivityResultData(requestCode, resultCode, data, ShareUtils.getInstance(this).QqShareListener); + } + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/com/gh/common/util/BitmapUtils.java b/app/src/main/java/com/gh/common/util/BitmapUtils.java index 771e19ad45..e44035d8b8 100644 --- a/app/src/main/java/com/gh/common/util/BitmapUtils.java +++ b/app/src/main/java/com/gh/common/util/BitmapUtils.java @@ -9,7 +9,9 @@ import android.graphics.drawable.Drawable; import android.media.ExifInterface; import java.io.BufferedOutputStream; +import java.io.ByteArrayOutputStream; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; @@ -51,6 +53,50 @@ public class BitmapUtils { return true; } + /** + * 保存图片 + * + * @param newPath + * @param filePath + * @return + */ + public static boolean savePicture(String newPath, String filePath, int compressSize) { + BitmapFactory.Options options = new BitmapFactory.Options(); + Bitmap bitmap = BitmapFactory.decodeFile(filePath, options); + + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + bitmap.compress(Bitmap.CompressFormat.JPEG, 85, bos); + float zoom = (float) Math.sqrt(compressSize / (float) bos.toByteArray().length); + + Matrix matrix = new Matrix(); + matrix.setScale(zoom, zoom); + + Bitmap result = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true); + bos.reset(); + + result.compress(Bitmap.CompressFormat.JPEG, 85, bos); + + while (bos.toByteArray().length > compressSize) { + matrix.setScale(0.9f, 0.9f); + + result = Bitmap.createBitmap(result, 0, 0, result.getWidth(), result.getHeight(), matrix, true); + bos.reset(); + result.compress(Bitmap.CompressFormat.JPEG, 85, bos); + } + + File file = new File(newPath); + try { + BufferedOutputStream fbos = new BufferedOutputStream(new FileOutputStream(file)); + result.compress(Bitmap.CompressFormat.JPEG, 85, fbos); + } catch (FileNotFoundException e) { + e.printStackTrace(); + return false; + } + + return true; + } + /** * 根据文件路径返回bitmap * diff --git a/app/src/main/java/com/gh/common/util/ImageUtils.kt b/app/src/main/java/com/gh/common/util/ImageUtils.kt index b363dbfee3..d3cdb1452a 100644 --- a/app/src/main/java/com/gh/common/util/ImageUtils.kt +++ b/app/src/main/java/com/gh/common/util/ImageUtils.kt @@ -128,7 +128,7 @@ class ImageUtils private constructor() { var index = 0 for (s in imgArr) { path = context.getCacheDir().path + File.separator + System.currentTimeMillis() + index + ".jpg" - if (BitmapUtils.savePicture(path, s)) { + if (BitmapUtils.savePicture(path, s, 200000)) { subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "support/upload/img?type=community", path, s, UserManager.getInstance().token)) index++ } else { 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 37ffb7ff99..75b75b5359 100644 --- a/app/src/main/java/com/gh/common/view/RichEditor.java +++ b/app/src/main/java/com/gh/common/view/RichEditor.java @@ -23,6 +23,8 @@ 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 @@ -425,6 +427,33 @@ public class RichEditor extends WebView { exec("javascript:RE.blurFocus();"); } + + 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(); //返回文本字符串 + } + + private String convertHexColorString(int color) { return String.format("#%06X", (0xFFFFFF & color)); } diff --git a/app/src/main/java/com/gh/gamecenter/AskQuestionsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/AskQuestionsDetailActivity.java index 2d05ece162..15b2c279f8 100644 --- a/app/src/main/java/com/gh/gamecenter/AskQuestionsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AskQuestionsDetailActivity.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.support.v4.app.FragmentManager; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.widget.RelativeLayout; @@ -92,10 +93,14 @@ public class AskQuestionsDetailActivity extends BaseActivity implements Fragment } else { shreIcon = getString(R.string.share_ghzs_logo); } + String description = data.getDescription(); + if (TextUtils.isEmpty(description)) { + description = getString(R.string.ask_share_default_summary); + } ShareUtils.getInstance(this).showShareWindows(view, "http://www.ghzs.com/qa/xjqxz" , shreIcon , getString(R.string.ask_share_questions_title, data.getTitle(), data.getAnswersCount()) - , data.getDescription(), ShareUtils.ShareType.askNormal); + , description, ShareUtils.ShareType.askNormal); } } @@ -179,7 +184,7 @@ public class AskQuestionsDetailActivity extends BaseActivity implements Fragment mShareIv.setVisibility(View.GONE); break; case QUESTIONS_DETAIL_FOLD: - setNavigationTitle("折叠答案"); + setNavigationTitle("折叠回答"); if (mShareIv != null && mShareIv.getVisibility() == View.VISIBLE) mShareIv.setVisibility(View.GONE); break; diff --git a/app/src/main/java/com/gh/gamecenter/AskSearchActivity.java b/app/src/main/java/com/gh/gamecenter/AskSearchActivity.java index 7b274cbad8..67058a433d 100644 --- a/app/src/main/java/com/gh/gamecenter/AskSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AskSearchActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.os.Bundle; import android.os.Message; import android.text.Editable; -import android.text.TextUtils; import android.text.TextWatcher; import android.view.KeyEvent; import android.view.View; @@ -96,7 +95,7 @@ public class AskSearchActivity extends BaseActivity { if (!newSearchKey.equals(mSearchKey)) { mBaseHandler.removeMessages(1); mSearchKey = newSearchKey; - if (mSearchKey.length() > 0) { + if (mSearchKey.length() >= 0) { mBaseHandler.sendEmptyMessageDelayed(1, 300); } } @@ -113,7 +112,7 @@ public class AskSearchActivity extends BaseActivity { } private void search() { - if (!TextUtils.isEmpty(mSearchKey) && mAskSearchFragment != null) { + if (mAskSearchFragment != null) { mAskSearchFragment.search(mSearchKey); } } diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 88384fb0de..b86e54fc11 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -51,7 +51,6 @@ import com.jakewharton.rxbinding.view.RxView; import com.lightgame.download.DataWatcher; import com.lightgame.download.DownloadEntity; import com.lightgame.utils.Utils; -import com.tencent.tauth.Tencent; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -226,18 +225,6 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, protected int getLayoutId() { return R.layout.activity_news_detail; } - - //接收QQ或者QQ空间分享回调 - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - - if (requestCode == com.tencent.connect.common.Constants.REQUEST_QQ_SHARE - || requestCode == com.tencent.connect.common.Constants.REQUEST_QZONE_SHARE) { - Tencent.onActivityResultData(requestCode, resultCode, data, ShareUtils.getInstance(this).QqShareListener); - } - } - // @Override // public boolean onCreateOptionsMenu(Menu menu) { // diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskAnswerDetailFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskAnswerDetailFragment.java index 9010fc25df..08683296f6 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskAnswerDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskAnswerDetailFragment.java @@ -6,6 +6,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.content.ContextCompat; +import android.text.TextUtils; import android.view.MenuItem; import android.view.View; import android.webkit.JavascriptInterface; @@ -38,8 +39,6 @@ import com.lightgame.config.CommonDebug; import org.json.JSONObject; import java.util.ArrayList; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import butterknife.BindView; import butterknife.OnClick; @@ -123,7 +122,7 @@ public class AskAnswerDetailFragment extends NormalFragment { @JavascriptInterface public void imageClick(String url) { if (url.contains("web_load_dfimg_icon.png")) { - mBaseHandler.post(() -> mRichEditor.replaceAllDfImage()); + mBaseHandler.post(() -> mRichEditor.replaceAllDfImage()); } else if (url.contains("/tb/")) { mBaseHandler.post(() -> mRichEditor.replaceDfImageByUrl(url)); } else { @@ -148,44 +147,27 @@ public class AskAnswerDetailFragment extends NormalFragment { } } - private String getAnswerText() { - String htmlStr = mRichEditor.getHtml(); - 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(); //返回文本字符串 - } - @Override public void onMenuItemClick(MenuItem menuItem) { switch (menuItem.getItemId()) { case R.id.menu_share: if (mDetailEntity == null) return; - String shreIcon; + String shareIcon; + String shareSummary = mRichEditor.getText(); if (mAnswersImgs.size() > 0) { - shreIcon = mAnswersImgs.get(0); + shareIcon = mAnswersImgs.get(0); } else { - shreIcon = getString(R.string.share_ghzs_logo); + shareIcon = getString(R.string.share_ghzs_logo); + } + if (TextUtils.isEmpty(shareSummary)) { + shareSummary = getString(R.string.ask_share_default_summary); } ShareUtils.getInstance(getActivity()).showShareWindows(getView(), "http://www.ghzs.com/qa/xjqxz" - , shreIcon + , shareIcon , getString(R.string.ask_share_answers_title, mDetailEntity.getUser().getName(), mDetailEntity.getQuestion().getTitle(), mDetailEntity.getVote()) - , getAnswerText(), ShareUtils.ShareType.askNormal); + , shareSummary, ShareUtils.ShareType.askNormal); break; case R.id.menu_collect: CheckLoginUtils.checkLogin(getContext(), () -> { diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java index 9ed58d6af1..b173ff2f8a 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java @@ -147,7 +147,7 @@ public class AskQuestionsNewFragment extends BaseFragment { mTablayout.setupWithViewPager(mViewpager); mTabIndicatorView.setupWithTabLayout(mTablayout); mTabIndicatorView.setupWithViewPager(mViewpager); - mTabIndicatorView.setIndicatorWidth(45); +// mTabIndicatorView.setIndicatorWidth(45); mTablayout.addTab(mTablayout.newTab()); // 调整顺序 item diff --git a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java index 38e772f84d..e6c7908b44 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java @@ -27,10 +27,12 @@ import com.gh.base.fragment.WaitingDialogFragment; import com.gh.common.util.AskErrorResponseUtils; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DisplayUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.GsonUtils; import com.gh.common.util.ImageUtils; import com.gh.gamecenter.AskQuestionsDetailActivity; import com.gh.gamecenter.R; +import com.gh.gamecenter.WebActivity; import com.gh.gamecenter.ask.entity.QuestionsDetailEntity; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.normal.NormalFragment; @@ -76,6 +78,8 @@ public class QuestionsEditFragment extends NormalFragment { RecyclerView mPicRv; @BindView(R.id.questionsedit_tag_add) TextView mTagAdd; + @BindView(R.id.questionsedit_tips) + View mTips; private SuggestPicAdapter mAdapter; @@ -84,6 +88,8 @@ public class QuestionsEditFragment extends NormalFragment { private List mTagList = new ArrayList<>(); private List mAllTagList = new ArrayList<>(); + private String mSearchKey; + @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { @@ -129,6 +135,10 @@ public class QuestionsEditFragment extends NormalFragment { @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Bundle arguments = getArguments(); + if (arguments != null) { + mSearchKey = arguments.getString(EntranceUtils.KEY_SEARCHKEY); + } getCommunitiesTags(); } @@ -137,6 +147,7 @@ public class QuestionsEditFragment extends NormalFragment { super.onViewCreated(view, savedInstanceState); setNavigationTitle(UserManager.getInstance().getCommunityName(getContext())); mPicRv.setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.HORIZONTAL, false)); + if (!TextUtils.isEmpty(mSearchKey)) mTitle.setText(mSearchKey); // 意见反馈上传图片列表 mPicRv.setLayoutManager(new GridLayoutManager(getContext(), 5) { @@ -149,7 +160,7 @@ public class QuestionsEditFragment extends NormalFragment { mPicRv.setAdapter(mAdapter); } - @OnClick({R.id.questionsedit_tag_add, R.id.questionsedit_post}) + @OnClick({R.id.questionsedit_tag_add, R.id.questionsedit_post, R.id.questionsedit_tips}) public void onClick(View v) { switch (v.getId()) { case R.id.questionsedit_tag_add: @@ -178,6 +189,9 @@ public class QuestionsEditFragment extends NormalFragment { }); }); break; + case R.id.questionsedit_tips: + startActivity(WebActivity.getIntentByUrl(getContext(), getString(R.string.questionsedit_tips_url))); + break; } } diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldFragment.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldFragment.java index 300e496a78..0043825b37 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldFragment.java @@ -9,6 +9,7 @@ import com.gh.common.util.EntranceUtils; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.NormalActivity; import com.gh.gamecenter.R; +import com.gh.gamecenter.WebActivity; import com.gh.gamecenter.ask.AskAnswerDetailFragment; import com.gh.gamecenter.ask.entity.AnswerEntity; import com.gh.gamecenter.baselist.ListAdapter; @@ -55,6 +56,7 @@ public class AnswerFoldFragment extends ListFragment { if (getArguments() != null) mQuestionsId = getArguments().getString(EntranceUtils.KEY_QUESTIONS_ID); super.onCreate(savedInstanceState); + mFlodHint.setOnClickListener((v) -> startActivity(WebActivity.getIntentByUrl(getContext(), getString(R.string.answer_fold_tips_url)))); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteFragment.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteFragment.java index 8e6fb85140..9762ff48bf 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteFragment.java @@ -2,6 +2,7 @@ package com.gh.gamecenter.ask.questionsdetail; import android.os.Bundle; import android.support.annotation.Nullable; +import android.text.TextUtils; import android.view.View; import com.gh.common.util.AskErrorResponseUtils; @@ -97,9 +98,13 @@ public class QuestionsInviteFragment extends ListFragment { userName = "我"; } + String description = mQuestionsDetailEntity.getDescription(); + if (TextUtils.isEmpty(description)) { + description = getString(R.string.ask_share_default_summary); + } ShareUtils.getInstance(getActivity()).showShareWindows(view, "http://www.ghzs.com/qa/xjqxz" - , shreIcon, getString(R.string.ask_share_invite_title, userName, mQuestionsDetailEntity.getTitle()) - , mQuestionsDetailEntity.getDescription(), ShareUtils.ShareType.askInvite); + , shreIcon, getString(R.string.ask_share_invite_title, userName, mQuestionsDetailEntity.getTitle()) + , description, ShareUtils.ShareType.askInvite); break; } diff --git a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchFragment.java b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchFragment.java index 82de2b40d4..d2a5d1ea3e 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchFragment.java @@ -41,6 +41,9 @@ public class AskSearchFragment extends ListFragment { @BindView(R.id.list_ask_hint) View mSearchHint; + @BindView(R.id.list_ask_shadow) + View mSearchShadow; + private AskSearchAdapter mAdapter; private String mSearchKey; @@ -125,6 +128,7 @@ public class AskSearchFragment extends ListFragment { mReuseNoData.setVisibility(View.VISIBLE); mListLoading.setVisibility(View.GONE); mListRefresh.setRefreshing(false); + mAdapter.provideListData(null); // 刷新页面 } @Override @@ -163,11 +167,22 @@ public class AskSearchFragment extends ListFragment { @OnClick(R.id.search_questions_skip) public void onClick(View view) { if (view.getId() == R.id.search_questions_skip) { - CheckLoginUtils.checkLogin(getContext(), () -> NormalActivity.startFragment(getContext(), QuestionsEditFragment.class)); + CheckLoginUtils.checkLogin(getContext(), () -> { + Bundle bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_SEARCHKEY, mSearchKey); + NormalActivity.startFragment(getContext(), QuestionsEditFragment.class, bundle); + }); } } public void search(String searchKey) { + if (TextUtils.isEmpty(searchKey)) { // 恢复默认状态 + mReuseNoConn.setVisibility(View.GONE); + mReuseNoData.setVisibility(View.GONE); + mListLoading.setVisibility(View.GONE); + mAdapter.provideListData(null); + return; + } postLog(true); mAdapter.setSearchKey(searchKey); mSearchKey = searchKey; @@ -175,6 +190,7 @@ public class AskSearchFragment extends ListFragment { if (mSearchHint.getVisibility() == View.GONE) { mSearchHint.setVisibility(View.VISIBLE); + mSearchShadow.setVisibility(View.VISIBLE); } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java index f6649ce798..8a6bbdc441 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java @@ -1,6 +1,5 @@ package com.gh.gamecenter.gamedetail; -import android.content.Intent; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; @@ -46,7 +45,6 @@ import com.lightgame.download.DataWatcher; import com.lightgame.download.DownloadEntity; import com.lightgame.utils.Utils; import com.lightgame.view.NoScrollableViewPager; -import com.tencent.tauth.Tencent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -147,18 +145,6 @@ public class GameDetailFragment extends NormalFragment implements View.OnTouchLi return R.layout.fragment_gamedetail; } - //接收QQ或者QQ空间分享回调 - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - - if (requestCode == com.tencent.connect.common.Constants.REQUEST_QQ_SHARE - || requestCode == com.tencent.connect.common.Constants.REQUEST_QZONE_SHARE) { - Tencent.onActivityResultData(requestCode, resultCode, data, ShareUtils.getInstance(getActivity()).QqShareListener); - } - - } - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/com/gh/gamecenter/login/UserRepository.java b/app/src/main/java/com/gh/gamecenter/login/UserRepository.java index 4cf59fb9c4..d1f0c245c9 100644 --- a/app/src/main/java/com/gh/gamecenter/login/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/login/UserRepository.java @@ -10,6 +10,7 @@ import android.support.annotation.Nullable; import android.text.TextUtils; import com.gh.common.constant.Constants; +import com.gh.common.util.AppDebugConfig; import com.gh.common.util.DeviceUtils; import com.gh.common.util.GetLoginDataUtils; import com.gh.common.util.LoginUtils; @@ -132,6 +133,7 @@ class UserRepository { mCachedId = null; PreferenceManager.getDefaultSharedPreferences(mContext).edit().putString(Constants.LOGIN_TOKEN_ID, null).apply(); GetLoginDataUtils.getInstance(mContext).QQLogout(); + UserManager.getInstance().logout(); } public LiveData> getLoginUserInfo() { @@ -274,7 +276,7 @@ class UserRepository { String string = httpException.response().errorBody().string(); JSONObject content = new JSONObject(string); int code = content.getInt("code"); - Utils.toast(mContext, mContext.getString(R.string.login_refresh_error)); +// Utils.toast(mContext, mContext.getString(R.string.login_refresh_error)); if (code == 40802) { // 其他设备登录了该账号 EventBus.getDefault().post(new EBShowDialog("loginException", string)); // 打开提示框 } @@ -282,12 +284,13 @@ class UserRepository { if (code == 40802 || code == 40401) { // 自动注销 logout(); } else { - // todo 其实这里不用管 ApiResponse value = new ApiResponse<>(); value.setThrowable(value.getThrowable()); value.setHttpException(httpException); mLoginObsResponseUserInfo.postValue(value); } + + if (AppDebugConfig.IS_DEBUG) Utils.log("refreshToken::" + code); } catch (Exception e1) { e1.printStackTrace(); } diff --git a/app/src/main/java/com/gh/gamecenter/login/UserViewModel.java b/app/src/main/java/com/gh/gamecenter/login/UserViewModel.java index 8268c06f68..3aeba74ce0 100644 --- a/app/src/main/java/com/gh/gamecenter/login/UserViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/login/UserViewModel.java @@ -11,7 +11,6 @@ import android.text.TextUtils; import com.gh.common.constant.Constants; import com.gh.gamecenter.entity.UserInfoEntity; -import com.gh.gamecenter.manager.UserManager; import org.json.JSONObject; @@ -74,7 +73,6 @@ public class UserViewModel extends AndroidViewModel { public void logout() { setCurrentUserId(null); mUserRepository.logout(); - UserManager.getInstance().logout(); } private void setCurrentUserId(String currentUserId) { diff --git a/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java b/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java index 25659ab6c7..269328026a 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java @@ -5,7 +5,6 @@ import android.preference.PreferenceManager; import com.gh.common.constant.Constants; import com.gh.common.util.DeviceUtils; -import com.gh.gamecenter.R; import com.gh.gamecenter.entity.LoginTokenEntity; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.eventbus.EBReuse; @@ -16,7 +15,6 @@ import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.retrofit.service.ApiService; import com.gh.gamecenter.retrofit.service.UserseaService; -import com.lightgame.utils.Utils; import org.greenrobot.eventbus.EventBus; import org.json.JSONException; @@ -112,7 +110,7 @@ public class RefreshTokenManager { String string = e.response().errorBody().string(); JSONObject content = new JSONObject(string); int code = content.getInt("code"); - Utils.toast(mContext, mContext.getString(R.string.login_refresh_error)); +// Utils.toast(mContext, mContext.getString(R.string.login_refresh_error)); if (code == 40802) { // 其他设备登录了该账号 EventBus.getDefault().post(new EBShowDialog("loginException", string)); // 打开提示框 } 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 59f3478d90..ba3c59519f 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); UserInfoEntity notifyUserInfo; if (userInfoEntity != null) { notifyUserInfo = userInfoEntity.getData(); diff --git a/app/src/main/res/layout/ask_search_actionbar.xml b/app/src/main/res/layout/ask_search_actionbar.xml index 1d525e0641..b426b27509 100644 --- a/app/src/main/res/layout/ask_search_actionbar.xml +++ b/app/src/main/res/layout/ask_search_actionbar.xml @@ -50,7 +50,7 @@ android:layout_centerVertical = "true" android:layout_marginRight = "20dp" android:src = "@drawable/ask_search_input_delete" - android:visibility = "visible" /> + android:visibility = "gone" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_ask_search.xml b/app/src/main/res/layout/fragment_ask_search.xml index 3094217708..516504bf01 100644 --- a/app/src/main/res/layout/fragment_ask_search.xml +++ b/app/src/main/res/layout/fragment_ask_search.xml @@ -3,38 +3,6 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" > - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_questions_edit.xml b/app/src/main/res/layout/fragment_questions_edit.xml index c736a8c02d..a1dddb1fff 100644 --- a/app/src/main/res/layout/fragment_questions_edit.xml +++ b/app/src/main/res/layout/fragment_questions_edit.xml @@ -140,6 +140,7 @@ android:textSize = "13sp" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 637ca67cac..e68508f09e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -460,7 +460,7 @@ 最多选择3张图片 没有你想要的？ 点我提问 - 查看折叠答案 + 查看折叠回答 没有我的游戏？点击提交 %1$d 回答 @@ -502,7 +502,7 @@ 我来回答 继续回答 邀请回答 - 编写答案 + 撰写回答 修改答案 网络错误 @@ -511,5 +511,8 @@ %1$s邀请你回答：%2$s %1$s回答了：%2$s(%3$d个赞同) http://image.ghzhushou.com/pic/57d604808ab49e467d8b4568.png + http://www.ghzs.com/article/5a4e14a1d53f8b26008b45d0.html + http://www.ghzs.com/article/5a50a008d53f8b23008b465a.html + 光环助手，快乐前行的游戏问答社区 diff --git a/libraries/LogHub/src/main/res/values/strings.xml b/libraries/LogHub/src/main/res/values/strings.xml deleted file mode 100644 index 7f19b437a6..0000000000 --- a/libraries/LogHub/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - LogHub -