title ui refact

app/src/main/AndroidManifest.xml

@@ -762,6 +762,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActGiftDetail"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActModifyThird"
@@ -769,18 +770,22 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActPlayGameList"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActPlayGameUserLikeList"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActPlayGameRecommendList"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActGcGameAppDetail"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActCommentGameApp"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActUserCommentDetail"
@@ -790,14 +795,12 @@
             android:name="com.sheep.gamegroup.view.activity.ActUserAppHome"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.sheep.gamegroup.view.activity.ActPlayGameDetail"
-            android:screenOrientation="portrait" />
-        <activity
             android:name="com.sheep.gamegroup.view.activity.ActSysNfDetail"
             android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActInvitation"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
 
         <!-- start幂动科技 -->
@@ -836,6 +839,7 @@
             android:screenOrientation="user" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.GameCertificationActivity"
+            android:theme="@style/AppActionTheme"
             android:exported="true"
             android:screenOrientation="portrait" />
         <!-- end 小绵羊sdk相关 -->
@@ -849,6 +853,7 @@
         <!-- 活动规则 -->
         <activity
             android:name=".ui.activity.ActiveRuleActivity"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <!-- 小绵羊3.4.5 我的关注 -->
         <activity
@@ -887,11 +892,13 @@
         <!-- 小绵羊3.4.5 发布发现内容 -->
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActPublishArticle"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
 
         <!-- 小绵羊3.4.5 选择图片与视频 -->
         <activity
             android:name="com.sheep.gamegroup.module.find.activity.ActMediaChoose"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.module.login.LoginAct"

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -155,8 +155,13 @@ public abstract class BaseActivity extends RxAppCompatActivity {
     }
 
     @Override
+    protected void onStop(){
+        super.onStop();
+    }
+
+    @Override
     protected void onDestroy() {
-//        fixHuaweiLeak();
+        fixHuaweiLeak();
         try {
             super.onDestroy();
             if (needButterKnife() && this.unbinder != null) {

app/src/main/java/com/sheep/gamegroup/absBase/BaseListActivity2.java

@@ -54,8 +54,6 @@ public abstract class BaseListActivity2<T> extends BaseActivity implements IRefr
     public static final int REFRESH_ON_CREATE = 0;
     public static final int REFRESH_ON_RESUME = 1;
     public static final int REFRESH_ON_YOURSELF = -1;
-    @BindView(R.id.title)
-    protected View title;
     @BindView(R.id.empty_view)
     protected View empty_view;
     @BindView(R.id.check_net_ll)

app/src/main/java/com/sheep/gamegroup/module/find/activity/ActMediaChoose.java

@@ -48,8 +48,11 @@ public class ActMediaChoose extends BaseActivity {
     private TitleFragmentListAdapter mAdapter;
     @Override
     public void initView() {
-        TitleBarUtils.getInstance().setTitle(this, "选择媒体")
-                .setTitleFinish(this).setRightImgBotton(this, R.mipmap.ic_open_camera, new View.OnClickListener() {
+        TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
+                .setTitle(this, "选择媒体")
+                .setTitleFinish(this)
+                .setRightImgBotton(this, R.mipmap.ic_open_camera, new View.OnClickListener() {
             @Override
             public void onClick(View view) {
 //                Jump2View.getInstance().goActEditVideo(video);

app/src/main/java/com/sheep/gamegroup/view/activity/ActCommentGameApp.java

@@ -44,7 +44,9 @@ public class ActCommentGameApp extends BaseActivity {
 
     @Override
     public void initView() {
-        TitleBarUtils.getInstance().setTitle(this, "写评价")
+        TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
+                .setTitle(this, "写评价")
                 .setEndTv(this, "发表", 0xFF2EBEF2, new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {

app/src/main/java/com/sheep/gamegroup/view/activity/ActGiftDetail.java

@@ -51,6 +51,7 @@ public class ActGiftDetail extends BaseActivity {
     TextView item_download_welfare_btn_bottom;
     @BindView(R.id.item_download_welfare_line)
     View item_download_welfare_line;
+
     @Override
     protected int getLayoutId() {
         return R.layout.act_gift_detail;
@@ -60,6 +61,7 @@ public class ActGiftDetail extends BaseActivity {
     public void initView() {
         TitleBarUtils.getInstance()
                 .setTitleFinish(this)
+                .setShowOrHide(this, true)
                 .setTitle(this, "礼包详情")
                 .setRightBtn(this, "分享", 0, new View.OnClickListener() {
                     @Override
@@ -78,18 +80,20 @@ public class ActGiftDetail extends BaseActivity {
         item_download_welfare_btn_center.setVisibility(View.VISIBLE);
 
     }
+
     private GiftBagApp data;
+
     @Override
     public void initData() {
         data = DataUtil.getObject(getIntent(), GiftBagApp.class);
-        if(data.getApp() != null)
+        if (data.getApp() != null)
             GlideImageLoader.setGameImage(item_download_welfare_iv, data.getApp().getIcon());
-        if(data.getGift_bag() != null) {
+        if (data.getGift_bag() != null) {
             ViewUtil.setText(item_download_welfare_name_tv, data.getGift_bag().getGiftName());
             ViewUtil.setText(gift_detail_time, data.getGift_bag().getDateText2());
             ViewUtil.setText(gift_detail_content, data.getGift_bag().getGiftContent());
             ViewUtil.setText(gift_detail_tip, data.getGift_bag().getUseMethod());
-            if(TextUtils.isEmpty(data.getCode())){//没有code，就视为没有领取礼包
+            if (TextUtils.isEmpty(data.getCode())) {//没有code，就视为没有领取礼包
                 item_download_welfare_btn_center.setText("领取");
                 item_download_welfare_btn_center.setOnClickListener(new View.OnClickListener() {
                     @Override

app/src/main/java/com/sheep/gamegroup/view/activity/ActInvitation.java

@@ -51,6 +51,7 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.FileUtil;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -72,8 +73,6 @@ import static com.sheep.gamegroup.util.ViewUtil.getNetImgByName;
 public class ActInvitation extends BaseUMActivity {
     @BindView(R.id.ask_share_list)
     RecyclerView ask_share_list;
-    @BindView(R.id.img_baseactivity_title)
-    ImageView img_baseactivity_title;
 
     GridLayoutManager gridLayoutManager;
     UserEntity userEntity = DataUtil.getInstance().getUserEntity();
@@ -105,8 +104,10 @@ public class ActInvitation extends BaseUMActivity {
     public void initView() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             main_layout.setPadding(0, 0, 0, G.getHasVirtualKey(this) - G.getNoHasVirtualKey(this));
-
         }
+        TitleBarUtils.getInstance().setShowOrHide(this, true)
+                .setTitle(this, "分享")
+                .setTitleFinish(this);
     }
 
     public void initListener() {
@@ -420,13 +421,4 @@ public class ActInvitation extends BaseUMActivity {
         ask_share_list.setAdapter(adapter);
     }
 
-
-    @OnClick(R.id.img_baseactivity_title)
-    public void onViewClicked(View view) {
-        switch (view.getId()) {
-            case R.id.img_baseactivity_title:
-                finish();
-                break;
-        }
-    }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameDetail.java

@@ -1,490 +0,0 @@
-package com.sheep.gamegroup.view.activity;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.AppCompatRatingBar;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.event.BigEvent;
-import com.sheep.gamegroup.greendao.download.DownLoadInfo;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.Applications;
-import com.sheep.gamegroup.model.entity.GameEntity;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.DataUtil;
-import com.sheep.gamegroup.util.DownloadUtil;
-import com.sheep.gamegroup.util.GlideImageLoader;
-import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
-import com.sheep.gamegroup.view.fragment.FgtPlaGameGift;
-import com.sheep.gamegroup.view.fragment.FgtPlayGameDetail;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import org.afinal.simplecache.ApiKey;
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.util.Locale;
-
-import butterknife.BindView;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import io.reactivex.schedulers.Schedulers;
-
-import static android.content.Intent.ACTION_PACKAGE_ADDED;
-import static android.content.Intent.ACTION_PACKAGE_REMOVED;
-
-/**
- * Created by ljy on 2018/9/4.
- * TODO 3.4不再用这个类，用ActGcPlayGameDetail
- */
-
-public class ActPlayGameDetail extends BaseActivity implements Action1<Integer> {
-    @BindView(R.id.appbar_act_game_details)
-    AppBarLayout appbarActGameDetails;
-    @BindView(R.id.status_height_view)
-    View statusHeightView;
-    @BindView(R.id.find_game_bar)
-    View find_game_bar;
-    @BindView(R.id.title_bottom_line)
-    LinearLayout title_bottom_line;
-    @BindView(R.id.img_baseactivity_title)
-    ImageView img_baseactivity_title;
-    @BindView(R.id.txt_baseactivity_title)
-    TextView txt_baseactivity_title;
-    @BindView(R.id.ibtn_baseactivity_right)
-    ImageButton ibtn_baseactivity_right;
-    @BindView(R.id.find_game_iv)
-    ImageView find_game_iv;
-    @BindView(R.id.find_game_name_tv)
-    TextView find_game_name_tv;
-    @BindView(R.id.find_game_info_tv)
-    TextView find_game_info_tv;
-    @BindView(R.id.find_game_xin)
-    AppCompatRatingBar find_game_xin;
-    @BindView(R.id.find_game_down_tv)
-    TextView find_game_down_tv;
-    @BindView(R.id.viewpager_act_game_details)
-    ViewPager mViewPager;
-    @BindView(R.id.tabLayout)
-    TabLayout tabLayout;
-    @BindView(R.id.welfare_gift_layout)
-    LinearLayout welfare_gift_layout;
-    @BindView(R.id.welfare_tv)
-    TextView welfare_tv;
-    @BindView(R.id.gift_tv)
-    TextView gift_tv;
-    @BindView(R.id.ll_game_tag)
-    LinearLayout ll_game_tag;
-
-    private Activity activity;
-    private int id;
-    private boolean mIsExpanded = false;//是否是折叠状态
-
-    private GameEntity gameEntity;
-    private Applications gameApp;
-    private boolean isNeedReservation = false;
-
-    private TitleFragmentListAdapter mAdapter;
-    private int curPosition = 0;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.act_play_game_detail_layout;
-    }
-
-    @Override
-    public void initView() {
-        id = getIntent().getIntExtra("id", 0);
-        activity = this;
-        TitleBarUtils.getInstance()
-                .setTitle(this, "详情")
-                .setTitleFinish(this);
-        EventBus.getDefault().register(this);
-
-        mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
-        txt_baseactivity_title.setVisibility(View.INVISIBLE);//不显示标题栏
-
-        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, 0);
-        statusHeightView.setLayoutParams(params);
-
-        appbarActGameDetails.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
-            @Override
-            public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-                int nameWidth = find_game_name_tv.getWidth();
-                if (nameWidth == 0) {
-                    find_game_name_tv.measure(0, 0);
-                    nameWidth = find_game_name_tv.getMeasuredWidth();
-                }
-                int infoWidth = find_game_info_tv.getWidth();
-                if (infoWidth == 0) {
-                    find_game_info_tv.measure(0, 0);
-                    infoWidth = find_game_info_tv.getMeasuredWidth();
-                }
-                //图标位置变化
-                int find_game_top = getResources().getDimensionPixelSize(R.dimen.find_game_top);
-                int find_icon_with = getResources().getDimensionPixelSize(R.dimen.find_icon_with);
-//                int leftMargin = getResources().getDimensionPixelSize(R.dimen.content_padding_5);
-                int titleHeight = img_baseactivity_title.getHeight();
-                int titleWidth = img_baseactivity_title.getWidth();
-                int topRow = (titleHeight - find_game_name_tv.getHeight() - find_game_info_tv.getHeight()) / 5;
-                int topRow2 = (titleHeight - find_game_name_tv.getHeight()) / 2;
-                int leftRow = topRow2 / 4;//isNeedReservation ? topRow : 5 * topRow;
-
-                int willTop = Math.max(topRow / 2, find_game_top + verticalOffset);
-                int row = (find_icon_with * willTop + titleHeight * (find_game_top - willTop)) / find_game_top - topRow;
-                RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) find_game_iv.getLayoutParams();
-                layoutParams.leftMargin = Math.max(titleWidth, (G.WIDTH - find_icon_with) / 2 + verticalOffset);
-                layoutParams.topMargin = willTop;
-                layoutParams.width = row;
-                layoutParams.height = row;
-                find_game_iv.setLayoutParams(layoutParams);
-                //名字位置变化
-                RelativeLayout.LayoutParams layoutParams2 = (RelativeLayout.LayoutParams) find_game_name_tv.getLayoutParams();
-                layoutParams2.leftMargin = Math.max(titleWidth + row + 2 * leftRow, (G.WIDTH - nameWidth) / 2 + verticalOffset);
-                layoutParams2.topMargin = Math.max(topRow2, getResources().getDimensionPixelSize(R.dimen.find_game_top2) + verticalOffset);
-                find_game_name_tv.setLayoutParams(layoutParams2);
-                //tag
-                RelativeLayout.LayoutParams layoutParams6 = (RelativeLayout.LayoutParams) ll_game_tag.getLayoutParams();
-                layoutParams6.topMargin = getResources().getDimensionPixelSize(R.dimen.find_game_top165) + verticalOffset;
-                ll_game_tag.setLayoutParams(layoutParams6);
-                //信息位置变化
-                RelativeLayout.LayoutParams layoutParams3 = (RelativeLayout.LayoutParams) find_game_info_tv.getLayoutParams();
-                int left1 = (G.WIDTH - infoWidth) / 2;
-                int left2 = titleWidth + row + 2 * leftRow;
-                layoutParams3.leftMargin = left1;//left2 > left1 ? Math.min(left2, left1 - verticalOffset) : Math.max(left2, left1 + verticalOffset);
-                layoutParams3.topMargin = /*Math.max(find_game_name_tv.getHeight() + 4 * topRow, */getResources().getDimensionPixelSize(R.dimen.find_game_top190) + verticalOffset/*)*/;
-                find_game_info_tv.setLayoutParams(layoutParams3);
-                //下载按钮位置变化
-                RelativeLayout.LayoutParams layoutParams4 = (RelativeLayout.LayoutParams) welfare_gift_layout.getLayoutParams();
-                layoutParams4.setMarginEnd(Math.max(ibtn_baseactivity_right.getWidth(), (G.WIDTH - welfare_gift_layout.getWidth()) / 2 + verticalOffset));
-                layoutParams4.topMargin = getResources().getDimensionPixelSize(R.dimen.find_game_top5) + verticalOffset;//Math.max((titleHeight - welfare_gift_layout.getHeight()) / 2, getResources().getDimensionPixelSize(R.dimen.find_game_top4) + verticalOffset);// Math.max(topRow, getResources().getDimensionPixelSize(R.dimen.find_game_top4) + verticalOffset);
-                welfare_gift_layout.setLayoutParams(layoutParams4);
-                //星级位置变化
-                RelativeLayout.LayoutParams layoutParams5 = (RelativeLayout.LayoutParams) find_game_xin.getLayoutParams();
-                layoutParams5.topMargin = getResources().getDimensionPixelSize(R.dimen.find_game_top210) + verticalOffset;
-                if (willTop == topRow / 2) {
-                    if (mIsExpanded) {
-//                        txt_baseactivity_title.setVisibility(View.INVISIBLE);
-                        find_game_bar.setVisibility(View.VISIBLE);
-                        title_bottom_line.setVisibility(View.VISIBLE);
-                        img_baseactivity_title.setImageLevel(1);
-                        mIsExpanded = false;//修改状态标记为折叠
-                    }
-                } else {
-                    if (!mIsExpanded) {
-                        mIsExpanded = true;//修改状态标记为展开
-//                        txt_baseactivity_title.setVisibility(View.VISIBLE);
-                        find_game_bar.setVisibility(View.INVISIBLE);
-                        title_bottom_line.setVisibility(View.INVISIBLE);
-                        img_baseactivity_title.setImageLevel(0);
-                    }
-                }
-            }
-        });
-
-        resetData();
-
-    }
-
-    private void resetData() {
-        //游戏简介与下载
-        ViewUtil.setText(find_game_name_tv);
-        ViewUtil.setText(find_game_info_tv);
-        ViewUtil.setText(find_game_down_tv);
-        if (find_game_xin != null)
-            find_game_xin.setRating(0.0f);
-        //游戏介绍
-    }
-
-    @Override
-    public void initListener() {
-
-    }
-
-    @Override
-    public void initData() {
-        GameEntity gameEntity = DataUtil.getInstance().getCacheResult(ApiKey.playGameDetail(id), GameEntity.class);
-        loadApp(gameEntity);
-
-        initDetailFromNet();
-    }
-
-    private void loadApp(GameEntity gameEntity) {
-        if (gameEntity != null) {
-            loadData(gameEntity);
-        } else {
-            resetData();
-        }
-    }
-
-    private void loadData(GameEntity gameEntity) {
-        this.gameEntity = gameEntity;
-        if (gameEntity == null || (gameApp = gameEntity.getApp()) == null) {
-            return;
-        }
-        //游戏简介与下载
-        GlideImageLoader.setGameImage(find_game_iv, gameApp.getIcon() + "");
-        ViewUtil.setText(find_game_name_tv, gameApp.getName());
-        isNeedReservation = !gameApp.isCanDownload();//这里认为只有两种状态：可下载与预约下载
-//        if (isNeedReservation)
-//            ViewUtil.setText(find_game_info_tv, String.format(Locale.CHINA, "开放时间：%s", TimeUtil.TimeStamp2Date(gameApp.getDownload_at(), "yyyy-MM-dd\u0020HH:mm")));
-//        else {
-//            String format = "包体大小 (%sM)";
-//            ViewUtil.setText(find_game_info_tv, String.format(Locale.CHINA, format, gameApp.getPackage_size()));
-//        }
-        String format = "包体大小 (%sM)";
-        ViewUtil.setText(find_game_info_tv, String.format(Locale.CHINA, format, gameApp.getPackage_size()));
-
-        find_game_xin.setRating(gameApp.getScore() / 2);
-
-        updateView(this, gameEntity, find_game_down_tv);
-
-        mAdapter.clearData();
-        mAdapter.add(FgtPlayGameDetail.newInstance(gameEntity), "详情");
-        //ViewPager
-        //welfare_gift_layout
-        if (gameEntity.isGiftAndBonus()) {
-            welfare_gift_layout.setVisibility(View.GONE);
-        } else {
-            welfare_gift_layout.setVisibility(View.VISIBLE);
-            mAdapter.add(FgtPlaGameGift.newInstance(gameEntity), "礼包");
-            if (gameEntity.isGift()) {
-                gift_tv.setVisibility(View.VISIBLE);
-            } else {
-                gift_tv.setVisibility(View.GONE);
-            }
-            if (TextUtils.isEmpty(gameEntity.getBonusText())) {
-                welfare_tv.setVisibility(View.GONE);
-            } else {
-                welfare_tv.setVisibility(View.VISIBLE);
-                ViewUtil.setText(welfare_tv, String.format(Locale.CHINA, "+%s元", gameEntity.getBonusText()));
-            }
-        }
-
-        mViewPager.setAdapter(mAdapter);
-        tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
-        tabLayout.setupWithViewPager(mViewPager);
-        CommonUtil.getInstance().reflex(tabLayout, activity);
-
-        //tag 标签绘制
-        CommonUtil.getInstance().paintLineaLayout(activity, gameEntity, ll_game_tag, 4, R.color.txt_bule, R.drawable.shape_blue_stroke_rectangle_no_lb);
-
-    }
-
-    //更新按钮状态与添加点击事件
-    private void updateView(final Activity activity, GameEntity gameEntity, TextView textView) {
-        CommonUtil.getInstance().palyGameDetailBtnValue(activity, gameEntity, textView, 0);
-    }
-
-
-    private void initDetailFromNet() {
-        showProgress();
-        SheepApp.getInstance().getNetComponent().getApiService().playGameDetail(id)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(this) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.playGameDetail(id));
-                        if (isNewData) {
-                            GameEntity gameEntity = baseMessage.getData(GameEntity.class);
-                            loadApp(gameEntity);
-                        }
-                        hideProgress();
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        G.showToast(baseMessage);
-                        resetData();
-                        hideProgress();
-                    }
-                });
-    }
-
-    @Override
-    public void call(Integer integer) {
-
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
-    //下载状态监听
-    void onPre(DownLoadInfo task) {
-        if (TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
-            return;
-        }
-
-        if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getMDownloadUrl())) {
-            find_game_down_tv.setText("准备下载中");
-        }
-    }
-
-    void taskStart(DownLoadInfo task) {
-        if (TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
-            return;
-        }
-        if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getMDownloadUrl())) {
-            find_game_down_tv.setText("开始下载中");
-        }
-    }
-
-    void taskResume(DownLoadInfo task) {
-        if (TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
-            return;
-        }
-        if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getMDownloadUrl())) {
-            find_game_down_tv.setText("恢复下载中");
-        }
-    }
-
-    //在这里处理任务执行中的状态，如进度进度条的刷新
-    protected void running(DownLoadInfo task) {
-        if (gameEntity == null || TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
-            return;
-        }
-        if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getMDownloadUrl())) {
-            find_game_down_tv.setText(String.format(Locale.CHINA, "%d%%(%s)", Math.abs(task.getMPercent()), task.getAverageSpeed()));//添加下载速度
-        }
-    }
-
-    void taskStop(DownLoadInfo task) {
-        if (gameEntity == null || TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
-            return;
-        }
-        if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getMDownloadUrl())) {
-            find_game_down_tv.setText(CommonUtil.CONTINUE_DOWNLOAD);
-        }
-    }
-
-    void taskCancel(DownLoadInfo task) {
-        if (gameEntity == null || TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
-            return;
-        }
-        if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getMDownloadUrl())) {
-            find_game_down_tv.setText("已经取消");
-        }
-    }
-
-    void taskFail(DownLoadInfo task) {
-        if (gameEntity == null || TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
-            return;
-        }
-        if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getMDownloadUrl())) {
-            find_game_down_tv.setText(CommonUtil.FAIL_DOWNLOAD);
-        }
-    }
-
-    void taskComplete(DownLoadInfo task) {
-        if (gameEntity == null || TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
-            return;
-        }
-        if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getMDownloadUrl())) {
-            find_game_down_tv.setText(CommonUtil.START_INSTALL);
-        }
-        if (gameEntity != null && gameEntity.getApp() != null && TextUtils.equals(task.getMDownloadUrl(), gameEntity.getApp().getDownload_link()))
-            gameEntity.getApp().updateState(DownloadUtil.STATUS_FINISH);
-        if (gameEntity != null && gameEntity.getRelease_task() != null && TextUtils.equals(task.getMDownloadUrl(), gameEntity.getApp().getDownload_link()))
-            gameEntity.getRelease_task().getDownloadHelper().updateState(DownloadUtil.STATUS_FINISH);
-    }
-
-    @Subscribe
-    public void onEventMainThread(Intent intent) {
-        if (intent != null && intent.getAction() != null && intent.getDataString() != null && intent.getDataString().contains("package:")) {
-            String packageName = intent.getDataString().replace("package:", "");
-            if (gameApp == null || !TextUtils.equals(packageName, gameApp.getPackage_names())) {
-                return;
-            }
-
-            if (find_game_down_tv != null) {
-                switch (intent.getAction()) {
-                    case ACTION_PACKAGE_ADDED:
-                        find_game_down_tv.setText(CommonUtil.GAME_OPEN);
-                        break;
-                    case ACTION_PACKAGE_REMOVED:
-                        String path = PackageUtil.isExistsFile(packageName, gameApp.getDownload_url());
-                        if (TextUtils.isEmpty(path)) {
-                            find_game_down_tv.setText(CommonUtil.START_DOWNLOAD);
-                        } else {
-                            find_game_down_tv.setText(CommonUtil.START_INSTALL);
-                        }
-                        break;
-                }
-            }
-
-            if (TextUtils.equals(packageName, gameApp.getPackage_names())) {
-                switch (intent.getAction()) {
-                    case ACTION_PACKAGE_ADDED:
-                        if (gameApp != null)
-                            gameApp.updateState(DownloadUtil.STATUS_INSTALLED);
-                        if (gameEntity.getRelease_task() != null)
-                            gameEntity.getRelease_task().getDownloadHelper().updateState(DownloadUtil.STATUS_INSTALLED);
-                        break;
-                    case ACTION_PACKAGE_REMOVED:
-                        String path = PackageUtil.isExistsFile(packageName, gameApp.getDownload_url());
-                        if (TextUtils.isEmpty(path)) {
-                            if (gameApp != null)
-                                gameApp.updateState(DownloadUtil.STATUS_INIT);
-                            if (gameEntity.getRelease_task() != null)
-                                gameEntity.getRelease_task().getDownloadHelper().updateState(DownloadUtil.STATUS_INIT);
-                        } else {
-                            if (gameApp != null)
-                                gameApp.updateState(DownloadUtil.STATUS_FINISH);
-                            if (gameEntity.getRelease_task() != null)
-                                gameEntity.getRelease_task().getDownloadHelper().updateState(DownloadUtil.STATUS_FINISH);
-                        }
-                        break;
-                }
-            }
-        }
-    }
-
-    @Subscribe
-    public void onEventMainThread(BigEvent event) {
-        switch (event.getEventTypes()) {
-            case REFRESH_XIAOMI_GAME_LIST:
-                initData();
-                break;
-        }
-        if (event.getData() instanceof DownLoadInfo) {
-            DownLoadInfo task = (DownLoadInfo) event.getData();
-            switch (event.getEventTypes()) {
-                case DOWNLOAD_RUNNING:
-                    running(task);
-                    break;
-                case DOWNLOAD_STOP:
-                    taskStop(task);
-                    break;
-                case DOWNLOAD_COMPLETE:
-                    taskComplete(task);
-                    break;
-                case DOWNLOAD_CANCEL:
-                    taskCancel(task);
-                    break;
-                case DOWNLOAD_FAIL:
-                    taskFail(task);
-                    break;
-            }
-        }
-    }
-}

app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameList.java

@@ -28,6 +28,7 @@ public class ActPlayGameList extends BaseListActivity2<GameEntity> {
         gameListType = DataUtil.getObject(getIntent(), GameListType.class);
         TitleBarUtils
                 .getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(this, gameListType.getTitle())
                 .setTitleFinish(this);
     }

app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameRecommendList.java

@@ -28,6 +28,7 @@ public class ActPlayGameRecommendList extends BaseListActivity2<GameEntity> {
         gameListType = DataUtil.getObject(getIntent(), GameListType.class);
         TitleBarUtils
                 .getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(this, gameListType.getTitle())
                 .setTitleFinish(this);
     }

app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameUserLikeList.java

@@ -25,6 +25,7 @@ public class ActPlayGameUserLikeList extends BaseListActivity2<GameEntity> {
         GameListType gameListType = DataUtil.getObject(getIntent(), GameListType.class);
         TitleBarUtils
                 .getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(this, gameListType.getTitle())
                 .setTitleFinish(this);
     }

app/src/main/java/com/sheep/gamegroup/view/activity/ActPublishArticle.java

@@ -74,7 +74,10 @@ public class ActPublishArticle extends BaseActivity {
 
     @Override
     public void initView() {
-        TitleBarUtils.getInstance().setTitleFinish(this).setTitle(this, "")
+        TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
+                .setTitleFinish(this)
+                .setTitle(this, "")
                 .setRightBtn(this, "发布", 0, new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {

app/src/main/java/com/sheep/gamegroup/view/activity/GameCertificationActivity.java

@@ -80,7 +80,9 @@ public class GameCertificationActivity extends BaseActivity {
         activity = this;
         textProgressBar = new TextProgressBar(activity);
         textProgressBar.setVisibility(View.VISIBLE);
-        TitleBarUtils.getInstance().setTitle(activity, "授权登录")
+        TitleBarUtils.getInstance()
+//                .setShowOrHide(this, true)
+                .setTitle(activity, "授权登录")
                 .setTitleListen(activity, 0, null);
         sdk_change_user_list.setVisibility(View.GONE);
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/ActiveRuleActivity.java

@@ -26,7 +26,9 @@ public class ActiveRuleActivity extends BaseActivity {
 
     @Override
     public void initView() {
-        TitleBarUtils.getInstance().setTitle(this, "活动规则")
+        TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
+                .setTitle(this, "活动规则")
                 .setTitleFinish(this);
     }
 

app/src/main/res/layout/act_comment_game_app.xml

@@ -3,10 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <include layout="@layout/title" />
-
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="50dp">

app/src/main/res/layout/act_game_certification.xml

@@ -5,8 +5,6 @@
     android:layout_height="match_parent"
     android:background="#F5F5F5">
 
-    <include layout="@layout/title" />
-
     <android.support.v4.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/act_gift_detail.xml

@@ -3,10 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <include layout="@layout/title" />
-
     <include layout="@layout/item_download_welfare" />
 
     <TextView

app/src/main/res/layout/act_invitation.xml

@@ -4,7 +4,7 @@
     android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="30dp"
+    android:fitsSystemWindows="true"
     android:background="#F0F0F0">
 
     <RelativeLayout
@@ -41,16 +41,6 @@
             android:overScrollMode="never" />
     </RelativeLayout>
 
-    <ImageView
-        android:id="@+id/img_baseactivity_title"
-        android:layout_width="?attr/actionBarSize"
-        android:layout_height="?attr/actionBarSize"
-        android:gravity="center_vertical"
-        android:scaleType="centerInside"
-        android:src="@drawable/narrow_back_black"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <RelativeLayout
         android:id="@+id/layout_f"
         android:layout_width="match_parent"

app/src/main/res/layout/act_media_choose.xml

@@ -3,14 +3,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <include layout="@layout/title" />
-
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
-        style="@style/style_tab"
-        android:layout_marginTop="7dp" />
+        style="@style/style_tab" />
 
     <include layout="@layout/line_1px_hor" />
 

app/src/main/res/layout/act_play_game_detail_layout.xml

@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/txt_white">
-
-    <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.design.widget.AppBarLayout
-            android:id="@+id/appbar_act_game_details"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/txt_white"
-            android:fitsSystemWindows="true">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="250dp"
-                android:gravity="center_horizontal"
-                android:orientation="vertical"
-                app:expandedTitleTextAppearance="@style/TextAppearance.Design.CollapsingToolbar.Expanded"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed"/>
-
-        </android.support.design.widget.AppBarLayout>
-
-        <android.support.v4.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fillViewport="false"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-            <!--选项卡-->
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-                <View
-                    android:id="@+id/find_information_line"
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    android:background="@color/theme_app_divider_color"
-                    android:layout_marginTop="@dimen/content_padding_10"
-                    app:layout_constraintTop_toBottomOf="@+id/find_information_time"/>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:background="@color/white"
-                    android:orientation="vertical">
-
-                    <android.support.design.widget.TabLayout
-                        android:id="@+id/tabLayout"
-                        style="@style/style_tab"
-                        app:tabIndicatorHeight="2dp"
-                        android:layout_height="48dp"/>
-                    <include layout="@layout/line_1px_hor" />
-                </LinearLayout>
-
-
-                <com.kfzs.android.view.widget.WrapContentHeightViewPager
-                    android:id="@+id/viewpager_act_game_details"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@color/white"
-                    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-                    android:layout_marginBottom="@dimen/content_padding_54"/>
-            </LinearLayout>
-        </android.support.v4.widget.NestedScrollView>
-    </android.support.design.widget.CoordinatorLayout>
-
-    <View
-        android:id="@+id/status_height_view"
-        android:layout_width="match_parent"
-        android:layout_height="0dp" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:layout_below="@+id/status_height_view">
-
-        <View
-            android:id="@+id/find_game_bar"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/white_F9F9F9"
-            android:visibility="invisible" />
-
-        <include
-            layout="@layout/title_bottom_line"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:visibility="invisible" />
-
-        <ImageView
-            android:id="@+id/img_baseactivity_title"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:paddingEnd="@dimen/content_padding"
-            android:paddingStart="@dimen/content_padding"
-            android:scaleType="centerInside"
-            android:src="@drawable/narrow_back_black" />
-
-        <TextView
-            android:id="@+id/txt_baseactivity_title"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/black_text_deep"
-            android:textSize="@dimen/text_size_4"
-            android:visibility="invisible" />
-        <!--右边图片按钮-->
-        <ImageButton
-            android:id="@+id/ibtn_baseactivity_right"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:paddingEnd="@dimen/content_padding"
-            android:paddingStart="@dimen/content_padding"
-            android:background="@color/translate"
-            android:src="@mipmap/share"
-            android:gravity="center"
-            android:visibility="invisible"/>
-    </RelativeLayout>
-
-    <ImageView
-        android:id="@+id/find_game_iv"
-        android:layout_width="@dimen/find_icon_with"
-        android:layout_height="@dimen/find_icon_with"
-        android:layout_marginTop="@dimen/find_game_top"
-        android:src="@drawable/loading_01"
-        android:layout_below="@+id/status_height_view" />
-
-    <TextView
-        android:id="@+id/find_game_name_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/find_game_top2"
-        android:layout_below="@+id/status_height_view"
-        android:text="@string/app_name"
-        android:textColor="@color/title"
-        android:textSize="16sp" />
-
-    <LinearLayout
-        android:id="@+id/ll_game_tag"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/find_game_top165"
-        android:layout_centerHorizontal="true"
-        android:orientation="horizontal"/>
-
-    <TextView
-        android:id="@+id/find_game_info_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/find_game_top190"
-        android:layout_below="@+id/status_height_view"
-        android:gravity="center"
-        android:layout_centerHorizontal="true"
-        android:text="厂商：网易 | 版本号：7.9"
-        android:textColor="@color/black_666666"
-        android:textSize="12sp" />
-
-    <android.support.v7.widget.AppCompatRatingBar
-        android:id="@+id/find_game_xin"
-        style="@style/style_rating_bar"
-        android:layout_width="wrap_content"
-        android:layout_marginTop="@dimen/find_game_top210"
-        android:layout_centerHorizontal="true"
-        android:isIndicator="true"
-        android:numStars="5"
-        android:rating="1.5"
-        android:stepSize="0.5" />
-
-    <LinearLayout
-        android:id="@+id/welfare_gift_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/find_game_top6"
-        android:layout_below="@+id/status_height_view"
-        android:orientation="horizontal"
-        android:visibility="invisible">
-        <TextView
-            android:id="@+id/welfare_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:padding="@dimen/content_padding_3"
-            android:background="@mipmap/welfare_gift_img_bg"
-            android:text=""
-            android:textSize="10sp"
-            android:textColor="@color/white"/>
-        <TextView
-            android:id="@+id/gift_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:padding="@dimen/content_padding_3"
-            android:background="@mipmap/welfare_gift_img_bg"
-            android:text="礼包"
-            android:textSize="10sp"
-            android:layout_marginStart="@dimen/content_padding_15"
-            android:textColor="@color/white"/>
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_centerInParent="true"
-        android:layout_alignParentBottom="true"
-        android:background="@color/white"
-        android:orientation="vertical">
-
-        <include layout="@layout/line_1px_hor" />
-
-        <TextView
-            android:id="@+id/find_game_down_tv"
-            style="@style/style_button"
-            android:text="下载" />
-    </LinearLayout>
-</RelativeLayout>

app/src/main/res/layout/act_publish_article.xml

@@ -2,10 +2,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:background="@color/white">
 
-    <include layout="@layout/title" />
-
     <android.support.v7.widget.AppCompatEditText
         android:id="@+id/act_publish_article_et"
         android:layout_width="match_parent"

app/src/main/res/layout/activity_active_rule.xml

@@ -3,12 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:background="@color/white">
 
-    <include
-        android:id="@+id/sign_rule_title_bar"
-        layout="@layout/title" />
-
     <TextView
         android:id="@+id/active_rule_text"
         android:layout_width="match_parent"