From 8e8b20c3dd3ef74b700dd99edae815570734c347 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Fri, 25 Aug 2017 17:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.0?= =?UTF-8?q?=EF=BC=888=E6=9C=8824=E6=97=A5=EF=BC=89=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=8C=85=E9=97=AE=E9=A2=98=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/base/fragment/BaseFragment.java | 2 +- .../java/com/gh/common/util/LoginUtils.java | 58 +++++---- .../java/com/gh/gamecenter/MainActivity.java | 2 +- .../com/gh/gamecenter/NewsDetailActivity.java | 2 + .../gh/gamecenter/SelectUserIconActivity.java | 4 +- .../com/gh/gamecenter/UserAreaActivity.java | 4 +- .../com/gh/gamecenter/UserInfoActivity.java | 11 +- .../gh/gamecenter/UserInfoEditActivity.java | 21 +++- .../java/com/gh/gamecenter/WebActivity.java | 2 + .../gamecenter/game/GameFragmentAdapter.java | 2 +- .../gamecenter/game/GamePluginViewHolder.java | 3 + .../gamecenter/gamedetail/XinXiFragment.java | 5 +- .../gamecenter/login/BaseLoginFragment.java | 6 +- .../gamecenter/personal/PersonalFragment.java | 5 +- .../search/SearchGameDetailFragment.java | 13 +- .../search/SearchGameListFragment.java | 13 +- .../gamecenter/subject/SubjectFragment.java | 10 +- .../border_captcha_bg.xml | 0 app/src/main/res/drawable/et_line_login.xml | 10 ++ app/src/main/res/layout/activity_setting.xml | 2 +- .../res/layout/activity_userinfo_edit.xml | 83 +++++++++---- app/src/main/res/layout/fragment_login.xml | 59 +++++---- .../res/layout/fragment_login_olduser.xml | 55 +++++---- app/src/main/res/layout/fragment_personal.xml | 114 ------------------ app/src/main/res/layout/game_plugin_item.xml | 1 + app/src/main/res/values/strings.xml | 2 +- 26 files changed, 246 insertions(+), 243 deletions(-) rename app/src/main/res/{drawable-xxhdpi => drawable}/border_captcha_bg.xml (100%) create mode 100644 app/src/main/res/drawable/et_line_login.xml diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment.java b/app/src/main/java/com/gh/base/fragment/BaseFragment.java index ece1663629..6f5366e269 100644 --- a/app/src/main/java/com/gh/base/fragment/BaseFragment.java +++ b/app/src/main/java/com/gh/base/fragment/BaseFragment.java @@ -116,7 +116,7 @@ public abstract class BaseFragment extends Fragment implements OnRequestCallB @Override public void onResume() { super.onResume(); - isEverPause = false; // TODO 导致根据isEverPause判断的方法无法执行 + isEverPause = false; } @Override diff --git a/app/src/main/java/com/gh/common/util/LoginUtils.java b/app/src/main/java/com/gh/common/util/LoginUtils.java index c379c9988c..207e32aebc 100644 --- a/app/src/main/java/com/gh/common/util/LoginUtils.java +++ b/app/src/main/java/com/gh/common/util/LoginUtils.java @@ -350,6 +350,14 @@ public class LoginUtils { @Override public void onResponse(UserInfoEntity response) { super.onResponse(response); + + String region = response.getRegion(); + if (region != null && region.contains("中国")) { // 转换地区格式 + String replace = region.replace("中国 ", ""); + region = replace.replace(" ", "-"); + response.setRegion(region); + } + saveUserInfo(context, response); if (listener != null) { listener.onLogin(response, loginTag); @@ -446,31 +454,14 @@ public class LoginUtils { } //更改用户信息 - public static void changeUserInfo(final onChangeUserInfoListener listener, final Context context, String content, String editType) { + public static void changeUserInfo(final onChangeUserInfoListener listener, final Context context, + final String content, final String editType) { final UserInfoEntity entity = getUserInfo(context); if (entity == null) { return; } - - switch (editType) { - case "nickName": - entity.setName(content); - break; - case "contact": - entity.setContact(content); - break; - case "sex": - entity.setGender(content); - break; - case "area": - entity.setRegion(content); - break; - case "userIcon": - entity.setIcon(content); - break; - default: - return; - } + Map map = new HashMap<>(); + map.put(editType, content); final Dialog loadingDialog = DialogUtils.showWaitDialog(context, "正在修改信息..."); @@ -478,7 +469,7 @@ public class LoginUtils { if (loginToken == null || loginToken.getAccessToken() == null) return; RequestBody body = RequestBody.create(MediaType.parse("application/json"), - new Gson().toJson(entity)); + new JSONObject(map).toString()); RetrofitManager .getUsersea() .changeUserInfo(loginToken.getAccessToken().getValue(), body) @@ -491,8 +482,29 @@ public class LoginUtils { if (loadingDialog != null) { loadingDialog.dismiss(); } + switch (editType) { + case "name": + entity.setName(content); + break; + case "contact": + entity.setContact(content); + break; + case "gender": + entity.setGender(content); + break; + case "region": + entity.setRegion(content); + break; + case "icon": + entity.setIcon(content); + break; + default: + return; + } saveUserInfo(context, entity); + + listener.onChange(); } @@ -529,7 +541,7 @@ public class LoginUtils { Utils.toast(context, "参数不全"); break; case 40001: - Utils.toast(context, "已经发送过短信"); + Utils.toast(context, "验证码获取过快，请稍后重试");// 已经发送过短信 break; case 40002: Utils.toast(context, "请求第三方开放平台时发生错误"); diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 106973a1b3..00acf9a2e5 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -702,7 +702,7 @@ public class MainActivity extends BaseActivity { getSuggestionType(); - if (getIntent() != null && getIntent().getBundleExtra(KEY_DATA) != null + if (LoginUtils.getUserInfo(this) != null && getIntent() != null && getIntent().getBundleExtra(KEY_DATA) != null && getIntent().getBundleExtra(KEY_DATA).getBoolean("exceptionReStart", false)) { DialogUtils.showWarningDialog(this, "发生闪退", "光环助手刚刚发生了闪退，反馈一下（只需简单描述你刚才的操作）以帮忙我们更好地修复问题？" , "暂不", " 反馈一下", new DialogUtils.ConfirmListener() { diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index c094a1847d..0d862bbb35 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -583,6 +583,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, mCollectionDao.delete(mNewsEntity.getId()); mNewsCollection.setEnabled(true); mNewsCollection.setImageResource(R.drawable.detail_collection_unselect); + toast("取消收藏"); } @Override @@ -603,6 +604,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, mCollectionDao.add(mNewsEntity.getId()); mNewsCollection.setEnabled(true); mNewsCollection.setImageResource(R.drawable.detail_collection_select); + toast("收藏成功"); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java index acc28dccd1..52adaa78d8 100644 --- a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java @@ -79,7 +79,7 @@ public class SelectUserIconActivity extends BaseActivity implements LoginUtils.o // intent.putExtra("url", url); // setResult(0x125, intent); // finish(); - LoginUtils.changeUserInfo(this, this, url, "userIcon"); + LoginUtils.changeUserInfo(this, this, url, "icon"); } } @@ -172,7 +172,7 @@ public class SelectUserIconActivity extends BaseActivity implements LoginUtils.o // intent.putExtra("url", iconUrl); // setResult(0x125, intent); // finish(); - LoginUtils.changeUserInfo(this, this, iconUrl, "userIcon"); + LoginUtils.changeUserInfo(this, this, iconUrl, "icon"); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/UserAreaActivity.java b/app/src/main/java/com/gh/gamecenter/UserAreaActivity.java index 8035d5216f..d97a930586 100644 --- a/app/src/main/java/com/gh/gamecenter/UserAreaActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserAreaActivity.java @@ -136,11 +136,11 @@ public class UserAreaActivity extends BaseActivity implements AreaAdapter.OnArea } else { String content; if (mProvinceName != null) { - content = mProvinceName + " - " + area; + content = mProvinceName + "-" + area; } else { content = area; } - LoginUtils.changeUserInfo(this, this, content, "area"); + LoginUtils.changeUserInfo(this, this, content, "region"); } } diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java index fa1bd077da..6e4380edc6 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java @@ -79,15 +79,22 @@ public class UserInfoActivity extends BaseActivity { String region = userInfo.getRegion(); if (!TextUtils.isEmpty(region)) { mUserinfoAreaTv.setText(region); + } else { + mUserinfoAreaTv.setText("未选择"); } + String gender = userInfo.getGender(); if (!TextUtils.isEmpty(gender)) { mUserinfoSexTv.setText(gender); + } else { + mUserinfoSexTv.setText("未选择"); } String contact = userInfo.getContact(); if (!TextUtils.isEmpty(contact)) { mUserinfoContactTv.setText(contact); + } else { + mUserinfoContactTv.setText("未选择"); } } } @@ -100,10 +107,10 @@ public class UserInfoActivity extends BaseActivity { startActivityForResult(SelectUserIconActivity.getIntent(this), 0x130); break; case R.id.userinfo_nickname_rl: - startActivityForResult(UserInfoEditActivity.getIntent(this, "nickName"), 0x130); + startActivityForResult(UserInfoEditActivity.getIntent(this, "name"), 0x130); break; case R.id.userinfo_sex_rl: - startActivityForResult(UserInfoEditActivity.getIntent(this, "sex"), 0x130); + startActivityForResult(UserInfoEditActivity.getIntent(this, "gender"), 0x130); break; case R.id.userinfo_area_rl: startActivityForResult(UserAreaActivity.getIntent(this), 0x130); diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java index 1a932930ef..826d2cce5f 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java @@ -29,6 +29,7 @@ import butterknife.OnClick; */ public class UserInfoEditActivity extends BaseActivity implements LoginUtils.onChangeUserInfoListener { + @BindView(R.id.userinfo_sex_man) TextView mUserinfoSexMan; @BindView(R.id.userinfo_sex_woman) @@ -47,6 +48,10 @@ public class UserInfoEditActivity extends BaseActivity implements LoginUtils.onC ImageView mUserinfoContactIv; @BindView(R.id.userinfo_edit_contact) LinearLayout mUserinfoEditContact; + @BindView(R.id.userinfo_sex_man_select) + View mUserinfoSexmanSelect; + @BindView(R.id.userinfo_sex_woman_select) + View mUserinfoSexWomanSelect; TextView mSaveTv; @@ -103,11 +108,21 @@ public class UserInfoEditActivity extends BaseActivity implements LoginUtils.onC private void initView() { String title; switch (mEditType) { - case "sex": + case "gender": mUserinfoEditSex.setVisibility(View.VISIBLE); title = "选择性别"; + String gender = mUserInfoEntity.getGender(); + if (!TextUtils.isEmpty(gender)) { + if (gender.equals("男")) { + mUserinfoSexmanSelect.setVisibility(View.VISIBLE); + mUserinfoSexWomanSelect.setVisibility(View.GONE); + } else { + mUserinfoSexmanSelect.setVisibility(View.GONE); + mUserinfoSexWomanSelect.setVisibility(View.VISIBLE); + } + } break; - case "nickName": + case "name": mUserinfoEditNickname.setVisibility(View.VISIBLE); mSaveTv.setVisibility(View.VISIBLE); mUserinfoNicknameEt.addTextChangedListener(new UserInfoEditTextWatcher(mUserinfoNicknameEt)); @@ -135,7 +150,7 @@ public class UserInfoEditActivity extends BaseActivity implements LoginUtils.onC } private void saveData() { - if ("nickName".equals(mEditType)) { + if ("name".equals(mEditType)) { String value = mUserinfoNicknameEt.getText().toString(); if (!TextUtils.isEmpty(value)) { LoginUtils.changeUserInfo(this, this, value, mEditType); diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java index 755acfd075..10094b093c 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java @@ -307,6 +307,7 @@ public class WebActivity extends BaseActivity { mCollectionDao.delete(mToolBoxEntity.getId()); mCollectionIv.setEnabled(true); mCollectionIv.setImageResource(R.drawable.detail_collection_unselect); + toast("取消收藏"); } @Override @@ -327,6 +328,7 @@ public class WebActivity extends BaseActivity { mCollectionDao.add(mToolBoxEntity.getId()); mCollectionIv.setEnabled(true); mCollectionIv.setImageResource(R.drawable.detail_collection_select); + toast("收藏成功"); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index ee35956afe..232b6392db 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -579,7 +579,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { // } holder.mHeadTitle.setText(String.format(Locale.getDefault(), "你有%d个游戏可以升级插件版", mPluginList.size())); - holder.mHeadOpen.setOnClickListener(new OnClickListener() { + holder.mPluginHead.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { if (isOpenPluginList) { diff --git a/app/src/main/java/com/gh/gamecenter/game/GamePluginViewHolder.java b/app/src/main/java/com/gh/gamecenter/game/GamePluginViewHolder.java index 30b490ad37..19c3f39f5c 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GamePluginViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/game/GamePluginViewHolder.java @@ -3,6 +3,7 @@ package com.gh.gamecenter.game; import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import com.gh.base.BaseRecyclerViewHolder; @@ -22,6 +23,8 @@ public class GamePluginViewHolder extends BaseRecyclerViewHolder { ImageView mHeadOpen; @BindView(R.id.plugin_rv) RecyclerView mPluginRv; + @BindView(R.id.plugin_head) + LinearLayout mPluginHead; public GamePluginViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiFragment.java index 6665166e82..37dc2da483 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiFragment.java @@ -88,8 +88,11 @@ public class XinXiFragment extends BaseFragment { @Override public void onResume() { - super.onResume(); DownloadManager.getInstance(getActivity()).addObserver(dataWatcher); + if (isEverPause && mAdapter != null) { + mAdapter.notifyDataSetChanged(); + } + super.onResume(); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/login/BaseLoginFragment.java b/app/src/main/java/com/gh/gamecenter/login/BaseLoginFragment.java index 86190737af..91c647c451 100644 --- a/app/src/main/java/com/gh/gamecenter/login/BaseLoginFragment.java +++ b/app/src/main/java/com/gh/gamecenter/login/BaseLoginFragment.java @@ -68,7 +68,7 @@ public abstract class BaseLoginFragment extends BaseFragment implements LoginUti message.what = 0; message.arg1 = arg1; mHandler.sendMessageDelayed(message, 1000); - mLoginCaptcha.setText(String.valueOf(arg1)); + mLoginCaptcha.setText(arg1 + "s"); } else { mLoginCaptcha.setText("重新获取"); mLoginCaptcha.setTextColor(ContextCompat.getColor(getContext(), R.color.title)); @@ -225,7 +225,9 @@ public abstract class BaseLoginFragment extends BaseFragment implements LoginUti } } drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight()); - mEditText.setCompoundDrawables(drawable, null, null, null); + Drawable line = ContextCompat.getDrawable(getContext(), R.drawable.et_line_login); + line.setBounds(0, 0, line.getMinimumWidth(), line.getMinimumHeight()); + mEditText.setCompoundDrawables(drawable, null, null, line); } @Override 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 60a145a418..69482a4f95 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -194,10 +194,9 @@ public class PersonalFragment extends BaseFragment implements GetLoginDataUtils. break; case R.id.personal_login_wechat: if (mUserInfoEntity != null) { - toast("签到"); - DialogUtils.showWarningDialog(getContext(), "签到", "签到暂未开放，如有建议请反馈给我们，万分感谢！" - , "关闭", "反馈", new DialogUtils.ConfirmListener() { + DialogUtils.showWarningDialog(getContext(), "广纳良言", "签到功能暂未开放，如果你有好的建议请反馈给我们，谢谢！" + , "以后再说", " 我有一个想法", new DialogUtils.ConfirmListener() { @Override public void onConfirm() { SuggestionActivity.startSuggestionActivity(getContext(), 2, null, "签到功能的建议："); diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java index c7a6fa5dc9..8503528605 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java @@ -5,6 +5,7 @@ import android.graphics.Rect; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.FragmentActivity; +import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.Gravity; @@ -13,18 +14,18 @@ import android.view.ViewTreeObserver; import android.widget.LinearLayout; import android.widget.TextView; +import com.gh.base.OnRequestCallBackListener; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.view.VerticalItemDecoration; -import com.lightgame.download.DataWatcher; -import com.lightgame.download.DownloadEntity; import com.gh.download.DownloadManager; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; -import com.gh.base.OnRequestCallBackListener; +import com.lightgame.download.DataWatcher; +import com.lightgame.download.DownloadEntity; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -101,6 +102,7 @@ public class SearchGameDetailFragment extends BaseFragment implements OnRequestC search_detail.setHasFixedSize(true); search_detail.addItemDecoration(new VerticalItemDecoration(getContext(), 8, true)); search_detail.setLayoutManager(new LinearLayoutManager(getActivity())); + ((DefaultItemAnimator) search_detail.getItemAnimator()).setSupportsChangeAnimations(false); adapter = new SearchGameDetailFragmentAdapter(SearchGameDetailFragment.this, key, type, mEntrance); search_detail.setAdapter(adapter); @@ -127,8 +129,11 @@ public class SearchGameDetailFragment extends BaseFragment implements OnRequestC @Override public void onResume() { - super.onResume(); + if (isEverPause && adapter != null) { + adapter.notifyDataSetChanged(); + } DownloadManager.getInstance(getContext()).addObserver(dataWatcher); + super.onResume(); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java index 05639f5919..e98e12b557 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java @@ -5,6 +5,7 @@ import android.graphics.Rect; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.FragmentActivity; +import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.Gravity; @@ -13,18 +14,18 @@ import android.view.ViewTreeObserver; import android.widget.LinearLayout; import android.widget.TextView; +import com.gh.base.OnRequestCallBackListener; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.view.VerticalItemDecoration; -import com.lightgame.download.DataWatcher; -import com.lightgame.download.DownloadEntity; import com.gh.download.DownloadManager; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; -import com.gh.base.OnRequestCallBackListener; +import com.lightgame.download.DataWatcher; +import com.lightgame.download.DownloadEntity; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -98,6 +99,7 @@ public class SearchGameListFragment extends BaseFragment implements OnRequestCal search_detail.setHasFixedSize(true); search_detail.addItemDecoration(new VerticalItemDecoration(getContext(), 1, true)); search_detail.setLayoutManager(new LinearLayoutManager(getActivity())); + ((DefaultItemAnimator) search_detail.getItemAnimator()).setSupportsChangeAnimations(false); adapter = new SearchGameListFragmentAdapter(SearchGameListFragment.this, key, type, mEntrance); search_detail.setAdapter(adapter); @@ -124,8 +126,11 @@ public class SearchGameListFragment extends BaseFragment implements OnRequestCal @Override public void onResume() { - super.onResume(); + if (isEverPause && adapter != null) { + adapter.notifyDataSetChanged(); + } DownloadManager.getInstance(getContext()).addObserver(dataWatcher); + super.onResume(); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java index 6f52cfc650..f99b06fd6f 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java @@ -181,20 +181,16 @@ public class SubjectFragment extends BaseFragment { @Override public void onResume() { - super.onResume(); - if (isEverPause) { - for (GameEntity entity : adapter.getSubjectList()) { - entity.setEntryMap(DownloadManager.getInstance(getContext()).getEntryMap(entity.getName())); - } + if (isEverPause && adapter != null) { + adapter.notifyDataSetChanged(); } - isEverPause = false; DownloadManager.getInstance(getContext()).addObserver(dataWatcher); + super.onResume(); } @Override public void onPause() { super.onPause(); - isEverPause = true; DownloadManager.getInstance(getContext()).removeObserver(dataWatcher); } diff --git a/app/src/main/res/drawable-xxhdpi/border_captcha_bg.xml b/app/src/main/res/drawable/border_captcha_bg.xml similarity index 100% rename from app/src/main/res/drawable-xxhdpi/border_captcha_bg.xml rename to app/src/main/res/drawable/border_captcha_bg.xml diff --git a/app/src/main/res/drawable/et_line_login.xml b/app/src/main/res/drawable/et_line_login.xml new file mode 100644 index 0000000000..3deaaeed30 --- /dev/null +++ b/app/src/main/res/drawable/et_line_login.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index ccf9ea1c11..3c7b652103 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -210,7 +210,7 @@ android:layout_width = "wrap_content" android:layout_height = "wrap_content" android:layout_centerVertical = "true" - android:text = "退出帐号" + android:text = "退出账号" android:textColor = "@color/title" android:textSize = "15sp" /> diff --git a/app/src/main/res/layout/activity_userinfo_edit.xml b/app/src/main/res/layout/activity_userinfo_edit.xml index 4ca3f294fb..e3b0df08c5 100644 --- a/app/src/main/res/layout/activity_userinfo_edit.xml +++ b/app/src/main/res/layout/activity_userinfo_edit.xml @@ -14,28 +14,59 @@ android:orientation = "vertical" android:visibility = "gone" > - + - + + + + + + + + + + + + + android:textCursorDrawable = "@drawable/cursor_color" + android:textSize = "15sp" /> + + android:textCursorDrawable = "@drawable/cursor_color" + android:textSize = "15sp" /> + android:textCursorDrawable = "@drawable/cursor_color" + android:textSize = "15sp" /> + android:orientation = "vertical" + android:visibility = "gone" > + android:gravity = "center_vertical" + android:orientation = "horizontal" > + android:src = "@drawable/user_default_icon2" /> + + android:layout_marginLeft = "15dp" + android:text = "什么是老用户登录？" + android:textColor = "@color/type_xinyou" + android:textSize = "16sp" /> + android:layout_marginTop = "8dp" + android:background = "@color/type_xinyou" /> + + android:layout_marginTop = "15dp" + android:text = "如果你在当前的手机/设备中安装过光环助手V3.0以前的版本（具体是指V2.0-V2.6），则过去产生的数据只记录在本地缓存中，为了防止数据丢失，请尽快使用手机号完成登录。\n\n注：为了保证数据的唯一性，只能使用没登录过的手机号进行登录。" + android:textColor = "@color/title" + android:textSize = "12sp" /> @@ -121,7 +132,7 @@ android:layout_marginLeft = "-20dp" android:layout_marginRight = "-20dp" android:orientation = "vertical" - android:visibility="visible"> + android:visibility = "visible" > + + android:textCursorDrawable = "@drawable/cursor_color" + android:textSize = "15sp" /> + android:textCursorDrawable = "@drawable/cursor_color" + android:textSize = "15sp" /> + android:orientation = "vertical" > + android:gravity = "center_vertical" + android:orientation = "horizontal" > + android:src = "@drawable/user_default_icon2" /> + + android:layout_marginLeft = "15dp" + android:text = "什么是老用户登录？" + android:textColor = "@color/type_xinyou" + android:textSize = "16sp" /> + android:layout_marginTop = "8dp" + android:background = "@color/type_xinyou" /> + + android:layout_marginTop = "15dp" + android:text = "如果你在当前的手机/设备中安装过光环助手V3.0以前的版本（具体是指V2.0-V2.6），则过去产生的数据只记录在本地缓存中，为了防止数据丢失，请尽快使用手机号完成登录。\n\n注：为了保证数据的唯一性，只能使用没登录过的手机号进行登录。" + android:textColor = "@color/title" + android:textSize = "12sp" /> diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml index 4e0f8b21f9..c6f9eed8e0 100644 --- a/app/src/main/res/layout/fragment_personal.xml +++ b/app/src/main/res/layout/fragment_personal.xml @@ -239,120 +239,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/game_plugin_item.xml b/app/src/main/res/layout/game_plugin_item.xml index 078401a83b..e987175001 100644 --- a/app/src/main/res/layout/game_plugin_item.xml +++ b/app/src/main/res/layout/game_plugin_item.xml @@ -6,6 +6,7 @@ android:layout_marginTop="8dp"> 还可以选择以下方式登录 版本更新 个人中心 - 起一个难忘的名字 + 起一个难忘的名字吧