diff --git a/app/src/main/assets/web_load_dfimg_icon.png b/app/src/main/assets/web_load_dfimg_icon.png index cb5a2259b9..cf953ee745 100644 Binary files a/app/src/main/assets/web_load_dfimg_icon.png and b/app/src/main/assets/web_load_dfimg_icon.png differ 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 2b4d06506d..eb1a2361f7 100644 --- a/app/src/main/java/com/gh/common/util/ImageUtils.kt +++ b/app/src/main/java/com/gh/common/util/ImageUtils.kt @@ -72,7 +72,7 @@ class ImageUtils private constructor() { return } val layoutParams = simpleDraweeView?.layoutParams - val scale = imageInfo.width.toFloat()/imageInfo.height.toFloat() + val scale = imageInfo.width.toFloat() / imageInfo.height.toFloat() layoutParams?.width = (height * scale).toInt() simpleDraweeView?.layoutParams = layoutParams } @@ -162,7 +162,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, 200000)) { + if (BitmapUtils.savePicture(path, s, 1024 * 1024)) { subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "images?type=community", path, s, UserManager.getInstance().token)) index++ } else { @@ -204,7 +204,7 @@ class ImageUtils private constructor() { if (context == null || TextUtils.isEmpty(picturePath)) return Observable.create(Observable.OnSubscribe { subscriber -> val path = context.getCacheDir().path + File.separator + System.currentTimeMillis() + ".jpg" - if (BitmapUtils.savePicture(path, picturePath, 200000)) { + if (BitmapUtils.savePicture(path, picturePath, 1024*1024)) { subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "images?type=community", path, UserManager.getInstance().token)) } else { subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "images?type=community", picturePath, UserManager.getInstance().token)) diff --git a/app/src/main/java/com/gh/common/util/PackageUtils.java b/app/src/main/java/com/gh/common/util/PackageUtils.java index 3ad2c80443..a956eb4a79 100644 --- a/app/src/main/java/com/gh/common/util/PackageUtils.java +++ b/app/src/main/java/com/gh/common/util/PackageUtils.java @@ -7,6 +7,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.Signature; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.text.TextUtils; @@ -273,6 +274,20 @@ public class PackageUtils { return null; } + + /* + * 获取apk的版本 + */ + public static Drawable getIconByPackage(Context context, String packageName) { + try { + PackageManager packageManager = context.getApplicationContext().getPackageManager(); + return packageManager.getApplicationIcon(packageName); + } catch (NameNotFoundException e) { + e.printStackTrace(); + } + return null; + } + /* * 获取所有已安装的软件的包名、版本(非系统应用) */ diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java index 5c71a7644e..ec942a284a 100644 --- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java @@ -2,8 +2,10 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; +import android.os.Bundle; import android.support.annotation.NonNull; +import com.gh.common.util.EntranceUtils; import com.halo.assistant.fragment.AboutFragment; /** @@ -12,12 +14,10 @@ import com.halo.assistant.fragment.AboutFragment; public class AboutActivity extends NormalActivity { @NonNull - public static Intent getIntent(Context context) { - -// return new IntentFactory.Builder(context) -// .setActivity(AboutActivity.class) -// .setFragment(AboutFragment.class).build(); - return getTargetIntent(context, AboutActivity.class, AboutFragment.class); + public static Intent getIntent(Context context, boolean isUpdate) { + Bundle bundle = new Bundle(); + bundle.putBoolean(EntranceUtils.KEY_VERSION_UPDATE, isUpdate); + return getTargetIntent(context, AboutActivity.class, AboutFragment.class, bundle); } } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 06ec267972..ac6ec4f0e3 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -399,6 +399,7 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt switch (view.getId()) { case R.id.suggest_post_btn: if (TextUtils.isEmpty(mSuggestContentEt.getText().toString())) { + toast("请输入反馈内容"); return; } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java index 19913fa6a7..a62b422be5 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java @@ -8,7 +8,6 @@ import android.graphics.drawable.Drawable; import android.preference.PreferenceManager; import android.support.v4.util.ArrayMap; import android.support.v7.widget.RecyclerView.ViewHolder; -import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; @@ -399,21 +398,15 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { holder.swipeText.setPadding(0, 0, DisplayUtils.dip2px(mContext, 15), 0); - ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); - - if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty() - || gameEntity.getTag() == null || gameEntity.getTag().isEmpty()) { - if (gameEntity.getApk() != null && gameEntity.getApk().size() > 0 - && !TextUtils.isEmpty(gameEntity.getApk().get(0).getVersion())) { - holder.gameDes.setText(String.format("V%s", gameEntity.getApk().get(0).getVersion())); - } else { - holder.gameDes.setText(gameEntity.getBrief()); - } - holder.gameName.setText(gameEntity.getName()); - } else { + if (gameEntity.getApk().size() > 0) { + holder.gameThumb.setImageDrawable(PackageUtils.getIconByPackage(mContext, gameEntity.getApk().get(0).getPackageName())); holder.gameName.setText(String.format("%s - %s", gameEntity.getName(), PlatformUtils.getInstance(mContext).getPlatformName(gameEntity.getApk().get(0).getPlatform()))); holder.gameDes.setText(String.format("V%s", PackageUtils.getVersionByPackage(mContext, gameEntity.getApk().get(0).getPackageName()))); + } else { + ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); + holder.gameName.setText(gameEntity.getName()); + holder.gameDes.setText(gameEntity.getBrief()); } GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag(), "", gameEntity.getTagStyle()); diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt index 47d7e1d3c9..0e24532466 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -21,6 +21,7 @@ import com.gh.gamecenter.* import com.gh.gamecenter.adapter.ImagePagerAdapter import com.gh.gamecenter.adapter.viewholder.* import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.category.CategoryDirectoryActivity import com.gh.gamecenter.databinding.* import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBDownloadStatus @@ -231,6 +232,8 @@ class GameFragmentAdapter(context: Context, model: GameViewModel) : BaseRecycler val entity = subjectDigestList[4] if (entity.type == "block") { mContext.startActivity(BlockActivity.getIntent(mContext, entity)) + } else if (entity.type == "category") { + mContext.startActivity(CategoryDirectoryActivity.getIntent(mContext, entity.columnId!!, entity.name!!)) } else { SubjectActivity.startSubjectActivity(mContext, entity.columnId, entity.columnName, entity.order , StringUtils.buildString("(游戏-专题:", entity.name, "[1-", (5).toString(), "]", ")")) diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuActivity.kt b/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuActivity.kt index 48721b79a4..45ddd96aa1 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuActivity.kt @@ -20,7 +20,6 @@ import com.gh.gamecenter.R import com.gh.gamecenter.databinding.ActivityKaifuAddBinding import com.gh.gamecenter.entity.KaiFuCalendarEntity import com.gh.gamecenter.gamedetail.FuliFragment -import com.lightgame.utils.Utils import java.util.* @@ -48,7 +47,6 @@ class AddKaiFuActivity : BaseActivity() { if (it == null) { toast(R.string.post_failure_hint) } else { - Utils.log("===========1111::" + it.size) val intent = Intent() intent.putParcelableArrayListExtra(FuliFragment.GAME_DETAIL_ADD_KAIFU_KEY, it) setResult(Activity.RESULT_OK, intent) diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuViewModel.kt b/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuViewModel.kt index 661d8b3cbd..5a2e7cc1a1 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuViewModel.kt @@ -115,7 +115,7 @@ class AddKaiFuViewModel(application: Application) : AndroidViewModel(application val splitName = listJson.split("\"note\":" + "\"" + entity.getNote()!! + "\"") if (splitTime.size > 2 || splitName.size > 2) { isSuccess = false - entity.setDataMark(if (splitTime.size > 2) 1 else 2) + entity.setDataMark(4) } } if (i == calendarList.size - 1 && !isSuccess) { diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java index 2a1b20497d..4ad3109d62 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java @@ -47,8 +47,11 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setText(messageEntity.getAnswer().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); - if (images != null && images.size() > 0) - mBinding.messageOriginalIcon.setImageURI(images.get(0)); + if (images.size() > 0) { + mBinding.messageAskIcon.setImageURI(images.get(0)); + mBinding.messageAskIcon.setVisibility(View.VISIBLE); + mBinding.messageArticleIcon.setVisibility(View.GONE); + } break; case "reply": mBinding.messageCommand.setText("回复了你"); @@ -56,7 +59,9 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setMaxLines(Integer.MAX_VALUE); mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle()); - mBinding.messageOriginalIcon.setImageURI(messageEntity.getArticle().getThumb()); + mBinding.messageArticleIcon.setImageURI(messageEntity.getArticle().getThumb()); + mBinding.messageArticleIcon.setVisibility(View.VISIBLE); + mBinding.messageAskIcon.setVisibility(View.GONE); break; case "follow_question": mBinding.messageCommand.setText("回答了你关注的问题"); @@ -65,8 +70,11 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setText(messageEntity.getAnswer().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); - if (images != null && images.size() > 0) - mBinding.messageOriginalIcon.setImageURI(images.get(0)); + if (images.size() > 0) { + mBinding.messageAskIcon.setImageURI(images.get(0)); + mBinding.messageAskIcon.setVisibility(View.VISIBLE); + mBinding.messageArticleIcon.setVisibility(View.GONE); + } break; case "reply_answer_comment": mBinding.messageCommand.setText("回复了你"); @@ -75,8 +83,11 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); - if (images != null && images.size() > 0) - mBinding.messageOriginalIcon.setImageURI(images.get(0)); + if (images.size() > 0) { + mBinding.messageAskIcon.setImageURI(images.get(0)); + mBinding.messageAskIcon.setVisibility(View.VISIBLE); + mBinding.messageArticleIcon.setVisibility(View.GONE); + } break; case "answer_comment": mBinding.messageCommand.setText("评论了你"); @@ -85,46 +96,63 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setText(messageEntity.getComment().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); - if (images != null && images.size() > 0) - mBinding.messageOriginalIcon.setImageURI(images.get(0)); + if (images.size() > 0) { + mBinding.messageAskIcon.setImageURI(images.get(0)); + mBinding.messageAskIcon.setVisibility(View.VISIBLE); + mBinding.messageArticleIcon.setVisibility(View.GONE); + } break; case "answer_vote": mBinding.messageCommand.setText("赞同你的回答"); mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); - if (images != null && images.size() > 0) - mBinding.messageOriginalIcon.setImageURI(images.get(0)); + if (images.size() > 0) { + mBinding.messageAskIcon.setImageURI(images.get(0)); + mBinding.messageAskIcon.setVisibility(View.VISIBLE); + mBinding.messageArticleIcon.setVisibility(View.GONE); + } break; case "comment_vote": mBinding.messageCommand.setText("赞了你的评论"); mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle()); - mBinding.messageOriginalIcon.setImageURI(messageEntity.getArticle().getThumb()); + mBinding.messageArticleIcon.setImageURI(messageEntity.getArticle().getThumb()); + mBinding.messageArticleIcon.setVisibility(View.VISIBLE); + mBinding.messageAskIcon.setVisibility(View.GONE); break; case "answer_comment_vote": mBinding.messageCommand.setText("赞了你的评论"); mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); - if (images != null && images.size() > 0) - mBinding.messageOriginalIcon.setImageURI(images.get(0)); + if (images.size() > 0) { + mBinding.messageAskIcon.setImageURI(images.get(0)); + mBinding.messageAskIcon.setVisibility(View.VISIBLE); + mBinding.messageArticleIcon.setVisibility(View.GONE); + } break; case "invited": mBinding.messageCommand.setText("邀请你回答"); mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getQuestion().getImages(); - if (images != null && images.size() > 0) - mBinding.messageOriginalIcon.setImageURI(images.get(0)); + if (images.size() > 0) { + mBinding.messageAskIcon.setImageURI(images.get(0)); + mBinding.messageAskIcon.setVisibility(View.VISIBLE); + mBinding.messageArticleIcon.setVisibility(View.GONE); + } break; case "system_invited": mBinding.messageCommand.setText("有新问题等你回答"); mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getQuestion().getImages(); - if (images != null && images.size() > 0) - mBinding.messageOriginalIcon.setImageURI(images.get(0)); + if (images.size() > 0) { + mBinding.messageAskIcon.setImageURI(images.get(0)); + mBinding.messageAskIcon.setVisibility(View.VISIBLE); + mBinding.messageArticleIcon.setVisibility(View.GONE); + } break; } } diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index 76e45cb374..b55a0bed70 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -135,7 +135,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { view = mLayoutInflater.inflate(R.layout.newsdetail_item_content, parent, false); return new NewsDetailContentViewHolder(view); case 1: - view = mLayoutInflater.inflate(R.layout.gamedetail_item_top, parent, false); + view = mLayoutInflater.inflate(R.layout.newsdetail_item_game, parent, false); return new GameDetailTopViewHolder(view); case 2: view = mLayoutInflater.inflate(R.layout.gamedetail_item_news, parent, false); diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java index 1e8180dd11..49ca56ddf7 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java @@ -208,8 +208,14 @@ public class QuestionsDetailAdapter extends ListAdapter { } holder.mTitle.setText(mQuestionsDetailEntity.getTitle()); - holder.mAnswercount.setText(mContext.getString(R.string.ask_answer_count, mQuestionsDetailEntity.getAnswersCount())); holder.concernCount.setText(mQuestionsDetailEntity.getFollowCount() + "人关注"); + + if (mQuestionsDetailEntity.getAnswersCount() == 0) { + holder.mAnswercount.setVisibility(View.GONE); + } else { + holder.mAnswercount.setVisibility(View.VISIBLE); + holder.mAnswercount.setText(mContext.getString(R.string.ask_answer_count, mQuestionsDetailEntity.getAnswersCount())); + } } private void addTag(FlexboxLayout mTagRl, String tag, boolean isLastTag) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteFragment.java b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteFragment.java index af45a4a43a..e23d6d0d20 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteFragment.java @@ -9,17 +9,19 @@ import android.view.View; import com.gh.common.util.AskErrorResponseUtils; import com.gh.common.util.CheckLoginUtils; +import com.gh.common.util.DialogUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.UrlFilterUtils; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.R; -import com.gh.gamecenter.qa.entity.InviteEntity; -import com.gh.gamecenter.entity.MeEntity; -import com.gh.gamecenter.qa.entity.QuestionsDetailEntity; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; import com.gh.gamecenter.baselist.LoadType; import com.gh.gamecenter.baselist.NormalListViewModel; +import com.gh.gamecenter.entity.MeEntity; +import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity; +import com.gh.gamecenter.qa.entity.InviteEntity; +import com.gh.gamecenter.qa.entity.QuestionsDetailEntity; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -139,10 +141,27 @@ public class QuestionsInviteFragment extends ListFragment { + startActivity(AnswerDetailActivity.getIntent(getContext(), answerId, "邀请达人")); + }); } } diff --git a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java index 06fefe6160..9fccac61d9 100644 --- a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java @@ -4,12 +4,14 @@ import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.view.View; import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.StringUtils; import com.gh.gamecenter.R; @@ -53,6 +55,10 @@ public class AboutFragment extends NormalFragment { // ((TextView) findViewById(R.id.about_tv_version)).setText("V" + PackageUtils.getVersionName(this)); mVersionName.setText("V" + PackageUtils.getPatchVersionName()); // TODO 版本号暂时与gradle versionName不一致 + + if (getArguments() != null && getArguments().getBoolean(EntranceUtils.KEY_VERSION_UPDATE)) { + UpdateManager.getInstance(getContext()).checkUpdate(false, handler); // 检查更新 + } } @Override @@ -64,7 +70,7 @@ public class AboutFragment extends NormalFragment { @OnClick({R.id.about_shengming, R.id.setting_rl_update}) public void OnClick(View view) { if (view.getId() == R.id.setting_rl_update) { - UpdateManager.getInstance(getContext()).checkUpdate(false, handler); // 检出更新 + UpdateManager.getInstance(getContext()).checkUpdate(false, handler); // 检查更新 } else if (view.getId() == R.id.about_shengming) { Intent intent = WebActivity.getWebIntent(getContext()); startActivity(intent); @@ -100,6 +106,7 @@ public class AboutFragment extends NormalFragment { if (msg.what == 0) { final String version = (String) msg.obj; fragment.mAboutVersion.setText(StringUtils.buildString("发现新版本 V", version)); + fragment.mAboutVersion.setTextColor(ContextCompat.getColor(fragment.getContext(), R.color.theme)); } else if (msg.what == 1) { fragment.mAboutVersion.setText(R.string.toast_upload_latest); } diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java index c91813a6c2..be344f74d0 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java @@ -37,7 +37,6 @@ import com.gh.gamecenter.personal.PersonalFragment; import com.kyleduo.switchbutton.SwitchButton; import com.lightgame.download.FileUtils; import com.lightgame.utils.Utils; -import com.tencent.bugly.beta.Beta; import org.greenrobot.eventbus.EventBus; @@ -80,6 +79,8 @@ public class SettingsFragment extends NormalFragment { private int checkSizeIndex; + private boolean mIsUpdate; + @Override public void onStop() { saveCurrentSetting(); @@ -98,8 +99,8 @@ public class SettingsFragment extends NormalFragment { setNavigationTitle(getString(R.string.title_settings)); if (getArguments() != null) { - boolean isUpdate = getArguments().getBoolean(EntranceUtils.KEY_VERSION_UPDATE, false); - if (isUpdate) { + mIsUpdate = getArguments().getBoolean(EntranceUtils.KEY_VERSION_UPDATE, false); + if (mIsUpdate) { mVersionName.setText(getString(R.string.personal_update_hint)); mVersionName.setTextColor(Color.WHITE); mVersionName.setBackgroundResource(R.drawable.setting_update_hint); @@ -255,10 +256,7 @@ public class SettingsFragment extends NormalFragment { fontSize(); break; case setting_rl_about: - if (BuildConfig.DEBUG) { - Beta.checkUpgrade(); // 手动检查热补丁 - } - startActivity(AboutActivity.getIntent(getContext())); + startActivity(AboutActivity.getIntent(getContext(), mIsUpdate)); break; case R.id.setting_rl_concerngame: mSettingConcerngameSb.performClick(); diff --git a/app/src/main/res/drawable-xhdpi/message_article_placeholder.png b/app/src/main/res/drawable-xhdpi/message_article_placeholder.png new file mode 100644 index 0000000000..b7a272db5a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/message_article_placeholder.png differ diff --git a/app/src/main/res/drawable-xhdpi/message_ask_placeholder.png b/app/src/main/res/drawable-xhdpi/message_ask_placeholder.png new file mode 100644 index 0000000000..61b41f55da Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/message_ask_placeholder.png differ diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml index 150f561208..ccb9a71594 100644 --- a/app/src/main/res/layout/fragment_setting.xml +++ b/app/src/main/res/layout/fragment_setting.xml @@ -258,6 +258,7 @@ android:layout_centerVertical = "true" android:paddingBottom = "2dp" android:paddingLeft = "8dp" + android:paddingRight = "8dp" android:paddingTop = "2dp" android:textColor = "@color/hint" android:textSize = "12sp" /> diff --git a/app/src/main/res/layout/libao_item.xml b/app/src/main/res/layout/libao_item.xml index 2bae15e3c5..cc98c836e9 100644 --- a/app/src/main/res/layout/libao_item.xml +++ b/app/src/main/res/layout/libao_item.xml @@ -13,8 +13,8 @@ diff --git a/app/src/main/res/layout/libaodetail_item_top.xml b/app/src/main/res/layout/libaodetail_item_top.xml index fa7ba0762c..f079b2be6e 100644 --- a/app/src/main/res/layout/libaodetail_item_top.xml +++ b/app/src/main/res/layout/libaodetail_item_top.xml @@ -23,8 +23,8 @@ diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml index 647d182df6..d21f83fea4 100644 --- a/app/src/main/res/layout/message_item.xml +++ b/app/src/main/res/layout/message_item.xml @@ -44,7 +44,7 @@ android:layout_height = "wrap_content" android:layout_marginLeft = "10dp" android:layout_marginTop = "4dp" - android:textColor = "@color/hint" + android:textColor = "@color/title" android:textSize = "13sp" app:layout_constraintLeft_toRightOf = "@id/message_user_name" app:layout_constraintTop_toTopOf = "parent" /> @@ -74,14 +74,31 @@ app:layout_constraintRight_toRightOf = "parent" app:layout_constraintTop_toBottomOf = "@id/message_content" > - + + + + + + + + android:layout_width = "80dp" + android:layout_height = "60dp" /> - + android:textStyle = "bold" /> + android:textSize = "14sp" /> + android:layout_marginTop = "8dp" > + android:layout_marginTop = "12dp" > + android:background = "@color/cutting_line" /> - + - + - + - + - + + + + + + + - - + android:textSize = "11sp" /> - \ No newline at end of file + \ No newline at end of file