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 16fad3821f..5a1c6ff4f3 100644 --- a/app/src/main/java/com/gh/common/util/BitmapUtils.java +++ b/app/src/main/java/com/gh/common/util/BitmapUtils.java @@ -8,8 +8,6 @@ import android.graphics.PixelFormat; import android.graphics.drawable.Drawable; import android.media.ExifInterface; -import com.lightgame.utils.Utils; - import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -62,6 +60,8 @@ public class BitmapUtils { * @param filePath * @return */ + + // TODO 应该根据图片分辨率大小 采取不同的压缩方式 (质量/分辨率) public static boolean savePicture(String newPath, String filePath, int compressSize) { BitmapFactory.Options options = new BitmapFactory.Options(); Bitmap bitmap = BitmapFactory.decodeFile(filePath, options); @@ -84,10 +84,8 @@ public class BitmapUtils { result = Bitmap.createBitmap(result, 0, 0, result.getWidth(), result.getHeight(), matrix, true); bos.reset(); result.compress(Bitmap.CompressFormat.JPEG, 85, bos); - Utils.log("========11::" + bos.toByteArray().length ); } - Utils.log("========22::" + bos.toByteArray().length ); File file = new File(newPath); try { @@ -98,8 +96,6 @@ public class BitmapUtils { return false; } - File file1 = new File(newPath); - Utils.log("========zzz::" + file1.length() ); return true; } diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java index 886d49346e..64cb413ac2 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -281,7 +281,6 @@ public class LibaoUtils { if (loadingDialog != null) loadingDialog.dismiss(); JSONObject responseBody = (JSONObject) response; - Utils.log("postLibaoTao=====" + responseBody); String libaoCode = null; try { libaoCode = responseBody.getString("code"); @@ -419,7 +418,6 @@ public class LibaoUtils { if (loadingDialog != null) loadingDialog.dismiss(); JSONObject responseBody = (JSONObject) response; - Utils.log("postLibaoLing=====" + responseBody); String libaoCode = null; try { libaoCode = responseBody.getString("code"); @@ -472,7 +470,6 @@ public class LibaoUtils { String string = exception.response().errorBody().string(); JSONObject errorJson = new JSONObject(string); String detail = errorJson.getString("detail"); - Utils.log("=======detail ::" + errorJson.toString()); switch (detail) { case "coming": Utils.toast(context, "礼包领取时间未开始"); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java index 55b508a79c..80f7d1530d 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java @@ -33,7 +33,6 @@ import com.gh.gamecenter.manager.InstallManager; import com.gh.gamecenter.retrofit.Response; import com.halo.assistant.HaloApp; import com.lightgame.adapter.BaseRecyclerAdapter; -import com.lightgame.utils.Utils; import java.io.File; import java.text.DecimalFormat; @@ -384,7 +383,6 @@ public class KcSelectGameAdapter extends BaseRecyclerAdapter { } else { installGameEntity = mApkList.get(i - mGameList.size() - 1); } - Utils.log("======" + installGameEntity.getGameName()); FileInfo fileInfo = new FileInfo(); fileInfo.setName(installGameEntity.getGameName()); fileInfo.setFilePath(installGameEntity.getGamePath()); diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyFragment.java index 1b8d44d753..437097412d 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyFragment.java @@ -1,6 +1,7 @@ package com.gh.gamecenter.ask; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.view.View; @@ -35,6 +36,8 @@ public class AskQuestionsNewBodyFragment extends ListFragment { private String mType; + private String mCommunityId; + @BindView(R.id.reuse_nodata_skip_tv_btn) View mSkipHint; @@ -45,13 +48,23 @@ public class AskQuestionsNewBodyFragment extends ListFragment { @Override public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); mType = getArguments().getString(AskQuestionsNewFragment.ASK_QUESTIONS_TYPE); + mCommunityId = UserManager.getInstance().getCommunityId(getContext()); + super.onCreate(savedInstanceState); mOnLoggenInListener = () -> { NormalActivity.startFragment(getContext(), QuestionsEditFragment.class); }; } + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + if (!UserManager.getInstance().getCommunityId(getContext()).equals(mCommunityId)) { + mCommunityId = UserManager.getInstance().getCommunityId(getContext()); + onRefresh(); + } + } + @OnClick(R.id.reuse_nodata_skip_tv_btn) public void onViewClick(View v) { if (v.getId() == R.id.reuse_nodata_skip_tv_btn) { @@ -68,7 +81,7 @@ public class AskQuestionsNewBodyFragment extends ListFragment { @Override public Observable> provideDataObservable() { return RetrofitManager.getInstance(getContext()).getApi() - .getAskQuestions(UserManager.getInstance().getCommunityId(getContext()), mType, getListOffset()); + .getAskQuestions(mCommunityId, mType, getListOffset()); } @Override 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 2ba80589cf..58e76cf2f5 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java @@ -14,7 +14,7 @@ import android.view.View; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.adapter.FragmentStateAdapter; +import com.gh.base.adapter.FragmentAdapter; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.ImageUtils; import com.gh.common.view.TabIndicatorView; @@ -142,7 +142,7 @@ public class AskQuestionsNewFragment extends BaseFragment { private void initTab() { - FragmentStateAdapter adapter = new FragmentStateAdapter(getChildFragmentManager(), getFragments()); + FragmentAdapter adapter = new FragmentAdapter(getChildFragmentManager(), getFragments()); mViewpager.setAdapter(adapter); mTablayout.setupWithViewPager(mViewpager); mTabIndicatorView.setupWithTabLayout(mTablayout); 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 90028fd5ce..e7b20d0e70 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 @@ -35,7 +35,6 @@ import com.lightgame.utils.Utils; import org.json.JSONException; import org.json.JSONObject; -import java.io.IOException; import java.net.HttpURLConnection; import java.util.HashMap; import java.util.Map; @@ -184,7 +183,6 @@ public class AnswerEditFragment extends NormalFragment { return; } try { - Utils.log("=====::" + response.toString()); int statusCode = response.getInt("statusCode"); if (statusCode == HttpURLConnection.HTTP_OK) { mMapImg.put(picturePath, response.getString("icon")); @@ -267,11 +265,6 @@ public class AnswerEditFragment extends NormalFragment { @Override public void onFailure(HttpException e) { super.onFailure(e); - try { - Utils.log("=======" + e.response().errorBody().string()); - } catch (IOException e1) { - e1.printStackTrace(); - } postDialog.dismissAllowingStateLoss(); toast("提交失败"); AskErrorResponseUtils.errorResponseControl(getContext(), e); diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java index 2e8f87d9d0..fd5bc2d6d7 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java @@ -9,7 +9,6 @@ import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBKaiFuReset; import com.gh.gamecenter.normal.NormalFragment; -import com.lightgame.utils.Utils; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -99,7 +98,6 @@ public class KaiFuWrapperFragment extends NormalFragment { @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBKaiFuReset reset) { if (SINGLE_GAME_KAIFU.equals(reset.getControl())) { - Utils.log("=========::" + reset.getGameId() + "==" + reset.getControl()); mResetMenuItem.setVisible(true); FragmentTransaction fragmentTransaction = getChildFragmentManager().beginTransaction(); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index bf6580c14e..605881ef96 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -25,7 +25,6 @@ import com.gh.gamecenter.newsdetail.NewsDetailCommentViewHolder; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; -import com.lightgame.utils.Utils; import java.util.ArrayList; import java.util.List; @@ -76,7 +75,6 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { // 加载数据 public void addList(final int offset) { - Utils.log("=======000000"); if (TextUtils.isEmpty(UserManager.getInstance().getToken())) { mCallBackListener.loadDone(null); return; @@ -86,7 +84,6 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { return; } - Utils.log("=======1111"); isLoading = true; RetrofitManager.getInstance(mContext).getApi().getConcernLibao(offset) .map(new Func1, List>() { 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 4221bf5f65..48784b8c69 100644 --- a/app/src/main/java/com/gh/gamecenter/login/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/login/UserRepository.java @@ -422,6 +422,7 @@ class UserRepository { super.onApiFailure(e); mLoginObsResponseUserInfo.postValue(e); if (loginTag != null) { + Utils.toast(mContext, R.string.login_failure); logout(); } diff --git a/app/src/main/res/layout/fragment_list_nodate_skip.xml b/app/src/main/res/layout/fragment_list_nodate_skip.xml index 9d94184686..4e8dd6b444 100644 --- a/app/src/main/res/layout/fragment_list_nodate_skip.xml +++ b/app/src/main/res/layout/fragment_list_nodate_skip.xml @@ -28,7 +28,8 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" android:gravity = "center" - android:orientation = "vertical" > + android:orientation = "vertical" + android:visibility = "gone" > + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_web.xml b/app/src/main/res/menu/menu_web.xml index 6322e10d7d..b2f2710e79 100644 --- a/app/src/main/res/menu/menu_web.xml +++ b/app/src/main/res/menu/menu_web.xml @@ -15,7 +15,7 @@ app:showAsAction = "always" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6aea9c404d..546208c605 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -528,5 +528,6 @@ http://www.ghzs.com/question/%1$s http://www.ghzs.com/question/%1$s?answer=%2$s 3.什么是违规内容?点我]]> + 登录失败 diff --git a/scripts/tinker_release_base.sh b/scripts/tinker_release_base.sh index 0470926966..fd9d698126 100755 --- a/scripts/tinker_release_base.sh +++ b/scripts/tinker_release_base.sh @@ -12,7 +12,10 @@ # get current shell absolute dir CWD=$(cd "$(dirname "$0")"; pwd) - +if [ -n "$(git status --porcelain)" ]; then + echo "Please make sure that you commit your code before release " + exit 0 +fi source ${CWD}/tinker_env.sh # 如果git代码已经提交了,目的是为了确认git commit id是能作为一个可追踪的tinkerId