Przeglądaj źródła

删除部分没有用到的端端代码;
修复有些手机沉浸式显示出错的问题

zengjiebin 7 lat temu
rodzic
commit
0e8292683f
30 zmienionych plików z 752 dodań i 4258 usunięć
  1. 17 14
      app/src/main/AndroidManifest.xml
  2. 0 508
      app/src/main/java/com/kfzs/duanduan/ActGameDetails.java
  3. 0 48
      app/src/main/java/com/kfzs/duanduan/ActGategoryRank.java
  4. 0 232
      app/src/main/java/com/kfzs/duanduan/ActMain.java
  5. 0 498
      app/src/main/java/com/kfzs/duanduan/ActSearch.java
  6. 0 373
      app/src/main/java/com/kfzs/duanduan/ActWeb.java
  7. 0 18
      app/src/main/java/com/kfzs/duanduan/BaseCompatFragment.java
  8. 1 2
      app/src/main/java/com/kfzs/duanduan/KFZSApp.java
  9. 0 216
      app/src/main/java/com/kfzs/duanduan/adp/AdpFragmentRank.java
  10. 0 545
      app/src/main/java/com/kfzs/duanduan/adp/AdpMainPageRecy.java
  11. 0 140
      app/src/main/java/com/kfzs/duanduan/adp/AdpSearchGame.java
  12. 0 69
      app/src/main/java/com/kfzs/duanduan/adp/BaseAdpterWithDownBtn.java
  13. 0 206
      app/src/main/java/com/kfzs/duanduan/fragment/CategoryRankFragment.java
  14. 1 1
      app/src/main/java/com/kfzs/duanduan/fragment/FgtAskgetmoney.java
  15. 0 218
      app/src/main/java/com/kfzs/duanduan/fragment/FgtGameDetail.java
  16. 0 371
      app/src/main/java/com/kfzs/duanduan/fragment/FgtMainGame.java
  17. 0 6
      app/src/main/java/com/kfzs/duanduan/react/MainTab.java
  18. 305 305
      app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java
  19. 0 100
      app/src/main/java/com/kfzs/duanduan/utils/dlg/SkipUtils.java
  20. 3 6
      app/src/main/java/com/sheep/gamegroup/util/Jump2View.java
  21. 1 1
      app/src/main/java/com/sheep/gamegroup/util/TestUtil.java
  22. 277 0
      app/src/main/java/com/sheep/gamegroup/view/activity/ActMain.java
  23. 0 341
      app/src/main/java/com/sheep/gamegroup/view/activity/ActMainGame.java
  24. 0 6
      app/src/main/java/com/sheep/gamegroup/view/activity/ChangeTelAct.java
  25. 0 3
      app/src/main/java/com/sheep/gamegroup/view/activity/PersonalCenterAct.java
  26. 1 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java
  27. 28 27
      app/src/main/res/layout/act_audit_layout.xml
  28. 116 0
      app/src/main/res/layout/act_main.xml
  29. 1 1
      app/src/main/res/layout/fgt_personacenter_item_top.xml
  30. 1 2
      app/src/main/res/layout/fgt_personalcenter_layout.xml

+ 17 - 14
app/src/main/AndroidManifest.xml

@@ -210,9 +210,23 @@
             android:theme="@style/MyDialogActivityTheme"
             />
 
-        <!--半袋米首页-->
-        <activity
-            android:name="com.kfzs.duanduan.ActMain"
+        <!--&lt;!&ndash;半袋米首页&ndash;&gt;-->
+        <!--<activity-->
+            <!--android:name="com.kfzs.duanduan.ActMain"-->
+            <!--android:configChanges="keyboardHidden|screenSize|orientation"-->
+            <!--android:exported="true"-->
+            <!--android:hardwareAccelerated="true"-->
+            <!--android:launchMode="singleTask"-->
+            <!--android:screenOrientation="portrait"-->
+            <!--android:theme="@style/AppTheme"-->
+            <!--android:windowSoftInputMode="adjustPan|stateHidden">-->
+            <!--<intent-filter>-->
+                <!--<category android:name="android.intent.category.DEFAULT" />-->
+                <!--<action android:name="android.intent.action.VIEW" />-->
+            <!--</intent-filter>-->
+        <!--</activity>-->
+        <activity
+            android:name="com.sheep.gamegroup.view.activity.ActMain"
             android:configChanges="keyboardHidden|screenSize|orientation"
             android:exported="true"
             android:hardwareAccelerated="true"
@@ -227,17 +241,6 @@
         </activity>
 
         <activity
-            android:name="com.kfzs.duanduan.ActSearch"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustNothing" />
-        <activity
-            android:name="com.kfzs.duanduan.ActGameDetails"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.kfzs.duanduan.ActGategoryRank"
-            android:screenOrientation="portrait" />
-
-        <activity
             android:name="com.sheep.gamegroup.view.activity.AskGetMoneyAct"
             android:screenOrientation="portrait" />
 

+ 0 - 508
app/src/main/java/com/kfzs/duanduan/ActGameDetails.java

@@ -1,508 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.NestedScrollView;
-import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.RatingBar;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.arialyy.annotations.Download;
-import com.arialyy.aria.core.Aria;
-import com.arialyy.aria.core.download.DownloadTask;
-import com.bumptech.glide.Glide;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.adp.AdpViewPagerDetail;
-import com.kfzs.duanduan.bean.BaseMsg;
-import com.kfzs.duanduan.bean.DownloadStatus;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-import com.kfzs.duanduan.bean.UserRecord;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventDownloadHandler;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.fragment.FgtGameDetail;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.GameOuterClass;
-import com.kfzs.duanduan.utils.InstallButtonUtils;
-import com.kfzs.duanduan.utils.NumberFormatUtils;
-import com.kfzs.duanduan.utils.ShareUtils;
-import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.APIRequestV2;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-import com.kfzs.duanduan.view.DialogStorageLow;
-import com.kfzs.duanduan.view.KFProgressButton;
-import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.G;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-import static com.kfzs.duanduan.bean.KFIntentKeys.EXTRA_PAGE_NUM;
-
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  ActGameDetails</p>
- * @ <p>Description: 商品详情页,已经重构了</p>
- * @ KFIntentKeys.EXTRA_GAME_ID 传商品Id
- * @ date:  2017/6/19 13:36
- * @ QQ:    315096953
- */
-public class ActGameDetails extends BaseCompatActivity {
-
-    private GameOuterClass.Game respGame;
-
-    private Boolean bShowDownloadBtn = true;
-
-    private String sGameId = "";
-    private Map<String, InstallButtonUtils> mInstallButtonMgr = new HashMap<>();
-    private UserRecord userRecord;
-
-    private int selectType = 0;//选择tab项0,1,2
-
-
-    @BindView(R.id.viewpager_act_game_details)
-    ViewPagerAutoHeigh mViewPager;
-
-    @BindView(R.id.img_act_game_details_logo)
-    ImageView mGameIcon;
-
-    @BindView(R.id.img_act_game_details_bg)
-    ImageView mImgBg;
-
-    @BindView(R.id.txt_act_game_details_name)
-    TextView mGameName;
-
-    @BindView(R.id.txt_act_game_details_types)
-    TextView mGameTags;
-
-    @BindView(R.id.img_back)
-    View mBack;
-
-    @BindView(R.id.img_share)
-    View mShare;
-
-    @BindView(R.id.txt_act_game_details_downcount)
-    TextView mGameDldCnt;
-
-    @BindView(R.id.ratb_act_game_details)
-    RatingBar mGameStars;
-
-    @BindView(R.id.downbtn_frg_fgt_app_detail_install)
-    KFProgressButton mBtnDown;
-
-
-    @BindView(R.id.toolbar_layout_act_game_details)
-    CollapsingToolbarLayout collapsingToolbarLayout;
-
-    @BindView(R.id.txt_act_game_details_title)
-    TextView mTxtTitle;
-
-    @BindView(R.id.tabLayout)
-    TabLayout tabLayout;
-    @BindView(R.id.nestedScrollView)
-    NestedScrollView nestedScrollView;
-
-    private EventDownloadHandler.OnDownCallback mOnDownCallback;
-    private FgtGameDetail mFragmentGameDetail;
-    private boolean mIsExpanded = false;//是否是折叠状态
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_game_details_parent);
-        ButterKnife.bind(this);
-
-        EventBus.getDefault().register(this);
-
-        bShowDownloadBtn = !getIntent().hasExtra(KFIntentKeys.EXTRA_GAME_REQUEST_ORDER);
-        selectType = getIntent().getIntExtra(EXTRA_PAGE_NUM, 0);
-        initView();
-        initData();
-        Aria.download(this).register();
-    }
-
-    private void initData() {
-        Intent intent = getIntent();
-        sGameId = intent.getStringExtra(KFIntentKeys.EXTRA_GAME_ID);
-        loadLoanUserercord(sGameId);
-
-        doNetworkTask(sGameId);
-    }
-
-    /**
-     * 初始化各组件
-     */
-    private void initView() {
-//        int height = HelperUtils.W * 310 / 720;
-//        mImgBg.setLayoutParams(new RelativeLayout.LayoutParams(HelperUtils.W, height));
-
-        setSupportActionBar((Toolbar) findViewById(R.id.toolbar_act_game_details));
-        if(mFragmentGameDetail == null){
-            mFragmentGameDetail = new FgtGameDetail();
-        }
-        AdpViewPagerDetail adpViewPagerDetail = new AdpViewPagerDetail(getSupportFragmentManager());
-        adpViewPagerDetail.add(mFragmentGameDetail, getString(R.string.app_details_details));
-//        adpViewPagerDetail.add(new FgtGift(), getString(R.string.app_details_user_gift));//小绵羊中注释掉用户礼包
-//        adpViewPagerDetail.add(new FgContinuePlay(), getString(R.string.continue_play));//小绵羊中注释掉借着玩
-        mViewPager.setOffscreenPageLimit(2);
-        mViewPager.setAdapter(adpViewPagerDetail);
-
-        mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                mViewPager.reSetHeight();
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-
-        /*
-          标题显示和隐藏的监听
-         */
-        ((AppBarLayout) findViewById(R.id.appbar_act_game_details)).addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
-            @Override
-            public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-                if (Math.abs(verticalOffset) <
-                        appBarLayout.getTotalScrollRange() - HelperUtils.getDpiToPix(20)) {
-                    if (!mIsExpanded) {
-                        mIsExpanded = true;//修改状态标记为展开
-                        mTxtTitle.setVisibility(View.INVISIBLE);
-                    }
-                } else if (Math.abs(verticalOffset) >= appBarLayout.getTotalScrollRange()) {
-                    if (mIsExpanded) {
-                        mTxtTitle.setVisibility(View.VISIBLE);
-                        mIsExpanded = false;//修改状态标记为折叠
-                    }
-                }
-            }
-        });
-
-        tabLayout.setupWithViewPager(mViewPager);
-        tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-            @Override
-            public void onTabSelected(TabLayout.Tab tab) {
-                selectType = tab.getPosition();
-//                G.showToast(tab.getPosition()+","+tab.getText());
-                Log.e("tab.getPosition()", tab.getPosition() + "");
-                setButtonStatue(tab.getPosition());
-
-            }
-
-            @Override
-            public void onTabUnselected(TabLayout.Tab tab) {
-
-            }
-
-            @Override
-            public void onTabReselected(TabLayout.Tab tab) {
-
-            }
-        });
-
-        mBack.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onBackPressed();
-            }
-        });
-        mShare.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                popShare();
-            }
-        });
-
-
-        if (getIntent().hasExtra(EXTRA_PAGE_NUM)) {
-            mViewPager.setCurrentItem(selectType);
-        }
-    }
-
-    /**
-     * 设置button状态
-     */
-    private void setButtonStatue(int position){
-        if (position == 2) {
-//                    mBtnDown.setVisibility(View.GONE);
-            if (userRecord == null) {
-                return;
-            }
-            if (userRecord.getLoan_state() == 2 && userRecord.getHave_access_state() == 2) {//不允许借款
-//                        mBtnDown.setVisibility(View.GONE);
-            } else {
-//                        mBtnDown.setVisibility(View.VISIBLE);
-                if (userRecord.getHave_access_state() == 2) {//未借款
-                    mBtnDown.setText("去还款");
-                } else {
-                    mBtnDown.setText("去借款");
-                }
-            }
-            mBtnDown.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    G.showToast(R.string.coming_soon);
-                }
-            });
-        } else {
-            if (!bShowDownloadBtn) {
-                mBtnDown.setVisibility(View.GONE);
-                return;
-            }
-            mBtnDown.setVisibility(View.VISIBLE);
-            if (respGame == null) {
-                return;
-            }
-//                    nestedScrollView.setNestedScrollingEnabled(true);
-            try {
-                DownBtnUtils.addDownloadBtnListener(mBtnDown, ActGameDetails.this,
-                        mInstallButtonMgr, respGame, "game_detail" + respGame.getId());
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    /**
-     * 分享游戏;
-     */
-    private void popShare() {
-        String shareUrl;
-        if (respGame != null && !TextUtils.isEmpty(respGame.getDownloadUrl())) {
-            shareUrl = respGame.getDownloadUrl();
-        } else if (respGame != null && !TextUtils.isEmpty(respGame.getBookDownloadUrl())) {
-            shareUrl = respGame.getBookDownloadUrl();
-        } else {
-            showToast("分享地址错误!");
-            return;
-        }
-        if (!TextUtils.isEmpty(shareUrl) && shareUrl.toLowerCase().startsWith("http")) {
-            new ShareUtils().showShareView(this, shareUrl, respGame.getGameName(),
-                    respGame.getIconImage(), respGame.getIntroduce());
-        } else {
-            String msg = "分享错误,请联系客服!\n错误链接为: " + shareUrl;
-            Log.w("DD_ERROR", msg);
-            showToast(msg);
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (KFZSApp.actMain == null) {
-            Intent intent = new Intent(this, ActMain.class);
-            startActivity(intent);
-        }
-        this.finish();
-    }
-
-    private void doNetworkTask(final String sGameId) {
-
-        String reqUrl = UrlBll.AppStoreApi.GAME_LISTS + "/" + sGameId;
-
-        APIRequest bannerRequest = APIRequestInstance.getReq(TAG, reqUrl, null, new ResponseNetworkTask() {
-
-            @Override
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                respGame = apiResponse.getGame();
-                if (TextUtils.isEmpty(respGame.getGameName()) || isFinishing()) {
-                    return;
-                }
-
-
-                //                mImgIconGift.setVisibility(View.VISIBLE);
-                mGameName.setText(respGame.getGameName());
-                mTxtTitle.setText(respGame.getGameName());
-                mGameTags.setText(respGame.getTypeText());
-                mGameDldCnt.setText(" (" + String.format(getString(R.string.download_count), respGame.getDownloadNum() + "") + ")");
-                //                mGameSize.setText(respGame.getSize());
-                //                mGameDescription.setText(respGame.getIntroduce());
-                mGameStars.setRating(NumberFormatUtils.getDivideResult(respGame.getStar()));
-
-
-                Glide.with(ActGameDetails.this).load(respGame.getIconImage()).into(mGameIcon);
-
-                Glide.with(ActGameDetails.this).load(respGame.getDetailBackImage()).into(mImgBg);
-
-
-                mFragmentGameDetail.setData(respGame);
-
-
-                setButtonStatue(selectType);
-//                if (!bShowDownloadBtn) {
-//                    mBtnDown.setVisibility(View.GONE);
-//                    return;
-//                }
-//                mBtnDown.setVisibility(View.VISIBLE);
-//                DownBtnUtils.addDownloadBtnListener(mBtnDown, ActGameDetails.this,
-//                        mInstallButtonMgr, respGame, "game_detail" + respGame.getId());
-
-
-//               mInstallButtonMgr.put(respGame.getDownloadUrl(),
-//                        InstallButtonUtils.init("game_detail", respGame.getDownloadUrl(),
-//                                mBtnDown, "game_detail"));
-//
-//                DownBtnUtils.addDownloadBtnListener(mBtnDown, ActGameDetails.this, mInstallButtonMgr, respGame, "game_detail");
-//                GameStatusScanner scanner = new GameStatusScanner(ActGameDetails.this, mBtnDown, TAG) {
-//                    @Override
-//                    public void onButtonClickReturnListener(String downloadUrl, boolean bPaused, int percent) {
-//                        mBtnDown.updateButtonUI(bPaused ? KFProgressButton.STATUS.STATUS_PAUSED : KFProgressButton.STATUS.STATUS_INSTALLING);
-//                    }
-//                };
-//                scanner.compare(respGame);
-//                scanner.addListener();
-
-
-                if (respGame == null || TextUtils.isEmpty(respGame.getDownloadUrl())) {
-                    mBtnDown.setEnabled(false);
-                    mBtnDown.setText(getString(R.string.please_wait));
-                    mBtnDown.setVisibility(View.VISIBLE);
-                }
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-
-            }
-
-        }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
-
-        KFZSNetwork.addRequest(bannerRequest);
-
-    }
-
-
-    /**
-     * 安装按钮状态更新
-     *
-     * @param info
-     */
-    @Subscribe
-    public void onEventMainThread(DownloadStatus info) {
-        if (mOnDownCallback == null) {
-            mOnDownCallback = DownBtnUtils.installBtnStatus(mInstallButtonMgr);
-        }
-        EventDownloadHandler.newInstance(this, mOnDownCallback)
-                .setmTag(TAG).handlDownloadResult(info);
-    }
-
-    @Subscribe
-    public void onEventMainThread(BigEvent event) {
-        if (event.getEventTypes() == EventTypes.STORAGE_LOW) {
-            DialogStorageLow.showDialog(this);
-        }
-    }
-
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
-    /**
-     * 获取借着完状态
-     * return 401:未登录 400:未绑定手机 200:成功
-     */
-    public void loadLoanUserercord(final String sGameId) {
-        String url = UrlBll.V2.BORROW_PLAY_LOAN_USERRECORD;
-        HashMap<String, String> m = new HashMap<>();
-        m.put("gameId", sGameId);
-        APIRequestV2 apiRequestV2 = APIRequestInstance.getReqUrlV2(url,
-                url, m, new Response.Listener<BaseMsg>() {
-                    @Override
-                    public void onResponse(BaseMsg baseMsg) {
-//                        doNetworkTask(sGameId);
-                        String s = baseMsg.getMsg();
-                        int code = baseMsg.getCode();
-                        switch (code) {
-                            case 400:
-//                                G.showToast("请绑定手机号");
-                                return;
-                            case 401:
-//                                G.showToast(baseMsg.getMsg() + "");
-                                return;
-                            case 200:
-                                UserRecord u = baseMsg.getData(UserRecord.class);
-                                if (u != null) {
-                                    userRecord = u;
-                                }
-                                break;
-                        }
-                    }
-                }, new Response.ErrorListener() {
-                    @Override
-                    public void onErrorResponse(VolleyError volleyError) {
-
-                    }
-                });
-        KFZSNetwork.addRequest(apiRequestV2);
-    }
-
-    /**
-     *
-     */
-    private boolean getFlagBorrow() {
-        if (userRecord == null) {
-            return false;
-        }
-        if (userRecord.getLoan_state() == 2 && userRecord.getHave_access_state() == 1) {
-            return true;
-        }
-        return false;
-    }
-
-    @Download.onTaskStop void stopDownload(DownloadTask task){
-        if(isThisGame(task)){
-            mBtnDown.setText("暂停");
-        }
-    }
-    @Download.onTaskStart void startDownload(DownloadTask task){
-        if(isThisGame(task)){
-            mBtnDown.setText("下载");
-        }
-    }
-
-    @Download.onTaskComplete void completeDownload(DownloadTask task){
-        if(isThisGame(task)){
-            mBtnDown.setText("安装");
-        }
-    }
-
-    @Download.onTaskRunning void runDownload(DownloadTask task){
-        if(isThisGame(task)){
-            mBtnDown.setText("下载中");
-        }
-    }
-    private boolean isThisGame(DownloadTask task){
-        return respGame != null && task != null && TextUtils.equals(task.getKey(), respGame.getDownloadUrl());
-    }
-}

+ 0 - 48
app/src/main/java/com/kfzs/duanduan/ActGategoryRank.java

@@ -1,48 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.BaseCompatActivity;
-import com.kfzs.duanduan.fragment.CategoryRankFragment;
-import com.kfzs.duanduan.utils.dlg.TitleBarUtils;
-
-/**
- * 游戏列表页面
- * Created by Administrator on 2017/12/13.
- */
-
-public class ActGategoryRank extends BaseCompatActivity {
-
-    public static final String INTENT_TYPE_ID="INTENT_TYPE_ID";
-
-    private int mIntGameTypeId=0;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_game_lists_common);
-        mIntGameTypeId=getIntent().getIntExtra(INTENT_TYPE_ID,0);
-        TitleBarUtils.getInstance().setTitle(this, "分类");
-        TitleBarUtils.getInstance().setTitleFinish(this);
-        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-        Bundle bundle = new Bundle();
-        bundle.putInt(INTENT_TYPE_ID, mIntGameTypeId);
-        Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
-        if(fragment == null){
-            fragment = new CategoryRankFragment();
-            fragment.setArguments(bundle);
-            transaction.add(R.id.fragment_container, fragment, "tag");
-            transaction.commitAllowingStateLoss();
-        }else{
-            fragment.setArguments(bundle);
-            transaction.replace(R.id.fragment_container, fragment);
-            transaction.commitAllowingStateLoss();
-        }
-
-
-    }
-}

+ 0 - 232
app/src/main/java/com/kfzs/duanduan/ActMain.java

@@ -1,232 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.react.TabsHelper;
-import com.kfzs.duanduan.utils.StatusBarUtils;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.view.DialogStorageLow;
-import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.model.entity.Container;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.umeng.socialize.UMShareAPI;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.lang.reflect.Field;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import rx.functions.Action1;
-
-
-/**
- *
- */
-public class ActMain extends BaseActivity implements TabsHelper.ItemPosition {
-    private static final String TAG = "ActMain";
-
-    @BindView(R.id.other_container)
-    LinearLayout other_container;
-    @BindView(R.id.main_layout)
-    RelativeLayout main_layout;
-
-    public final static String INTENT_GAME_ID = "INTEN_GAME_ID";
-
-
-    private ImageView mImgDot;//下载按钮的小红点
-
-
-    public TabsHelper tabsHelper;
-
-    private TabsHelper.ItemPosition itemPosition;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_main;
-    }
-
-    @Override
-    public void initView() {
-        KFZSApp.actMain = this;
-        tabsHelper = new TabsHelper(this);
-        HelperUtils.init();//初始化屏幕的高,density等
-        ButterKnife.bind(this);
-        EventBus.getDefault().register(this);
-
-        mImgDot = findViewById(R.id.img_download_manager_dot);
-        tabsHelper.init();
-
-    }
-
-    @Override
-    public void initListener() {
-        findViewById(R.id.edt_main_search_enter).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(ActMain.this, ActSearch.class));
-            }
-        });
-        findViewById(R.id.img_download_manager).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mImgDot.setVisibility(View.GONE);
-                startActivity(new Intent(ActMain.this, ActDownloadMgr.class));
-                UMConfigUtils.onEvent(UMConfigUtils.Event.GAME_DOWNLOAD_MANAGER);
-            }
-        });
-    }
-
-    @Override
-    public void initData() {
-
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setStatusSC();
-    }
-
-    /**
-     * 设置状态栏沉浸式
-     */
-    private void setStatusSC() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            getWindow().setStatusBarColor(Color.TRANSPARENT);
-            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION	 | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-            main_layout.setPadding(0, 0, 0, G.getHasVirtualKey(KFZSApp.actMain) -G.getNoHasVirtualKey(KFZSApp.actMain) );
-
-        }
-    }
-
-    /**
-     * 设置状态栏正常
-     */
-    private void setStatusVI() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            getWindow().setStatusBarColor(Color.parseColor("#29d6fd"));
-            main_layout.setPadding(0, 0, 0, G.getHasVirtualKey(KFZSApp.actMain) -G.getNoHasVirtualKey(KFZSApp.actMain) );
-           // getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-    }
-
-
-
-    private Container<Action1<Integer>> container = new Container<>();
-
-    public Container<Action1<Integer>> getContainer() {
-        return container;
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (container != null && container.getT() != null)
-            container.getT().call(1);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if (container != null && container.getT() != null)
-            container.getT().call(2);
-    }
-
-    /**
-     * 传递事件
-     */
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        KFZSNetwork.stopByTag(TAG);
-        EventBus.getDefault().unregister(this);
-        if (container != null && container.getT() != null)
-            container.setT(null);
-    }
-
-
-    /**
-     * 主要的事件广播接收更新处理
-     *
-     * @param event
-     */
-    @Subscribe
-    public void onEventMainThread(BigEvent event) {
-        switch (event.getEventTypes()) {
-            case TIPS_DOWN_ICON:
-                mImgDot.setVisibility(View.VISIBLE);
-                break;
-            case STORAGE_LOW:
-                DialogStorageLow.showDialog(this);
-                break;
-        }
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        setIntent(intent);
-        if (intent.hasExtra(INTENT_GAME_ID)) {
-            tabsHelper.goToPostion(intent.getIntExtra(INTENT_GAME_ID, 0));
-        } else {
-            recreate();
-        }
-    }
-
-    /**
-     *
-     */
-    @Override
-    public void onBackPressed() {
-        tabsHelper.onBackPressed();
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
-    }
-
-    @Override
-    public void positionClick(int position) {
-        switch (position) {
-            case 0://赚钱
-                setStatusSC();
-                break;
-            /*case 1://审核
-                setStatusVI();
-                break;
-            case 2://邀请
-                setStatusVI();
-                break;
-            case 3://发现
-                setStatusVI();
-                break;
-            case 4://个人中心
-                setStatusVI();
-                break;*/
-            default:
-                setStatusVI();
-                break;
-
-        }
-    }
-}

+ 0 - 498
app/src/main/java/com/kfzs/duanduan/ActSearch.java

@@ -1,498 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.text.Editable;
-import android.text.Html;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.arialyy.annotations.Download;
-import com.arialyy.aria.core.Aria;
-import com.arialyy.aria.core.download.DownloadTask;
-import com.kfzs.android.view.tag.FlowLayout;
-import com.kfzs.android.view.tag.TagAdapter;
-import com.kfzs.android.view.tag.TagFlowLayout;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.adp.AdpSearchGame;
-import com.kfzs.duanduan.adp.AdpSearchRecord;
-import com.kfzs.duanduan.adp.AdpSearchViewPager;
-import com.kfzs.duanduan.bean.DownloadStatus;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.event.EventDownloadHandler;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.HotWordsOuterClass;
-import com.kfzs.duanduan.proto.MistinessNamesOuterClass;
-import com.kfzs.duanduan.utils.InstallButtonUtils;
-import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-import com.orhanobut.logger.Logger;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.R;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-
-public class ActSearch extends BaseCompatActivity {
-
-    private static final String TAG = ActSearch.class.getSimpleName();
-    private final String TAG_REQUEST_URL = "ActSearch:TAG_REQUEST_URL";
-    private Map<String, InstallButtonUtils> mInstallButtonMgrMap = new HashMap<>();
-
-    @BindView(R.id.edt_act_search_keyword)
-    AutoCompleteTextView mEdtKeyWord;
-    @BindView(R.id.img_act_search_clear)
-    ImageView mImgClear;
-
-    @BindView(R.id.tabs_act_search)
-    TabLayout mTabLayout;
-    @BindView(R.id.viewpager_act_search)
-    ViewPager mViewPager;
-    @BindView(R.id.search_history_listview)
-    ListView mListRecord;
-
-    @BindView(R.id.layout_activity_search_record)
-    View mViewRecord;
-    @BindView(R.id.layout_activity_search_content)
-    View mViewContent;
-
-
-    private AdpSearchRecord mAdpSearchRecord;
-    private TagAdapter<HotWordsOuterClass.HotWords> hotWordAdapter;
-    ;
-    private List<HotWordsOuterClass.HotWords> lHotWords = new ArrayList<>();
-
-    private String mStrSearchKey;
-
-    private EventDownloadHandler.OnDownCallback mOnDownCallback;
-    private AdpSearchViewPager mAdpSearchViewPager;
-
-    private AdpSearchGame mAdpSearchGame;
-    private ArrayAdapter<String> mAdpKeyWords;
-
-    private boolean mIsAutoShowTxt = true;//是否自动提示输入,不然在点搜索历史的时候,也会自动提示
-
-    private boolean isDownLoad = true;//是否显示有下载
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_search);
-
-        ButterKnife.bind(this);
-        EventBus.getDefault().register(this);
-        Aria.download(this).register();
-
-        mAdpSearchViewPager = new AdpSearchViewPager(this);
-        mAdpSearchRecord = new AdpSearchRecord(this, new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                setShowKeyTips(false);
-                showRecord(false);
-                mEdtKeyWord.setText(mAdpSearchRecord.getItem(position).getKey());
-                doQueryTask(mAdpSearchRecord.getItem(position).getKey());
-            }
-        });
-        //设置返回主页的按钮
-        mTabLayout.setupWithViewPager(mViewPager);
-
-
-        setSearchInputStatus();
-        setInputEvents();
-        initTabGame();
-        //initTabNewGame();
-        //initTabTest();
-
-
-        loadSearchHistory();
-        loadHotTagView();
-        mViewPager.setAdapter(mAdpSearchViewPager);
-    }
-
-    private void setShowKeyTips(boolean isAutoShowTxt) {
-        mIsAutoShowTxt = isAutoShowTxt;
-        if (!mIsAutoShowTxt) {
-            mAdpKeyWords.clear();
-            mAdpKeyWords.notifyDataSetChanged();
-        }
-    }
-
-
-    /**
-     * 载入搜索历史列表
-     */
-    private void loadSearchHistory() {
-        View tvFooter = LayoutInflater.from(this).inflate(R.layout.listview_item_search_histroy_footer, null);
-        mListRecord.addFooterView(tvFooter);
-        mListRecord.setAdapter(mAdpSearchRecord);
-
-        tvFooter.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mAdpSearchRecord.getCount() < 1) {
-                    return;
-                }
-                mAdpSearchRecord.clear();
-                mAdpSearchRecord.notifyDataSetChanged();
-            }
-        });
-    }
-
-
-    /**
-     * 载入热门标签,用得以前别人的,没去具体了解了
-     */
-    private void loadHotTagView() {
-
-        TagFlowLayout tagList = findViewById(R.id.search_tagflow_layout);
-        tagList.setMaxSelectCount(1);
-        hotWordAdapter = new TagAdapter<HotWordsOuterClass.HotWords>(lHotWords) {
-            @Override
-            public View getView(FlowLayout parent, int position, HotWordsOuterClass.HotWords o) {
-
-                TextView tv = (TextView) LayoutInflater.from(ActSearch.this).inflate(R.layout.hot_tag_item, parent, false);
-                tv.setText(o.getHotWord());
-                return tv;
-            }
-        };
-
-        tagList.setAdapter(hotWordAdapter);
-        tagList.setOnTagClickListener(new TagFlowLayout.OnTagClickListener() {
-            @Override
-            public boolean onTagClick(View view, int position, FlowLayout parent) {
-                setShowKeyTips(false);
-                showRecord(true);
-                mEdtKeyWord.setText(lHotWords.get(position).getHotWord());
-                doQueryTask(lHotWords.get(position).getHotWord());
-                return false;
-            }
-        });
-
-        APIRequest hotWordsRequest = APIRequestInstance.getReqUrl(TAG, UrlBll.AppStoreApi.HOTWORDS, null, new ResponseNetworkTask() {
-
-            @Override
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                lHotWords.clear();
-                lHotWords.addAll(apiResponse.getHotWordsList());
-                hotWordAdapter.notifyDataChanged();
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-                Logger.d("onFail", msg);
-            }
-
-        }, HelperUtils.makeErr(getString(R.string.toast_init_tag_fail)));
-        KFZSNetwork.addRequest(hotWordsRequest);
-    }
-
-
-    /**
-     * 是否显示搜索历史
-     *
-     * @param isShowRecord
-     */
-    private void showRecord(boolean isShowRecord) {
-        mViewRecord.setVisibility(isShowRecord ? View.VISIBLE : View.GONE);
-        mViewContent.setVisibility(isShowRecord ? View.GONE : View.VISIBLE);
-    }
-
-    /**
-     * 初始化游戏Tab
-     */
-    private void initTabGame() {
-        View view = View.inflate(this, R.layout.list_search, null);
-        ListView listView = view.findViewById(R.id.list_list_search);
-        listView.setEmptyView(view.findViewById(R.id.empty_view));
-        mAdpSearchGame = new AdpSearchGame(this);
-        mAdpSearchGame.setmInstallButtonMgrMap(mInstallButtonMgrMap);
-        listView.setAdapter(mAdpSearchGame);
-
-        mAdpSearchViewPager.addView(view, R.string.tab_search_game);
-    }
-
-    /**
-     * 初始化游戏NewGame
-     */
-    private void initTabNewGame() {
-        View view = View.inflate(this, R.layout.list_search, null);
-        ListView listView = view.findViewById(R.id.list_list_search);
-        listView.setEmptyView(view.findViewById(R.id.empty_view));
-
-        //mAdpSearchNewGame = new AdpSearchNewGame(this);
-        //mAdpSearchNewGame.setmInstallButtonMgrMap(mInstallButtonMgrMap);
-        //listView.setAdapter(mAdpSearchNewGame);
-
-        mAdpSearchViewPager.addView(view, R.string.tab_search_newgame);
-    }
-
-    /**
-     * 初始化游戏Test
-     */
-    private void initTabTest() {
-        View view = View.inflate(this, R.layout.list_search, null);
-        ListView listView = view.findViewById(R.id.list_list_search);
-        listView.setEmptyView(view.findViewById(R.id.empty_view));
-
-        //mAdpSearchTest = new AdpSearchTest(this);
-        //mAdpSearchTest.setmInstallButtonMgrMap(mInstallButtonMgrMap);
-        //listView.setAdapter(mAdpSearchTest);
-
-        mAdpSearchViewPager.addView(view, R.string.tab_search_test);
-    }
-
-
-    /**
-     * 自动转到输入模式
-     */
-    private void setSearchInputStatus() {
-        mEdtKeyWord.setFocusable(true);
-        mEdtKeyWord.setFocusableInTouchMode(true);
-        mEdtKeyWord.requestFocus();
-        InputMethodManager imm = (InputMethodManager) this.getSystemService(Context.INPUT_METHOD_SERVICE);
-        if(imm != null)
-            imm.showSoftInput(mEdtKeyWord, 0);
-    }
-
-
-    /**
-     * 监听输入框,如果是按回车就搜索,有内容时显示清除按钮等。
-     */
-    private void setInputEvents() {
-        mAdpKeyWords = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1);
-        mEdtKeyWord.setAdapter(mAdpKeyWords);
-        //以逗号为分隔符
-//        mEdtKeyWord.setTokenizer(new AutoCompleteTextView.CommaTokenizer());
-        mEdtKeyWord.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                mImgClear.setVisibility(TextUtils.isEmpty(s) ? View.GONE : View.VISIBLE);
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                if (mIsAutoShowTxt) {
-                    loadKeyWords();
-                } else {
-                    mEdtKeyWord.setSelection(mEdtKeyWord.length());
-                }
-                setShowKeyTips(true);
-                if (s.length() < 1) {
-                    showRecord(true);
-                    return;
-                }
-            }
-        });
-
-        mEdtKeyWord.setOnKeyListener(new View.OnKeyListener() {
-            @Override
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                if (keyCode == KeyEvent.KEYCODE_ENTER) {
-                    Object imm = getSystemService(INPUT_METHOD_SERVICE);
-                    View focus = getCurrentFocus();
-                    if(imm instanceof InputMethodManager && focus != null) {
-                        ((InputMethodManager) imm).hideSoftInputFromWindow(focus.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
-                    }
-                    doQueryTask(mEdtKeyWord.getText().toString());
-                }
-                return false;
-            }
-        });
-    }
-
-    private void loadKeyWords() {
-        if (mEdtKeyWord.length() < 1) {
-            return;
-        }
-        KFZSNetwork.stopByTag(TAG_REQUEST_URL);
-        HashMap<String, String> paramsurl = new HashMap<>();
-        paramsurl.put("q", mEdtKeyWord.getText().toString().trim());
-        APIRequest bannerRequest = APIRequestInstance.getReqUrl(TAG, UrlBll.AppStoreApi.SEARCH_KEYWORDS,
-                paramsurl, new ResponseNetworkTask() {
-                    @Override
-                    public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                        List<MistinessNamesOuterClass.MistinessNames> list = apiResponse.getMistinessNamesList();
-                        mAdpKeyWords.clear();
-                        for (MistinessNamesOuterClass.MistinessNames min : list) {
-                            mAdpKeyWords.add(min.getGameNames());
-                        }
-                        mAdpKeyWords.notifyDataSetChanged();
-                        //强制匹配
-                        mAdpKeyWords.getFilter().filter(mEdtKeyWord.getText().toString());
-                    }
-
-                    @Override
-                    public void onFail(int code, String msg) {
-
-                    }
-                }, null);
-        bannerRequest.setTag(TAG_REQUEST_URL);
-        KFZSNetwork.addRequest(bannerRequest);
-    }
-
-
-    /**
-     * 主要的点击事件监听
-     *
-     * @param v
-     */
-    @OnClick({R.id.ibtn_act_serach, R.id.btn_act_search_search, R.id.img_act_search_clear})
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.ibtn_act_serach:
-                Object imm = getSystemService(INPUT_METHOD_SERVICE);
-                View focus = getCurrentFocus();
-                if(imm instanceof InputMethodManager && focus != null) {
-                    ((InputMethodManager) imm).hideSoftInputFromWindow(focus.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
-                }
-                this.finish();
-                break;
-            case R.id.btn_act_search_search:
-                doQueryTask(mEdtKeyWord.getText().toString());
-                break;
-            case R.id.img_act_search_clear:
-                mEdtKeyWord.setText("");
-                mImgClear.setVisibility(View.GONE);
-                break;
-        }
-    }
-
-
-    /**
-     * 提交搜索请求
-     *
-     * @param keyword
-     */
-    private void doQueryTask(String keyword) {
-        if (keyword == null || keyword.trim().length() < 1) {
-            return;
-        }
-        mStrSearchKey = keyword.trim();
-        mAdpSearchRecord.add(mStrSearchKey);
-
-        HashMap<String, String> params = new HashMap<>();
-        if (null != KFZSDDContentSession.getInstance().findOutHeadSession(app)) {
-            params.put(UrlBll.HeadParams.AUTHORIZATION,
-                    KFZSDDContentSession.getInstance().findOutHeadSession(app).getToken());
-        }
-        UMConfigUtils.onEvent(UMConfigUtils.Event.GAME_SEARCH);
-        HashMap<String, String> paramsurl = new HashMap<>();
-        paramsurl.put("q", mStrSearchKey);
-        APIRequest bannerRequest = APIRequestInstance.getReqUrlWithHead(TAG, UrlBll.AppStoreApi.SEARCH,
-                params, paramsurl, new ResponseNetworkTask() {
-                    @Override
-                    public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                        mAdpSearchGame.clear();
-                        //mAdpSearchNewGame.clear();
-                        //mAdpSearchTest.clear();
-                        mAdpSearchGame.addAll(apiResponse.getGamesList());
-                        //mAdpSearchNewGame.addAll(apiResponse.getOpenServersList());
-                        //mAdpSearchTest.addAll(apiResponse.getOpenTestsList());
-
-                        mAdpSearchGame.notifyDataSetChanged();
-                        //mAdpSearchNewGame.notifyDataSetChanged();
-                        //mAdpSearchTest.notifyDataSetChanged();
-                        showRecord(false);
-                    }
-
-                    @Override
-                    public void onFail(int code, String msg) {
-                        Logger.d(TAG, "搜索结果获取失败" + msg);
-                    }
-                }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
-        KFZSNetwork.addRequest(bannerRequest);
-        UMConfigUtils.Event.GAME_SEARCH.onEvent();
-    }
-
-    /**
-     * 格式化搜索结果显示
-     *
-     * @param strKey
-     * @param strCount
-     * @return
-     */
-    private Spanned getHTMLStr(String strKey, String strCount) {
-        return Html.fromHtml("与<font color='#fa6324' size='20'>“" + strKey + "”</font>" + "结果相关" +
-                "共 <font color='#fa6324' size='25'>" + strCount + "</font>" + " 条");
-    }
-
-
-    /**
-     * 下载任务状态的事件
-     *
-     * @param info
-     */
-    @Subscribe
-    public void onEventMainThread(DownloadStatus info) {
-        if (mOnDownCallback == null) {
-            mOnDownCallback = DownBtnUtils.installBtnStatus(mInstallButtonMgrMap);
-        }
-
-        EventDownloadHandler
-                .newInstance(this, mOnDownCallback)
-                .setmTag(TAG)
-                .handlDownloadResult(info);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
-
-    @Download.onTaskStop void stopDownload(DownloadTask task){
-        if(!isDownLoad){
-            mAdpSearchGame.notifyDataSetChanged();
-        }
-    }
-    @Download.onTaskStart void startDownload(DownloadTask task){
-        if(!isDownLoad){
-            mAdpSearchGame.notifyDataSetChanged();
-        }
-    }
-
-    @Download.onTaskComplete void completeDownload(DownloadTask task){
-        if(!isDownLoad){
-            mAdpSearchGame.notifyDataSetChanged();
-        }
-    }
-
-    @Download.onTaskRunning void runDownload(DownloadTask task){
-        if(!isDownLoad){
-            mAdpSearchGame.notifyDataSetChanged();
-        }
-    }
-}

+ 0 - 373
app/src/main/java/com/kfzs/duanduan/ActWeb.java

@@ -1,373 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import com.tencent.smtt.sdk.WebChromeClient;
-import com.tencent.smtt.sdk.WebSettings;
-import com.tencent.smtt.sdk.WebView;
-import com.tencent.smtt.sdk.WebViewClient;
-
-import android.webkit.JavascriptInterface;
-import android.widget.ImageButton;
-import android.widget.TextView;
-
-import com.kfzs.android.view.RunThreadUtils;
-import com.kfzs.android.view.widget.SafeWebView;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-import com.kfzs.duanduan.data.graph.provider.current.Current;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.db.DataSave;
-import com.kfzs.duanduan.utils.ShareUtils;
-import com.kfzs.duanduan.utils.net.OnURLParseByJS;
-import com.orhanobut.logger.Logger;
-import com.sheep.gamegroup.util.ShareJs;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.R;
-import com.umeng.socialize.UMShareAPI;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-import static com.kfzs.duanduan.bean.KFIntentKeys.EXTRA_WEBVIEW_NO_TITLE;
-
-/**
- * all web view
- * Created by HooRang on 2017/2/17.
- */
-public class ActWeb extends BaseCompatActivity {
-
-    public static final String BEHAVIOR_GAME_BOOK = "behavior:act:webView:game_book";
-
-    public
-    @BindView(R.id.tv_nav_label)
-    TextView tvLabel;
-
-    @BindView(R.id.activity_webview)
-    SafeWebView mWebView;
-
-    @BindView(R.id.ibtn_act_webview)
-    ImageButton btnBack;
-
-    @BindView(R.id.btn_share)
-    ImageButton btnShare;
-
-    private String extraUrl;
-    private String shareUrl;
-    private String extraTitle;
-    private String extraGameBookID;
-    private String extraGameID;
-    private String behavior;
-    private String extraShareImgUrl;
-    private WebSettings webViewSettings;
-    private OnURLParseByJS urlParseByJS;
-    private String packageName;
-    private String gameVer;
-    private String gameSize;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_webview);
-
-        ButterKnife.bind(this);
-        webViewSettings = mWebView.getSettings();
-        webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
-        mWebView.autoSettingWebViewDefaultByWideViewPort(this, false);
-        behavior = getIntent().getStringExtra(KFIntentKeys.EXTRA_BEHAIOR);
-        extraUrl = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_URL);
-        extraTitle = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_TITLE);
-        extraShareImgUrl = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_SHARE_IMGURL);
-        extraGameID = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_GAME_ID);
-        extraGameBookID = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_GAME_BOOK_ID);
-        packageName = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_PACKAGENAME);
-        gameVer = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_GAME_VERSION);
-        gameSize = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_GAME_SIZE);
-        if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
-            findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);
-        }
-
-
-        mWebView.addJavascriptInterface(new PublicJavaScript(), "PublicJavaScript");
-        mWebView.addJavascriptInterface(new ShareJs(this), "ShareWeixinQq");
-        urlParseByJS = new JSCallFilter();
-        filterURLByBehavior();
-        loadUrl();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        webViewSettings.setJavaScriptEnabled(true);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        webViewSettings.setJavaScriptEnabled(false);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        mWebView.setVisibility(View.GONE);
-        mWebView.removeAllViews();
-        mWebView.destroy();
-    }
-
-    private void loadUrl() {
-        tvLabel.setText(extraTitle);
-        Logger.d("loadUrl: " + extraUrl);
-        //        extraUrl = "http://app.haowan.yunduanzs.cn/static/index.html?type=android&dd_channel=family&gamebookid=21&gameid=132#/";
-        mWebView.setWebChromeClient(new WebChromeClient());
-        mWebView.setWebViewClient(new WebViewClient() {
-            boolean once = true;
-
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                try {
-                    if (filterURLByJS(url, "openActivity"))
-                        return true;
-
-                    if (url.contains(".apk") && !url.contains("channel") && once) {
-                        // 创建下载请求
-                        once = false;
-                        setUmengOnEvent(extraTitle);
-                        Intent intent = new Intent();
-                        intent.setAction(Intent.ACTION_VIEW);
-                        intent.addCategory(Intent.CATEGORY_BROWSABLE);
-                        intent.setData(Uri.parse(url));
-                        startActivity(intent);
-
-
-//                        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
-//                        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-//                        request.setTitle(extraTitle);
-//                        request.setDescription("文件下载中...");
-//                        File saveFile = new File(Environment.getExternalStorageDirectory(), extraTitle + ".apk");
-//                        request.setDestinationUri(Uri.fromFile(saveFile));
-//                        DownloadManager manager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
-//                        long downloadId = manager.enqueue(request);
-//
-//                        FileDownloader.start(url);
-//
-//                        DownLoadInfo task = new DownLoadInfo();
-//                        task.setMIconUrl(extraShareImgUrl);
-//                        task.setMGameName(extraTitle);
-//                        task.setMGameID(Integer.valueOf(extraGameID));
-//                        task.setMDownloadUrl(url);
-//                        task.setMPackageName(packageName);
-//                        task.setMVersionCode(Integer.parseInt(TextUtils.isEmpty(gameVer) ? "1.0" : gameVer));
-//                        task.setMTotalSize(Double.valueOf(gameSize));
-//                        downloadTaskService.addDownloadTask(task);
-//
-//                        EventBus.getDefault().post(BigEvent.get()
-//                                .setEventTypes(EventTypes.TIPS_DOWN_ICON));
-//
-//                        startActivity(new Intent(ActWeb.this, ActDownloadMgr.class));
-//                        ActWeb.this.finish();
-                        return true;
-                    }
-                    view.loadUrl(url);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return true;
-            }
-        });
-        mWebView.loadUrl(extraUrl);
-    }
-
-
-    private void setUmengOnEvent(String extInfo) {
-        Map<String, String> map = new HashMap<>();
-        map.put("gameUnique", extInfo);
-        UMConfigUtils.Event.GAME_DOWNLOAD.onEvent(map);
-    }
-
-
-    private void filterURLByBehavior() {
-        Logger.d("extraGameID: " + extraGameID + " |extraGameBookID: " + extraGameBookID);
-        String channelName = DataSave.getInstance().getChannelName();
-        if (TextUtils.equals(behavior, BEHAVIOR_GAME_BOOK)) {
-            shareUrl = extraUrl + "?type=share&dd_channel=" + channelName;
-            extraUrl = extraUrl + "?type=android&dd_channel=" + channelName;
-            if (!TextUtils.isEmpty(extraGameID) && !TextUtils.isEmpty(extraGameBookID)) {
-                extraUrl = extraUrl + "&gamebookid=" + extraGameBookID + "&gameid=" + extraGameID;
-                shareUrl = shareUrl + "&gamebookid=" + extraGameBookID + "&gameid=" + extraGameID;
-            } else {
-                showToast("订阅游戏参数错误\nbehavior: " + behavior + "\nGameID: " + extraGameID + "\nGameBookID: " + extraGameBookID);
-                ActWeb.this.finish();
-            }
-        }
-        filterShareBtn();
-    }
-
-    private void filterShareBtn() {
-        if (TextUtils.equals(behavior, BEHAVIOR_GAME_BOOK)) {
-            btnShare.setVisibility(View.VISIBLE);
-        } else {
-            btnShare.setVisibility(View.GONE);
-        }
-    }
-
-    private boolean filterURLByJS(String url, String router) {
-        Uri uri = Uri.parse(url);
-        String scheme = uri.getScheme();
-        if (scheme.equals("js")) {
-            if (uri.getAuthority().equals(router)) {
-                Set<String> collection = uri.getQueryParameterNames();
-                if (urlParseByJS != null) {
-                    String who = "";
-                    String where = "";
-                    String doJob = "";
-                    for (String name : collection) {
-                        if (name.equals("who")) {
-                            who = uri.getQueryParameter(name);
-                        }
-                        if (name.equals("where")) {
-                            where = uri.getQueryParameter(name);
-                        }
-                        if (name.equals("do")) {
-                            doJob = uri.getQueryParameter(name);
-                        }
-                    }
-                    urlParseByJS.whoWhereDo(who, where, doJob);
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    @OnClick({R.id.ibtn_act_webview, R.id.btn_share})
-    public void onClick(View v) {
-        int resId = v.getId();
-        switch (resId) {
-            case R.id.ibtn_act_webview:
-                onBackPressed();
-                //                this.finish();
-                break;
-            case R.id.btn_share:
-                popShare();
-                break;
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (KFZSApp.actMain == null) {
-            Intent intent = new Intent(this, ActMain.class);
-            startActivity(intent);
-        }
-        this.finish();
-    }
-
-    private void popShare() {
-        Logger.d("now share url: " + shareUrl);
-        if (!TextUtils.isEmpty(shareUrl) && shareUrl.toLowerCase().startsWith("http")) {
-            new ShareUtils().showShareView(this, shareUrl, extraTitle, extraShareImgUrl, extraTitle);
-        } else {
-            String msg = "分享错误,请联系客服!\n错误链接为: " + shareUrl;
-            Log.w("DD_ERROR", msg);
-            showToast(msg);
-        }
-    }
-
-    private class JSCallFilter implements OnURLParseByJS {
-
-        private static final String WHO_WEB = "1";
-        private static final String WHERE_CLOSE_SELF = "11";
-        private static final String WHERE_BOOK_GAME = "22";
-
-        @Override
-        public void whoWhereDo(String who, String where, String doJob) {
-            Logger.d("who:" + who + " |where:" + where + " |doJob:" + doJob);
-            switch (who) {
-                case WHO_WEB:
-                    switch (where) {
-                        case WHERE_BOOK_GAME:
-                            skip2GameDetails(doJob, true);
-                            break;
-                        case WHERE_CLOSE_SELF:
-                            showInfoAndCloseSelf("");
-                            break;
-                        default:
-                            showInfoAndCloseSelf("异常Web行为,关闭Web");
-                            break;
-                    }
-                    break;
-                default:
-                    showInfoAndCloseSelf("异常Web对象,关闭Web");
-                    break;
-            }
-        }
-    }
-
-
-    public class PublicJavaScript {
-        @JavascriptInterface
-        public String getHeader() {
-            return DDProviderHelper.getInstance().getLastUserToken(KFZSApp.context);
-        }
-        @JavascriptInterface
-        public String getNick() {
-            Current current= DDProviderHelper.getInstance().getLastUser(ActWeb.this);
-            if(current==null || TextUtils.isEmpty(current.getMNickName())){
-                return "";
-            }
-
-            return current.getMNickName();
-        }
-
-        @JavascriptInterface
-        public void finish() {
-            ActWeb.this.finish();
-        }
-    }
-
-    /**
-     * 分享js调用
-     * @param msg
-     */
-
-    private void showInfoAndCloseSelf(String msg) {
-        Logger.d(msg);
-        if (!TextUtils.isEmpty(msg)) {
-            showToast(msg);
-        }
-        RunThreadUtils.delay(new Runnable() {
-            @Override
-            public void run() {
-                ActWeb.this.finish();
-            }
-        }, 100, true);
-    }
-
-    private void skip2GameDetails(String doJob, boolean bRequestOrder) {
-        Bundle bundle = new Bundle();
-        bundle.putString(KFIntentKeys.EXTRA_GAME_ID, doJob);
-        if (bRequestOrder) {
-            bundle.putString(KFIntentKeys.EXTRA_GAME_REQUEST_ORDER, doJob);
-        }
-        skip2Activity(ActGameDetails.class, bundle);
-        this.finish();
-    }
-
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
-    }
-
-
-}

+ 0 - 18
app/src/main/java/com/kfzs/duanduan/BaseCompatFragment.java

@@ -207,24 +207,6 @@ public abstract class BaseCompatFragment extends Fragment {
     }
 
 
-    protected void skip2GameDetails(int sGameId) {
-        Intent intent = new Intent(mContext, ActGameDetails.class);
-        intent.putExtra(KFIntentKeys.EXTRA_GAME_ID, String.valueOf(sGameId));
-        startActivity(intent);
-    }
-
-    protected void skip2Activity(Class<?> cls) {
-        skip2Activity(cls, null);
-    }
-
-    protected void skip2Activity(Class<?> cls, Bundle bundle) {
-        Intent intent = new Intent(getActivity(), cls);
-        if (null != bundle) {
-            intent.putExtras(bundle);
-        }
-        startActivity(intent);
-    }
-
 
     /**
      * 刷新数据

+ 1 - 2
app/src/main/java/com/kfzs/duanduan/KFZSApp.java

@@ -38,7 +38,7 @@ import java.util.Map;
  * </pre>
  * Created by sinlov on 17/2/10.
  */
-public class KFZSApp extends MultiDexApplication {
+public abstract class KFZSApp extends MultiDexApplication {
 
     public static final boolean DEBUG = BuildConfig.DEBUG;
 
@@ -53,7 +53,6 @@ public class KFZSApp extends MultiDexApplication {
     public static String path_img_catch;
     public static String path_download;
     public static String path_Log;
-    public static ActMain actMain;
 
 
     public static final int MAX_DOWNLOAD_TASK_SIZE = 5;

+ 0 - 216
app/src/main/java/com/kfzs/duanduan/adp/AdpFragmentRank.java

@@ -1,216 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.RatingBar;
-
-import com.bumptech.glide.Glide;
-import com.kfzs.duanduan.utils.DiscountUtils;
-import com.kfzs.duanduan.view.KFProgressButton;
-import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.utils.InstallButtonUtils;
-import com.kfzs.duanduan.bean.RecyleObj;
-import com.kfzs.duanduan.bean.RecyleType;
-import com.kfzs.duanduan.proto.GameOuterClass;
-import com.kfzs.duanduan.utils.NumberFormatUtils;
-import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.view.FilterWindow;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpFragmentRank</p>
- * @ <p>Description: 首页排行页面的Recycle适配器</p>
- * @ date:  2017/7/12 14:30
- * @ QQ:    315096953
- */
-
-public class AdpFragmentRank extends AdpCommonRecy<RecyleObj> {
-
-
-    private final String TAG = this.getClass().getName();
-    private final int TAG_ID = R.id.btn_list_item_game_info;
-    private Map<String, InstallButtonUtils> mDownLoadItemLogicMgrMap = new HashMap<>();
-    private Context mContext;
-    private RecyclerView mRecyView;
-    private FilterWindow filterWindow;
-    private Button btnPanel;
-    private View.OnClickListener mTypeClickListener;
-
-    private int[] mIconId = {R.id.game_rank_top3_icon1, R.id.game_rank_top3_icon2, R.id.game_rank_top3_icon3};
-    private int[] mNameId = {R.id.game_rank_top3_name1, R.id.game_rank_top3_name2, R.id.game_rank_top3_name3};
-    private int[] mBtnId = {R.id.game_rank_top3_install1, R.id.game_rank_top3_install2, R.id.game_rank_top3_install3};
-    private int[] mLayoutId = {R.id.game_rank_top3_content1, R.id.game_rank_top3_content2, R.id.game_rank_top3_content3};
-    private int[] mGiftId = {R.id.img_listview_item_game_rank_top1, R.id.img_listview_item_game_rank_top2, R.id.img_listview_item_game_rank_top3};
-
-    public AdpFragmentRank(Context context, RecyclerView recyclerView, View.OnClickListener clickListener) {
-        super(context);
-        mContext = context;
-        mRecyView = recyclerView;
-        mTypeClickListener = clickListener;
-    }
-
-    @Override
-    public int getViewIdByType(int viewType) {
-        int resId = 0;
-        RecyleType recyleType = RecyleType.values()[viewType];
-        switch (recyleType) {
-            case RANK_TYPE:
-                resId = R.layout.listview_item_filter_panel;
-                break;
-            case RANK_TOP3:
-                resId = R.layout.listview_item_game_rank_top3;
-                break;
-            case RANK_LIST:
-                resId = R.layout.listview_item_game_info;
-        }
-        return resId;
-    }
-
-    /**
-     * 返回下载管理年HashMap
-     *
-     * @return
-     */
-    public Map<String, InstallButtonUtils> getmDownLoadItemLogicMgrMap() {
-        return mDownLoadItemLogicMgrMap;
-    }
-
-    /**
-     * 这一步不能少,不然会类型不匹配
-     *
-     * @param position
-     * @return
-     */
-    @Override
-    public int getItemViewType(int position) {
-        return getmListDatas().get(position).getRecyleType().ordinal();
-    }
-
-    @Override
-    public void convert(ViewHolder holder, RecyleObj recyleObj) {
-        switch (recyleObj.getRecyleType()) {
-            case RANK_TYPE:
-                bindFilterPanel(holder);
-                break;
-            case RANK_TOP3:
-                bindTop3(holder, (List<GameOuterClass.Game>) recyleObj.getDataObj());
-                break;
-            case RANK_LIST:
-                bindList(holder, (GameOuterClass.Game) recyleObj.getDataObj(), holder.getAdapterPosition());
-                break;
-        }
-    }
-
-
-    /**
-     * 绑定排行页的分类选择View
-     *
-     * @param helper
-     */
-    private void bindFilterPanel(final ViewHolder helper) {
-        btnPanel = helper.getView(R.id.btn_query_condition);
-        btnPanel.setOnClickListener(mTypeClickListener);
-    }
-
-
-    /**
-     * 绑定排行页的列表View
-     *
-     * @param helper
-     * @param model
-     */
-    private void bindList(final ViewHolder helper, GameOuterClass.Game model, int position) {
-        helper.setText(R.id.txt_list_item_game_info_title, model.getGameName());
-        helper.setText(R.id.txt_list_item_game_info_type, model.getTypeText());
-
-        helper.setText(R.id.txt_list_item_game_info_down_count,
-                String.format(mContext.getString(R.string.download_count), model.getDownloadNum() + ""));
-
-        helper.getView(R.id.ratbar_list_item_game_info, RatingBar.class)
-                .setRating(NumberFormatUtils.getDivideResult(model.getStar()));
-        DiscountUtils.getInstance().showDiscount(helper.itemView,
-                model.getIconImage(),
-                model.getDiscount());
-
-//        Glide.with(mContext)
-//                .load(model.getIconImage())
-//                .transform(new KFGlideRoundTransform(mContext, 5))
-//                .into((ImageView) helper.getView(R.id.img_list_item_game_info_logo));
-
-        if (!helper.getConvertView().hasOnClickListeners()) {
-            helper.getConvertView().setOnClickListener(clsListGoDetail);
-        }
-        helper.getConvertView().setTag(TAG_ID, model.getId());
-        DownBtnUtils.addDownloadBtnListener(helper.getView(R.id.btn_list_item_game_info, KFProgressButton.class),
-                mContext, mDownLoadItemLogicMgrMap, model, "rank_list" + position);
-    }
-
-
-    /**
-     * 点击排行 ,跳游戏详情
-     */
-    private View.OnClickListener clsListGoDetail = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            SkipUtils.getInstance().goGameDetails(mContext, (int) v.getTag(TAG_ID));
-        }
-    };
-
-    /**
-     * 绑定Top3的View
-     *
-     * @param helper
-     * @param lResponseTopThreeList
-     */
-    private void bindTop3(final ViewHolder helper, final List<GameOuterClass.Game> lResponseTopThreeList) {
-        for (int i = 0; i < lResponseTopThreeList.size(); i++) {
-            final GameOuterClass.Game oTempGame = lResponseTopThreeList.get(i);
-            if (i == 0) {
-                ImageView ivChampion = helper.getView(R.id.game_rank_top3_1_bg);
-                Glide.with(mContext)
-                        .load(oTempGame.getDetailBackImage())
-                        .into(ivChampion);
-            }
-
-            helper.setText(mNameId[i], oTempGame.getGameName());
-            helper.setVisible(mGiftId[i], oTempGame.getExistGift() == 1);
-            ImageView ivGameIcon = helper.getView(mIconId[i]);
-            Glide.with(mContext)
-                    .load(oTempGame.getIconImage())
-                    .into(ivGameIcon);
-
-            String position = String.valueOf((i + 1) * 12345);
-            mDownLoadItemLogicMgrMap.put(oTempGame.getDownloadUrl(), InstallButtonUtils
-                    .init(position, oTempGame.getDownloadUrl(), oTempGame.getPackageName(), helper.getView(mBtnId[i], KFProgressButton.class),
-                            "bindTopThreePanel" + i));
-            DownBtnUtils.addDownloadBtnListener(helper.getView(mBtnId[i], KFProgressButton.class),
-                    mContext,mDownLoadItemLogicMgrMap,lResponseTopThreeList.get(i),TAG);
-            helper.getView(mLayoutId[i]).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    SkipUtils.getInstance().goGameDetails(mContext, oTempGame.getId());
-                }
-            });
-        }
-    }
-
-    @Override
-    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        return super.onCreateViewHolder(parent, viewType);
-    }
-
-    @Override
-    public void onBindViewHolder(ViewHolder holder, int position) {
-        super.onBindViewHolder(holder, position);
-    }
-}

+ 0 - 545
app/src/main/java/com/kfzs/duanduan/adp/AdpMainPageRecy.java

@@ -1,545 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.app.Activity;
-import android.content.Context;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ImageView;
-import android.widget.RadioGroup;
-import android.widget.RatingBar;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
-import com.kfzs.duanduan.bean.CateGameBean;
-import com.kfzs.duanduan.bean.GuessYouLike;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-import com.kfzs.duanduan.bean.NewGameRecommend;
-import com.kfzs.duanduan.bean.RecyleObj;
-import com.kfzs.duanduan.bean.RecyleType;
-import com.kfzs.duanduan.bean.SpecialRecommend;
-import com.kfzs.duanduan.bean.VipStyle;
-import com.kfzs.duanduan.proto.IndexBannerOuterClass;
-import com.kfzs.duanduan.utils.DiscountUtils;
-import com.kfzs.duanduan.utils.InstallButtonUtils;
-import com.kfzs.duanduan.utils.NumberFormatUtils;
-import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.view.ImageGlarry;
-import com.kfzs.duanduan.view.KFProgressButton;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.G;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpMainPageRecy</p>
- * @ <p>Description: 这是首页推荐栏的RecyleView适配器</p>
- * @ date:  2017/6/15 13:03
- * @ QQ:    315096953
- */
-
-public class AdpMainPageRecy extends AdpCommonRecy<RecyleObj> {
-
-    private final String TAG = this.getClass().getName();
-    private Map<String, InstallButtonUtils> mDownLoadItemLogicMgrMap = new HashMap<>();
-    //设置Tag,因为默认Tag用于HoldView了 ,所以加个TagKey,ID必须为任意ResId
-    private final static int TAG_ID_TEMP = R.id.view_tag_1;
-    private final static int TAG_ID_TEMP2 = R.id.view_tag_2;
-    private RecyclerView mRecyView;//返回顶层的监听
-    private final static String HTML_FORMAT = "<b><font color='#E4B441'>限时福利 </font>%s会员专享</b>";
-    private ImageGlarry mImageGlarry;
-
-    public AdpMainPageRecy(Context context, RecyclerView recyclerView) {
-        super(context);
-        mContext = context;
-        mRecyView = recyclerView;
-    }
-
-
-    /**
-     * @param viewType
-     * @return 失败返回0
-     */
-    @Override
-    public int getViewIdByType(int viewType) {
-        int resId = R.layout.empty;
-        RecyleType recyleType = RecyleType.values()[viewType];
-        switch (recyleType) {
-            case BANNER:
-                resId = R.layout.fgt_main_banner;
-                break;
-            case OWN_ZONE:
-                resId = R.layout.fgt_main_own_zone;
-                break;
-            case GUESS_YOU_LIKE:
-                resId = R.layout.fgt_main_guess_you_like;
-                break;
-            case NEW_FIRST:
-                resId = R.layout.fgt_main_newrealse;
-                break;
-            case NEW_GAME_RECOMMEND:
-                resId = R.layout.fgt_main_new_game_invite;
-                break;
-            case SPECIAL_GAME_RECOMMEND:
-                resId = R.layout.fgt_main_special_game_invite;
-                break;
-            case RPG:
-            case CARTON:
-                resId = R.layout.mainpage_game_list;
-                break;
-            case SUBJECT:
-                resId = R.layout.subject_list;
-                break;
-            case NEW_GAME:
-                resId = R.layout.fgt_main_newgame;
-                break;
-            case CHOICES_GAME:
-                resId = R.layout.fgt_main_choosegames;
-                break;
-            case DEFINE_GAME:
-                resId = R.layout.fgt_main_define;
-                break;
-            case BACK_TOP:
-                resId = R.layout.listview_item_load_over;
-                break;
-        }
-        return resId;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        return getmListDatas().get(position).getRecyleType().ordinal();
-    }
-
-    public Map<String, InstallButtonUtils> getmDownLoadItemLogicMgrMap() {
-        return mDownLoadItemLogicMgrMap;
-    }
-
-    @Override
-    public void convert(ViewHolder holder, RecyleObj recyleObj) {
-        if (recyleObj.getLoaded()) {//性能优化处理
-            return;
-        }
-        switch (recyleObj.getRecyleType()) {
-            case BANNER:
-                bindBanner(holder, (List<IndexBannerOuterClass.IndexBanner>) recyleObj.getDataObj());
-                break;
-            case OWN_ZONE:
-                bindOwnZone(holder);
-                break;
-            case NEW_GAME_RECOMMEND:
-                bindNewGameRecommend(holder, (List<NewGameRecommend>) recyleObj.getDataObj());
-                break;
-            case SPECIAL_GAME_RECOMMEND:
-                bindSpecialGameRecommend(holder, (SpecialRecommend) recyleObj.getDataObj());
-                break;
-            case RPG:
-            case CARTON:
-                CateGameBean cateGameBean = (CateGameBean) recyleObj.getDataObj();
-                bindCarTonAndRPG(holder, cateGameBean, cateGameBean.getType_name());
-                break;
-            case SUBJECT:
-                bindSubject(holder, (CateGameBean) recyleObj.getDataObj());
-                break;
-            case GUESS_YOU_LIKE:
-                bindGuessYouLike(holder, (GuessYouLike) recyleObj.getDataObj());
-                break;
-            case BACK_TOP:
-                TextView textView = holder.getView(R.id.txt_back_top);
-                if (!textView.hasOnClickListeners()) {//性能优化
-                    textView.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            mRecyView.scrollToPosition(0);
-                        }
-                    });
-                }
-                break;
-        }
-        recyleObj.setLoaded(true);
-    }
-
-    /**
-     * 绑定猜你喜欢
-     *
-     * @param holder
-     */
-    private void bindGuessYouLike(ViewHolder holder, final GuessYouLike guessYouLike) {
-        if (guessYouLike == null) {
-            return;
-        }
-        RecyclerView recyclerView = holder.getView(R.id.recy_fgt_main_guess_you_like);
-        Glide.with(mContext).load(guessYouLike.getImg())
-                .into(holder.getView(R.id.img_fgt_main_guess_you_like, ImageView.class));
-        holder.getView(R.id.img_fgt_main_guess_you_like)
-                .setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        SkipUtils.getInstance().goGameType(mContext, guessYouLike.getGametypeid());
-                    }
-                });
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new StaggeredGridLayoutManager(3,
-                StaggeredGridLayoutManager.HORIZONTAL));
-        recyclerView.setAdapter(new RecyclerView.Adapter() {
-            @Override
-            public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-                RelativeLayout itemView = (RelativeLayout) LayoutInflater.from(mContext)
-                        .inflate(R.layout.item_fgt_main_game_list, parent, false);
-                itemView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        SkipUtils.getInstance().goGameDetails(mContext, (int) v.getTag(TAG_ID_TEMP));
-                    }
-                });
-                ViewGroup.LayoutParams layoutParams = new RadioGroup.LayoutParams((int) (G.WIDTH * 0.92),
-                        ViewGroup.LayoutParams.WRAP_CONTENT);
-                itemView.setLayoutParams(layoutParams);
-
-                RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(itemView) {
-                };
-                return viewHolder;
-            }
-
-            @Override
-            public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-                holder.itemView.setTag(TAG_ID_TEMP, guessYouLike.getGames().get(position).getId());
-
-                DiscountUtils.getInstance().showDiscount(holder.itemView,
-                        guessYouLike.getGames().get(position).getIconImage(),
-                        guessYouLike.getGames().get(position).getDiscount());
-
-                ((TextView) holder.itemView.findViewById(R.id.txt_item_main_game_list_title)
-                ).setText(guessYouLike.getGames().get(position).getGameName());
-                ((TextView) holder.itemView.findViewById(R.id.txt_item_main_game_list_type)
-                ).setText(guessYouLike.getGames().get(position).getTypeText());
-
-                ((TextView) holder.itemView.findViewById(R.id.txt_item_fgt_main_game_list_down)
-                ).setText("(" + guessYouLike.getGames().get(position).getDownloadNum() + ")");
-
-                ((RatingBar) holder.itemView.findViewById(R.id.ratb_item_fgt_main_game_list)
-                ).setRating(NumberFormatUtils.getDivideResult(guessYouLike.getGames().get(position).getStar()));
-                holder.itemView.findViewById(R.id.line_item_fgt_main_game_list)
-                        .setVisibility(position % 3 == 2 ? View.GONE : View.VISIBLE);
-                DownBtnUtils.addDownloadBtnListener((KFProgressButton) holder.itemView.findViewById(R.id.btn_item_fgt_main_game_list),
-                        mContext, mDownLoadItemLogicMgrMap, guessYouLike.getGames().get(position).getGameV1(),
-                        "guess_you_like" + position);
-            }
-
-            @Override
-            public int getItemCount() {
-                return guessYouLike.getGames().size();
-            }
-
-
-        });
-    }
-
-
-    /**
-     * 绑定专题
-     *
-     * @param holder
-     * @param gameBean
-     */
-    private void bindSubject(ViewHolder holder, final CateGameBean gameBean) {
-        if (gameBean == null) {
-            return;
-        }
-        RecyclerView recyclerView = holder.getView(R.id.recy_subject_list);
-        Glide.with(mContext).load(gameBean.getImg())
-                .into(holder.getView(R.id.img_subject_list, ImageView.class));
-        holder.getView(R.id.img_subject_list)
-                .setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        SkipUtils.getInstance().goGameType(mContext, gameBean.getGametypeid());
-                    }
-                });
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new StaggeredGridLayoutManager(3,
-                StaggeredGridLayoutManager.HORIZONTAL));
-        recyclerView.setAdapter(new RecyclerView.Adapter() {
-            @Override
-            public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-                View itemView = LayoutInflater.from(mContext)
-                        .inflate(R.layout.item_fgt_main_game_list, parent, false);
-                itemView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        SkipUtils.getInstance().goGameDetails(mContext, (int) v.getTag(TAG_ID_TEMP));
-                    }
-                });
-                ViewGroup.LayoutParams layoutParams = new RadioGroup.LayoutParams((int) (G.WIDTH * 0.92),
-                        ViewGroup.LayoutParams.WRAP_CONTENT);
-                itemView.setLayoutParams(layoutParams);
-                RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(itemView) {
-                };
-                return viewHolder;
-            }
-
-            @Override
-            public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-                holder.itemView.setTag(TAG_ID_TEMP, gameBean.getGames().get(position).getId());
-
-                DiscountUtils.getInstance().showDiscount(holder.itemView,
-                        gameBean.getGames().get(position).getIconImage(),
-                        gameBean.getGames().get(position).getDiscount());
-
-                ((TextView) holder.itemView.findViewById(R.id.txt_item_main_game_list_title)
-                ).setText(gameBean.getGames().get(position).getGameName());
-
-                ((TextView) holder.itemView.findViewById(R.id.txt_item_main_game_list_type)
-                ).setText(gameBean.getGames().get(position).getTypeText());
-
-                ((TextView) holder.itemView.findViewById(R.id.txt_item_fgt_main_game_list_down)
-                ).setText("(" + gameBean.getGames().get(position).getDownloadNum() + ")");
-
-                holder.itemView.findViewById(R.id.line_item_fgt_main_game_list)
-                        .setVisibility(position % 3 == 2 ? View.GONE : View.VISIBLE);
-
-                ((RatingBar) holder.itemView.findViewById(R.id.ratb_item_fgt_main_game_list)
-                ).setRating(NumberFormatUtils.getDivideResult(gameBean.getGames().get(position).getStar()));
-                DownBtnUtils.addDownloadBtnListener((KFProgressButton) holder.itemView.findViewById(R.id.btn_item_fgt_main_game_list),
-                        mContext, mDownLoadItemLogicMgrMap, gameBean.getGames().get(position).getGameV1(), "subject_" + position);
-            }
-
-            @Override
-            public int getItemCount() {
-                return gameBean.getGames().size();
-            }
-
-        });
-    }
-
-    /**
-     * 绑定卡通一栏
-     *
-     * @param holder
-     * @param gameBean
-     * @param typename 这里以后改为int或枚举吧,很可能会动增的
-     */
-    private void bindCarTonAndRPG(ViewHolder holder, final CateGameBean gameBean, String typename) {
-        if (gameBean == null) {
-            return;
-        }
-        RecyclerView recyclerView = holder.getView(R.id.recy_mainpage_game_list, RecyclerView.class);
-        holder.getView(R.id.txt_mainpage_game_list, TextView.class)
-                .setText(typename);
-        holder.getView(R.id.txt_mainpage_game_list_more)
-                .setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        SkipUtils.getInstance().goGameType(mContext, gameBean.getGametypeid());
-                    }
-                });
-//        Glide.with(mContext).load(VipStyle.getInstance().getMore())
-//                .into(holder.getView(R.id.txt_mainpage_game_list_more, ImageView.class));
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new LinearLayoutManager(mContext));
-        recyclerView.setAdapter(new RecyclerView.Adapter() {
-            @Override
-            public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-                View itemView = LayoutInflater.from(mContext)
-                        .inflate(R.layout.item_fgt_main_game_list, parent, false);
-                itemView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        SkipUtils.getInstance().goGameDetails(mContext, (int) v.getTag(TAG_ID_TEMP));
-                    }
-                });
-                RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(itemView) {
-                };
-                return viewHolder;
-            }
-
-            @Override
-            public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-                holder.itemView.setTag(TAG_ID_TEMP, gameBean.getGames().get(position).getId());
-
-                DiscountUtils.getInstance().showDiscount(holder.itemView,
-                        gameBean.getGames().get(position).getIconImage(),
-                        gameBean.getGames().get(position).getDiscount());
-
-                ((TextView) holder.itemView.findViewById(R.id.txt_item_main_game_list_title)
-                ).setText(gameBean.getGames().get(position).getGameName());
-
-                ((TextView) holder.itemView.findViewById(R.id.txt_item_main_game_list_type)
-                ).setText(gameBean.getGames().get(position).getTypeText());
-
-                ((TextView) holder.itemView.findViewById(R.id.txt_item_fgt_main_game_list_down)
-                ).setText("(" + gameBean.getGames().get(position).getDownloadNum() + ")");
-
-                holder.itemView.findViewById(R.id.line_item_fgt_main_game_list)
-                        .setVisibility(position == getItemCount() - 1 ? View.GONE : View.VISIBLE);
-                ((RatingBar) holder.itemView.findViewById(R.id.ratb_item_fgt_main_game_list)
-                ).setRating(NumberFormatUtils.getDivideResult(gameBean.getGames().get(position).getStar()));
-                DownBtnUtils.addDownloadBtnListener((KFProgressButton) holder.itemView.findViewById(R.id.btn_item_fgt_main_game_list),
-                        mContext, mDownLoadItemLogicMgrMap, gameBean.getGames().get(position).getGameV1(), "carton_" + position);
-            }
-
-            @Override
-            public int getItemCount() {
-                return gameBean.getGames().size();
-            }
-        });
-    }
-
-
-    /**
-     * 绑定特别推荐栏
-     *
-     * @param holder
-     */
-    private void bindSpecialGameRecommend(ViewHolder holder, final SpecialRecommend specialRecommend) {
-        if (specialRecommend == null) {
-            return;
-        }
-        Glide.with(mContext).load(specialRecommend.getImg())
-                .into(holder.getView(R.id.img_main_special_recommend_banner, ImageView.class));
-        DiscountUtils.getInstance().showDiscount(holder.itemView,
-                specialRecommend.getGame().getIconImage(),
-                specialRecommend.getGame().getDiscount());
-
-        holder.getView(R.id.txt_main_special_recommend_main_title, TextView.class)
-                .setText(specialRecommend.getName());
-        holder.getView(R.id.txt_main_special_recommend_title, TextView.class)
-                .setText(specialRecommend.getGame().getGameName());
-        holder.getView(R.id.txt_main_special_recommend_type, TextView.class)
-                .setText(specialRecommend.getGame().getSize());
-        holder.getView(R.id.lay_fgt_main_special_recommend)
-                .setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        SkipUtils.getInstance().goGameDetails(mContext, specialRecommend.getGame().getId());
-                    }
-                });
-        holder.getView(R.id.img_main_special_recommend_banner)
-                .setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        SkipUtils.getInstance().goGameDetails(mContext, specialRecommend.getGame().getId());
-                    }
-                });
-        DownBtnUtils.addDownloadBtnListener(holder.getView(R.id.btn_fgt_main_special_recommend, KFProgressButton.class),
-                mContext, mDownLoadItemLogicMgrMap, specialRecommend.getGame().getGameV1(), "specail_recommend");
-    }
-
-    /**
-     * 新游推荐
-     *
-     * @param holder
-     */
-    private void bindNewGameRecommend(ViewHolder holder, final List<NewGameRecommend> recommendList) {
-        if (recommendList == null || recommendList.size() < 1) {
-            return;
-        }
-        RecyclerView recyclerView = holder.getView(R.id.recy_fgt_main_new_game_invite);
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new StaggeredGridLayoutManager(1,
-                StaggeredGridLayoutManager.HORIZONTAL));
-        recyclerView.setAdapter(new RecyclerView.Adapter() {
-            @Override
-            public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-                View itemView = LayoutInflater.from(mContext)
-                        .inflate(R.layout.item_fgt_main_new_game_invite, parent, false);
-                itemView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        SkipUtils.getInstance().goGameDetails(mContext, (int) v.getTag(TAG_ID_TEMP));
-                    }
-                });
-                RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(itemView) {
-                };
-                return viewHolder;
-            }
-
-            @Override
-            public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-                holder.itemView.setTag(TAG_ID_TEMP, recommendList.get(position).getGameid());
-                ((TextView) holder.itemView.findViewById(R.id.txt_item_fgt_main_new_game_invite)
-                ).setText(recommendList.get(position).getGamename());
-
-                DiscountUtils.getInstance().showDiscount(holder.itemView,
-                        recommendList.get(position).getIcon(), recommendList.get(position).getDiscount());
-            }
-
-            @Override
-            public int getItemCount() {
-                return recommendList.size();
-            }
-        });
-    }
-
-    /**
-     * 绑定专区
-     *
-     * @param holder
-     */
-    private void bindOwnZone(ViewHolder holder) {
-        Glide.with(mContext).load(VipStyle.getInstance().getIndexbanner())
-                .into(holder.getView(R.id.img_fgt_main_own_zone, ImageView.class));
-        holder.itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                G.showToast(R.string.coming_soon);
-            }
-        });
-    }
-
-
-    /**
-     * 绑定Banner的操作过程
-     *
-     * @param holder
-     * @param topBannerList
-     */
-    private void bindBanner(ViewHolder holder, final List<IndexBannerOuterClass.IndexBanner> topBannerList) {
-        ViewPager viewPager = holder.getView(R.id.viewpager_fgt_main_banner);
-        RadioGroup radioGroup = holder.getView(R.id.group_fgt_main_banner);
-        ArrayList<String> imgURL = new ArrayList<>();
-        for (IndexBannerOuterClass.IndexBanner indexBanner : topBannerList) {
-            imgURL.add(indexBanner.getImageUrl());
-        }
-        if (mImageGlarry != null) {
-            mImageGlarry.init(imgURL.toArray(new String[]{}), ImageView.ScaleType.CENTER_CROP);
-            return;
-        }
-        mImageGlarry = new ImageGlarry((Activity) mContext, viewPager, radioGroup);
-        mImageGlarry.init(imgURL.toArray(new String[]{}), ImageView.ScaleType.CENTER_CROP);
-        mImageGlarry.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                IndexBannerOuterClass.IndexBanner clickedGameObj = topBannerList.get(position);
-                Map<String, String> map = new HashMap<>();
-                map.put("BANNER_TYPE", clickedGameObj.getType() == KFIntentKeys.BANNER_TYPE_GAME ? "游戏Banner" : "广告Banner");
-                //TODO 小刁,这些事件分析以后要专门弄个静态类来统一管理
-                UMConfigUtils.Event.BANNER_CLICK_HORIZONTAL.onEvent(map);
-                switch (clickedGameObj.getType()) {
-                    case KFIntentKeys.BANNER_TYPE_GAME:
-                        SkipUtils.getInstance().goGameDetails(mContext, clickedGameObj.getGameId());
-                        break;
-                    case KFIntentKeys.BANNER_TYPE_AD:
-                        SkipUtils.getInstance().goWebView(mContext, clickedGameObj.getHtmlUrl(),
-                                clickedGameObj.getTitle(), mContext.getPackageName(), clickedGameObj.getGameId());
-                        break;
-                }
-            }
-        });
-    }
-
-
-}

+ 0 - 140
app/src/main/java/com/kfzs/duanduan/adp/AdpSearchGame.java

@@ -1,140 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.RatingBar;
-import android.widget.TextView;
-
-import com.kfzs.duanduan.proto.GameOuterClass;
-import com.kfzs.duanduan.utils.DiscountUtils;
-import com.kfzs.duanduan.utils.NumberFormatUtils;
-import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-import com.kfzs.duanduan.view.KFProgressButton;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpSearchGame</p>
- * @ <p>Description:</p>
- * @ date:  2017/6/22 16:14
- * @ QQ:    315096953
- */
-
-public class AdpSearchGame extends BaseAdpterWithDownBtn {
-
-    private List<GameOuterClass.Game> mList = new ArrayList<>();
-
-    public AdpSearchGame(Context context) {
-        this.mContext = context;
-    }
-
-    public void addAll(List<GameOuterClass.Game> list) {
-        mList.addAll(list);
-    }
-
-    public void clear() {
-        mList.clear();
-    }
-
-    @Override
-    public int getCount() {
-        return mList.size();
-    }
-
-    @Override
-    public GameOuterClass.Game getItem(int position) {
-        return mList.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return 0;
-    }
-
-    @Override
-    public View getView(final int position, View convertView, ViewGroup parent) {
-        if (convertView == null) {
-            convertView = View.inflate(mContext, R.layout.listview_item_game_info, null);
-            convertView.setOnClickListener(cls_GoDetail);
-        }
-        DiscountUtils.getInstance().showDiscount(convertView,
-                getItem(position).getIconImage(),
-                getItem(position).getDiscount());
-
-//        Glide.with(mContext).load(getItem(position).getIconImage())
-//                .into(ViewFindUtils.find(convertView, R.id.img_logo, ImageView.class));
-
-        ViewFindUtils.find(convertView, R.id.img_listview_item_game_info)
-                .setVisibility(getItem(position).getExistGift() == 1 ? View.VISIBLE : View.GONE);
-        ViewFindUtils.find(convertView, R.id.txt_list_item_game_info_title, TextView.class)
-                .setText(getItem(position).getGameName());
-        ViewFindUtils.find(convertView, R.id.txt_list_item_game_info_type, TextView.class)
-                .setText(getItem(position).getTypeText());
-
-        String downloadCnt = String.format(mContext.getString(R.string.download_count),
-                getItem(position).getDownloadNum() + "");
-        ViewFindUtils.find(convertView, R.id.txt_list_item_game_info_down_count, TextView.class)
-                .setText(downloadCnt + "");
-        ViewFindUtils.find(convertView, R.id.ratbar_list_item_game_info, RatingBar.class)
-                .setRating(NumberFormatUtils.getDivideResult(getItem(position).getStar()));
-
-        //更新跳转位置
-        convertView.setTag(TAG_ID, getItem(position).getId());
-
-        //下载按钮的功能处理
-        KFProgressButton btn = ViewFindUtils.hold(convertView, R.id.btn_list_item_game_info);
-        if (getItem(position).getIsInBook() == 1) {
-            if (getItem(position).getIsCanPreDown()) {
-                btn.setText(mContext.getString(R.string.predown));
-                btn.setOnClickListener(null);
-                DownBtnUtils.addDownloadBtnListener(btn, mContext,
-                        getmInstallButtonMgrMap(), getItem(position),
-                        "search_game" + position);
-            } else {
-                btn.setText(mContext.getString(R.string.tab_game_order));
-                btn.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        goBookedGame(getItem(position));
-                    }
-                });
-            }
-        } else {
-            btn.setText(mContext.getString(R.string.install));
-            btn.setOnClickListener(null);
-            DownBtnUtils.addDownloadBtnListener(btn, mContext,
-                    getmInstallButtonMgrMap(), getItem(position),
-                    "search_game" + position);
-        }
-        return convertView;
-    }
-
-
-    /**
-     * 跳到预约游戏
-     *
-     * @param game
-     */
-    private void goBookedGame(GameOuterClass.Game game) {
-        SkipUtils.getInstance().goGameDetails(mContext, game.getId());
-//        Intent intent = new Intent(mContext, ActWeb.class);
-//
-//        intent.putExtra(KFIntentKeys.EXTRA_BEHAIOR, ActWeb.BEHAVIOR_GAME_BOOK);
-//        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_SHARE_IMGURL, game.getIconImage());
-//        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_GAME_BOOK_ID, String.valueOf(game.getBookId()));
-//        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_GAME_ID, String.valueOf(game.getId()));
-//        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_PACKAGENAME, game.getPackageName());
-//        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_GAME_VERSION, game.getVersion());
-//        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_GAME_SIZE, game.getSize());
-//
-//        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_URL, game.getUrl());
-//        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_TITLE, game.getGameName());
-//        mContext.startActivity(intent);
-    }
-}

+ 0 - 69
app/src/main/java/com/kfzs/duanduan/adp/BaseAdpterWithDownBtn.java

@@ -1,69 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.utils.InstallButtonUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  BaseAdpterWithDownBtn</p>
- * @ <p>Description:搜索页有下载按钮的BaseAdapter统一处理</p>
- * @ date:  2017/8/3 18:19
- * @ QQ:    315096953
- */
-
-public class BaseAdpterWithDownBtn extends BaseAdapter {
-
-    private Map<String, InstallButtonUtils> mInstallButtonMgrMap = new HashMap<>();
-    protected Context mContext;
-
-    //养成习惯最好不要暂用默认TAG
-    protected final static int TAG_ID = R.id.view_tag_down_btn;
-
-
-    @Override
-    public int getCount() {
-        return 0;
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return null;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return 0;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        return null;
-    }
-
-    public Map<String, InstallButtonUtils> getmInstallButtonMgrMap() {
-        return mInstallButtonMgrMap;
-    }
-
-    public void setmInstallButtonMgrMap(Map<String, InstallButtonUtils> mInstallButtonMgrMap) {
-        this.mInstallButtonMgrMap = mInstallButtonMgrMap;
-    }
-
-    /**
-     * 跳详情页的统一监听
-     */
-    protected View.OnClickListener cls_GoDetail = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            SkipUtils.getInstance().goGameDetails(mContext, (int) v.getTag(TAG_ID));
-        }
-    };
-}

+ 0 - 206
app/src/main/java/com/kfzs/duanduan/fragment/CategoryRankFragment.java

@@ -1,206 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-
-import com.kfzs.appstore.utils.adapter.recyclerview.DividerItemDecoration;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.ActGategoryRank;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.adp.AdpFragmentRank;
-import com.kfzs.duanduan.bean.DownloadStatus;
-import com.kfzs.duanduan.bean.RecyleObj;
-import com.kfzs.duanduan.bean.RecyleType;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.event.EventDownloadHandler;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.GameOuterClass;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.view.FilterWindow;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.util.HashMap;
-
-
-/**
- * 分类排行榜
- * <p/>
- * Created by HooRang on 2017/2/16.
- */
-public class CategoryRankFragment extends BaseCompatFragment {
-
-    private static final String TAG = CategoryRankFragment.class.getName();
-
-    private AdpFragmentRank mAdpFragmentRank;
-
-    private RecyclerView mRecyclerView;
-    private FilterWindow mFilterWindow;
-
-    private Button mBtnTypeChoose;
-    private EventDownloadHandler.OnDownCallback mOnDownCallback;
-    private int gameType = 0;
-
-    private Activity activity;
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        activity = getActivity();
-        EventBus.getDefault().register(this);
-
-        setContentView(R.layout.fragment_game_lists_common);
-        Bundle bundle = getArguments();
-        if(bundle != null){
-            gameType = bundle.getInt(ActGategoryRank.INTENT_TYPE_ID);
-        }
-
-        mRecyclerView = ViewFindUtils.find(mContentView, R.id.recy_fgt_main_game);
-        //隐藏空空如也
-        ViewFindUtils.find(mContentView, R.id.empty_view).setVisibility(View.GONE);
-        mAdpFragmentRank = new AdpFragmentRank(activity, mRecyclerView, ClsTypeChoose);
-
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(activity));
-        DividerItemDecoration decor = new DividerItemDecoration(activity, DividerItemDecoration.VERTICAL);
-        decor.setIsShowFirstItemDecoration(false);
-        decor.setSize(getResources().getDimensionPixelOffset(R.dimen.app_list_item_divider_size));
-        decor.setColor(getResources().getColor(R.color.theme_app_divider_color));
-        decor.setPaddingStart(getResources().getDimensionPixelOffset(R.dimen.app_list_item_divider_start_image));
-        decor.setPaddingEnd(getResources().getDimensionPixelOffset(R.dimen.app_list_item_divider_end));
-        mRecyclerView.addItemDecoration(decor);
-        mRecyclerView.setAdapter(mAdpFragmentRank);
-
-        //首次载入数据
-        doNetworkTask(gameType ==0?"":gameType+"");
-    }
-
-    @Override
-    public void refreshData() {
-        doNetworkTask("");
-    }
-
-
-    /**
-     * 选择分类的监听
-     */
-    private View.OnClickListener ClsTypeChoose = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            mBtnTypeChoose = (Button) v;
-            showFilterPanel(mBtnTypeChoose);
-            mBtnTypeChoose.setCompoundDrawablesWithIntrinsicBounds(
-                    R.mipmap.btn_query_condition_left_ing, 0, R.mipmap.arrow_top, 0);
-        }
-    };
-
-    /**
-     * 展开分类选择板块
-     *
-     * @param anchor
-     */
-    private void showFilterPanel(View anchor) {
-        if (null == mFilterWindow) {
-            mFilterWindow = new FilterWindow(mContext, anchor, new FilterWindow.OnPopupWinListener() {
-                @Override
-                public void onReset() {
-                    doNetworkTask("");
-                }
-
-                @Override
-                public void onSubmit(String selectedIndexs) {
-                    Log.d(TAG, "selectedIndexs#" + selectedIndexs);
-                    doNetworkTask(selectedIndexs);
-                }
-
-                @Override
-                public void dismiss() {
-                    mBtnTypeChoose.setCompoundDrawablesWithIntrinsicBounds(R.mipmap.btn_query_condition_left_ing, 0, R.mipmap.arrow_bottom, 0);
-                }
-            });
-        }
-        mFilterWindow.createWindow().show();
-    }
-
-
-    /**
-     * 加载本页数据
-     *
-     * @param selectedIndexs
-     */
-    private void doNetworkTask(final String selectedIndexs) {
-        HashMap<String, String> params = new HashMap<>();
-        params.put("page", UrlBll.AppStoreApi.PAGE_CATEGORY_RANK + "");
-        if (!TextUtils.isEmpty(selectedIndexs)) {
-            params.put("types", selectedIndexs);
-        }
-
-        APIRequest bannerRequest = APIRequestInstance.getReqUrl(TAG, UrlBll.AppStoreApi.GAME_LISTS, params, new ResponseNetworkTask() {
-            @Override
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                refreshOver();
-                mAdpFragmentRank.clear();
-//                mAdpFragmentRank.add(RecyleObj.make(RecyleType.RANK_TYPE, null));
-                mAdpFragmentRank.add(RecyleObj.make(RecyleType.RANK_TOP3, apiResponse.getGameList().getTopThreeGamesList()));
-                for (GameOuterClass.Game game : apiResponse.getGameList().getOtherGamesList()) {
-                    mAdpFragmentRank.add(RecyleObj.make(RecyleType.RANK_LIST, game));
-                }
-                mAdpFragmentRank.notifyDataSetChanged();
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-                refreshOver();
-            }
-
-        }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
-        KFZSNetwork.addRequest(bannerRequest);
-    }
-
-
-    /**
-     * TODO 小刁,这里感觉以后应该可以删除
-     *
-     * @param isVisibleToUser
-     */
-    @Override
-    public void setUserVisibleHint(boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (!isVisibleToUser) {
-            refreshOver();
-        }
-    }
-
-    /**
-     * 把更新放到Logic里了,代码少一半以上。
-     *
-     * @param info
-     */
-    @Subscribe
-    public void onEventMainThread(DownloadStatus info) {
-        if (mOnDownCallback == null) {
-            mOnDownCallback = DownBtnUtils.installBtnStatus(mAdpFragmentRank.getmDownLoadItemLogicMgrMap());
-        }
-        EventDownloadHandler
-                .newInstance(activity, mOnDownCallback)
-                .setmTag(TAG)
-                .handlDownloadResult(info);
-    }
-
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-}

+ 1 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtAskgetmoney.java

@@ -15,7 +15,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
-import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.mine.GiftpackListAdapter;
 import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
@@ -28,6 +27,7 @@ import com.sheep.gamegroup.util.FastJsonUtils;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.InvitationActivity;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyFriend;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyRank;

+ 0 - 218
app/src/main/java/com/kfzs/duanduan/fragment/FgtGameDetail.java

@@ -1,218 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.bumptech.glide.Glide;
-import com.kfzs.appstore.utils.adapter.recyclerview.RecyclerViewAdapter;
-import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.bean.DownloadStatus;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.event.EventDownloadHandler;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.GameOuterClass;
-import com.kfzs.duanduan.utils.InstallButtonUtils;
-import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.view.KFProgressButton;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  FgtGameDetail</p>
- * @ <p>Description: 商品详情页的详情页面</p>
- * @ date:  2017/6/19 13:36
- * @ QQ:    315096953
- */
-
-public class FgtGameDetail extends BaseCompatFragment {
-
-
-    private RecyclerView mRvImags;
-    private TextView mGameDesc;
-    private ImageView mGsIcon1;
-    private ImageView mGsIcon2;
-    private ImageView mGsIcon3;
-    private ImageView mGsIcon4;
-    private TextView mGsName1;
-    private TextView mGsName2;
-    private TextView mGsName3;
-    private TextView mGsName4;
-    private KFProgressButton mGsBtn1;
-    private KFProgressButton mGsBtn2;
-    private KFProgressButton mGsBtn3;
-    private KFProgressButton mGsBtn4;
-    private RecyclerViewAdapter mRecyclerViewAdapter;
-
-    private Map<String, InstallButtonUtils> mInstallButtonMgr = new HashMap<>();
-    private EventDownloadHandler.OnDownCallback mOnDownCallback;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        EventBus.getDefault().register(this);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
-    private Activity activity;
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        activity = getActivity();
-        setContentView(R.layout.fgt_game_detail);
-        initViewById();
-        getGsGame();
-    }
-
-
-    @Subscribe
-    public void onEventMainThread(DownloadStatus info) {
-        if (mOnDownCallback == null) {
-            mOnDownCallback = DownBtnUtils.installBtnStatus(mInstallButtonMgr);
-        }
-        EventDownloadHandler.newInstance(SheepApp.getInstance(), mOnDownCallback)
-                .setmTag(TAG).handlDownloadResult(info);
-    }
-
-    /**
-     * guess the fuck games;
-     */
-    private void getGsGame() {
-        String gameId = activity.getIntent().getStringExtra(KFIntentKeys.EXTRA_GAME_ID);
-        //        http://10.8.210.223:8081/test/game/guess?game_id=125
-        String url = UrlBll.GameApi.GAME_GUESS + "game_id=" + gameId;
-
-        APIRequest gsRequest = APIRequestInstance.getReq(TAG, url, null, new Response.Listener<ApiResponseOuterClass.ApiResponse>() {
-            @Override
-            public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-                List<GameOuterClass.Game> gsGamesList = apiResponse.getGamesList();
-                //try for out of index
-                try {
-                    Glide.with(FgtGameDetail.this).load(gsGamesList.get(0).getIconImage()).into(mGsIcon1);
-                    Glide.with(FgtGameDetail.this).load(gsGamesList.get(1).getIconImage()).into(mGsIcon2);
-                    Glide.with(FgtGameDetail.this).load(gsGamesList.get(2).getIconImage()).into(mGsIcon3);
-                    Glide.with(FgtGameDetail.this).load(gsGamesList.get(3).getIconImage()).into(mGsIcon4);
-                    mGsName1.setText(gsGamesList.get(0).getGameName());
-                    mGsName2.setText(gsGamesList.get(1).getGameName());
-                    mGsName3.setText(gsGamesList.get(2).getGameName());
-                    mGsName4.setText(gsGamesList.get(3).getGameName());
-                    mGsIcon1.setOnClickListener(guessYouLikeLisener);
-                    mGsIcon1.setTag(R.id.view_tag_game_icon, gsGamesList.get(0).getId());
-                    mGsIcon2.setOnClickListener(guessYouLikeLisener);
-                    mGsIcon2.setTag(R.id.view_tag_game_icon, gsGamesList.get(1).getId());
-                    mGsIcon3.setOnClickListener(guessYouLikeLisener);
-                    mGsIcon3.setTag(R.id.view_tag_game_icon, gsGamesList.get(2).getId());
-                    mGsIcon4.setOnClickListener(guessYouLikeLisener);
-                    mGsIcon4.setTag(R.id.view_tag_game_icon, gsGamesList.get(3).getId());
-
-
-                    DownBtnUtils.addDownloadBtnListener(mGsBtn1, SheepApp.getInstance(), mInstallButtonMgr, gsGamesList.get(0), "gsGame_01");
-                    DownBtnUtils.addDownloadBtnListener(mGsBtn2, SheepApp.getInstance(), mInstallButtonMgr, gsGamesList.get(1), "gsGame_02");
-                    DownBtnUtils.addDownloadBtnListener(mGsBtn3, SheepApp.getInstance(), mInstallButtonMgr, gsGamesList.get(2), "gsGame_03");
-                    DownBtnUtils.addDownloadBtnListener(mGsBtn4, SheepApp.getInstance(), mInstallButtonMgr, gsGamesList.get(3), "gsGame_04");
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-
-            }
-        }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
-
-        KFZSNetwork.addRequest(gsRequest);
-    }
-
-
-    /**
-     * 点猜你喜欢中的icon,跳游戏详情
-     */
-    private View.OnClickListener guessYouLikeLisener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            SkipUtils.getInstance().goGameDetails(activity, (int) v.getTag(R.id.view_tag_game_icon));
-        }
-    };
-
-    private void initViewById() {
-        mRvImags = mContentView.findViewById(R.id.recy_fgt_game_detail);
-        mGameDesc = mContentView.findViewById(R.id.tv_game_desc);
-        mGsIcon1 = mContentView.findViewById(R.id.img_fgt_fgt_detail_1);
-        mGsIcon2 = mContentView.findViewById(R.id.img_fgt_fgt_detail_2);
-        mGsIcon3 = mContentView.findViewById(R.id.img_fgt_fgt_detail_3);
-        mGsIcon4 = mContentView.findViewById(R.id.img_fgt_fgt_detail_4);
-        mGsName1 = mContentView.findViewById(R.id.txt_fgt_game_detail_1);
-        mGsName2 = mContentView.findViewById(R.id.txt_fgt_fgt_detail_2);
-        mGsName3 = mContentView.findViewById(R.id.txt_fgt_fgt_detail_3);
-        mGsName4 = mContentView.findViewById(R.id.txt_fgt_fgt_detail_4);
-        mGsBtn1 = mContentView.findViewById(R.id.downbtn_fgt_game_detail_1);
-        mGsBtn2 = mContentView.findViewById(R.id.downbtn_fgt_game_detail_2);
-        mGsBtn3 = mContentView.findViewById(R.id.downbtn_fgt_game_detail_3);
-        mGsBtn4 = mContentView.findViewById(R.id.downbtn_fgt_game_detail_4);
-
-        mRvImags.setLayoutManager(new LinearLayoutManager(SheepApp.getInstance(), LinearLayoutManager.HORIZONTAL, false));
-        mRvImags.setNestedScrollingEnabled(false);
-
-    }
-
-    //设置数据;
-    public void setData(final GameOuterClass.Game game) {
-        if(game == null){
-            return;
-        }
-        String[] urls = game.getDetailImage().split("&&");
-        final ArrayList<String> urlList = new ArrayList<>();
-        Collections.addAll(urlList, urls);
-        if (mGameDesc != null)
-            mGameDesc.setText(game.getIntroduce());
-        mRecyclerViewAdapter = new RecyclerViewAdapter<String>(SheepApp.getInstance(), R.layout.item_image, urlList) {
-            @Override
-            public void convert(ViewHolder viewHolder, String url, final int position) {
-                View view = viewHolder.getView(R.id.img_detail);
-                if (view instanceof ImageView) {
-                    Glide.with(FgtGameDetail.this).load(url).into((ImageView) view);
-                    view.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            if(TextUtils.isEmpty(game.getDetailImage())){
-                               return;
-                            }
-                            Jump2View.getInstance().showImgList(activity, position, urlList);
-                        }
-                    });
-                }
-
-            }
-        };
-        mRvImags.setAdapter(mRecyclerViewAdapter);
-
-
-    }
-}

+ 0 - 371
app/src/main/java/com/kfzs/duanduan/fragment/FgtMainGame.java

@@ -1,371 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-
-import com.android.volleyplus.Response;
-import com.arialyy.annotations.Download;
-import com.arialyy.aria.core.Aria;
-import com.arialyy.aria.core.download.DownloadTask;
-import com.kf.utils.KFLog;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.services.DownloadTaskService;
-import com.kfzs.duanduan.utils.InstallButtonUtils;
-import com.kfzs.duanduan.view.KFProgressButton;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.adp.AdpMainPageRecy;
-import com.kfzs.duanduan.bean.BaseMsg;
-import com.kfzs.duanduan.bean.CateGameList;
-import com.kfzs.duanduan.bean.DownloadStatus;
-import com.kfzs.duanduan.bean.GuessYouLike;
-import com.kfzs.duanduan.bean.NewGameRecommend;
-import com.kfzs.duanduan.bean.RecyleObj;
-import com.kfzs.duanduan.bean.RecyleType;
-import com.kfzs.duanduan.bean.SpecialRecommend;
-import com.kfzs.duanduan.bll.GameListBll;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.event.EventDownloadHandler;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.IndexAllbannerOuterClass;
-import com.kfzs.duanduan.proto.IndexGameOuterClass;
-import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.io.File;
-import java.util.Map;
-
-import static android.content.Intent.ACTION_PACKAGE_ADDED;
-import static android.content.Intent.ACTION_PACKAGE_REMOVED;
-
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  FgtMainGame</p>
- * @ <p>Description: 首页Fragment的游戏一栏</p>
- * @ date:  2017/6/14 13:39
- * @ QQ:    315096953
- */
-public class FgtMainGame extends BaseCompatFragment {
-
-
-    private RecyclerView mRecyView;
-    private IndexAllbannerOuterClass.IndexAllbanner mAllBannerDatas;
-    private AdpMainPageRecy mAdpMainPageRecy;
-    private EventDownloadHandler.OnDownCallback mOnDownCallback;
-    private static final int POS_BANNER = 0;
-    private static final int POS_OWN = 1;//专属栏
-//    private static final int POS_THREE = 2;//三玩栏
-    private static final int POS_NEW_GAME_BANNER = 2;//新游预的banner
-    private static final int POS_NEW_GAME_RECOMMEND = 3;//新游推荐的列表
-    private static final int POS_GUESS_YOU_LIKE = 4;//猜你喜欢
-    private static final int POS_SPECIAL_RECOMMEND = 5;//特别推荐
-    private static final int POS_COUPON = 6;//优惠券
-    private static final int POS_RPG = 7;//角色扮演
-    private static final int POS_SUBJECT = 8;//专题
-    private static final int POS_CARTON = 9;//二次元
-    private static final int POS_BACK_TOP = 10;//返回到顶部
-    SwipeRefreshLayout mSwipeRefreshLayout;
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        EventBus.getDefault().register(this);
-        setContentView(R.layout.fgt_main_game);
-        mRecyView = mContentView.findViewById(R.id.recy_fgt_main_game);
-        mSwipeRefreshLayout = mContentView.findViewById(R.id.refresh);
-        mRecyView.setLayoutManager(new LinearLayoutManager(getActivity()));
-        mAdpMainPageRecy = new AdpMainPageRecy(getActivity(), mRecyView);
-        for (int i = 0; i < 12; i++) {
-            mAdpMainPageRecy.add(RecyleObj.make(RecyleType.NONE, null));
-        }
-        mRecyView.setAdapter(mAdpMainPageRecy);
-        loadDatas();
-
-        mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                refreshData();
-                mSwipeRefreshLayout.setRefreshing(false);
-            }
-        });
-        Aria.download(this).register();
-
-    }
-
-    @Override
-    public void refreshData() {
-        loadDatas();
-    }
-
-
-    /**
-     * 加载本fragment数据
-     */
-    private void loadDatas() {
-        APIRequest bannerRequest = APIRequestInstance.getReq(TAG, UrlBll.AppStoreApi.BANNER, null, new Response.Listener<ApiResponseOuterClass.ApiResponse>() {
-
-
-            @Override
-            public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-
-                int code = apiResponse.getCodeValue();
-                switch (code) {
-                    case ApiResponseOuterClass.Codes.Success_VALUE:
-                        mAllBannerDatas = apiResponse.getIndexAllbanner();
-                        loadGameLists();
-                        break;
-                    default:
-                        KFLog.e("首页Banner加载失败#" + code);
-                        refreshOver();
-                        break;
-                }
-
-            }
-        }, HelperUtils.makeErr("获取banner数据报错"));
-        KFZSNetwork.addRequest(bannerRequest);
-
-        GameListBll gameListBll = new GameListBll();
-        //加载新游推荐列表
-        gameListBll.getNewGameRecommendList(null, 10, new Response.Listener<BaseMsg>() {
-            @Override
-            public void onResponse(BaseMsg baseMsg) {
-                if (baseMsg.getDatas(NewGameRecommend.class) == null
-                        || baseMsg.getDatas(NewGameRecommend.class).size() < 1) {
-                    return;
-                }
-                mAdpMainPageRecy.add(RecyleObj.make(RecyleType.NEW_GAME_RECOMMEND,
-                        baseMsg.getDatas(NewGameRecommend.class)), POS_NEW_GAME_RECOMMEND);
-                mAdpMainPageRecy.notifyItemChanged(POS_NEW_GAME_RECOMMEND);
-            }
-        });
-
-        //加载猜你喜欢一栏
-
-        gameListBll.getGuessYouLike(new Response.Listener<BaseMsg>() {
-            @Override
-            public void onResponse(BaseMsg baseMsg) {
-                if (baseMsg.getData(GuessYouLike.class) == null) {
-                    return;
-                }
-                mAdpMainPageRecy.add(RecyleObj.make(RecyleType.GUESS_YOU_LIKE,
-                        baseMsg.getData(GuessYouLike.class)), POS_GUESS_YOU_LIKE);
-                //TODO 暂时原因不明,如果局部加载,始终会第一次加载不出来。。。
-//                mAdpMainPageRecy.notifyItemChanged(POS_GUESS_YOU_LIKE);
-                mAdpMainPageRecy.notifyDataSetChanged();
-            }
-        });
-
-        //加载特别推荐
-        gameListBll.getSpecialRecommend(new Response.Listener<BaseMsg>() {
-            @Override
-            public void onResponse(BaseMsg baseMsg) {
-                if (baseMsg.getData(SpecialRecommend.class) == null) {
-                    return;
-                }
-                mAdpMainPageRecy.add(RecyleObj.make(RecyleType.SPECIAL_GAME_RECOMMEND,
-                        baseMsg.getData(SpecialRecommend.class)), POS_SPECIAL_RECOMMEND);
-                mAdpMainPageRecy.notifyItemChanged(POS_SPECIAL_RECOMMEND);
-            }
-        });
-
-        //加载专题二次元和角色扮演
-        gameListBll.getCartonRPGEtc(new Response.Listener<BaseMsg>() {
-            @Override
-            public void onResponse(BaseMsg baseMsg) {
-                CateGameList gameList = baseMsg.getData(CateGameList.class);
-                if (gameList == null) {
-                    return;
-                }
-                if (gameList.getCommon() != null && gameList.getCommon().size() > 0) {
-                    mAdpMainPageRecy.add(RecyleObj.make(RecyleType.RPG,
-                            gameList.getCommon().get(0)), POS_RPG);
-                }
-                if (gameList.getCommon() != null && gameList.getCommon().size() > 1) {
-                    mAdpMainPageRecy.add(RecyleObj.make(RecyleType.CARTON,
-                            gameList.getCommon().get(1)), POS_CARTON);
-                }
-                if (gameList.getSubject() != null
-                        && gameList.getSubject().getGames().size() > 0) {
-                    mAdpMainPageRecy.add(RecyleObj.make(RecyleType.SUBJECT,
-                            gameList.getSubject()), POS_SUBJECT);
-                }
-                mAdpMainPageRecy.notifyItemChanged(POS_SUBJECT);
-            }
-        });
-
-    }
-
-
-    /**
-     * 加载游戏列表
-     */
-    private void loadGameLists() {
-        try {
-            APIRequest bannerRequest = APIRequestInstance.getReq(TAG, UrlBll.AppStoreApi.RECOMMEND_GAME_GROUPS, null, new Response.Listener<ApiResponseOuterClass.ApiResponse>() {
-
-                @Override
-                public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-                    int code = apiResponse.getCodeValue();
-                    switch (code) {
-                        case ApiResponseOuterClass.Codes.Success_VALUE:
-                            IndexGameOuterClass.IndexGame indexGame = apiResponse.getIndexGame();
-                            loadViews(indexGame);
-                            break;
-                        default:
-                            break;
-                    }
-                    refreshOver();
-
-                }
-            }, HelperUtils.makeErr("接口 v1/index_game 报错"));
-            KFZSNetwork.addRequest(bannerRequest);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-
-    /**
-     * 加载视图,以前是一个接口就有了recyview的所有值,所以用了dataObj
-     * 现改为多个接口,所以值就在adp里再去分别获取吧,dataObj不用了。
-     *
-     * @param indexGame
-     */
-    private void loadViews(IndexGameOuterClass.IndexGame indexGame) {
-
-        if (mAllBannerDatas.getShufflingList() != null &&
-                !mAllBannerDatas.getShufflingList().isEmpty()) {
-            mAdpMainPageRecy.add(RecyleObj.make(RecyleType.BANNER,
-                    mAllBannerDatas.getShufflingList()), POS_BANNER);
-        }
-//        mAdpMainPageRecy.add(RecyleObj.make(RecyleType.OWN_ZONE, null), POS_OWN);//VIP专区
-//        mAdpMainPageRecy.add(RecyleObj.make(RecyleType.THREE_PLAY, null), POS_THREE);
-        mAdpMainPageRecy.add(RecyleObj.make(RecyleType.BACK_TOP, null), POS_BACK_TOP);
-
-        System.gc();
-        mAdpMainPageRecy.notifyDataSetChanged();
-    }
-
-    /**
-     * 把更新放到Logic里了,代码少一半以上。
-     *
-     * @param info
-     */
-    @Subscribe
-    public void onEventMainThread(DownloadStatus info) {
-        if (mOnDownCallback == null) {
-            mOnDownCallback = DownBtnUtils.installBtnStatus(mAdpMainPageRecy.getmDownLoadItemLogicMgrMap());
-        }
-        EventDownloadHandler
-                .newInstance(getActivity(), mOnDownCallback)
-                .setmTag(TAG)
-                .handlDownloadResult(info);
-    }
-//        if(Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction()) || Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction()) || Intent.ACTION_PACKAGE_REPLACED.equals(intent.getAction())){
-    @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:","");
-            for (Map.Entry<String, InstallButtonUtils> entry : mAdpMainPageRecy.getmDownLoadItemLogicMgrMap().entrySet()) {
-                if(packageName.equals(entry.getValue().getPackageName())){
-                    switch (intent.getAction()){
-                        case ACTION_PACKAGE_ADDED:
-                            entry.getValue().setStatus(KFProgressButton.STATUS.STATUS_FINISH);
-                            return;
-                        case ACTION_PACKAGE_REMOVED:
-                            if(new File(ClassFileHelper.getFilePathByPackageName(packageName)).exists()) {
-                                entry.getValue().setStatus(KFProgressButton.STATUS.STATUS_FINISH);
-                            } else {
-                                entry.getValue().setStatus(KFProgressButton.STATUS.STATUS_INIT);
-                            }
-                            return;
-                    }
-                }
-            }
-        }
-    }
-
-
-    @Download.onPre void onPre(DownloadTask task) {
-        DownloadStatus downloadStatus = new DownloadStatus();
-        downloadStatus.setStatus(DownloadTaskService.STATUS_INIT);
-        downloadStatus.setApkPath(task.getDownloadPath());
-        downloadStatus.setDownloadUrl(task.getKey());
-        onEventMainThread(downloadStatus);
-    }
-    @Download.onTaskStart void taskStart(DownloadTask task) {
-        DownloadStatus downloadStatus = new DownloadStatus();
-        downloadStatus.setStatus(DownloadTaskService.STATUS_ING);
-        downloadStatus.setApkPath(task.getDownloadPath());
-        downloadStatus.setDownloadUrl(task.getKey());
-        onEventMainThread(downloadStatus);
-    }
-    @Download.onTaskResume void taskResume(DownloadTask task) {
-        DownloadStatus downloadStatus = new DownloadStatus();
-        downloadStatus.setStatus(DownloadTaskService.STATUS_ING);
-        downloadStatus.setApkPath(task.getDownloadPath());
-        downloadStatus.setDownloadUrl(task.getKey());
-        onEventMainThread(downloadStatus);
-    }
-    //在这里处理任务执行中的状态,如进度进度条的刷新
-    @Download.onTaskRunning protected void running(DownloadTask task) {
-        DownloadStatus downloadStatus = new DownloadStatus();
-        downloadStatus.setStatus(DownloadTaskService.STATUS_ING);
-        downloadStatus.setApkPath(task.getDownloadPath());
-        downloadStatus.setDownloadUrl(task.getKey());
-        onEventMainThread(downloadStatus);
-    }
-
-    @Download.onTaskStop void taskStop(DownloadTask task) {
-        DownloadStatus downloadStatus = new DownloadStatus();
-        downloadStatus.setStatus(DownloadTaskService.STATUS_PAUSE);
-        downloadStatus.setApkPath(task.getDownloadPath());
-        downloadStatus.setDownloadUrl(task.getKey());
-        onEventMainThread(downloadStatus);
-    }
-
-    @Download.onNoSupportBreakPoint void onNoSupportBreakPoint(DownloadTask task) {
-    }
-
-    @Download.onTaskCancel void taskCancel(DownloadTask task) {
-        DownloadStatus downloadStatus = new DownloadStatus();
-        downloadStatus.setStatus(DownloadTaskService.STATUS_DELETE);
-        downloadStatus.setApkPath(task.getDownloadPath());
-        downloadStatus.setDownloadUrl(task.getKey());
-        onEventMainThread(downloadStatus);
-    }
-
-    @Download.onTaskFail void taskFail(DownloadTask task) {
-        DownloadStatus downloadStatus = new DownloadStatus();
-        downloadStatus.setStatus(DownloadTaskService.STATUS_FAIL);
-        downloadStatus.setApkPath(task.getDownloadPath());
-        downloadStatus.setDownloadUrl(task.getKey());
-        onEventMainThread(downloadStatus);
-    }
-
-    @Download.onTaskComplete void taskComplete(DownloadTask task) {
-        DownloadStatus downloadStatus = new DownloadStatus();
-        downloadStatus.setStatus(DownloadTaskService.STATUS_FINISH);
-        downloadStatus.setApkPath(task.getDownloadPath());
-        downloadStatus.setDownloadUrl(task.getKey());
-        onEventMainThread(downloadStatus);
-    }
-
-
-    @Override
-    public void setUserVisibleHint(boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (!isVisibleToUser) {
-            refreshOver();
-        }
-    }
-}

+ 0 - 6
app/src/main/java/com/kfzs/duanduan/react/MainTab.java

@@ -2,9 +2,7 @@ package com.kfzs.duanduan.react;
 
 import android.support.v4.app.Fragment;
 
-import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.fragment.FgtAskgetmoney;
-import com.kfzs.duanduan.fragment.FgtFind;
 import com.kfzs.duanduan.fragment.FgtNull;
 import com.kfzs.duanduan.fragment.FgtPersonalCenter;
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
@@ -93,10 +91,6 @@ public enum MainTab {
     public abstract Fragment getFragment();
 
 
-    public String getTabName(ActMain activity) {
-        return activity.getString(this.stringId);
-    }
-
     public int getStringId() {
         return stringId;
     }

+ 305 - 305
app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -1,305 +1,305 @@
-package com.kfzs.duanduan.react;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.ViewPager;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.kf.utils.ToastBuilder;
-import com.kfzs.duanduan.ActMain;
-import com.kfzs.duanduan.KFZSApp;
-import com.kfzs.duanduan.adp.ViewPagerFragmentAdapter;
-import com.kfzs.duanduan.fragment.FgtFind;
-import com.kfzs.duanduan.fragment.FgtPersonalCenter;
-import com.kfzs.duanduan.fragment.FgtSmallSheep;
-import com.sheep.gamegroup.util.DrawablesHelper;
-import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.gamegroup.util.SysAppUtil;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.gamegroup.view.fragment.FgtMainAudit;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
-
-
-/**
- * Created by realicing on 2017/11/24.
- */
-
-public class TabsHelper {
-
-    //多次点击预防
-    public static final int MIN_CLICK_DELAY_TIME = 200;
-    private long lastClickTime = 0;
-    private ActMain activity;
-
-    LinearLayout other_container;
-
-    View layout_main_activity_toolbar;
-    View layout_bottom;
-    LinearLayout tab_container;
-    View tab_line;
-
-    private ViewPager view_pager_container;
-    private TextView mTxtToolBar;
-    private ItemPosition itemPosition;
-    public TabsHelper() {
-    }
-    public TabsHelper(ItemPosition itemPosition) {
-        this.itemPosition = itemPosition;
-    }
-
-    private void initViews() {
-        activity = KFZSApp.actMain;
-        other_container = activity.findViewById(R.id.other_container);
-        view_pager_container = activity.findViewById(R.id.view_pager_container);
-        layout_main_activity_toolbar = activity.findViewById(R.id.layout_main_activity_toolbar);
-        layout_bottom = activity.findViewById(R.id.layout_bottom);
-        tab_container = activity.findViewById(R.id.tab_container);
-        tab_line = activity.findViewById(R.id.tab_line);
-        mTxtToolBar = activity.findViewById(R.id.txt_main_activity_toolbar);
-    }
-
-    private List<Fragment> fragmentList = new ArrayList<>();
-    private long mLastBackTime = 0;//上次按退出按钮的时间
-
-    /**
-     * 点返回按钮时的多情况处理
-     */
-    private void nativeBack() {
-        if (System.currentTimeMillis() - mLastBackTime < 1000) {
-            KFZSApp.getInstance().quit();
-        } else {
-            ToastBuilder.make(activity.getApplicationContext(), R.string.toast_double_click_exit_app, ToastBuilder.DEFAULT_TOAST_SINGLE);
-        }
-        mLastBackTime = System.currentTimeMillis();
-    }
-
-
-    private List<View> tabs = new ArrayList<>();
-
-    private void initArrays() {
-        MainTab[] mainTabs = MainTab.values();
-        int index = 0;
-        for (MainTab mainTab : mainTabs) {
-            fragmentList.add(mainTab.getFragment());
-
-            View view = tab_container.getChildAt(index*2+1);
-            if(view instanceof TextView){
-                ((TextView) view).setText(mainTab.getStringId());
-                new DrawablesHelper((TextView) view).direction(DrawablesHelper.TOP).drawable(mainTab.getDrawableId()).commit();
-            }
-            tabs.add(view);
-            final int position = index;
-            view.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    long currentTime = System.currentTimeMillis();
-                    if (currentTime - lastClickTime > MIN_CLICK_DELAY_TIME) {
-                        lastClickTime = currentTime;
-
-                        checkViewState(position);
-                        view_pager_container.setCurrentItem(position, false);
-                        int sheepPosition = MainTab.FgtSmallSheep.ordinal();
-                        int personnalPosition = MainTab.FgtPersonnalCenter.ordinal();
-                        int auditPosition = MainTab.FgtMainAudit.ordinal();
-                        int fPosition = MainTab.Fgt_Find.ordinal();
-                        FgtSmallSheep fgtSmallSheep = (FgtSmallSheep) fragmentList.get(sheepPosition);
-                        FgtPersonalCenter personnalCenter = (FgtPersonalCenter) fragmentList.get(personnalPosition);
-                        FgtMainAudit auditFgt = (FgtMainAudit) fragmentList.get(auditPosition);
-//                        FgtFind findFgt = (FgtFind) fragmentList.get(fPosition);
-                        if(position == sheepPosition){
-                            fgtSmallSheep.onResume();
-                        } else {
-                            fgtSmallSheep.onPause();
-                        }
-                        if(position == personnalPosition){
-                            personnalCenter.onResume();
-                        }
-                        if(position == auditPosition){
-                            auditFgt.onResume();
-                        }
-                        if(position == fPosition){
-//                            findFgt.onResume();
-                        }
-                        checkWhichPage(position);
-                    }
-
-
-                }
-            });
-            index++;
-        }
-        //隐藏不显示的控件
-        for (int i = index * 2; i < tab_container.getChildCount()-1; i++) {
-           tab_container.getChildAt(i).setVisibility(View.GONE);
-        }
-    }
-
-    /**
-     * 统计
-     * @param position
-     */
-    private void checkWhichPage(int position){
-        if(position == MainTab.FgtSmallSheep.ordinal()) {//赚钱
-            itemPosition.positionClick(0);
-            UMConfigUtils.Event.TAB_SHEEP.onEvent();
-        }else if(position == MainTab.Fgt_Find.ordinal()) {//发现
-            itemPosition.positionClick(1);
-            UMConfigUtils.Event.TAB_FIND.onEvent();
-        }else if(position == MainTab.FgtPersonnalCenter.ordinal()) {//个人中心
-            itemPosition.positionClick(2);
-            UMConfigUtils.Event.TAB_USER.onEvent();
-        }else if (position==MainTab.FgtMainAudit.ordinal()){//审核
-            itemPosition.positionClick(3);
-        }else if(position==MainTab.FgtMainAskGetMoney.ordinal()){//邀请
-            itemPosition.positionClick(4);
-        }
-    }
-
-    private void checkViewState(int position) {
-        int top;
-        int bottom;
-       /*if(position == MainTab.FgtMainGame.ordinal()) {
-           top = activity.getResources().getDimensionPixelSize(R.dimen.app_nav_toolbar_height);
-           bottom = 0;
-           layout_main_activity_toolbar.setVisibility(View.VISIBLE);
-           if (!isGetAdvertisementDialogData) {
-               isGetAdvertisementDialogData = true;
-               activity.getAdvertisementDialogData();//获取广告弹窗信息
-           }
-       }else if(position == MainTab.FgtMainCategory.ordinal()) {
-           top = activity.getResources().getDimensionPixelSize(R.dimen.app_nav_toolbar_height);
-           bottom = activity.getResources().getDimensionPixelSize(R.dimen.bottom_height);
-           layout_main_activity_toolbar.setVisibility(View.VISIBLE);
-       } else*/ {
-            top = 0;
-            bottom = activity.getResources().getDimensionPixelSize(R.dimen.bottom_height);
-            layout_main_activity_toolbar.setVisibility(View.GONE);
-        }
-        RelativeLayout.LayoutParams layout = (RelativeLayout.LayoutParams) other_container
-                .getLayoutParams();
-        layout.setMargins(0, top, 0, bottom);
-        other_container.setLayoutParams(layout);
-    }
-    private boolean isGetAdvertisementDialogData = false;
-
-    public int getCurrentItem() {
-        return view_pager_container.getCurrentItem();
-    }
-
-    private int lastPosition = MainTab.FgtSmallSheep.ordinal();//默认选中小绵羊
-
-    private void initViewPager() {
-        LogUtil.logI("fragmentList.size---"+fragmentList.size());
-        ViewPagerFragmentAdapter mViewPagerFragmentAdapter = new ViewPagerFragmentAdapter(activity.getSupportFragmentManager(), fragmentList);
-        view_pager_container.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                //设置tab选择状态
-                if (lastPosition > -1)
-                    tabs.get(lastPosition).setActivated(false);
-                tabs.get(position).setActivated(true);
-                showFind(position == MainTab.Fgt_Find.ordinal());
-                //更新position
-                lastPosition = position;
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-        view_pager_container.setAdapter(mViewPagerFragmentAdapter);
-        view_pager_container.setCurrentItem(lastPosition, false);
-        tabs.get(lastPosition).setActivated(true);
-        checkViewState(lastPosition);
-    }
-
-    private void showFind(boolean isFind) {
-        View frame_container = activity.findViewById(R.id.frame_container);
-        if(isFind)
-            frame_container.bringToFront();
-        else
-            other_container.bringToFront();
-    }
-
-    public void init() {
-        initViews();
-        initArrays();
-        initViewPager();
-
-        FragmentTransaction transaction = activity.getSupportFragmentManager().beginTransaction();
-        Bundle bundle = new Bundle();
-        Fragment fragment = activity.getSupportFragmentManager().findFragmentByTag("tag");
-        if(fragment == null){
-            fragment = new FgtFind();
-            fragment.setArguments(bundle);
-            transaction.add(R.id.frame_container, fragment, "tag");
-            transaction.commitAllowingStateLoss();
-        }else {
-            fragment.setArguments(bundle);
-            transaction.replace(R.id.frame_container, fragment);
-            transaction.commitAllowingStateLoss();
-        }
-    }
-
-    private long lastbackrn = 0;
-    private int presscount = 0;
-    private final int period = 400;
-
-    public void onBackPressed() {
-        if (System.currentTimeMillis() - lastbackrn < period) {
-            presscount = presscount + 1;
-            Observable.just(1).delay(period * presscount, TimeUnit.MILLISECONDS)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Action1<Integer>() {
-                        @Override
-                        public void call(Integer integer) {
-                            doBackPress();
-                        }
-                    });
-        } else {
-            presscount = 0;
-            doBackPress();
-        }
-        lastbackrn = System.currentTimeMillis();
-    }
-
-    private void doBackPress() {
-        nativeBack();
-    }
-
-    public void goToPostion(int postion) {
-        tabs.get(postion).performClick();
-    }
-
-    /**
-     * 设置获取当前是哪个fragment位置的回调
-     */
-   public interface ItemPosition{
-        /**
-         * @param position ,fragment的位置
-         */
-        void positionClick(int position);
-    }
-
-}
+//package com.kfzs.duanduan.react;
+//
+//import android.os.Bundle;
+//import android.support.v4.app.Fragment;
+//import android.support.v4.app.FragmentTransaction;
+//import android.support.v4.view.ViewPager;
+//import android.view.View;
+//import android.widget.LinearLayout;
+//import android.widget.RelativeLayout;
+//import android.widget.TextView;
+//
+//import com.kf.utils.ToastBuilder;
+//import com.kfzs.duanduan.ActMain;
+//import com.kfzs.duanduan.KFZSApp;
+//import com.kfzs.duanduan.adp.ViewPagerFragmentAdapter;
+//import com.kfzs.duanduan.fragment.FgtFind;
+//import com.kfzs.duanduan.fragment.FgtPersonalCenter;
+//import com.kfzs.duanduan.fragment.FgtSmallSheep;
+//import com.sheep.gamegroup.util.DrawablesHelper;
+//import com.sheep.gamegroup.util.LogUtil;
+//import com.sheep.gamegroup.util.SysAppUtil;
+//import com.sheep.gamegroup.util.UMConfigUtils;
+//import com.sheep.gamegroup.view.fragment.FgtMainAudit;
+//import com.sheep.jiuyan.samllsheep.R;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.concurrent.TimeUnit;
+//
+//import rx.Observable;
+//import rx.android.schedulers.AndroidSchedulers;
+//import rx.functions.Action1;
+//import rx.schedulers.Schedulers;
+//
+//
+///**
+// * Created by realicing on 2017/11/24.
+// */
+//
+//public class TabsHelper {
+//
+//    //多次点击预防
+//    public static final int MIN_CLICK_DELAY_TIME = 200;
+//    private long lastClickTime = 0;
+//    private ActMain activity;
+//
+//    LinearLayout other_container;
+//
+//    View layout_main_activity_toolbar;
+//    View layout_bottom;
+//    LinearLayout tab_container;
+//    View tab_line;
+//
+//    private ViewPager view_pager_container;
+//    private TextView mTxtToolBar;
+//    private ItemPosition itemPosition;
+//    public TabsHelper() {
+//    }
+//    public TabsHelper(ItemPosition itemPosition) {
+//        this.itemPosition = itemPosition;
+//    }
+//
+//    private void initViews() {
+//        activity = KFZSApp.actMain;
+//        other_container = activity.findViewById(R.id.other_container);
+//        view_pager_container = activity.findViewById(R.id.view_pager_container);
+//        layout_main_activity_toolbar = activity.findViewById(R.id.layout_main_activity_toolbar);
+//        layout_bottom = activity.findViewById(R.id.layout_bottom);
+//        tab_container = activity.findViewById(R.id.tab_container);
+//        tab_line = activity.findViewById(R.id.tab_line);
+//        mTxtToolBar = activity.findViewById(R.id.txt_main_activity_toolbar);
+//    }
+//
+//    private List<Fragment> fragmentList = new ArrayList<>();
+//    private long mLastBackTime = 0;//上次按退出按钮的时间
+//
+//    /**
+//     * 点返回按钮时的多情况处理
+//     */
+//    private void nativeBack() {
+//        if (System.currentTimeMillis() - mLastBackTime < 1000) {
+//            KFZSApp.getInstance().quit();
+//        } else {
+//            ToastBuilder.make(activity.getApplicationContext(), R.string.toast_double_click_exit_app, ToastBuilder.DEFAULT_TOAST_SINGLE);
+//        }
+//        mLastBackTime = System.currentTimeMillis();
+//    }
+//
+//
+//    private List<View> tabs = new ArrayList<>();
+//
+//    private void initArrays() {
+//        MainTab[] mainTabs = MainTab.values();
+//        int index = 0;
+//        for (MainTab mainTab : mainTabs) {
+//            fragmentList.add(mainTab.getFragment());
+//
+//            View view = tab_container.getChildAt(index*2+1);
+//            if(view instanceof TextView){
+//                ((TextView) view).setText(mainTab.getStringId());
+//                new DrawablesHelper((TextView) view).direction(DrawablesHelper.TOP).drawable(mainTab.getDrawableId()).commit();
+//            }
+//            tabs.add(view);
+//            final int position = index;
+//            view.setOnClickListener(new View.OnClickListener() {
+//                @Override
+//                public void onClick(View view) {
+//                    long currentTime = System.currentTimeMillis();
+//                    if (currentTime - lastClickTime > MIN_CLICK_DELAY_TIME) {
+//                        lastClickTime = currentTime;
+//
+//                        checkViewState(position);
+//                        view_pager_container.setCurrentItem(position, false);
+//                        int sheepPosition = MainTab.FgtSmallSheep.ordinal();
+//                        int personnalPosition = MainTab.FgtPersonnalCenter.ordinal();
+//                        int auditPosition = MainTab.FgtMainAudit.ordinal();
+//                        int fPosition = MainTab.Fgt_Find.ordinal();
+//                        FgtSmallSheep fgtSmallSheep = (FgtSmallSheep) fragmentList.get(sheepPosition);
+//                        FgtPersonalCenter personnalCenter = (FgtPersonalCenter) fragmentList.get(personnalPosition);
+//                        FgtMainAudit auditFgt = (FgtMainAudit) fragmentList.get(auditPosition);
+////                        FgtFind findFgt = (FgtFind) fragmentList.get(fPosition);
+//                        if(position == sheepPosition){
+//                            fgtSmallSheep.onResume();
+//                        } else {
+//                            fgtSmallSheep.onPause();
+//                        }
+//                        if(position == personnalPosition){
+//                            personnalCenter.onResume();
+//                        }
+//                        if(position == auditPosition){
+//                            auditFgt.onResume();
+//                        }
+//                        if(position == fPosition){
+////                            findFgt.onResume();
+//                        }
+//                        checkWhichPage(position);
+//                    }
+//
+//
+//                }
+//            });
+//            index++;
+//        }
+//        //隐藏不显示的控件
+//        for (int i = index * 2; i < tab_container.getChildCount()-1; i++) {
+//           tab_container.getChildAt(i).setVisibility(View.GONE);
+//        }
+//    }
+//
+//    /**
+//     * 统计
+//     * @param position
+//     */
+//    private void checkWhichPage(int position){
+//        if(position == MainTab.FgtSmallSheep.ordinal()) {//赚钱
+//            itemPosition.positionClick(0);
+//            UMConfigUtils.Event.TAB_SHEEP.onEvent();
+//        }else if(position == MainTab.Fgt_Find.ordinal()) {//发现
+//            itemPosition.positionClick(1);
+//            UMConfigUtils.Event.TAB_FIND.onEvent();
+//        }else if(position == MainTab.FgtPersonnalCenter.ordinal()) {//个人中心
+//            itemPosition.positionClick(2);
+//            UMConfigUtils.Event.TAB_USER.onEvent();
+//        }else if (position==MainTab.FgtMainAudit.ordinal()){//审核
+//            itemPosition.positionClick(3);
+//        }else if(position==MainTab.FgtMainAskGetMoney.ordinal()){//邀请
+//            itemPosition.positionClick(4);
+//        }
+//    }
+//
+//    private void checkViewState(int position) {
+//        int top;
+//        int bottom;
+//       /*if(position == MainTab.FgtMainGame.ordinal()) {
+//           top = activity.getResources().getDimensionPixelSize(R.dimen.app_nav_toolbar_height);
+//           bottom = 0;
+//           layout_main_activity_toolbar.setVisibility(View.VISIBLE);
+//           if (!isGetAdvertisementDialogData) {
+//               isGetAdvertisementDialogData = true;
+//               activity.getAdvertisementDialogData();//获取广告弹窗信息
+//           }
+//       }else if(position == MainTab.FgtMainCategory.ordinal()) {
+//           top = activity.getResources().getDimensionPixelSize(R.dimen.app_nav_toolbar_height);
+//           bottom = activity.getResources().getDimensionPixelSize(R.dimen.bottom_height);
+//           layout_main_activity_toolbar.setVisibility(View.VISIBLE);
+//       } else*/ {
+//            top = 0;
+//            bottom = activity.getResources().getDimensionPixelSize(R.dimen.bottom_height);
+//            layout_main_activity_toolbar.setVisibility(View.GONE);
+//        }
+//        RelativeLayout.LayoutParams layout = (RelativeLayout.LayoutParams) other_container
+//                .getLayoutParams();
+//        layout.setMargins(0, top, 0, bottom);
+//        other_container.setLayoutParams(layout);
+//    }
+//    private boolean isGetAdvertisementDialogData = false;
+//
+//    public int getCurrentItem() {
+//        return view_pager_container.getCurrentItem();
+//    }
+//
+//    private int lastPosition = MainTab.FgtSmallSheep.ordinal();//默认选中小绵羊
+//
+//    private void initViewPager() {
+//        LogUtil.logI("fragmentList.size---"+fragmentList.size());
+//        ViewPagerFragmentAdapter mViewPagerFragmentAdapter = new ViewPagerFragmentAdapter(activity.getSupportFragmentManager(), fragmentList);
+//        view_pager_container.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+//
+//            @Override
+//            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+//
+//            }
+//
+//            @Override
+//            public void onPageSelected(int position) {
+//                //设置tab选择状态
+//                if (lastPosition > -1)
+//                    tabs.get(lastPosition).setActivated(false);
+//                tabs.get(position).setActivated(true);
+//                showFind(position == MainTab.Fgt_Find.ordinal());
+//                //更新position
+//                lastPosition = position;
+//            }
+//
+//            @Override
+//            public void onPageScrollStateChanged(int state) {
+//
+//            }
+//        });
+//        view_pager_container.setAdapter(mViewPagerFragmentAdapter);
+//        view_pager_container.setCurrentItem(lastPosition, false);
+//        tabs.get(lastPosition).setActivated(true);
+//        checkViewState(lastPosition);
+//    }
+//
+//    private void showFind(boolean isFind) {
+//        View frame_container = activity.findViewById(R.id.frame_container);
+//        if(isFind)
+//            frame_container.bringToFront();
+//        else
+//            other_container.bringToFront();
+//    }
+//
+//    public void init() {
+//        initViews();
+//        initArrays();
+//        initViewPager();
+//
+//        FragmentTransaction transaction = activity.getSupportFragmentManager().beginTransaction();
+//        Bundle bundle = new Bundle();
+//        Fragment fragment = activity.getSupportFragmentManager().findFragmentByTag("tag");
+//        if(fragment == null){
+//            fragment = new FgtFind();
+//            fragment.setArguments(bundle);
+//            transaction.add(R.id.frame_container, fragment, "tag");
+//            transaction.commitAllowingStateLoss();
+//        }else {
+//            fragment.setArguments(bundle);
+//            transaction.replace(R.id.frame_container, fragment);
+//            transaction.commitAllowingStateLoss();
+//        }
+//    }
+//
+//    private long lastbackrn = 0;
+//    private int presscount = 0;
+//    private final int period = 400;
+//
+//    public void onBackPressed() {
+//        if (System.currentTimeMillis() - lastbackrn < period) {
+//            presscount = presscount + 1;
+//            Observable.just(1).delay(period * presscount, TimeUnit.MILLISECONDS)
+//                    .subscribeOn(Schedulers.io())
+//                    .observeOn(AndroidSchedulers.mainThread())
+//                    .subscribe(new Action1<Integer>() {
+//                        @Override
+//                        public void call(Integer integer) {
+//                            doBackPress();
+//                        }
+//                    });
+//        } else {
+//            presscount = 0;
+//            doBackPress();
+//        }
+//        lastbackrn = System.currentTimeMillis();
+//    }
+//
+//    private void doBackPress() {
+//        nativeBack();
+//    }
+//
+//    public void goToPostion(int postion) {
+//        tabs.get(postion).performClick();
+//    }
+//
+//    /**
+//     * 设置获取当前是哪个fragment位置的回调
+//     */
+//   public interface ItemPosition{
+//        /**
+//         * @param position ,fragment的位置
+//         */
+//        void positionClick(int position);
+//    }
+//
+//}

+ 0 - 100
app/src/main/java/com/kfzs/duanduan/utils/dlg/SkipUtils.java

@@ -1,100 +0,0 @@
-package com.kfzs.duanduan.utils.dlg;
-
-import android.content.Context;
-import android.content.Intent;
-import android.text.TextUtils;
-
-import com.kfzs.duanduan.ActGameDetails;
-import com.kfzs.duanduan.ActGategoryRank;
-import com.kfzs.duanduan.ActWeb;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  SkipUtils</p>
- * @ <p>Description: 专门负责各类Activity的跳转</p>
- * @ date:  2017/6/15 13:55
- * @ QQ:    315096953
- */
-
-public class SkipUtils {
-
-    private static SkipUtils mSkipUtils;
-
-    public synchronized static SkipUtils getInstance() {
-        if (mSkipUtils == null) {
-            mSkipUtils = new SkipUtils();
-        }
-        return mSkipUtils;
-    }
-
-    /**
-     * 跳到详情页
-     *
-     * @param sGameId
-     */
-    public void goGameDetails(Context context, int sGameId) {
-        Intent intent = new Intent(context, ActGameDetails.class);
-        intent.putExtra(KFIntentKeys.EXTRA_GAME_ID, String.valueOf(sGameId));
-        context.startActivity(intent);
-    }
-
-    /**
-     * @param context
-     * @param sGameId
-     * @param whichpage 游戏里面有个多栏项目,默认跳到第几个项目
-     */
-    public void goGameDetails(Context context, int sGameId, int whichpage) {
-        Intent intent = new Intent(context, ActGameDetails.class);
-        intent.putExtra(KFIntentKeys.EXTRA_GAME_ID, String.valueOf(sGameId));
-        intent.putExtra(KFIntentKeys.EXTRA_PAGE_NUM, whichpage);
-        context.startActivity(intent);
-    }
-
-    /**
-     * 跳游戏分类页
-     *
-     * @param context
-     * @param gametypeid
-     */
-    public void goGameType(Context context, int gametypeid) {
-        Intent intent = new Intent(context, ActGategoryRank.class);
-        intent.putExtra(ActGategoryRank.INTENT_TYPE_ID, gametypeid);
-        context.startActivity(intent);
-    }
-
-    /**
-     * 跳到Web页
-     *
-     * @param strUrl
-     * @param strTitle
-     */
-    public void goWebView(Context context, String strUrl, String strTitle, String packName, int gameid) {
-        Intent intent = new Intent(context, ActWeb.class);
-        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_URL, strUrl);
-        if (!TextUtils.isEmpty(strTitle)) {
-            intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_TITLE, strTitle);
-        }
-        if (!TextUtils.isEmpty(packName)) {
-            intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_PACKAGENAME, packName);
-        }
-        if (gameid > 0) {
-            intent.putExtra(KFIntentKeys.EXTRA_GAME_ID, gameid + "");
-        }
-        context.startActivity(intent);
-    }
-
-    public void goWebView(Context context, String strUrl, String strTitle, Boolean isNotitle) {
-        Intent intent = new Intent(context, ActWeb.class);
-        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_URL, strUrl);
-        if (!TextUtils.isEmpty(strTitle)) {
-            intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_TITLE, strTitle);
-        }
-        if (isNotitle) {
-            intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_NO_TITLE, true);
-        }
-        context.startActivity(intent);
-    }
-
-}

+ 3 - 6
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -11,7 +11,6 @@ import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
 
-import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.bean.KFIntentKeys;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.Advertising;
@@ -36,7 +35,6 @@ import com.sheep.gamegroup.model.entity.XianWanEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.view.activity.ActAudit;
 import com.sheep.gamegroup.view.activity.ActBindMobileRegister;
-import com.sheep.gamegroup.view.activity.ActModifyThird;
 import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 import com.sheep.gamegroup.view.activity.ActCreditCardWeb;
 import com.sheep.gamegroup.view.activity.ActDownloadWelfareList;
@@ -51,7 +49,9 @@ import com.sheep.gamegroup.view.activity.ActGuide;
 import com.sheep.gamegroup.view.activity.ActGuideDeblocked;
 import com.sheep.gamegroup.view.activity.ActGuideOnHook;
 import com.sheep.gamegroup.view.activity.ActLoadH5;
+import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.ActMiDong;
+import com.sheep.gamegroup.view.activity.ActModifyThird;
 import com.sheep.gamegroup.view.activity.ActMyMoney;
 import com.sheep.gamegroup.view.activity.ActMyWelfare;
 import com.sheep.gamegroup.view.activity.ActNewAboutUs;
@@ -239,10 +239,7 @@ public class Jump2View {
      */
     public void goHomePageView(final Context context, Object o){
         final Intent intent = new Intent(context, ActMain.class);
-        if(o instanceof Integer){
-            intent.putExtra(ActMain.INTENT_GAME_ID, (Integer) o);
-            context.startActivity(intent);
-        } else if(o instanceof String){
+        if(o instanceof String){
             //统计用户登录信息
             UMConfigUtils.onProfileSignIn();
             //从登录界面过来//新注册用户才添加到数据库,并设置可以显示

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -15,7 +15,6 @@ import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.react.ConfigUtil;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -28,6 +27,7 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.usage.AppUsageManager;
 import com.sheep.gamegroup.view.activity.ActInstallApkList;
+import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.ActSheepApkList;
 import com.sheep.gamegroup.view.activity.ActSheepPngList;
 import com.sheep.gamegroup.view.activity.ActWeb;

+ 277 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActMain.java

@@ -0,0 +1,277 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.kfzs.duanduan.KFZSApp;
+import com.kfzs.duanduan.adp.ViewPagerFragmentAdapter;
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.fragment.FgtFind;
+import com.kfzs.duanduan.react.MainTab;
+import com.kfzs.duanduan.utils.StatusBarUtils;
+import com.kfzs.duanduan.view.DialogStorageLow;
+import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.Container;
+import com.sheep.gamegroup.util.DrawablesHelper;
+import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
+
+
+/**
+ * Created by realicing on 2018/9/6.
+ * realicing@sina.com
+ */
+public class ActMain extends BaseActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StatusBarUtils.setTranslucent(this);
+        super.onCreate(savedInstanceState);
+    }
+
+    @BindView(R.id.view_pager_container)
+    ViewPager view_pager_container;
+    @BindView(R.id.frame_container)
+    FrameLayout frame_container;
+    @BindView(R.id.tab_container)
+    LinearLayout tab_container;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.act_main;
+    }
+
+    @Override
+    public void initView() {
+        ButterKnife.bind(this);
+        EventBus.getDefault().register(this);
+        initViewPager();
+        initFind();
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @Override
+    public void initData() {
+
+    }
+
+    private List<Fragment> fragmentList = new ArrayList<>();
+
+    private int lastPosition = MainTab.FgtSmallSheep.ordinal();//默认选中小绵羊
+
+    //多次点击预防
+    public static final int MIN_CLICK_DELAY_TIME = 200;
+    private long lastClickTime = 0;
+
+    private void initViewPager() {
+
+        MainTab[] mainTabs = MainTab.values();
+        int index = 0;
+        for (MainTab mainTab : mainTabs) {
+            fragmentList.add(mainTab.getFragment());
+
+            View view = tab_container.getChildAt(index * 2 + 1);
+            if (view instanceof TextView) {
+                ((TextView) view).setText(mainTab.getStringId());
+                new DrawablesHelper((TextView) view).direction(DrawablesHelper.TOP).drawable(mainTab.getDrawableId()).commit();
+            }
+            tabs.add(view);
+            final int position = index;
+            view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    long currentTime = System.currentTimeMillis();
+                    if (currentTime - lastClickTime > MIN_CLICK_DELAY_TIME) {
+                        lastClickTime = currentTime;
+                        view_pager_container.setCurrentItem(position);
+                        checkWhichPage(position);
+                    }
+
+
+                }
+            });
+            index++;
+        }
+        //隐藏不显示的控件
+        for (int i = index * 2; i < tab_container.getChildCount() - 1; i++) {
+            tab_container.getChildAt(i).setVisibility(View.GONE);
+        }
+        ViewPagerFragmentAdapter mViewPagerFragmentAdapter = new ViewPagerFragmentAdapter(getSupportFragmentManager(), fragmentList);
+        view_pager_container.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                //设置tab选择状态
+                View lastTab = ListUtil.getItem(tabs, lastPosition);
+                View curTab = ListUtil.getItem(tabs, position);
+                if (lastTab != null)
+                    lastTab.setActivated(false);
+                if (curTab != null)
+                    curTab.setActivated(true);
+                showFind(position == MainTab.Fgt_Find.ordinal());
+                //更新position
+                lastPosition = position;
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+        view_pager_container.setAdapter(mViewPagerFragmentAdapter);
+        view_pager_container.setCurrentItem(lastPosition);
+        tabs.get(lastPosition).setActivated(true);
+    }
+
+    /**
+     * 统计
+     *
+     * @param position
+     */
+    private void checkWhichPage(int position) {
+        if (position == MainTab.FgtSmallSheep.ordinal()) {//赚钱
+            UMConfigUtils.Event.TAB_SHEEP.onEvent();
+        } else if (position == MainTab.Fgt_Find.ordinal()) {//发现
+            UMConfigUtils.Event.TAB_FIND.onEvent();
+        } else if (position == MainTab.FgtPersonnalCenter.ordinal()) {//个人中心
+            UMConfigUtils.Event.TAB_USER.onEvent();
+        } else if (position == MainTab.FgtMainAudit.ordinal()) {//审核
+        } else if (position == MainTab.FgtMainAskGetMoney.ordinal()) {//邀请
+        }
+    }
+
+    private void showFind(boolean isFind) {
+        if (isFind)
+            frame_container.bringToFront();
+        else
+            view_pager_container.bringToFront();
+    }
+
+    public void initFind() {
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        Bundle bundle = new Bundle();
+        Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
+        if (fragment == null) {
+            fragment = new FgtFind();
+            fragment.setArguments(bundle);
+            transaction.add(R.id.frame_container, fragment, "tag");
+            transaction.commitAllowingStateLoss();
+        } else {
+            fragment.setArguments(bundle);
+            transaction.replace(R.id.frame_container, fragment);
+            transaction.commitAllowingStateLoss();
+        }
+    }
+
+    private long mLastBackTime = 0;//上次按退出按钮的时间
+
+    /**
+     * 点返回按钮时的多情况处理
+     */
+    private void doBackPress() {
+        if (System.currentTimeMillis() - mLastBackTime < 1000) {
+            KFZSApp.getInstance().quit();
+        } else {
+            G.showToast(R.string.toast_double_click_exit_app);
+        }
+        mLastBackTime = System.currentTimeMillis();
+    }
+
+    private long lastBackTime = 0;
+    private int pressCount = 0;
+    private static final int PERIOD = 400;
+
+    @Override
+    public void onBackPressed() {
+        if (System.currentTimeMillis() - lastBackTime < PERIOD) {
+            pressCount = pressCount + 1;
+            Observable.just(1).delay(PERIOD * pressCount, TimeUnit.MILLISECONDS)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new Action1<Integer>() {
+                        @Override
+                        public void call(Integer integer) {
+                            doBackPress();
+                        }
+                    });
+        } else {
+            pressCount = 0;
+            doBackPress();
+        }
+        lastBackTime = System.currentTimeMillis();
+    }
+
+
+    private List<View> tabs = new ArrayList<>();
+
+    private Container<Action1<Integer>> container = new Container<>();
+
+    public Container<Action1<Integer>> getContainer() {
+        return container;
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (container != null && container.getT() != null)
+            container.getT().call(1);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (container != null && container.getT() != null)
+            container.getT().call(2);
+    }
+    /**
+     * 主要的事件广播接收更新处理
+     *
+     * @param event
+     */
+    @Subscribe
+    public void onEventMainThread(BigEvent event) {
+        switch (event.getEventTypes()) {
+            case STORAGE_LOW:
+                DialogStorageLow.showDialog(this);
+                break;
+        }
+    }
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+        if (container != null && container.getT() != null)
+            container.setT(null);
+    }
+}

+ 0 - 341
app/src/main/java/com/sheep/gamegroup/view/activity/ActMainGame.java

@@ -1,341 +0,0 @@
-package com.sheep.gamegroup.view.activity;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.BitmapFactory;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.ActDownloadMgr;
-import com.kfzs.duanduan.ActGameDetails;
-import com.kfzs.duanduan.ActSearch;
-import com.kfzs.duanduan.KFZSApp;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
-import com.kfzs.duanduan.db.DataSave;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.fragment.FgtMainGame;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.GameOuterClass;
-import com.kfzs.duanduan.proto.RecommendedGameOuterClass;
-import com.kfzs.duanduan.services.DownloadTaskService;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-import com.kfzs.duanduan.view.AppHomepageAdvertisementDialog;
-import com.kfzs.duanduan.view.DialogStorageLow;
-import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-import com.zhy.http.okhttp.OkHttpUtils;
-import com.zhy.http.okhttp.callback.StringCallback;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import okhttp3.Call;
-
-import static com.kfzs.duanduan.services.DownloadTaskService.STATUS_ING;
-
-/**
- * Created by ljy on 2018/5/10.
- */
-
-public class ActMainGame extends BaseActivity {
-
-    @BindView(R.id.layout_main_activity_toolbar)
-    View layout_main_activity_toolbar;
-    @BindView(R.id.download_layout)
-    View download_layout;
-    @BindView(R.id.edt_main_search_enter)
-    EditText edt_main_search_enter;
-    @BindView(R.id.img_download_manager_dot)
-    ImageView mImgDot;//下载按钮的小红点
-    Activity activity;
-
-
-    private static final String TAG = "ActMainGame";
-    private DownloadTaskService mDownloadTaskService;
-
-    private AppHomepageAdvertisementDialog gameDialog;//预约窗口
-    private boolean isGetAdvertisementDialogData = false;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.common_container_act;
-    }
-
-    @Override
-    public void initView() {
-
-        activity = this;
-
-        EventBus.getDefault().register(this);
-        mDownloadTaskService = new DownloadTaskService(this);
-        TitleBarUtils
-                .getInstance()
-                .setTitle(this, "玩转游戏")
-                .setTitleFinish(this)
-                .setRightImgBotton(activity, R.drawable.index_download, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        startActivity(new Intent(activity, ActDownloadMgr.class));
-//                        mImgDot.setVisibility(View.GONE);
-                        TitleBarUtils.getInstance()
-                                .setRightRedPoint(activity, View.GONE);
-                        UMConfigUtils.onEvent(UMConfigUtils.Event.GAME_DOWNLOAD_MANAGER);
-                    }
-                });
-        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-        Bundle bundle = new Bundle();
-        Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
-        if (fragment == null) {
-            fragment = new FgtMainGame();
-            fragment.setArguments(bundle);
-            transaction.add(R.id.frame_container, fragment, "tag");
-            transaction.commitAllowingStateLoss();
-        } else {
-            fragment.setArguments(bundle);
-            transaction.replace(R.id.frame_container, fragment);
-            transaction.commitAllowingStateLoss();
-        }
-    }
-
-    @Override
-    public void initListener() {
-
-        edt_main_search_enter.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(activity, ActSearch.class));
-            }
-        });
-    }
-
-    @Override
-    public void initData() {
-        layout_main_activity_toolbar.setVisibility(View.VISIBLE);
-        download_layout.setVisibility(View.GONE);
-        if (!isGetAdvertisementDialogData) {
-            isGetAdvertisementDialogData = true;
-            getAdvertisementDialogData();//获取广告弹窗信息
-        }
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
-    /*
-     移植过来
-     */
-    /**
-     * 获取首页弹窗Dialog广告
-     */
-    public void getAdvertisementDialogData() {
-        Log.d(TAG, "getAdvertisementDialogData: " + UrlBll.AdvertisementApi.RECOMMENDED_ADVERTISEMENT);
-        APIRequest bannerRequest = APIRequestInstance.getReqUrl(TAG, UrlBll.AdvertisementApi.RECOMMENDED_ADVERTISEMENT, null, new ResponseNetworkTask() {
-
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                try {
-                    showAdvertisementDialog(apiResponse);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-                Log.d("FLY", "code: " + code + "\nmsg: " + msg);
-            }
-        }, null);
-        KFZSNetwork.addRequest(bannerRequest);
-    }
-
-    private void showAdvertisementDialog(ApiResponseOuterClass.ApiResponse apiResponse) {
-        if (apiResponse == null || apiResponse.getRecommendedGamesList().isEmpty()) {
-            Log.d(TAG, "The showAdvertisementDialog response is null ");
-            return;
-        }
-
-        final RecommendedGameOuterClass.RecommendedGame recommendeGame = apiResponse.getRecommendedGamesList().get(0);
-        final String splashImageUrL = recommendeGame.getImageUrl();
-        Log.d(TAG, "splashImageUrL: " + splashImageUrL);
-        final String splashImageUr1 = recommendeGame.getTitle();
-        Log.d(TAG, "splashImageUrL: " + splashImageUr1);
-        final GameOuterClass.Game game = recommendeGame.getGame();
-        Log.d(TAG, "game: " + game.toString());
-        if (!TextUtils.isEmpty(splashImageUrL)) {
-            if (gameDialog != null) {
-                gameDialog.dismiss();
-            }
-            gameDialog = new AppHomepageAdvertisementDialog(activity);
-            gameDialog.setShutImg(BitmapFactory.decodeResource(getResources(), R.drawable.btn_dialog_close));
-            gameDialog.setBackground(splashImageUrL);
-            if (getBtntext(recommendeGame).equals(getString(R.string.book_now))) {
-                gameDialog.setCanceledOnTouchOutside(true);
-                gameDialog.setCanceledOnTouchOutside(true);
-                gameDialog.setCancelable(true);
-                gameDialog.setDownloadOnOnclickListener(getBtntext(recommendeGame), new AppHomepageAdvertisementDialog.onDownloadOnclickListener() {
-                    @Override
-                    public void onDownloadClick() {
-                        SkipUtils.getInstance().goGameDetails(activity,
-                                recommendeGame.getGame().getId());
-                    }
-                });
-                gameDialog.setBackgroundOnclickListener(new AppHomepageAdvertisementDialog.onBackOnclickListener() {
-                    @Override
-                    public void onClick() {
-                        SkipUtils.getInstance().goGameDetails(activity, recommendeGame.getGame().getId());
-                    }
-                });
-
-
-            } else {
-                gameDialog.setDownloadOnOnclickListener(getBtntext(recommendeGame),
-                        new AppHomepageAdvertisementDialog.onDownloadOnclickListener() {
-                            @Override
-                            public void onDownloadClick() {
-                                final String downloadUrl = game.getDownloadUrl();
-                                if (!TextUtils.isEmpty(downloadUrl) && !downloadUrl.endsWith(".apk")) {
-                                    String url = UrlBll.GameApi.DOWNLOAD_REDIRECT + "game_id=" + game.getId() + "&channel=" + DataSave.getInstance().getChannelName();
-                                    OkHttpUtils.get().url(url).build().execute(new StringCallback() {
-                                        @Override
-                                        public void onError(Call call, Exception e, int id) {
-                                        }
-
-                                        @Override
-                                        public void onResponse(String response, int id) {
-                                            if (!TextUtils.isEmpty(response)) {
-                                                try {
-                                                    JSONObject object = new JSONObject(response);
-                                                    String realUrl = object.optString("DownloadUrl");
-                                                    if (TextUtils.isEmpty(realUrl))
-                                                        Toast.makeText(activity, "获取" + DataSave.getInstance().getChannelName() + "渠道下载地址失败", Toast.LENGTH_SHORT).show();
-                                                    else {
-                                                        KFZSApp.getInstance().mRealDownloadUrl.put(realUrl, downloadUrl);
-                                                        DownLoadInfo downloadInfo = addNewDownloadTask(game.getGameName(), realUrl, game.getPackageName(),
-                                                                Integer.parseInt(game.getVersionCode()), game.getIconImage(), game.getSize(), game.getId(), STATUS_ING);
-                                                        mDownloadTaskService.start(downloadInfo);
-                                                        EventBus.getDefault().post(BigEvent.get()
-                                                                .setEventTypes(EventTypes.TIPS_DOWN_ICON));
-                                                    }
-                                                } catch (JSONException e) {
-                                                    e.printStackTrace();
-                                                }
-                                            }
-
-                                        }
-                                    });
-                                } else {
-                                    DownLoadInfo downloadInfo = addNewDownloadTask(game.getGameName(),
-                                            downloadUrl,
-                                            game.getPackageName(),
-                                            Integer.parseInt(game.getVersionCode()),
-                                            game.getIconImage(),
-                                            game.getSize(),
-                                            game.getId(),
-                                            STATUS_ING);
-
-                                    mDownloadTaskService.start(downloadInfo);
-                                    EventBus.getDefault().post(BigEvent.get()
-                                            .setEventTypes(EventTypes.TIPS_DOWN_ICON));
-                                }
-                            }
-                        });
-
-                gameDialog.setBackgroundOnclickListener(new AppHomepageAdvertisementDialog.onBackOnclickListener() {
-                    @Override
-                    public void onClick() {
-                        Intent intent = new Intent(activity, ActGameDetails.class);
-                        intent.putExtra(KFIntentKeys.EXTRA_GAME_ID, recommendeGame.getGameId() + "");
-                        activity.startActivity(intent);
-                    }
-                });
-            }
-
-
-            gameDialog.show();
-        } else {
-            Log.d(TAG, "showAdvertisementDialog: game or splashImageUrL is null");
-        }
-    }
-
-    private DownLoadInfo addNewDownloadTask(String gameName, String downloadUrl, String packageName,
-                                            int versionCode, String iconUrl, String size, Integer gameId, int state) {
-
-        final DownLoadInfo task = new DownLoadInfo();
-        task.setMIconUrl(iconUrl);
-        task.setMGameName(gameName);
-        task.setMDownloadUrl(downloadUrl);
-        task.setMPackageName(packageName);
-        task.setMVersionCode(versionCode);
-        task.setMTotalSize(Double.valueOf(size));
-        task.setMGameID(gameId);
-        task.setMStatus(state);
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                mDownloadTaskService.addDownloadTask(task);
-            }
-        }).start();
-        return task;
-    }
-
-
-    /**
-     * 返回首页启动广告弹窗的按钮文本
-     *
-     * @param game
-     * @return
-     */
-    private String getBtntext(RecommendedGameOuterClass.RecommendedGame game) {
-        String backStr = "立即下载";
-        if (TextUtils.isEmpty(game.getApkUrl())) {
-            backStr = getString(R.string.book_now);
-        }
-        return backStr;
-    }
-    /**
-     * 主要的事件广播接收更新处理
-     *
-     * @param event
-     */
-    @Subscribe
-    public void onEventMainThread(BigEvent event) {
-        switch (event.getEventTypes()) {
-            case TIPS_DOWN_ICON:
-//                mImgDot.setVisibility(View.VISIBLE);
-                  TitleBarUtils.getInstance()
-                          .setRightRedPoint(activity, View.VISIBLE);
-                break;
-            case STORAGE_LOW:
-                DialogStorageLow.showDialog(this);
-                break;
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-}

+ 0 - 6
app/src/main/java/com/sheep/gamegroup/view/activity/ChangeTelAct.java

@@ -11,9 +11,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
-import com.kfzs.duanduan.ActMain;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerChangePhoneComponent;
 import com.sheep.gamegroup.di.modules.PhoneModule;
@@ -29,11 +26,8 @@ import com.sheep.gamegroup.util.UMConfigUtils;
 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.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import org.greenrobot.eventbus.EventBus;
-
 import javax.inject.Inject;
 
 import butterknife.BindView;

+ 0 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/PersonalCenterAct.java

@@ -4,13 +4,10 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.view.View;
 
 import com.kfzs.duanduan.fragment.FgtPersonalCenter;
 import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 /**
  * 个人中心首页

+ 1 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.multidex.MultiDex;
 
-import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.react.ConfigUtil;
 import com.kfzs.duanduan.react.SharedPreferences;
 import com.sheep.gamegroup.di.components.DaggerNetComponent;
@@ -23,6 +22,7 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.ScreenShotListenManager;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.LoginAct;
 import com.sheep.jiuyan.samllsheep.service.DownloadService;
 import com.sheep.jiuyan.samllsheep.service.FloatService;

+ 28 - 27
app/src/main/res/layout/act_audit_layout.xml

@@ -3,29 +3,24 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginTop="24dp" />
-
     <android.support.constraint.ConstraintLayout
         android:id="@+id/root_1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@mipmap/audit_top_bg"
-        android:paddingBottom="@dimen/content_padding_15">
+        android:paddingBottom="@dimen/content_padding_15"
+        android:paddingTop="@dimen/content_padding_15">
 
 
         <ImageView
             android:id="@+id/img_baseactivity_title"
             android:layout_width="wrap_content"
             android:layout_height="?attr/actionBarSize"
-            android:paddingStart="@dimen/content_padding_20"
-            android:paddingEnd="@dimen/content_padding_20"
             android:gravity="center_vertical"
+            android:paddingEnd="@dimen/content_padding_20"
+            android:paddingStart="@dimen/content_padding_20"
             android:scaleType="centerInside"
             android:src="@drawable/narrow_back_white"
             app:layout_constraintStart_toStartOf="parent"
@@ -49,62 +44,66 @@
             android:id="@+id/number_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/text_size_3"
-            android:textColor="@color/white"
-            android:text=""
             android:gravity="center"
-            app:layout_constraintTop_toBottomOf="@+id/txt_baseactivity_title"
+            android:text=""
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_3"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"/>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/txt_baseactivity_title" />
 
         <LinearLayout
-            android:layout_below="@+id/number_tv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@+id/number_tv"
+            android:layout_below="@+id/number_tv"
+            android:layout_marginTop="@dimen/content_padding_15"
             app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginTop="@dimen/content_padding_15">
+            app:layout_constraintTop_toBottomOf="@+id/number_tv">
+
             <TextView
                 android:id="@+id/audit_total_complete_tv"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:gravity="center"
                 android:text=""
                 android:textColor="@color/white"
-                android:textSize="@dimen/text_size_13"/>
+                android:textSize="@dimen/text_size_13" />
+
             <View
                 android:layout_width="1dp"
                 android:layout_height="20dp"
                 android:layout_gravity="center"
-                android:background="@color/disenable_color"/>
+                android:background="@color/disenable_color" />
+
             <TextView
                 android:id="@+id/audit_total_money_tv"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:gravity="center"
                 android:text=""
                 android:textColor="@color/white"
-                android:textSize="@dimen/text_size_13"/>
+                android:textSize="@dimen/text_size_13" />
+
             <View
                 android:layout_width="1dp"
                 android:layout_height="20dp"
                 android:layout_gravity="center"
-                android:background="@color/disenable_color"/>
+                android:background="@color/disenable_color" />
 
             <LinearLayout
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/audit_total_welfare_tv"
                     android:layout_width="0dp"
-                    android:layout_weight="1"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:gravity="center"
                     android:text=""
                     android:textColor="@color/white"
@@ -123,11 +122,13 @@
 
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
-        style="@style/style_tab"/>
+        style="@style/style_tab"
+        android:background="@color/white"  />
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        android:background="@color/white" />
 </com.kfzs.android.view.widget.TouchEventConsumerLayout>

+ 116 - 0
app/src/main/res/layout/act_main.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/common_container" />
+
+    <com.kfzs.duanduan.view.NoScrollViewPager
+        android:id="@+id/view_pager_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="@dimen/bottom_height" />
+
+    <RelativeLayout
+        android:id="@+id/layout_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_height"
+        android:layout_alignParentBottom="true"
+        android:background="@color/white">
+
+        <LinearLayout
+            android:id="@+id/tab_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingTop="4dp">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="@dimen/tab_height"
+                android:layout_weight="1" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/tab_height"
+                android:drawableTop="@drawable/drawable_selector_task"
+                android:gravity="center"
+                android:minWidth="@dimen/tab_width"
+                android:text="@string/tab_viewpager_gamestore"
+                android:textColor="@color/selector_color_main_tab"
+                android:textSize="10sp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="@dimen/tab_height"
+                android:layout_weight="2" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/tab_height"
+                android:drawableTop="@drawable/drawable_selector_task"
+                android:gravity="center"
+                android:minWidth="@dimen/tab_width"
+                android:text="@string/tab_viewpager_classification"
+                android:textColor="@color/selector_color_main_tab"
+                android:textSize="10sp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="@dimen/tab_height"
+                android:layout_weight="2" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/tab_height"
+                android:drawableTop="@drawable/drawable_selector_task"
+                android:gravity="center"
+                android:minWidth="@dimen/tab_width"
+                android:text="@string/mine_hoggerel"
+                android:textColor="@color/selector_color_main_tab"
+                android:textSize="10sp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="@dimen/tab_height"
+                android:layout_weight="2" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/tab_height"
+                android:drawableTop="@drawable/drawable_selector_task"
+                android:gravity="center"
+                android:minWidth="@dimen/tab_width"
+                android:text="@string/tab_viewpager_borrowplay"
+                android:textColor="@color/selector_color_main_tab"
+                android:textSize="10sp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="@dimen/tab_height"
+                android:layout_weight="2" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/tab_height"
+                android:drawableTop="@drawable/drawable_selector_task"
+                android:gravity="center"
+                android:minWidth="@dimen/tab_width"
+                android:text="@string/tab_viewpager_borrowplay"
+                android:textColor="@color/selector_color_main_tab"
+                android:textSize="10sp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="@dimen/tab_height"
+                android:layout_weight="1" />
+        </LinearLayout>
+
+        <View
+            android:id="@+id/tab_line"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/divider_gray" />
+    </RelativeLayout>
+</RelativeLayout>

+ 1 - 1
app/src/main/res/layout/fgt_personacenter_item_top.xml

@@ -13,7 +13,7 @@
         <RelativeLayout
             android:id="@+id/layout_navigationBar"
             android:layout_width="match_parent"
-            android:layout_height="40dp">
+            android:layout_height="?attr/actionBarSize">
 
             <ImageView
                 android:id="@+id/img_baseactivity_title"

+ 1 - 2
app/src/main/res/layout/fgt_personalcenter_layout.xml

@@ -9,8 +9,7 @@
         android:id="@+id/root_4"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginTop="24dp">
+        android:orientation="vertical">
 
         <include layout="@layout/fgt_personacenter_item_top" />