Procházet zdrojové kódy

删除无用资源3

zengjiebin před 8 roky
rodič
revize
f8b841611b
100 změnil soubory, kde provedl 9 přidání a 11691 odebrání
  1. 0 235
      app/src/main/java/com/kfzs/duanduan/ActDuJiaShouFa.java
  2. 0 63
      app/src/main/java/com/kfzs/duanduan/adp/AdpFgtAppDetailBbs.java
  3. 0 70
      app/src/main/java/com/kfzs/duanduan/adp/AdpFgtAppDetailNewGame.java
  4. 0 98
      app/src/main/java/com/kfzs/duanduan/adp/AdpGameBook.java
  5. 0 212
      app/src/main/java/com/kfzs/duanduan/adp/AdpMainPageGift.java
  6. 0 169
      app/src/main/java/com/kfzs/duanduan/adp/AdpMainStartService.java
  7. 0 84
      app/src/main/java/com/kfzs/duanduan/adp/AdpSearchNewGame.java
  8. 0 86
      app/src/main/java/com/kfzs/duanduan/adp/AdpSearchTest.java
  9. 0 46
      app/src/main/java/com/kfzs/duanduan/adp/AdpViewPagerMainPage.java
  10. 0 90
      app/src/main/java/com/kfzs/duanduan/adp/AdpVipCoupon.java
  11. 0 53
      app/src/main/java/com/kfzs/duanduan/adp/UserSelfInfoShowAdapter.java
  12. 0 112
      app/src/main/java/com/kfzs/duanduan/fragment/FgContinuePlay.java
  13. 0 198
      app/src/main/java/com/kfzs/duanduan/fragment/FgtBookedGame.java
  14. 0 25
      app/src/main/java/com/kfzs/duanduan/fragment/FgtCouponHistory.java
  15. 0 56
      app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCard.java
  16. 0 73
      app/src/main/java/com/kfzs/duanduan/fragment/FgtNewGame.java
  17. 0 174
      app/src/main/java/com/kfzs/duanduan/fragment/GiftGameFragment.java
  18. 0 245
      app/src/main/java/com/kfzs/duanduan/fragment/OpenServiceTestFragment.java
  19. 0 114
      app/src/main/java/com/kfzs/duanduan/mine/GiftpackBroughtAdapter.java
  20. 0 142
      app/src/main/java/com/kfzs/duanduan/mine/GiftpackHasBroughtFragment.java
  21. 0 62
      app/src/main/java/com/kfzs/duanduan/mine/GiftpackListActivity.java
  22. 0 56
      app/src/main/java/com/kfzs/duanduan/mine/GiftpackListAdapter.java
  23. 0 56
      app/src/main/java/com/kfzs/duanduan/mine/VoucherAdapter.java
  24. 0 144
      app/src/main/java/com/kfzs/duanduan/mine/VoucherFragment.java
  25. 0 96
      app/src/main/java/com/kfzs/duanduan/mine/VoucherItemAdapter.java
  26. 0 55
      app/src/main/java/com/kfzs/duanduan/mine/VoucherListActivity.java
  27. 0 53
      app/src/main/java/com/kfzs/duanduan/oem/AppDownloadUtil.java
  28. 0 106
      app/src/main/java/com/kfzs/duanduan/oem/GetPackageNmeHlpe.java
  29. 0 122
      app/src/main/java/com/kfzs/duanduan/oem/UtilParamsWebview.java
  30. 0 13
      app/src/main/java/com/kfzs/duanduan/react/MainTab.java
  31. 1 1
      app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java
  32. 4 7
      app/src/main/java/com/kfzs/duanduan/utils/dlg/DownBtnUtils.java
  33. 0 16
      app/src/main/java/com/sheep/gamegroup/util/MyDbManager.java
  34. 0 4
      app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java
  35. 1 21
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
  36. 1 10
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailCreditCardAct.java
  37. 0 255
      app/src/main/java/com/sheep/gamegroup/view/adapter/DownLoadTvAdp.java
  38. 0 71
      app/src/main/java/com/sheep/gamegroup/view/download/DownloadCallback.java
  39. 0 119
      app/src/main/java/com/sheep/gamegroup/view/download/ProgressDownloader.java
  40. 0 70
      app/src/main/java/com/sheep/gamegroup/view/download/ProgressResponseBody.java
  41. 0 21
      app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java
  42. 0 300
      app/src/main/java/com/sheep/jiuyan/samllsheep/adapter/DownListAdapter.java
  43. 0 56
      app/src/main/java/com/sheep/jiuyan/samllsheep/base/AppActivity.java
  44. 2 7
      app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseActivity.java
  45. 0 48
      app/src/main/java/com/sheep/jiuyan/samllsheep/download/DefaultDownloadViewHolder.java
  46. 0 205
      app/src/main/java/com/sheep/jiuyan/samllsheep/download/DowanLoadManagerDialog.java
  47. 0 181
      app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadCallback.java
  48. 0 182
      app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadCallbackDialog.java
  49. 0 157
      app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadInfo.java
  50. 0 250
      app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadManager.java
  51. 0 35
      app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadState.java
  52. 0 28
      app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadStateConverter.java
  53. 0 47
      app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadViewHolder.java
  54. 0 9
      app/src/main/java/com/sheep/jiuyan/samllsheep/event/FloatMsg.java
  55. 0 9
      app/src/main/java/com/sheep/jiuyan/samllsheep/event/MainTab.java
  56. 0 9
      app/src/main/java/com/sheep/jiuyan/samllsheep/event/NewUserDialog.java
  57. 0 280
      app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/FloatService.java
  58. 0 21
      app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/FloatWindow.java
  59. 0 214
      app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/ShotScreen.java
  60. 0 35
      app/src/main/java/com/sheep/jiuyan/samllsheep/net/BindUser.java
  61. 0 119
      app/src/main/java/com/sheep/jiuyan/samllsheep/net/NetManager.java
  62. 0 89
      app/src/main/java/com/sheep/jiuyan/samllsheep/net/SheepCallback.java
  63. 0 78
      app/src/main/java/com/sheep/jiuyan/samllsheep/net/Url.java
  64. 0 287
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/AskFriendActivity.java
  65. 0 211
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/BindPhoneActivity.java
  66. 0 99
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/BindWxActivity.java
  67. 0 422
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/GameDetailActivity.java
  68. 0 152
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/InputWXAccountActivity.java
  69. 0 195
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/LoginActivity.java
  70. 0 503
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java
  71. 0 206
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/MoneyHistroyActivity.java
  72. 0 154
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/NewUserGuideActivity.java
  73. 0 239
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/RegisterActivity.java
  74. 0 261
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/ResetPWDActivity.java
  75. 0 185
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/ShotScreenActivity.java
  76. 0 155
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/SplashActivity.java
  77. 0 359
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/TaskRecordActivity.java
  78. 0 228
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/UserCenterActivity.java
  79. 0 100
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/WXAccountActivity.java
  80. 0 247
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/WebActivity.java
  81. 0 214
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/WithdrawActivity.java
  82. 0 104
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/WithdrawRecordActivity.java
  83. 0 167
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/WxAccountDetail.java
  84. 0 84
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/XDownLoadActivity.java
  85. 0 39
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpChangeUser.java
  86. 0 54
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpCommonList.java
  87. 0 101
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpCommonRecy.java
  88. 0 133
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpMainActivity.java
  89. 0 58
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpMainPageViewPager.java
  90. 0 91
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpNewUserTask.java
  91. 0 87
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpTaskList.java
  92. 0 45
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpWxDetailList.java
  93. 0 123
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/TaskAdapter.java
  94. 0 87
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/ViewHolder.java
  95. 0 19
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/BindUserEntiey.java
  96. 0 113
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/Commit.java
  97. 0 45
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/HaoWanMsg.java
  98. 0 19
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/InviteUrl.java
  99. 0 43
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/Money.java
  100. 0 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/MoneyHistroy.java

+ 0 - 235
app/src/main/java/com/kfzs/duanduan/ActDuJiaShouFa.java

@@ -1,235 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.RatingBar;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.kfzs.duanduan.view.KFProgressButton;
-import com.kfzs.appstore.utils.adapter.recyclerview.DividerItemDecoration;
-import com.kfzs.appstore.utils.adapter.recyclerview.OnItemClickListener;
-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.bean.DownloadStatus;
-import com.kfzs.duanduan.utils.InstallButtonUtils;
-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.net.ResponseNetworkTask;
-import com.kfzs.duanduan.utils.NumberFormatUtils;
-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.dlg.ViewFindUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-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;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  ActDuJiaShouFa</p>
- * @ <p>Description: 独家首发游戏页面,独家英文太复杂  exclusive</p>
- * @ date:  2017/6/12 11:58
- * @ QQ:    315096953
- */
-
-public class ActDuJiaShouFa extends BaseCompatActivity {
-
-    private static final String TAG = ActDuJiaShouFa.class.getSimpleName();
-
-    public static final String INTENT_GAME = "INTENT_GAME";//传送过来的独家首发单游戏类,GameOuterClass.Game
-
-    private RecyclerViewAdapter mRecyAdpter;
-
-    private Map<String, InstallButtonUtils> mInstallButtonMgrMap = new HashMap<>();
-
-    private List<GameOuterClass.Game> mListGame = new ArrayList<>();
-
-    @BindView(R.id.list_activity_recommend_today)
-    RecyclerView mRecyView;
-
-    @BindView(R.id.toolbar_auth)
-    Toolbar mToolBar;
-
-    //独家首发游戏的View,如果没有传,就不显示。
-    @BindView(R.id.game_info_layout_content)
-    View mView;
-
-
-    private EventDownloadHandler.OnDownCallback mOnDownCallback;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        EventBus.getDefault().register(this);
-        setContentView(R.layout.activity_recommend_today);
-        ButterKnife.bind(this);
-
-        mToolBar.setTitle(getString(R.string.sole_fist));
-        mToolBar.setNavigationIcon(R.drawable.ic_arrow_back_24dp);
-        mToolBar.setNavigationOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onBackPressed();
-            }
-        });
-
-        initDefaultGame();
-        DividerItemDecoration decor = new DividerItemDecoration(this, DividerItemDecoration.VERTICAL);
-        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));
-        decor.setPaddingEnd(getResources().getDimensionPixelOffset(R.dimen.app_list_item_divider_end));
-        mRecyView.setLayoutManager(new LinearLayoutManager(this));
-        mRecyView.addItemDecoration(decor);
-        doNetworkTask();
-    }
-
-
-    private void initDefaultGame() {
-        if (!getIntent().hasExtra(INTENT_GAME)) {
-            mView.setVisibility(View.GONE);
-            return;
-        }
-        final GameOuterClass.Game game = (GameOuterClass.Game) getIntent().getSerializableExtra(INTENT_GAME);
-
-        Glide.with(this).load(game.getIconImage())
-                .into(ViewFindUtils.find(mView, R.id.img_logo, ImageView.class));
-
-        ViewFindUtils.find(mView, R.id.img_listview_item_game_info)
-                .setVisibility(game.getExistGift() == 1 ? View.VISIBLE : View.GONE);
-        ViewFindUtils.find(mView, R.id.txt_list_item_game_info_title, TextView.class)
-                .setText(game.getGameName());
-        ViewFindUtils.find(mView, R.id.txt_list_item_game_info_type, TextView.class)
-                .setText(game.getTypeText());
-
-        String downloadCnt = String.format(getString(R.string.download_count),
-                game.getDownloadNum() + "");
-        ViewFindUtils.find(mView, R.id.txt_list_item_game_info_down_count, TextView.class)
-                .setText(downloadCnt + "");
-        ViewFindUtils.find(mView, R.id.ratbar_list_item_game_info, RatingBar.class)
-                .setRating(NumberFormatUtils.getDivideResult(game.getStar()));
-
-        ViewFindUtils.find(mView, R.id.game_info_layout_content).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                SkipUtils.getInstance().goGameDetails(ActDuJiaShouFa.this, game.getId());
-            }
-        });
-        DownBtnUtils.addDownloadBtnListener(ViewFindUtils.find(mView, R.id.btn_list_item_game_info,
-                KFProgressButton.class), this, mInstallButtonMgrMap, game, "DujiashoufaActivity_dujia");
-    }
-
-
-    /**
-     * 获取并加载游戏列表
-     */
-    private void doNetworkTask() {
-        HashMap<String, String> params = new HashMap<>();
-        params.put("page", UrlBll.AppStoreApi.PAGE_SOLE_GAME + "");
-
-        APIRequest bannerRequest = APIRequestInstance.getReqUrl(TAG, UrlBll.AppStoreApi.GAME_LISTS, params, new ResponseNetworkTask() {
-
-            @Override
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                mListGame.clear();
-                mListGame.addAll(apiResponse.getExclusiveStarting().getSpecialGameList());
-                mListGame.addAll(apiResponse.getExclusiveStarting().getGeneralGameList());
-
-                mRecyAdpter = new RecyclerViewAdapter<GameOuterClass.Game>(ActDuJiaShouFa.this
-                        , R.layout.listview_item_game_info, mListGame) {
-                    @Override
-                    public void convert(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());
-                        String downloadCnt = String.format(getString(R.string.download_count), String.valueOf(model.getDownloadNum()));
-                        helper.setText(R.id.txt_list_item_game_info_down_count, downloadCnt);
-
-                        RatingBar ratingBar = helper.getView(R.id.ratbar_list_item_game_info);
-                        ratingBar.setRating(NumberFormatUtils.getDivideResult(model.getStar()));
-                        Glide.with(mContext)
-                                .load(model.getIconImage())
-                                .into((ImageView) helper.getView(R.id.img_logo));
-
-                        /**
-                         * 初始化下载按钮的状态
-                         */
-                        DownBtnUtils.addDownloadBtnListener(helper.getView(R.id.btn_list_item_game_info, KFProgressButton.class)
-                                , ActDuJiaShouFa.this, mInstallButtonMgrMap, model, position + "");
-                    }
-                };
-
-                mRecyView.setAdapter(mRecyAdpter);
-                mRecyAdpter.setOnItemClickListener(new OnItemClickListener() {
-                    @Override
-                    public void onItemClick(ViewGroup parent, View view, Object o, int position) {
-                        Intent intent = new Intent(ActDuJiaShouFa.this, ActGameDetails.class);
-                        intent.putExtra(KFIntentKeys.EXTRA_GAME_ID, String.valueOf(mListGame.get(position).getId()));
-                        startActivity(intent);
-                    }
-
-                    @Override
-                    public boolean onItemLongClick(ViewGroup parent, View view, Object o, int position) {
-                        return false;
-                    }
-                });
-            }
-
-            @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(final DownloadStatus info) {
-        if (mOnDownCallback == null) {
-            mOnDownCallback = DownBtnUtils.installBtnStatus(mInstallButtonMgrMap);
-        }
-        EventDownloadHandler
-                .newInstance(this, mOnDownCallback)
-                .setmTag(TAG)
-                .handlDownloadResult(info);
-    }
-
-    /**
-     * 反注册EventBus
-     */
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
-}

+ 0 - 63
app/src/main/java/com/kfzs/duanduan/adp/AdpFgtAppDetailBbs.java

@@ -1,63 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpFgtAppDetailBbs</p>
- * @ <p>Description: 商品详情页中论坛列表的适配器</p>
- * @ date:  2017/6/20 11:32
- * @ QQ:    315096953
- */
-
-public class AdpFgtAppDetailBbs extends BaseAdapter {
-
-    private Context mContext;
-
-    public AdpFgtAppDetailBbs(Context context) {
-        this.mContext = context;
-    }
-
-    @Override
-    public int getCount() {
-        return 12;
-    }
-
-    @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) {
-        if (convertView == null) {
-            convertView = View.inflate(mContext, R.layout.item_app_detail_bbs, null);
-        }
-
-
-//        ViewFindUtils.hold(convertView,R.id.txt_item_app_detail_bbs_count, TextView.class)
-//                .setText("");
-//        ViewFindUtils.hold(convertView,R.id.txt_item_app_detail_bbs_nick, TextView.class)
-//                .setText("");
-//        ViewFindUtils.hold(convertView,R.id.txt_item_app_detail_bbs_time, TextView.class)
-//                .setText("");
-//        ViewFindUtils.hold(convertView,R.id.txt_item_app_detail_bbs_title, TextView.class)
-//                .setText("");
-//        ViewFindUtils.hold(convertView,R.id.img_item_app_detail_bbs, ImageView.class);
-
-        return convertView;
-    }
-}

+ 0 - 70
app/src/main/java/com/kfzs/duanduan/adp/AdpFgtAppDetailNewGame.java

@@ -1,70 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.proto.OpenTestOpenServerList;
-import com.kfzs.duanduan.utils.DateFormatUtils;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpFgtAppDetailNewGame</p>
- * @ <p>Description: 商品详情页中开服列表的适配器</p>
- * @ date:  2017/6/20 11:18
- * @ QQ:    315096953
- */
-
-public class AdpFgtAppDetailNewGame extends BaseAdapter {
-
-    private Context mContext;
-    private List<OpenTestOpenServerList.OpenServer> mData = new ArrayList<>();
-
-    public AdpFgtAppDetailNewGame(Context context) {
-        this.mContext = context;
-    }
-
-    @Override
-    public int getCount() {
-        return mData.size();
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return position;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        if (convertView == null) {
-            convertView = View.inflate(mContext, R.layout.item_app_detail_new_game, null);
-        }
-        OpenTestOpenServerList.OpenServer openServer = mData.get(position);
-        String date = DateFormatUtils.doOpenserveDate(openServer.getOpenServerTime());
-        //暂时不需要这个了
-//        ViewFindUtils.hold(convertView, R.id.txt_item_app_detail_new_game_title, TextView.class)
-//                        .setText(openServer.getRemark());
-        ViewFindUtils.hold(convertView, R.id.txt_item_app_detail_new_game_zone, TextView.class)
-                .setText(openServer.getRemark());
-        ViewFindUtils.hold(convertView, R.id.txt_item_app_detail_new_game_time, TextView.class)
-                .setText(date);
-        return convertView;
-    }
-
-    public void setData(List<OpenTestOpenServerList.OpenServer> list) {
-        this.mData = list;
-
-    }
-}

+ 0 - 98
app/src/main/java/com/kfzs/duanduan/adp/AdpGameBook.java

@@ -1,98 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
-import com.kfzs.appstore.utils.sys.ClipboardUtils;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.proto.GameBookOuterClass;
-import com.kfzs.duanduan.proto.GameOuterClass;
-import com.kfzs.duanduan.proto.GiftOuterClass;
-import com.kfzs.duanduan.utils.DateFormatUtils;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpGameBook</p>
- * @ <p>Description:</p>
- * @ date:  2017/11/24 13:39
- * @ QQ:    315096953
- */
-
-public class AdpGameBook extends AdpCommonRecy<GameBookOuterClass.GameBooked> {
-    private final String giftEndTimeHint;
-    private final String itemHintMsgFirstPlayTime;
-    private Context mContext;
-    private AdapterView.OnItemClickListener mOnItemClickListener;
-
-
-    public AdpGameBook(Context context) {
-        super(context);
-        mContext = context;
-        giftEndTimeHint = context.getResources().getString(R.string.item_hint_msg_gift_end_time);
-        itemHintMsgFirstPlayTime = context.getResources().getString(R.string.item_hint_msg_first_play_time);
-    }
-
-    public void setOnItemClickListener(AdapterView.OnItemClickListener onItemClickListener) {
-        this.mOnItemClickListener = onItemClickListener;
-    }
-
-    @Override
-    public int getViewIdByType(int viewType) {
-        return R.layout.listview_item_game_book_self;
-    }
-
-    @Override
-    public void convert(final ViewHolder holder, GameBookOuterClass.GameBooked gameBooked) {
-        GameOuterClass.Game game = gameBooked.getGame();
-        holder.setText(R.id.tv_item_game_book_self_name, game.getGameName());
-        String giftEndTime = DateFormatUtils.doSecond2Date(gameBooked.getGift().getEndTime());
-        giftEndTime = giftEndTimeHint + giftEndTime;
-        holder.setText(R.id.tv_item_game_book_self_gift_end_time, giftEndTime);
-
-        String playTime = DateFormatUtils.doSecond2Date(gameBooked.getGame().getStartTime());
-        playTime = itemHintMsgFirstPlayTime + playTime;
-        holder.setText(R.id.tv_item_game_book_self_date_play, playTime);
-
-        GiftOuterClass.Gift gift = gameBooked.getGift();
-        if (gift != null) {
-            final String code = gift.getCode();
-            if (!TextUtils.isEmpty(code)) {
-                holder.setVisible(R.id.ll_item_game_book_self_gift, true);
-                holder.setText(R.id.tv_item_game_book_self_gift_code, code);
-
-                holder.getView(R.id.btn_item_game_book_self_gift_copy).setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        if (!TextUtils.isEmpty(code)) {
-                            ClipboardUtils.copy2Clipboard(mContext, code);
-                            Toast.makeText(mContext, "礼包码: " + code + "\n已经复制,请粘贴使用", Toast.LENGTH_SHORT).show();
-                        }
-                    }
-                });
-            }
-        }
-        ImageView icon = holder.getView(R.id.img_item_game_book_self_icon);
-        Glide.with(mContext).load(game.getIconImage())
-                .apply(new RequestOptions().error(android.R.drawable.stat_notify_error))
-                .into(icon);
-
-        holder.getConvertView().setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                if (AdpGameBook.this.mOnItemClickListener != null) {
-                    AdpGameBook.this.mOnItemClickListener
-                            .onItemClick(null,
-                                    v, holder.getLayoutPosition(), 0);
-                }
-
-            }
-        });
-    }
-
-}

+ 0 - 212
app/src/main/java/com/kfzs/duanduan/adp/AdpMainPageGift.java

@@ -1,212 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.Context;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bean.RecyleObj;
-import com.kfzs.duanduan.bean.RecyleType;
-import com.kfzs.duanduan.proto.GiftCenterOuterClass;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpMainPageGift</p>
- * @ <p>Description:</p>
- * @ date:  2017/6/23 14:00
- * @ QQ:    315096953
- */
-
-public class AdpMainPageGift extends AdpCommonRecy<RecyleObj> {
-
-    private final String TAG = this.getClass().getName();
-    //设置Tag,因为默认Tag用于HoldView了 ,所以加个TagKey,ID必须为任意ResId
-    private final static int TAG_ID_TEMP = R.id.view_common_adpter;
-
-    public AdpMainPageGift(Context context) {
-        super(context);
-        mContext = context;
-    }
-
-
-
-    /**
-     * @param viewType
-     * @return 失败返回0
-     */
-    @Override
-    public int getViewIdByType(int viewType) {
-        int resId = 0;
-        RecyleType recyleType = RecyleType.values()[viewType];
-        switch (recyleType) {
-            case GIFT_BANNER:
-                resId = R.layout.fgt_main_banner;
-                break;
-            case ALREADY_INSTALL:
-                resId = R.layout.fgt_main_gift_install;
-                break;
-            case OWN_GIFT:
-                resId = R.layout.fgt_main_gift_dujia;
-                break;
-        }
-        return resId;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        return getmListDatas().get(position).getRecyleType().ordinal();
-    }
-
-
-    /**
-     * @param holder
-     * @param recyleObj
-     */
-    @Override
-    public void convert(ViewHolder holder, RecyleObj recyleObj) {
-        switch (recyleObj.getRecyleType()) {
-            case GIFT_BANNER:
-                //bindGiftBanner(holder, (List<IndexBannerGiftCenterOuterClass.IndexBannerGiftCenter>) recyleObj.getDataObj());
-                break;
-            case ALREADY_INSTALL:
-                bindAlreadyPlayed(holder, (List<GiftCenterOuterClass.GiftCenter>) recyleObj.getDataObj());
-                break;
-            case OWN_GIFT:
-                bindDuJiaGift(holder, (List<GiftCenterOuterClass.GiftCenter>) recyleObj.getDataObj());
-                break;
-        }
-    }
-
-
-    /**
-     * 绑定独家礼包
-     *
-     * @param holder
-     * @param models
-     */
-    private void bindDuJiaGift(ViewHolder holder, final List<GiftCenterOuterClass.GiftCenter> models) {
-        RecyclerView recyclerView = holder.getView(R.id.recy_fgt_main_gift_dujia);
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new GridLayoutManager(mContext, 2));
-        recyclerView.setAdapter(new RecyclerView.Adapter() {
-            @Override
-            public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-                View view = View.inflate(mContext, R.layout.list_item_main_page_gift_dujia, null);
-                view.setOnClickListener(cls_GoGameDetail);
-                return new ViewHolder(mContext, view, parent, -1);
-            }
-
-            @Override
-            public void onBindViewHolder(RecyclerView.ViewHolder holder, final int position) {
-                ViewFindUtils.find(holder.itemView, R.id.txt_list_item_main_page_gift_dujia_title,
-                        TextView.class).setText(models.get(position).getTitle());
-                ViewFindUtils.find(holder.itemView, R.id.txt_list_item_main_page_gift_dujia_getnum,
-                        TextView.class).setText(String.format("已有 %d 人领取", models.get(position).getReceiveUserNum()));
-                ViewFindUtils.find(holder.itemView, R.id.txt_list_item_main_page_gift_dujia_gift,
-                        TextView.class).setText(String.format("礼包总数:%d", models.get(position).getGiftNum()));
-                Glide.with(mContext)
-                        .load(models.get(position).getIconImage())
-                        .into(ViewFindUtils.find(holder.itemView, R.id.img_list_item_main_page_gift_dujia_logo,
-                                ImageView.class));
-
-//                ViewFindUtils.find(holder.itemView, R.id.img_list_item_main_page_gift_dujia_icon)
-//                        .setVisibility(models.get(position).getGiftNum() - models.get(position).getReceiveUserNum() > 0 ?
-//                                View.VISIBLE : View.GONE);
-                ViewFindUtils.find(holder.itemView, R.id.img_list_item_main_page_gift_dujia_icon)
-                        .setVisibility(models.get(position).getGiftNum() > 0 ?
-                                View.VISIBLE : View.GONE);
-                holder.itemView.setTag(TAG_ID_TEMP, models.get(position).getGameId());
-            }
-
-            @Override
-            public int getItemCount() {
-                return models.size();
-            }
-        });
-
-    }
-
-
-    /**
-     * TAG_ID_TEMP为GameId
-     */
-    private View.OnClickListener cls_GoGameDetail = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            SkipUtils.getInstance().goGameDetails(mContext, (int) v.getTag(TAG_ID_TEMP), 1);
-        }
-    };
-
-
-    /**
-     * 绑定已经玩过游戏的礼包
-     *
-     * @param holder
-     * @param models
-     */
-    private void bindAlreadyPlayed(final ViewHolder holder,
-                                   final List<GiftCenterOuterClass.GiftCenter> models) {
-        //不能用GONE的方式,这样会有空白
-        RecyclerView.LayoutParams param = (RecyclerView.LayoutParams) holder.getConvertView().getLayoutParams();
-        if (models == null || models.size() < 1) {
-            holder.getConvertView().setVisibility(View.GONE);
-            param.height = 0;
-            param.width = 0;
-        } else {
-            param.height = LinearLayout.LayoutParams.WRAP_CONTENT;
-            param.width = LinearLayout.LayoutParams.MATCH_PARENT;
-            holder.getConvertView().setVisibility(View.VISIBLE);
-        }
-        holder.getConvertView().setLayoutParams(param);
-
-
-        RecyclerView recyclerView = holder.getView(R.id.recy_fgt_main_gift_played);
-        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 view = View.inflate(mContext, R.layout.list_item_main_page_gift_played, null);
-                view.setLayoutParams(new RelativeLayout
-                        .LayoutParams((HelperUtils.W - HelperUtils.getDpiToPix(10)) / 2,
-                        HelperUtils.getDpiToPix(100)));
-                view.setOnClickListener(cls_GoGameDetail);
-                ViewHolder viewHolder = new ViewHolder(mContext, view, parent, -1);
-                return viewHolder;
-            }
-
-            @Override
-            public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-                ViewFindUtils.find(holder.itemView, R.id.txt_list_item_main_page_gift_played_title,
-                        TextView.class).setText(models.get(position).getTitle());
-                ViewFindUtils.find(holder.itemView, R.id.txt_list_item_main_page_gift_played_gift,
-                        TextView.class).setText("礼包总数:" + models.get(position).getGiftNum());
-                Glide.with(mContext)
-                        .load(models.get(position).getIconImage())
-                        .into(ViewFindUtils.find(holder.itemView, R.id.img_list_item_main_page_gift_played_logo,
-                                ImageView.class));
-                holder.itemView.setTag(TAG_ID_TEMP, models.get(position).getGameId());
-            }
-
-            @Override
-            public int getItemCount() {
-                return models.size();
-            }
-        });
-    }
-
-}

+ 0 - 169
app/src/main/java/com/kfzs/duanduan/adp/AdpMainStartService.java

@@ -1,169 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-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.OpenTestOpenServerList;
-import com.kfzs.duanduan.utils.DateFormatUtils;
-import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpMainStartService</p>
- * @ <p>Description:</p>
- * @ date:  2017/6/26 10:53
- * @ QQ:    315096953
- */
-
-public class AdpMainStartService extends AdpCommonRecy<RecyleObj> {
-
-    private final String TAG = this.getClass().getName();
-    private Map<String, InstallButtonUtils> mDownLoadItemLogicMgrMap = new HashMap<>();
-
-    public AdpMainStartService(Context context) {
-        super(context);
-        mContext = context;
-    }
-
-
-    /**
-     * @param viewType
-     * @return 失败返回0
-     */
-    @Override
-    public int getViewIdByType(int viewType) {
-        int resId = 0;
-        RecyleType recyleType = RecyleType.values()[viewType];
-        switch (recyleType) {
-            case START_TAB_NAME:
-                resId = R.layout.item_main_page_start_service_tab;
-                break;
-            case START_SERVICE_TODAY:
-            case START_SERVICE_TOMORROW:
-            case START_TEST_TODAY:
-            case START_TEST_TOMORROW:
-                resId = R.layout.list_item_search_test;
-                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) {
-        switch (recyleObj.getRecyleType()) {
-            case START_TAB_NAME:
-                bindTab(holder, recyleObj);
-                break;
-            case START_SERVICE_TODAY:
-            case START_SERVICE_TOMORROW:
-                bindOpenService(holder, (OpenTestOpenServerList.OpenServer) recyleObj.getDataObj());
-                break;
-            case START_TEST_TODAY:
-            case START_TEST_TOMORROW:
-                bindOpenTest(holder, (OpenTestOpenServerList.OpenTest) recyleObj.getDataObj());
-                break;
-        }
-    }
-
-
-    /**
-     * 绑定自定义列表
-     *
-     * @param holder
-     * @param recyleObj Tab的分类名
-     */
-    private void bindTab(ViewHolder holder, RecyleObj recyleObj) {
-        holder.getView(R.id.txt_item_main_page_start_service_tab, TextView.class)
-                .setText(recyleObj.getDataObj() + "");
-    }
-
-
-    /**
-     * 加载开服信息
-     *
-     * @param holder
-     * @param openServer
-     */
-    private void bindOpenService(ViewHolder holder, OpenTestOpenServerList.OpenServer openServer) {
-        Glide.with(mContext)
-                .load(openServer.getGame().getIconImage())
-                .into(holder.getView(R.id.img_list_item_search_test_logo, ImageView.class));
-        holder.getView(R.id.txt_list_item_search_test_title, TextView.class)
-                .setText(openServer.getGame().getGameName());
-
-        holder.getView(R.id.txt_list_item_search_test_time, TextView.class)
-                .setText(DateFormatUtils.doOpenserveDate(openServer.getOpenServerTime()));
-        holder.getView(R.id.img_list_item_search_test_icon)
-                .setVisibility(openServer.getGame().getExistGift() == 1 ? View.VISIBLE : View.GONE);
-        holder.getView(R.id.txt_list_item_search_test_type, TextView.class)
-                .setText(openServer.getRemark());
-        DownBtnUtils.addDownloadBtnListener(holder.getView(R.id.btn_list_item_search_test,
-                KFProgressButton.class), mContext, mDownLoadItemLogicMgrMap, openServer.getGame(),
-                "mainpape_open_service" + openServer.getCreatedTime() + openServer.getGameId());
-
-        final int gameid = openServer.getGameId();
-        holder.getConvertView().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                SkipUtils.getInstance().goGameDetails(mContext, gameid);
-            }
-        });
-    }
-
-
-    /**
-     * 加载开测信息
-     *
-     * @param holder
-     * @param openTest
-     */
-    private void bindOpenTest(ViewHolder holder, final OpenTestOpenServerList.OpenTest openTest) {
-        Glide.with(mContext)
-                .load(openTest.getGame().getIconImage())
-                .into(holder.getView(R.id.img_list_item_search_test_logo, ImageView.class));
-        holder.getView(R.id.txt_list_item_search_test_title, TextView.class)
-                .setText(openTest.getGame().getGameName());
-        holder.getView(R.id.txt_list_item_search_test_time, TextView.class)
-                .setText(DateFormatUtils.doOpenTestDate(openTest.getOpenTestTime()));
-        holder.getView(R.id.img_list_item_search_test_icon)
-                .setVisibility(openTest.getGame().getExistGift() == 1 ? View.VISIBLE : View.GONE);
-        holder.getView(R.id.txt_list_item_search_test_type, TextView.class)
-                .setText(openTest.getRemark());
-        DownBtnUtils.addDownloadBtnListener(holder.getView(R.id.btn_list_item_search_test,
-                KFProgressButton.class), mContext, mDownLoadItemLogicMgrMap, openTest.getGame(),
-                "mainpape_open_test" + openTest.getCreatedTime() + openTest.getGameId());
-
-
-        final int gameid = openTest.getGameId();
-        holder.getConvertView().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                SkipUtils.getInstance().goGameDetails(mContext, gameid);
-            }
-        });
-    }
-
-
-}

+ 0 - 84
app/src/main/java/com/kfzs/duanduan/adp/AdpSearchNewGame.java

@@ -1,84 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.kfzs.duanduan.view.KFProgressButton;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.proto.OpenTestOpenServerList;
-import com.kfzs.duanduan.utils.DateFormatUtils;
-import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpSearchNewGame</p>
- * @ <p>Description:</p>
- * @ date:  2017/6/22 16:16
- * @ QQ:    315096953
- */
-
-public class AdpSearchNewGame extends BaseAdpterWithDownBtn {
-    private List<OpenTestOpenServerList.OpenServer> mList = new ArrayList<>();
-
-    public AdpSearchNewGame(Context context) {
-        this.mContext = context;
-    }
-
-    public void addAll(List<OpenTestOpenServerList.OpenServer> list) {
-        mList.addAll(list);
-    }
-
-    public void clear() {
-        mList.clear();
-    }
-
-    @Override
-    public int getCount() {
-        return mList.size();
-    }
-
-    @Override
-    public OpenTestOpenServerList.OpenServer getItem(int position) {
-        return mList.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return 0;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        if (convertView == null) {
-            convertView = View.inflate(mContext, R.layout.list_item_search_newgame, null);
-            convertView.setOnClickListener(cls_GoDetail);
-        }
-        ViewFindUtils.hold(convertView, R.id.txt_listview_item_newgame_title, TextView.class)
-                .setText(getItem(position).getGame().getGameName());
-        ViewFindUtils.hold(convertView, R.id.txt_listview_item_newgame_zone, TextView.class)
-                .setText(getItem(position).getRemark());
-        ViewFindUtils.hold(convertView, R.id.txt_listview_item_newgame_time, TextView.class)
-                .setText(DateFormatUtils.doOpenserveDate(getItem(position).getOpenServerTime()));
-
-        ViewFindUtils.hold(convertView, R.id.img_listview_item_newgame_icon)
-                .setVisibility(getItem(position).getGame().getExistGift() == 1 ? View.VISIBLE : View.GONE);
-        Glide.with(mContext)
-                .load(getItem(position).getGame().getIconImage())
-                .into(ViewFindUtils.hold(convertView, R.id.img_list_item_search_newgame_logo, ImageView.class));
-
-        convertView.setTag(TAG_ID,getItem(position).getGameId());
-        DownBtnUtils.addDownloadBtnListener(ViewFindUtils.hold(convertView, R.id.btn_list_item_game_info,
-                KFProgressButton.class), mContext,
-                getmInstallButtonMgrMap(), getItem(position).getGame(),
-                "search_open_service" + position);
-        return convertView;
-    }
-}

+ 0 - 86
app/src/main/java/com/kfzs/duanduan/adp/AdpSearchTest.java

@@ -1,86 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.kfzs.duanduan.view.KFProgressButton;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.proto.OpenTestOpenServerList;
-import com.kfzs.duanduan.utils.DateFormatUtils;
-import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpSearchTest</p>
- * @ <p>Description:</p>
- * @ date:  2017/6/22 16:16
- * @ QQ:    315096953
- */
-
-public class AdpSearchTest extends BaseAdpterWithDownBtn {
-    private List<OpenTestOpenServerList.OpenTest> mList = new ArrayList<>();
-
-    public AdpSearchTest(Context context) {
-        this.mContext = context;
-    }
-
-    public void addAll(List<OpenTestOpenServerList.OpenTest> list) {
-        mList.addAll(list);
-    }
-
-    public void clear() {
-        mList.clear();
-    }
-
-    @Override
-    public int getCount() {
-        return mList.size();
-    }
-
-    @Override
-    public OpenTestOpenServerList.OpenTest getItem(int position) {
-        return mList.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return 0;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        if (convertView == null) {
-            convertView = View.inflate(mContext, R.layout.list_item_search_test, null);
-            convertView.setOnClickListener(cls_GoDetail);
-        }
-
-        ViewFindUtils.hold(convertView, R.id.txt_list_item_search_test_title, TextView.class)
-                .setText(getItem(position).getGame().getGameName());
-        ViewFindUtils.hold(convertView, R.id.txt_list_item_search_test_time, TextView.class)
-                .setText(DateFormatUtils.doOpenTestDate(getItem(position).getOpenTestTime()));
-        ViewFindUtils.hold(convertView, R.id.txt_list_item_search_test_type, TextView.class)
-                .setText(getItem(position).getRemark());
-
-        //显示礼包图标
-        ViewFindUtils.hold(convertView, R.id.img_list_item_search_test_icon)
-                .setVisibility(getItem(position).getGame().getExistGift() == 1 ? View.VISIBLE : View.GONE);
-        Glide.with(mContext)
-                .load(getItem(position).getGame().getIconImage())
-                .into(ViewFindUtils.hold(convertView, R.id.img_list_item_search_test_logo, ImageView.class));
-
-        convertView.setTag(TAG_ID,getItem(position).getGameId());
-        DownBtnUtils.addDownloadBtnListener(ViewFindUtils.hold(convertView, R.id.btn_list_item_search_test,
-                KFProgressButton.class), mContext,
-                getmInstallButtonMgrMap(), getItem(position).getGame(),
-                "search_test" + position);
-        return convertView;
-    }
-}

+ 0 - 46
app/src/main/java/com/kfzs/duanduan/adp/AdpViewPagerMainPage.java

@@ -1,46 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpViewPagerMainPage</p>
- * @ <p>Description: 首页的ViewPager监听</p>
- * @ date:  2017/6/14 13:21
- * @ QQ:    315096953
- */
-
-public class AdpViewPagerMainPage extends FragmentPagerAdapter {
-
-    private List<String> mTitles = new ArrayList<>();
-    private List<Fragment> mListFragment = new ArrayList<>();
-
-    public AdpViewPagerMainPage(FragmentManager fm) {
-        super(fm);
-    }
-
-    public void add(Fragment fragment, String title) {
-        mListFragment.add(fragment);
-        mTitles.add(title);
-    }
-
-    @Override
-    public CharSequence getPageTitle(int position) {
-        return mTitles.get(position);
-    }
-
-    @Override
-    public Fragment getItem(int position) {
-        return mListFragment.get(position);
-    }
-
-    @Override
-    public int getCount() {
-        return mTitles.size();
-    }
-}

+ 0 - 90
app/src/main/java/com/kfzs/duanduan/adp/AdpVipCoupon.java

@@ -1,90 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.proto.CouponCodeOuterClass;
-import com.kfzs.duanduan.utils.DateFormatUtils;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpVipCoupon</p>
- * @ <p>Description:</p>
- * @ date:  2017/12/18 22:52
- * @ QQ:    315096953
- */
-
-public class AdpVipCoupon extends BaseAdapter {
-
-    private Context mContext;
-    private List<CouponCodeOuterClass.CouponCode> mList = new ArrayList<>();
-    private final static int TAG_CODE = R.id.view_tag_1;
-
-    public AdpVipCoupon(Context context) {
-        mContext = context;
-    }
-
-    public void add(CouponCodeOuterClass.CouponCode couponCode) {
-        mList.add(couponCode);
-    }
-
-    public void addALL(List<CouponCodeOuterClass.CouponCode> list) {
-        mList.addAll(list);
-    }
-
-    public void clear() {
-        mList.clear();
-    }
-
-    @Override
-    public int getCount() {
-        return mList.size();
-    }
-
-    @Override
-    public CouponCodeOuterClass.CouponCode getItem(int i) {
-        return mList.get(i);
-    }
-
-    @Override
-    public long getItemId(int i) {
-        return 0;
-    }
-
-    @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
-        if (view == null) {
-            view = View.inflate(mContext, R.layout.item_fgt_vip_coupon, null);
-            ViewFindUtils.find(view, R.id.txt_item_fgt_vip_coupon_copy)
-                    .setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            ClipboardManager cm = (ClipboardManager) mContext
-                                    .getSystemService(Context.CLIPBOARD_SERVICE);
-                            cm.setText(view.getTag(TAG_CODE) + "");
-                            G.showToast("复制成功!");
-                        }
-                    });
-        }
-
-        ViewFindUtils.hold(view, R.id.txt_item_fgt_vip_coupon_title, TextView.class)
-                .setText(getItem(i).getName());
-        ViewFindUtils.hold(view, R.id.txt_item_fgt_vip_coupon_time, TextView.class)
-                .setText("兑换时间:" + DateFormatUtils.doSecond2Date(getItem(i).getReceiveTime()));
-        ViewFindUtils.hold(view, R.id.txt_item_fgt_vip_coupon_code, TextView.class)
-                .setText(getItem(i).getCode());
-        ViewFindUtils.hold(view, R.id.txt_item_fgt_vip_coupon_copy)
-                .setTag(TAG_CODE, getItem(i).getCode());
-        return view;
-    }
-}

+ 0 - 53
app/src/main/java/com/kfzs/duanduan/adp/UserSelfInfoShowAdapter.java

@@ -1,53 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.Context;
-import android.view.View;
-
-import com.kfzs.appstore.utils.adapter.recyclerview.RecyclerViewAdapter;
-import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bean.SelfInfoPojo;
-
-import java.util.List;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/3/2.
- */
-public class UserSelfInfoShowAdapter extends RecyclerViewAdapter<SelfInfoPojo> {
-
-    public UserSelfInfoShowAdapter(Context context, List<SelfInfoPojo> data) {
-        super(context, R.layout.listview_item_self_info, data);
-    }
-
-    @Override
-    public void convert(ViewHolder holder, SelfInfoPojo data , int position) {
-        if (data != null) {
-            Integer iconID = data.getIconID();
-            if (iconID != null) {
-                holder.setImageResource(R.id.item_self_info_iv_icon, iconID);
-            }
-            holder.setText(R.id.item_self_info_tv_title, data.getHint());
-            holder.setText(R.id.item_self_info_tv_info, data.getInfo());
-            View canEdit = holder.getView(R.id.item_self_info_iv_can_edit);
-            if (data.isCanEdit()) {
-                canEdit.setVisibility(View.VISIBLE);
-            } else {
-                canEdit.setVisibility(View.GONE);
-            }
-        }
-    }
-}

+ 0 - 112
app/src/main/java/com/kfzs/duanduan/fragment/FgContinuePlay.java

@@ -1,112 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bean.BaseMsg;
-import com.kfzs.duanduan.bean.BorrowPlayIntegral;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-import com.kfzs.duanduan.bean.UserRecord;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.GameOuterClass;
-import com.kfzs.duanduan.utils.dlg.CheckUtils;
-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.KFProgressButton;
-import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
-
-
-/**
- * 游戏详情中的借着玩
- * Created by ljy on 2018/1/16.
- */
-
-public class FgContinuePlay extends BaseCompatFragment {
-    TextView fgtContinuePlayTv;
-    FrameLayout emptyFg;
-
-    //activity 的 button
-    KFProgressButton mBtnDown;
-    String gameId;//游戏id
-    private GameOuterClass.Game respGame;
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-
-        setContentView(R.layout.fgt_continue_play);
-        gameId = getActivity().getIntent().getStringExtra(KFIntentKeys.EXTRA_GAME_ID);
-        mBtnDown = getActivity().findViewById(R.id.downbtn_frg_fgt_app_detail_install);
-
-        emptyFg = mContentView.findViewById(R.id.empty_fg);
-        fgtContinuePlayTv = mContentView.findViewById(R.id.fgt_continue_play_tv);
-    }
-
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        Log.e("onDestroyView", "onDestroyView");
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        Log.e("onAttach", "onAttach");
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        Log.e("onDetach", "onDetach");
-    }
-
-    @Override
-    public void onHiddenChanged(boolean hidden) {
-        super.onHiddenChanged(hidden);
-        Log.e("onHiddenChanged", "onHiddenChanged");
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        Log.e("onStart", "onStart");
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        Log.e("onResume", "onResume");
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        Log.e("onAttach", "onAttach");
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        Log.e("onStop", "onStop");
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        Log.e("onDestroy", "onDestroy");
-    }
-}

+ 0 - 198
app/src/main/java/com/kfzs/duanduan/fragment/FgtBookedGame.java

@@ -1,198 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.kfzs.appstore.utils.adapter.recyclerview.DividerItemDecoration;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.duanduan.ActWeb;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.adp.AdpGameBook;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.GameBookOuterClass;
-import com.kfzs.duanduan.utils.dlg.HandlerUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  FgtBookedGame</p>
- * @ <p>Description:这个类是重构复制过来的,我写不出这么烂的代码,不背锅</p>
- * @ date:  2017/12/19 10:41
- * @ QQ:    315096953
- */
-
-public class FgtBookedGame extends BaseCompatFragment {
-
-    private RecyclerView recyclerView;
-    private LinearLayout llDataShow;
-    private ImageView imgDataShow;
-    private TextView tvDataShow;
-    private Boolean isLoadingError = false;
-    private HandlerUtils mHandlerUtils;
-
-    private AdpGameBook adapter;
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        KFZSNetwork.stopByTag(TAG);
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        mHandlerUtils.setmIsBreak(true);
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentViewChildMode(R.layout.fgt_self_booked);
-        initViewByID(mContentView);
-        getMyGameBook();
-        mHandlerUtils = new HandlerUtils();
-    }
-
-    private void initViewByID(final View v) {
-        this.llDataShow = (LinearLayout) v.findViewById(R.id.ll_fgt_self_booked_network_data);
-        this.imgDataShow = (ImageView) v.findViewById(R.id.img_fgt_self_booked_network_data_show);
-        this.tvDataShow = (TextView) v.findViewById(R.id.tv_fgt_self_booked_network_data_show);
-        this.recyclerView = (RecyclerView) v.findViewById(R.id.rv_fgt_self_booked_list);
-        this.recyclerView.setNestedScrollingEnabled(false);
-        llDataShow.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (isLoadingError) {
-                    getMyGameBook();
-                }
-            }
-        });
-        adapter = new AdpGameBook(getActivity());
-        recyclerView.setLayoutManager(new LinearLayoutManager(mContext));
-        DividerItemDecoration decor = new DividerItemDecoration(mContext, DividerItemDecoration.VERTICAL);
-        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));
-        decor.setPaddingEnd(getResources().getDimensionPixelOffset(R.dimen.app_list_item_divider_end));
-        recyclerView.addItemDecoration(decor);
-        recyclerView.setAdapter(adapter);
-        adapter.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                SkipUtils.getInstance().goGameDetails(getContext(),
-                        adapter.getmListDatas().get(position).getGame().getId());
-//                GameBookOuterClass.GameBook gameBooked = adapter.getmListDatas().get(position).getGameBook();
-//                if (TextUtils.isEmpty(gameBooked.getUrl())
-//                        || !gameBooked.getUrl().toLowerCase().startsWith("http")) {
-//                    showToast("预约网址错误:" + gameBooked.getUrl());
-//                    return;
-//                }
-//                //TODO 小刁,这里的返回值服务端设计肯定有问题
-////                Log.e(TAG,gameBooked.toString());
-////                Log.e(TAG,adapterData.get(position).toString());
-//                Bundle bundle = new Bundle();
-//                bundle.putString(KFIntentKeys.EXTRA_BEHAIOR, ActWeb.BEHAVIOR_GAME_BOOK);
-//                bundle.putString(KFIntentKeys.EXTRA_WEBVIEW_URL, gameBooked.getUrl());
-//                bundle.putString(KFIntentKeys.EXTRA_WEBVIEW_TITLE, adapter.getmListDatas().get(position).getGame().getGameName());
-//                bundle.putString(KFIntentKeys.EXTRA_WEBVIEW_SHARE_IMGURL, adapter.getmListDatas().get(position).getGame().getIconImage());
-//                bundle.putString(KFIntentKeys.EXTRA_WEBVIEW_GAME_BOOK_ID, String.valueOf(gameBooked.getId()));
-//                bundle.putString(KFIntentKeys.EXTRA_WEBVIEW_GAME_ID, String.valueOf(gameBooked.getGameId()));
-//                Intent intent = new Intent(mContext, ActWeb.class);
-//                intent.putExtras(bundle);
-//                startActivity(intent);
-            }
-        });
-    }
-
-    private void getMyGameBook() {
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(mContext, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                badLoadingShow();
-            }
-        });
-        APIRequest req = APIRequestInstance.getReq(TAG, UrlBll.GameBookApi.GAME_BOOK_MY, null,
-                new OnGameBookMy(), errorListener);
-        KFZSNetwork.addRequest(req);
-        isLoadingError = false;
-        filterImageShowIn(R.drawable.img_just_loading_horizontal, View.VISIBLE, R.string.msg_empty, View.GONE);
-    }
-
-    private void badLoadingShow() {
-        filterImageShowIn(R.drawable.img_error_network_data, View.VISIBLE, R.string.msg_error_loading_network, View.VISIBLE);
-        isLoadingError = true;
-    }
-
-    private void filterImageShowIn(@DrawableRes int imgID, int visible, @StringRes int msgId, int msg_visible) {
-        llDataShow.setVisibility(View.VISIBLE);
-        imgDataShow.setImageDrawable(getResources().getDrawable(imgID));
-        imgDataShow.setVisibility(visible);
-        tvDataShow.setText(getString(msgId));
-        tvDataShow.setVisibility(msg_visible);
-    }
-
-    private class OnGameBookMy implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    final List<GameBookOuterClass.GameBooked> gameBookedLists = apiResponse.getGameBookedsList();
-                    if (gameBookedLists != null && gameBookedLists.size() > 0) {
-                        adapter.getmListDatas().clear();
-                        //安桌5.0所有arm机型不兼容,放慢速度能解决。。。
-                        if (gameBookedLists.size() > 10 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                            adapter.getmListDatas().addAll(gameBookedLists.subList(0, 10));
-                            adapter.notifyDataSetChanged();
-                            mHandlerUtils.setmIsBreak(true)
-                                    .taskPostInUi(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            adapter.getmListDatas().addAll(gameBookedLists.subList(10, gameBookedLists.size()));
-                                            adapter.notifyItemRangeInserted(10, gameBookedLists.size());
-                                        }
-                                    }, 1000);
-                        } else {
-                            adapter.getmListDatas().addAll(gameBookedLists);
-                            adapter.notifyDataSetChanged();
-                        }
-                        llDataShow.setVisibility(View.GONE);
-                    } else {
-                        filterImageShowIn(R.drawable.img_error_network_data, View.VISIBLE, R.string.msg_error_not_has_any_game_book, View.VISIBLE);
-                        isLoadingError = false;
-                    }
-                    break;
-                case ApiResponseOuterClass.Codes.Bad_Request_VALUE:
-                    badLoadingShow();
-                    break;
-                default:
-                    badLoadingShow();
-                    break;
-            }
-
-        }
-    }
-}

+ 0 - 25
app/src/main/java/com/kfzs/duanduan/fragment/FgtCouponHistory.java

@@ -1,25 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  FgtCouponHistory</p>
- * @ <p>Description:</p>
- * @ date:  2017/12/14 10:10
- * @ QQ:    315096953
- */
-
-public class FgtCouponHistory extends BaseCompatFragment {
-
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_coupon_history);
-    }
-
-
-}

+ 0 - 56
app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCard.java

@@ -1,56 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.util.TypedValue;
-import android.view.View;
-import android.webkit.WebView;
-
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.libs.widget.loading.SupportLoadingFragment;
-import com.kfzs.libs.widget.navigation.NavigationBar;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.groups.creditcard.ms.MinShengCreditActivity;
-import com.sheep.groups.creditcard.zx.ZhongXinCreditStep1Activity;
-import com.sheep.jiuyan.samllsheep.R;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-
-/**
- * Created by realicing on 2018/04/02.
- * realicing@sina.com
- */
-public class FgtCreditCard extends SupportLoadingFragment{
-
-    @BindView(R.id.navigationbar)
-    NavigationBar navigationBar;
-
-    @Override
-    public int layoutResId() {
-        return R.layout.ftg_credit_card;
-    }
-
-    @Override
-    public void setupViews(@Nullable Bundle savedInstanceState) {
-
-        navigationBar
-                .titleText("信用卡办理")
-                .titleTextSize(TypedValue.COMPLEX_UNIT_SP,17)
-                .titleTextColor(android.R.color.black)
-                .changeNavigationType(NavigationBar.IOS);
-
-    }
-
-    @OnClick({R.id.btn_ms,R.id.btn_zx})
-    public void onClick(View view){
-        if(R.id.btn_ms == view.getId()){
-//            startActivity(new Intent(getActivity(), MinShengCreditActivity.class));
-            Jump2View.getInstance().goMingShengWeb(getActivity(), null);
-        }else if(R.id.btn_zx == view.getId()){
-//            startActivity(new Intent(getActivity(), ZhongXinCreditStep1Activity.class));
-            Jump2View.getInstance().goZhongXinWeb(getActivity(), null);
-        }
-    }
-}

+ 0 - 73
app/src/main/java/com/kfzs/duanduan/fragment/FgtNewGame.java

@@ -1,73 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.widget.ListView;
-
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.OpenTestOpenServerList;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-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.adp.AdpFgtAppDetailNewGame;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  FgtNewGame</p>
- * @ <p>Description: 商品详情页的开服界面</p>
- * @ date:  2017/6/20 11:13
- * @ QQ:    315096953
- */
-
-public class FgtNewGame extends BaseCompatFragment {
-
-    private ListView mListView;
-    private AdpFgtAppDetailNewGame mAdpFgtAddDetailNewGame;
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_new_game);
-        mListView = (ListView) mContentView.findViewById(R.id.list_fgt_game);
-        mListView.setDividerHeight(3);
-        mListView.setEmptyView(mContentView.findViewById(R.id.download_mgr_empty_view));
-        loadData();
-    }
-
-    /**
-     * 载入数据
-     */
-    private void loadData() {
-        String gameId;
-        gameId = getActivity().getIntent().getStringExtra(KFIntentKeys.EXTRA_GAME_ID);
-        String reqUrl = UrlBll.Server.OPEN_SERVER_GAMEDETAIL + "game_id=" + gameId;
-        APIRequest giftReq = APIRequestInstance.getReq(TAG, reqUrl, null, new ResponseNetworkTask() {
-
-            @Override
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                List<OpenTestOpenServerList.OpenServer> serversList = apiResponse.getOpenServersList();
-                if (mAdpFgtAddDetailNewGame == null)
-                    mAdpFgtAddDetailNewGame = new AdpFgtAppDetailNewGame(getActivity());
-                mAdpFgtAddDetailNewGame.setData(serversList);
-                mListView.setAdapter(mAdpFgtAddDetailNewGame);
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-
-            }
-
-        }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
-
-        KFZSNetwork.addRequest(giftReq);
-
-
-    }
-
-}

+ 0 - 174
app/src/main/java/com/kfzs/duanduan/fragment/GiftGameFragment.java

@@ -1,174 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bean.RecyleObj;
-import com.kfzs.duanduan.bean.RecyleType;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.GiftCenterOuterClass;
-import com.kfzs.duanduan.proto.IndexBannerGiftCenterOuterClass;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-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.adp.AdpMainPageGift;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  GiftGameFragment</p>
- * @ <p>Description: 首页礼包Fragment栏</p>
- * @ date:  2017/6/14 11:14
- * @ QQ:    315096953
- */
-
-public class GiftGameFragment extends BaseCompatFragment {
-
-    private static final String TAG = GiftGameFragment.class.getSimpleName();
-
-    private RecyclerView mRecyclerView;
-
-    private AdpMainPageGift mAdpMainPageGift;
-    private RecyleObj[] mList = new RecyleObj[3];
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_gift_game);
-
-        mRecyclerView = ViewFindUtils.find(mContentView, R.id.recy_fgt_gift_game);
-        mAdpMainPageGift = new AdpMainPageGift(mContext);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
-        mRecyclerView.setAdapter(mAdpMainPageGift);
-
-        //        DividerItemDecoration decor = new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL);
-        //        decor.setIsShowFirstItemDecoration(false);
-        //        decor.setSize(0);
-        //        decor.setColor(getResources().getColor(R.color.white));
-        //        mRecyclerView.addItemDecoration(decor);
-
-        initData();
-
-        forbidSwipLayout();
-    }
-
-    private void initData() {
-        mAdpMainPageGift.clear();
-        mAdpMainPageGift.notifyDataSetChanged();
-
-        APIRequest requset = APIRequestInstance.getReqUrl(TAG, UrlBll.Gift.GIFT_LIST, null, new ResponseNetworkTask() {
-            @Override
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                List<GiftCenterOuterClass.GiftCenter> giftList = apiResponse.getGiftCentersList();
-                if (giftList.size() > 6) {
-                    giftList = giftList.subList(0, 6);
-                    mList[2] = RecyleObj.make(RecyleType.OWN_GIFT, giftList);
-                } else {
-                    mList[2] = RecyleObj.make(RecyleType.OWN_GIFT, giftList);
-                }
-                updateUi();
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-                mList[2] = RecyleObj.make(RecyleType.OWN_GIFT, new ArrayList<GiftCenterOuterClass.GiftCenter>());
-                updateUi();
-            }
-        }, HelperUtils.makeErr("网络错误,礼包列表加载失败!"));
-
-        KFZSNetwork.addRequest(requset);
-
-        APIRequest banner = APIRequestInstance.getReqUrl(TAG, UrlBll.Gift.GIFT_BANNER, null, new ResponseNetworkTask() {
-            @Override
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                List<IndexBannerGiftCenterOuterClass.IndexBannerGiftCenter> bannerGiftCentersList = apiResponse.getIndexBannerGiftCentersList();
-                if (bannerGiftCentersList.size() > 3) {
-                    bannerGiftCentersList = bannerGiftCentersList.subList(0, 3);
-                    mList[0] = RecyleObj.make(RecyleType.GIFT_BANNER, bannerGiftCentersList);
-                } else {
-                    mList[0] = RecyleObj.make(RecyleType.GIFT_BANNER, bannerGiftCentersList);
-                }
-
-                updateUi();
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-                mList[0] = RecyleObj.make(RecyleType.GIFT_BANNER, new ArrayList<IndexBannerGiftCenterOuterClass.IndexBannerGiftCenter>());
-                updateUi();
-            }
-        }, HelperUtils.makeErr("网络错误,Banner加载失败!"));
-        KFZSNetwork.addRequest(banner);
-
-        //TODO 小刁,这里有空应该把这个要登录的请求全部封装一下,不然总是加这个map
-        HashMap<String, String> params = new HashMap<>();
-        if (null != KFZSDDContentSession.getInstance().findOutHeadSession(mContext)) {
-            params.put(UrlBll.HeadParams.AUTHORIZATION,
-                    KFZSDDContentSession.getInstance().findOutHeadSession(mContext).getToken());
-        }
-
-        APIRequest already = APIRequestInstance.getReqUrlWithHead(TAG, UrlBll.Gift.GIFT_PLAYED, params, null, new ResponseNetworkTask() {
-            @Override
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                List<GiftCenterOuterClass.GiftCenter> giftCentersList = apiResponse.getGiftCentersList();
-                mList[1] = RecyleObj.make(RecyleType.ALREADY_INSTALL, giftCentersList);
-                updateUi();
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-                mList[1] = RecyleObj.make(RecyleType.ALREADY_INSTALL, new ArrayList<GiftCenterOuterClass.GiftCenter>());
-                updateUi();
-            }
-        }, HelperUtils.makeErr("已下载过游戏的礼包加载失败!"));
-        KFZSNetwork.addRequest(already);
-    }
-
-    private void updateUi() {
-        refreshOver();
-        if (mList[0] == null || mList[1] == null || mList[2] == null) {
-            return;
-        }
-        mAdpMainPageGift.clear();
-        mAdpMainPageGift.add(mList[0]);
-        mAdpMainPageGift.add(mList[1]);
-        mAdpMainPageGift.add(mList[2]);
-        mAdpMainPageGift.notifyDataSetChanged();
-    }
-
-    @Override
-    public void refreshData() {
-        super.refreshData();
-        initData();
-    }
-
-    /**
-     * 解决RecyleView没有滑动到顶部,下滑却触发了Swipelayout的刷新事件
-     */
-    private void forbidSwipLayout() {
-        mRecyclerView.setOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-                int topRowVerticalPosition =
-                        (recyclerView == null || recyclerView.getChildCount() == 0) ? 0 : recyclerView.getChildAt(0).getTop();
-                getmSwipeRefreshLayout().setEnabled(topRowVerticalPosition >= 0);
-            }
-
-            @Override
-            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-                super.onScrollStateChanged(recyclerView, newState);
-            }
-        });
-    }
-}

+ 0 - 245
app/src/main/java/com/kfzs/duanduan/fragment/OpenServiceTestFragment.java

@@ -1,245 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.widget.TextView;
-
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.adp.AdpMainStartService;
-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.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.event.EventDownloadHandler;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.OpenTestOpenServerList;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
-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 org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.util.HashMap;
-
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  OpenServiceTestFragment</p>
- * @ <p>Description: 首页开服Fragment栏</p>
- * @ date:  2017/6/14 11:16
- * @ QQ:    315096953
- */
-public class OpenServiceTestFragment extends BaseCompatFragment {
-
-    private static final String TAG = OpenServiceTestFragment.class.getName();
-
-    private RecyclerView mRecyclerView;//主要的List
-    private TextView mTxtTabService;//开服
-    private TextView mTxtTabTest;//开测
-    private AdpMainStartService mAdpMainStartService;//RecyView的Adp
-    private EventDownloadHandler.OnDownCallback mOnDownCallback;//安装按钮的回调
-
-    private OpenTestOpenServerList.OpenServerList mOpenServerList;
-    private OpenTestOpenServerList.OpenTestList mOpenTestList;
-
-    private static final int MAX_PAGE_COUNT = 10;//开测和开服的最多展示数量
-
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fragment_main_start_service);
-        EventBus.getDefault().register(this);
-
-        mRecyclerView = ViewFindUtils.find(mContentView, R.id.recy_main_start_service);
-        mTxtTabService = ViewFindUtils.find(mContentView, R.id.txt_main_start_service_tab1);
-        mTxtTabTest = ViewFindUtils.find(mContentView, R.id.txt_main_start_service_tab2);
-
-        mAdpMainStartService = new AdpMainStartService(getActivity());
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
-        mRecyclerView.setAdapter(mAdpMainStartService);
-        mTxtTabService.setSelected(true);//默认先显示开服信息
-        refreshData();
-        initLisener();
-    }
-
-    private void initLisener() {
-        mTxtTabService.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showService();
-            }
-        });
-        mTxtTabTest.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showTest();
-            }
-        });
-    }
-
-    @Override
-    public void refreshData() {
-        loadOpenService();
-        loadOpenTest();
-    }
-
-
-    /**
-     * 显示开测列表
-     */
-    private void showTest() {
-        if (mOpenTestList == null) {
-            return;
-        }
-        mTxtTabTest.setSelected(true);
-        mTxtTabService.setSelected(false);
-        mAdpMainStartService.clear();
-
-
-        mAdpMainStartService.add(RecyleObj.make(RecyleType.START_TAB_NAME,
-                getString(R.string.today_open_test)));
-        for (OpenTestOpenServerList.OpenTest openTest : mOpenTestList.getTodayTestList()) {
-            mAdpMainStartService.add(RecyleObj.make(RecyleType.START_TEST_TODAY, openTest));
-        }
-        mAdpMainStartService.add(RecyleObj.make(RecyleType.START_TAB_NAME,
-                getString(R.string.tomorrow_open_test)));
-        for (OpenTestOpenServerList.OpenTest openTest : mOpenTestList.getTomorrowTestList()) {
-            mAdpMainStartService.add(RecyleObj.make(RecyleType.START_TEST_TOMORROW, openTest));
-        }
-        mAdpMainStartService.notifyDataSetChanged();
-
-        if (mOpenTestList.getTomorrowTestCount() < 1
-                && mOpenTestList.getTodayTestCount() < 1) {
-            //showToast("暂无开测数据");
-        }
-    }
-
-    /**
-     * 显示开服列表
-     */
-    private void showService() {
-        if (mOpenServerList == null) {
-            return;
-        }
-        mTxtTabTest.setSelected(false);
-        mTxtTabService.setSelected(true);
-        mAdpMainStartService.clear();
-
-
-        mAdpMainStartService.add(RecyleObj.make(RecyleType.START_TAB_NAME,
-                getString(R.string.today_open_service)));
-
-        for (OpenTestOpenServerList.OpenServer openServer : mOpenServerList.getTodayServerList()) {
-            mAdpMainStartService.add(RecyleObj.make(RecyleType.START_SERVICE_TODAY, openServer));
-        }
-
-        mAdpMainStartService.add(RecyleObj.make(RecyleType.START_TAB_NAME,
-                getString(R.string.tomorrow_open_service)));
-        for (OpenTestOpenServerList.OpenServer openServer : mOpenServerList.getTomorrowServerList()) {
-            mAdpMainStartService.add(RecyleObj.make(RecyleType.START_SERVICE_TOMORROW, openServer));
-        }
-        mAdpMainStartService.notifyDataSetChanged();
-
-        if (mOpenServerList.getTomorrowServerCount() < 1
-                && mOpenServerList.getTodayServerCount() < 1
-                ) {
-            //showToast("暂无开服数据");
-        }
-    }
-
-    /**
-     * 载入开服列表
-     */
-    private void loadOpenService() {
-        HashMap<String, String> params = new HashMap<>();
-        params.put("limit", String.valueOf(MAX_PAGE_COUNT));
-        if (null != KFZSDDContentSession.getInstance().findOutHeadSession(mContext)) {
-            params.put(UrlBll.HeadParams.AUTHORIZATION,
-                    KFZSDDContentSession.getInstance().findOutHeadSession(mContext).getToken());
-        }
-
-        APIRequest bannerRequest = APIRequestInstance.getReq(TAG, UrlBll.AppStoreApi.OPEN_SERVER,
-                params, new ResponseNetworkTask() {
-                    @Override
-                    public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                        mOpenServerList = apiResponse.getServerList();
-                        if (mTxtTabService.isSelected()) {
-                            showService();
-                            refreshOver();
-                        }
-                    }
-
-                    @Override
-                    public void onFail(int code, String msg) {
-                        refreshOver();
-                    }
-                }, null);
-        KFZSNetwork.addRequest(bannerRequest);
-    }
-
-    private void loadOpenTest() {
-        HashMap<String, String> params = new HashMap<>();
-        params.put("limit", String.valueOf(MAX_PAGE_COUNT));
-        if (null != KFZSDDContentSession.getInstance().findOutHeadSession(mContext)) {
-            params.put(UrlBll.HeadParams.AUTHORIZATION,
-                    KFZSDDContentSession.getInstance().findOutHeadSession(mContext).getToken());
-        }
-
-        APIRequest bannerRequest = APIRequestInstance.getReq(TAG, UrlBll.AppStoreApi.OPEN_TEST,
-                params, new ResponseNetworkTask() {
-                    @Override
-                    public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                        mOpenTestList = apiResponse.getTestList();
-                        if (mTxtTabTest.isSelected()) {
-                            showTest();
-                            refreshOver();
-                        }
-                    }
-
-                    @Override
-                    public void onFail(int code, String msg) {
-                        refreshOver();
-                    }
-                }, null);
-        KFZSNetwork.addRequest(bannerRequest);
-    }
-
-
-    /**
-     * 把更新放到Logic里了,代码少一半以上。
-     *
-     * @param info
-     */
-    @Subscribe
-    public void onEventMainThread(DownloadStatus info) {
-        if (mOnDownCallback == null) {
-            mOnDownCallback = DownBtnUtils.installBtnStatus(mAdpMainStartService.getmDownLoadItemLogicMgrMap());
-        }
-        EventDownloadHandler
-                .newInstance(getActivity(), mOnDownCallback)
-                .setmTag(TAG)
-                .handlDownloadResult(info);
-        //TODO 小刁,这一句比较重要,如果必要的话,可以加个延时再刷新,不然按钮更新不同步
-        mAdpMainStartService.notifyDataSetChanged();
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-}

+ 0 - 114
app/src/main/java/com/kfzs/duanduan/mine/GiftpackBroughtAdapter.java

@@ -1,114 +0,0 @@
-package com.kfzs.duanduan.mine;
-
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bean.GiftList;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.utils.DateFormatUtils;
-
-import java.util.List;
-
-/**
- * Created by Administrator on 2017/12/18.
- */
-
-public class GiftpackBroughtAdapter extends BaseAdapter {
-
-    private Context mContext;
-    private List<GiftList> mListData;
-    private int type;//0:已用,1:已过期
-
-    public GiftpackBroughtAdapter(Context mContext, List<GiftList> mListData) {
-        this.mContext = mContext;
-        this.mListData = mListData;
-    }
-
-    @Override
-    public int getCount() {
-        return mListData.size();
-    }
-
-    @Override
-    public GiftList getItem(int i) {
-        return mListData.get(i);
-    }
-
-    @Override
-    public long getItemId(int i) {
-        return 0;
-    }
-
-    @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
-
-        final GiftList giftList = (GiftList) getItem(i);
-        view = LayoutInflater.from(mContext).inflate(R.layout.giftpackbroug_item,null);
-        if(giftList == null ){
-            return view;
-        }
-
-        ImageView iconIv = view.findViewById(R.id.giftpack_icon_iv);
-        ImageView stale_dated_iv = view.findViewById(R.id.stale_dated_iv);
-        TextView nameTv = view.findViewById(R.id.giftpack_name_tv);
-        TextView dateTv = view.findViewById(R.id.giftpack_date_tv);
-        TextView statueTv = view.findViewById(R.id.giftpack_statue_tv);
-        TextView keyTv = view.findViewById(R.id.giftpack_key_tv);
-        TextView copyTv = view.findViewById(R.id.giftpack_key_copy_tv);
-        Glide.with(mContext)
-                .load(giftList.getIcon())
-                .apply(new RequestOptions().error(android.R.drawable.stat_notify_error))
-                .into(iconIv);
-        nameTv.setText(giftList.getGameName()+"");
-        if(giftList.getEndTime() > 0){
-            dateTv.setText("有效期至:"+DateFormatUtils.doSecondDate(giftList.getEndTime()) +"");
-        }
-
-        keyTv.setText("激活码:"+giftList.getGiftCode()+"");
-        if(type == 1){
-            statueTv.setTextColor(mContext.getResources().getColor(R.color.backColor));
-            copyTv.setTextColor(mContext.getResources().getColor(R.color.backColor));
-            statueTv.setText("已到期");
-            stale_dated_iv.setVisibility(View.VISIBLE);
-        }else {
-            stale_dated_iv.setVisibility(View.GONE);
-            if(giftList.isUsedStatus()){
-                statueTv.setTextColor(mContext.getResources().getColor(R.color.backColor));
-                copyTv.setTextColor(mContext.getResources().getColor(R.color.backColor));
-                statueTv.setText("已领");
-            }else{
-                statueTv.setTextColor(mContext.getResources().getColor(R.color.blue_2c72f4));
-                statueTv.setText("即将到期,请尽快使用");
-                copyTv.setTextColor(mContext.getResources().getColor(R.color.blue_2c72f4));
-                copyTv.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        // 从API11开始android推荐使用android.content.ClipboardManager
-                        // 为了兼容低版本我们这里使用旧版的android.text.ClipboardManager,虽然提示deprecated,但不影响使用。
-                        ClipboardManager cm = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
-                        // 将文本内容放到系统剪贴板里。
-                        cm.setText(giftList.getGiftCode()+"");
-                        G.showToast(mContext, "复制成功。", Toast.LENGTH_LONG);
-                    }
-                });
-            }
-        }
-        return view;
-    }
-
-    public void toBindTopviewData(int type){
-        this.type = type;
-    }
-}

+ 0 - 142
app/src/main/java/com/kfzs/duanduan/mine/GiftpackHasBroughtFragment.java

@@ -1,142 +0,0 @@
-package com.kfzs.duanduan.mine;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ListView;
-
-import com.alibaba.fastjson.JSON;
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bean.BaseMsg;
-import com.kfzs.duanduan.bean.GiftList;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.ObjectOuterClass;
-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.view.ListMore;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 礼包已领和未领fragment
- * Created by Administrator on 2017/12/18.
- */
-
-public class GiftpackHasBroughtFragment extends BaseCompatFragment {
-
-    private String tabTitle = "";
-    private int type = 0;
-    private int page = 1;//页数
-    private int per_page = 10;
-    ListMore listview;
-    GiftpackBroughtAdapter mAdapter;
-    List<GiftList> mListData = new ArrayList<>();
-    String url = UrlBll.Gift.GIFT_RECEIVE_LIST;
-
-    static GiftpackHasBroughtFragment newInstance(int type){
-        GiftpackHasBroughtFragment giftpackHasBroughtFragment = new GiftpackHasBroughtFragment();
-        Bundle bundle = new Bundle();
-        bundle.putInt("type", type);
-        giftpackHasBroughtFragment.setArguments(bundle);
-        return giftpackHasBroughtFragment;
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Bundle bundle = getArguments();
-        if(bundle != null){
-            type = bundle.getInt("type", 0);
-        }
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.giftpacklist_fragment);
-        listview = mContentView.findViewById(R.id.listview);
-        if(type == 0){
-            url = UrlBll.Gift.GIFT_RECEIVE_LIST;
-        }else{
-            url = UrlBll.Gift.GIFT_EXPIRED_LIST;
-        }
-        initData();
-        loadDate(url);
-
-        listview.setmPullMoreEnable(false);
-        listview.setmOnListMoreListener(new ListMore.OnListMoreListener() {
-            @Override
-            public void onRefresh() {
-                page = 1;
-                loadDate(url);
-            }
-
-            @Override
-            public void onLoadMore() {
-                if(mListData != null && mListData.size() >= per_page*page){
-                    page += 1;
-                }
-                loadDate(url);
-            }
-        });
-    }
-
-    private void initData() {
-        mAdapter = new GiftpackBroughtAdapter(getActivity(), mListData);
-        listview.getmListView().setAdapter(mAdapter);
-        mAdapter.toBindTopviewData(type);
-    }
-
-    /**
-     * 加载数据
-     */
-    private void loadDate(String url) {
-        //加载新游预约推荐列表
-        listview.setRefreshing(true);
-        HashMap<String ,String> paras = new HashMap<>();
-        paras.put("page", page+"");
-        paras.put("per_page", "10");
-        APIRequestV2 apiRequestV2 = APIRequestInstance.getReqUrlV2(url+"",
-                url, paras, new Response.Listener<BaseMsg>() {
-                    @Override
-                    public void onResponse(BaseMsg baseMsg) {
-                        if(listview.isRefreshing()){
-                            listview.setRefreshing(false);
-                        }
-                        List<GiftList> gameList = baseMsg.getDatas(GiftList.class);
-                        if (gameList == null || gameList.size() < 0) {
-                            return;
-                        }
-                        if(page == 1){
-                            mListData.clear();
-                        }
-                        mListData.addAll(gameList);
-                        mAdapter.notifyDataSetChanged();
-                    }
-                },
-                new Response.ErrorListener() {
-                    @Override
-                    public void onErrorResponse(VolleyError volleyError) {
-                        if(listview.isRefreshing()){
-                            listview.setRefreshing(false);
-                        }
-                        G.showToast(getString(R.string.toast_init_data_fail));
-                    }
-                });
-        KFZSNetwork.addRequest(apiRequestV2);
-    }
-}

+ 0 - 62
app/src/main/java/com/kfzs/duanduan/mine/GiftpackListActivity.java

@@ -1,62 +0,0 @@
-package com.kfzs.duanduan.mine;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.view.View;
-
-import com.kfzs.duanduan.BaseCompatActivity;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.utils.dlg.TitleBarUtils;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-/**
- * 我的礼包list
- * Created by Administrator on 2017/12/15.
- */
-
-public class GiftpackListActivity extends BaseCompatActivity {
-
-    public static final String GIFT_LIST_TAG = "com.kfzs.duanduan.mine.GiftpackListActivity";
-    @BindView(R.id.indicator)
-    TabLayout indicator;
-    @BindView(R.id.pager)
-    ViewPager pager;
-
-    private GiftpackListAdapter mAdapter;
-    private String[] titles = new String[]{"已领", "已过期"};
-
-    private Bundle extras;
-    private boolean isSelect;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.giftpacklist_activity);
-        ButterKnife.bind(this);
-        extras = getIntent().getExtras();
-
-        initViews();
-    }
-
-    private void initViews() {
-        TitleBarUtils.getInstance().setTitle(this, "我的礼包");
-        TitleBarUtils.getInstance().setTitleFinish(this);
-        mAdapter = new GiftpackListAdapter(getSupportFragmentManager(), this);
-        mAdapter.add(GiftpackHasBroughtFragment.newInstance(0), titles[0]);
-        mAdapter.add(GiftpackHasBroughtFragment.newInstance(1), titles[1]);
-        pager.setAdapter(mAdapter);
-        indicator.setupWithViewPager(pager);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-    }
-
-
-}

+ 0 - 56
app/src/main/java/com/kfzs/duanduan/mine/GiftpackListAdapter.java

@@ -1,56 +0,0 @@
-package com.kfzs.duanduan.mine;
-
-import android.content.Context;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 礼包 fragment adapter
- * Created by Administrator on 2017/12/15.
- */
-
-public class GiftpackListAdapter extends FragmentPagerAdapter {
-    private Context mContext;
-    private List<Object> mListFragment = new ArrayList<>();
-    private List<Object> mTitles = new ArrayList<>();
-
-    public GiftpackListAdapter(FragmentManager fm, Context mContext) {
-        super(fm);
-        this.mContext = mContext;
-    }
-
-    public void add(Fragment fragment, String title) {
-        mListFragment.add(fragment);
-        mTitles.add(title);
-    }
-
-    @Override
-    public Fragment getItem(int position) {
-        return (Fragment) mListFragment.get(position);
-    }
-
-    @Override
-    public int getCount() {
-        return mListFragment.size();
-    }
-
-    @Override
-    public int getItemPosition(Object object) {
-        return super.getItemPosition(object);
-    }
-
-    @Override
-    public CharSequence getPageTitle(int position) {
-        return (CharSequence) mTitles.get(position);
-    }
-}

+ 0 - 56
app/src/main/java/com/kfzs/duanduan/mine/VoucherAdapter.java

@@ -1,56 +0,0 @@
-package com.kfzs.duanduan.mine;
-
-import android.content.Context;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import com.kfzs.duanduan.bean.GiftList;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 商卷
- * Created by Administrator on 2017/12/18.
- */
-
-public class VoucherAdapter extends FragmentPagerAdapter {
-
-    private Context mContext;
-    private List<Object> mListFragment = new ArrayList<>();
-    private List<Object> mTitles = new ArrayList<>();
-
-    public VoucherAdapter(FragmentManager fm, Context mContext) {
-        super(fm);
-        this.mContext = mContext;
-    }
-
-    public void add(Fragment fragment, String title) {
-        mListFragment.add(fragment);
-        mTitles.add(title);
-    }
-
-    @Override
-    public Fragment getItem(int position) {
-        return (Fragment) mListFragment.get(position);
-    }
-
-    @Override
-    public int getCount() {
-        return mListFragment.size();
-    }
-
-    @Override
-    public int getItemPosition(Object object) {
-        return super.getItemPosition(object);
-    }
-
-    @Override
-    public CharSequence getPageTitle(int position) {
-        return (CharSequence) mTitles.get(position);
-    }
-}

+ 0 - 144
app/src/main/java/com/kfzs/duanduan/mine/VoucherFragment.java

@@ -1,144 +0,0 @@
-package com.kfzs.duanduan.mine;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.VoucherOuterClass;
-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.view.ListMore;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Created by Administrator on 2017/12/18.
- */
-
-public class VoucherFragment extends BaseCompatFragment {
-    private String tabTitle = "";
-    private int type = 0;
-    private int page = 1;//页数
-    private int per_page = 10;
-    ListMore listview;
-    VoucherItemAdapter mAdapter;
-    List<VoucherOuterClass.Voucher> mListData = new ArrayList<>();
-    String url = UrlBll.AppStoreApi.VOUCHER_RECEIVE_LSIT;
-
-    static VoucherFragment newInstance(int type){
-        VoucherFragment voucherFragment = new VoucherFragment();
-        Bundle bundle = new Bundle();
-        bundle.putInt("type", type);
-        voucherFragment.setArguments(bundle);
-        return voucherFragment;
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Bundle bundle = getArguments();
-        if(bundle != null){
-            type = bundle.getInt("type", 0);
-        }
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.giftpacklist_fragment);
-        listview =  mContentView.findViewById(R.id.listview);
-        if(type == 0){
-            url = UrlBll.AppStoreApi.VOUCHER_RECEIVE_LSIT;
-        }else{
-            url = UrlBll.AppStoreApi.VOUCHER_EXPIRED_LSIT;
-        }
-        initData();
-        loadDate(url);
-
-        listview.setDrivers(null);
-        listview.setmPullMoreEnable(false);
-        listview.setmOnListMoreListener(new ListMore.OnListMoreListener() {
-            @Override
-            public void onRefresh() {
-                page = 1;
-                loadDate(url);
-            }
-
-            @Override
-            public void onLoadMore() {
-                if(mListData != null && mListData.size() >= per_page*page){
-                    page += 1;
-                }
-                loadDate(url);
-            }
-        });
-    }
-
-    private void initData() {
-        mAdapter = new VoucherItemAdapter(getActivity(), mListData);
-        listview.getmListView().setAdapter(mAdapter);
-        mAdapter.bindDataType(type);
-    }
-
-    /**
-     * 加载数据
-     */
-    private void loadDate(String url) {
-        //加载新游预约推荐列表
-        HashMap<String ,String> paras = new HashMap<>();
-        paras.put("page", page+"");
-        paras.put("per_page", "10");
-        listview.setRefreshing(true);
-
-        if (null != KFZSDDContentSession.getInstance().findOutHeadSession(getActivity())) {
-            String token = KFZSDDContentSession.getInstance().findOutHeadSession(getActivity()).getToken();
-            paras.put(UrlBll.HeadParams.AUTHORIZATION, token);
-        }
-        APIRequest bannerRequest = APIRequestInstance.getReq(TAG, url, paras, new Response.Listener<ApiResponseOuterClass.ApiResponse>() {
-
-            @Override
-            public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-
-                if (listview.isRefreshing()) {
-                    listview.setRefreshing(false);
-                }
-                int code = apiResponse.getCodeValue();
-                switch (code) {
-                    case ApiResponseOuterClass.Codes.Success_VALUE:
-                        if (apiResponse.getVouchersList() != null && apiResponse.getVouchersList().size() > 0) {
-                            if (page == 1) {
-                                mListData.clear();
-                            }
-
-                            mListData.addAll(apiResponse.getVouchersList());
-                            mAdapter.notifyDataSetChanged();
-                        }
-                        break;
-                    default:
-                        break;
-                }
-                refreshOver();
-
-            }
-        }, new Response.ErrorListener() {
-            @Override
-            public void onErrorResponse(VolleyError volleyError) {
-                if(listview.isRefreshing()){
-                    listview.setRefreshing(false);
-                }
-                G.showToast(getString(R.string.toast_init_data_fail));
-            }
-        });
-        KFZSNetwork.addRequest(bannerRequest);
-    }
-}

+ 0 - 96
app/src/main/java/com/kfzs/duanduan/mine/VoucherItemAdapter.java

@@ -1,96 +0,0 @@
-package com.kfzs.duanduan.mine;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bean.GiftList;
-import com.kfzs.duanduan.proto.VoucherOuterClass;
-import com.kfzs.duanduan.utils.CouponUtils;
-import com.kfzs.duanduan.utils.DateFormatUtils;
-
-import java.util.List;
-
-
-/**
- * Created by Administrator on 2017/12/18.
- */
-
-public class VoucherItemAdapter extends BaseAdapter {
-    private Context mContext;
-    private List<VoucherOuterClass.Voucher> mListData;
-    int type = 0;
-    private CouponUtils couponUtils = new CouponUtils();
-
-    public VoucherItemAdapter(Context mContext, List<VoucherOuterClass.Voucher> mListData) {
-        this.mContext = mContext;
-        this.mListData = mListData;
-    }
-
-    @Override
-    public int getCount() {
-        return mListData.size();
-    }
-
-    @Override
-    public VoucherOuterClass.Voucher getItem(int i) {
-        return mListData.get(i);
-    }
-
-    @Override
-    public long getItemId(int i) {
-        return 0;
-    }
-
-    @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
-
-        VoucherOuterClass.Voucher voucher = getItem(i);
-        view = LayoutInflater.from(mContext).inflate(R.layout.voucher_item,null);
-        if(voucher == null ){
-            return view;
-        }
-
-        ImageView iconIv = view.findViewById(R.id.voucher_icon_iv);
-        ImageView stale_dated_iv = view.findViewById(R.id.stale_dated_iv);
-        TextView nameTv = view.findViewById(R.id.voucher_name_tv);
-        TextView dateTv = view.findViewById(R.id.voucher_date_tv);
-        TextView voucher_money_tv = view.findViewById(R.id.voucher_money_tv);
-        TextView voucher_diraction_tv = view.findViewById(R.id.voucher_diraction_tv);
-        TextView copyTv = view.findViewById(R.id.voucher_key_copy_tv);
-        View lineView = view.findViewById(R.id.line_view);
-        Glide.with(mContext)
-                .load(voucher.getGameIcon())
-                .apply(new RequestOptions().error(android.R.drawable.stat_notify_error))
-                .into(iconIv);
-        nameTv.setText(voucher.getGameName()+"");
-        voucher_diraction_tv.setText(couponUtils.getVoucherContent(voucher));
-        if(voucher.getEndTime() > 0){
-            dateTv.setText("有效期至:"+ DateFormatUtils.doSecondDate(voucher.getEndTime()) +"");
-        }
-        voucher_money_tv.setText("¥"+voucher.getAmount() +"");
-        if(type == 0){
-            voucher_money_tv.setTextColor(mContext.getResources().getColor(R.color.blue_2c72f4));
-            copyTv.setTextColor(mContext.getResources().getColor(R.color.blue_2c72f4));
-            stale_dated_iv.setVisibility(View.GONE);
-            lineView.setBackground(mContext.getResources().getDrawable(R.drawable.shape_line_blue));
-        }else{
-            voucher_money_tv.setTextColor(mContext.getResources().getColor(R.color.backColor));
-            copyTv.setTextColor(mContext.getResources().getColor(R.color.backColor));
-            stale_dated_iv.setVisibility(View.VISIBLE);
-            lineView.setBackground(mContext.getResources().getDrawable(R.drawable.shape_line_gray));
-        }
-        return view;
-    }
-
-    public void bindDataType(int type){
-        this.type = type;
-    }
-}

+ 0 - 55
app/src/main/java/com/kfzs/duanduan/mine/VoucherListActivity.java

@@ -1,55 +0,0 @@
-package com.kfzs.duanduan.mine;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-
-import com.kfzs.duanduan.BaseCompatActivity;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.utils.dlg.TitleBarUtils;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * 商卷list
- * Created by Administrator on 2017/12/18.
- */
-
-public class VoucherListActivity extends BaseCompatActivity {
-    public static final String GIFT_LIST_TAG = "com.kfzs.duanduan.mine.VoucherListActivity";
-    @BindView(R.id.indicator)
-    TabLayout indicator;
-    @BindView(R.id.pager)
-    ViewPager pager;
-
-    private VoucherAdapter mAdapter;
-    private String[] titles = new String[]{"已领", "已过期"};
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.giftpacklist_activity);
-        ButterKnife.bind(this);
-
-        initViews();
-    }
-
-    private void initViews() {
-
-        TitleBarUtils.getInstance()
-                .setTitle(this, "我的代金券")
-                .setTitleFinish(this);
-        mAdapter = new VoucherAdapter(getSupportFragmentManager(), this);
-        mAdapter.add(VoucherFragment.newInstance(0), titles[0]);
-        mAdapter.add(VoucherFragment.newInstance(1), titles[1]);
-        pager.setAdapter(mAdapter);
-        indicator.setupWithViewPager(pager);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-    }
-}

+ 0 - 53
app/src/main/java/com/kfzs/duanduan/oem/AppDownloadUtil.java

@@ -1,53 +0,0 @@
-package com.kfzs.duanduan.oem;
-
-import android.content.Context;
-
-import com.kfzs.duanduan.datashare.provider.appdownload.AppdownloadBean;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-/**
- * Created by Administrator on 2017/12/25.
- */
-
-public class AppDownloadUtil {
-    public static String TEST_URL = "http://testten.kuaifazs.com:7777/recall?";//http://testten.kuaifazs.com/?t=1
-    public static String URL = "http://oem.kuaifazs.com:7777/recall?";
-    private static AppDownloadUtil appDownloadUtil;
-
-    public static AppDownloadUtil getInstance(){
-        if(appDownloadUtil == null)
-            appDownloadUtil = new AppDownloadUtil();
-        return appDownloadUtil;
-    }
-
-    /**
-     * 访问统计接口
-     * 拼接get 地址
-     * String url_data = "http://testten.kuaifazs.com:7777/recall?packageName="+ URLEncoder.encode(packageNames,"utf8")+"&interfaceName="+interfaceName+"&status="+staus+ UtilParamsWebview.getInstance().getParams(context);
-    */
-    public String accessInterfaceNetwork(Context context, String url, AppdownloadBean appdownloadBean){
-        StringBuffer stringBuffer = new StringBuffer();
-        stringBuffer.append(url)
-                .append("packageName=")
-                .append(strUrlEncode(appdownloadBean.getPkgName()))
-                .append("&interfaceName=")
-                .append(strUrlEncode(appdownloadBean.getInterfaceName()))
-                .append("&status=")
-                .append(strUrlEncode(appdownloadBean.getStaus()+""));
-        return stringBuffer.toString() + UtilParamsWebview.getInstance().getParams(context);
-    }
-
-    /**
-     * urlencode
-     */
-    public String strUrlEncode(String params){
-        try {
-            return URLEncoder.encode(params, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-            return params;
-        }
-    }
-}

+ 0 - 106
app/src/main/java/com/kfzs/duanduan/oem/GetPackageNmeHlpe.java

@@ -1,106 +0,0 @@
-package com.kfzs.duanduan.oem;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.support.v4.app.ActivityCompat;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * 获取apk文件包名
- * Created by Administrator on 2017/12/25.
- */
-
-public class GetPackageNmeHlpe {
-    private static final int REQUEST_EXTERNAL_STORAGE = 1;
-    private static String[] PERMISSIONS_STORAGE = {
-            Manifest.permission.READ_EXTERNAL_STORAGE,
-            Manifest.permission.WRITE_EXTERNAL_STORAGE
-    };
-    public static GetPackageNmeHlpe packageNme;
-
-    public static GetPackageNmeHlpe getInstance(){
-        if(packageNme == null)
-            packageNme = new GetPackageNmeHlpe();
-        return packageNme;
-    }
-
-    /**
-     * 获取apk文件包名
-     */
-    public String getPackageNames(Context context, String path)
-    {
-        PackageManager pm = context.getPackageManager();
-        PackageInfo info = pm.getPackageArchiveInfo(path, PackageManager.GET_ACTIVITIES);
-        ApplicationInfo applicationInfo = null;
-        String packageName = null;
-        if (info != null){
-            applicationInfo = info.applicationInfo;
-            packageName = applicationInfo.packageName;
-
-        }
-        return packageName;
-    }
-
-    /**
-     * 获取文件信息
-     */
-    public String getFileInfo(Context context, String path){
-        StringBuffer stringBuffer = new StringBuffer();
-        File file = new File(path);
-        if(file.exists()){
-            FileInputStream fis = null;
-            try {
-                fis = new FileInputStream(file);
-                stringBuffer
-                        .append("文件时间:"+new SimpleDateFormat("yyyy-MM-dd")
-                                .format(new Date(file.lastModified()))+"\n");
-                stringBuffer
-                        .append("文件大小:"+fis.available()+"B\n");
-                stringBuffer
-                        .append("文件名字:"+file.getName()+"B\n");
-                stringBuffer
-                        .append("文件路径:"+file.getPath()+"B\n");
-                stringBuffer
-                        .append("文件绝对路径:"+file.getAbsolutePath()+"B\n");
-                stringBuffer
-                        .append("文件父类路径:"+file.getParent()+"B\n");
-                stringBuffer
-                        .append("文件读取:"+file.canRead()+"B\n");
-                stringBuffer
-                        .append("文件写入:"+file.canWrite()+"B\n");
-
-
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            } catch (IOException ie){
-                ie.printStackTrace();
-            }
-
-        }else{
-            file.mkdir();
-        }
-        return stringBuffer.toString();
-    }
-
-    /**
-     * 获取动态权限
-     */
-    public void getPermisission(Activity context){
-        int permission = ActivityCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE);
-        if(permission != PackageManager.PERMISSION_GRANTED){
-            ActivityCompat.requestPermissions(context,
-                    PERMISSIONS_STORAGE,
-                    REQUEST_EXTERNAL_STORAGE);
-        }
-    }
-}

+ 0 - 122
app/src/main/java/com/kfzs/duanduan/oem/UtilParamsWebview.java

@@ -1,122 +0,0 @@
-package com.kfzs.duanduan.oem;
-
-import android.content.Context;
-import android.util.Log;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.bean.BaseMsg;
-import com.kfzs.duanduan.utils.dlg.DeviceUtils;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.APIRequestV2;
-import com.kfzs.duanduan.utils.sys.ChannelContent;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
-
-/**
- * Created by Administrator on 2017/12/27.
- */
-
-public class UtilParamsWebview {
-    public static UtilParamsWebview utilParamsWebview;
-
-    public static UtilParamsWebview getInstance(){
-        if(utilParamsWebview == null){
-            utilParamsWebview = new UtilParamsWebview();
-        }
-        return utilParamsWebview;
-    }
-
-    public String getParams(Context context) {
-        String backStr = "";
-        DeviceUtils deviceUtils = new DeviceUtils(context);
-        backStr += "&imei=" + deviceUtils.getIMEIRnd();
-        backStr += "&imsi=" + deviceUtils.getIMSI();
-        backStr += "&androidId=" + deviceUtils.getAndroidId()+"";
-        Log.e("androidId-----",deviceUtils.getAndroidId()+"");
-        try {
-            backStr += "&mode=" + URLEncoder.encode(deviceUtils.getModel(), "utf8");
-            backStr += "&macaddress=" + URLEncoder.encode(deviceUtils.getWifiMac(),"utf8");
-            backStr += "&manufacture=" + URLEncoder.encode(deviceUtils.getManufacture(), "utf8");
-            backStr += "&wifibssid=" + URLEncoder.encode(deviceUtils.getWifiBSSID(), "utf8");
-            backStr += "&wifissid=" + URLEncoder.encode(deviceUtils.getWifiSSID(), "utf8");
-        } catch (UnsupportedEncodingException ignore) {
-        }
-        backStr += "&appvercode=" + deviceUtils.getAppVersionCode();
-        backStr += "&channelid=" + ChannelContent.getInstance().getChannel_name();
-        return backStr;
-    }
-    public String returnBitMap2(String url){
-        URL myFileUrl = null;
-        try {
-            myFileUrl = new URL(url);
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        }
-        try {
-            HttpURLConnection conn = (HttpURLConnection) myFileUrl
-                    .openConnection();
-            conn.setRequestMethod("GET");
-            conn.setConnectTimeout(10 * 1000);
-            conn.setDoInput(true);
-            conn.connect();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-
-    public HttpURLConnection returnBitMap(String downUrl){
-        try {
-            URL url = new URL(downUrl);
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-            conn.setConnectTimeout(10 * 1000);
-            conn.connect();
-            InputStream is = conn.getInputStream();
-            is.close();
-            return conn;
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * 更新请求
-     */
-    public void updateData(String url){
-        APIRequestV2 apiRequestV2 = APIRequestInstance.getReqUrlV2(url+"",
-                url, null, new Response.Listener<BaseMsg>() {
-                    @Override
-                    public void onResponse(BaseMsg baseMsg) {
-//                        List<GiftList> gameList = baseMsg.getDatas(GiftList.class);
-//                        if (gameList == null || gameList.size() < 0) {
-//                            return;
-//                        }
-//                        if(page == 1){
-//                            mListData.clear();
-//                        }
-//                        mListData.addAll(gameList);
-//                        mAdapter.notifyDataSetChanged();
-                    }
-                },
-                new Response.ErrorListener() {
-                    @Override
-                    public void onErrorResponse(VolleyError volleyError) {
-//                        if(listview.isRefreshing()){
-//                            listview.setRefreshing(false);
-//                        }
-//                        G.showToast(getString(R.string.toast_init_data_fail));
-                    }
-                });
-        KFZSNetwork.addRequest(apiRequestV2);
-
-    }
-}

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

@@ -3,7 +3,6 @@ package com.kfzs.duanduan.react;
 import android.support.v4.app.Fragment;
 
 import com.kfzs.duanduan.ActMain;
-import com.kfzs.duanduan.fragment.FgtCreditCard;
 import com.kfzs.duanduan.fragment.FgtMainCategory;
 import com.kfzs.duanduan.fragment.FgtMainGame;
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
@@ -59,18 +58,6 @@ public enum MainTab {
 //            return R.drawable.drawable_selector_bp;
 //        }
 //    },
-//    CreditCard(R.string.tab_viewpager_credit_card) {
-//        @Override
-//        public Fragment getFragment() {
-//            return new FgtCreditCard();
-//        }
-//
-//        @Override
-//        public int getDrawableId() {
-//            return R.drawable.drawable_selector_credit;
-//        }
-//
-//    }
     ;
     private int stringId;
 

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

@@ -120,7 +120,7 @@ public class TabsHelper {
             index++;
         }
         //隐藏不显示的控件
-        for (int i = index * 2 + 1; i < tab_container.getChildCount(); i++) {
+        for (int i = index * 2; i < tab_container.getChildCount()-1; i++) {
            tab_container.getChildAt(i).setVisibility(View.GONE);
         }
     }

+ 4 - 7
app/src/main/java/com/kfzs/duanduan/utils/dlg/DownBtnUtils.java

@@ -1,19 +1,16 @@
 package com.kfzs.duanduan.utils.dlg;
 
-import android.app.Activity;
 import android.content.Context;
 import android.util.Log;
 
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
+import com.kfzs.duanduan.event.EventDownloadHandler;
+import com.kfzs.duanduan.proto.GameOuterClass;
 import com.kfzs.duanduan.services.DownloadTaskService;
 import com.kfzs.duanduan.utils.ApkUtils;
-import com.kfzs.duanduan.view.KFProgressButton;
-import com.kfzs.duanduan.utils.InstallButtonUtils;
-import com.kfzs.duanduan.event.EventDownloadHandler;
 import com.kfzs.duanduan.utils.GameStatusScanner;
-import com.kfzs.duanduan.proto.GameOuterClass;
-import com.sheep.gamegroup.view.dialog.DialogAccountAbnormal;
-import com.sheep.jiuyan.samllsheep.download.DownloadInfo;
+import com.kfzs.duanduan.utils.InstallButtonUtils;
+import com.kfzs.duanduan.view.KFProgressButton;
 
 import java.util.Map;
 

+ 0 - 16
app/src/main/java/com/sheep/gamegroup/util/MyDbManager.java

@@ -5,7 +5,6 @@ import android.os.Handler;
 import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.download.DownloadInfo;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import org.xutils.DbManager;
@@ -93,21 +92,6 @@ public class MyDbManager {
         return users;
     }
 
-    /**
-     * 获取下载数据
-     */
-    public DownloadInfo dbFindDownLoad(String taskName, String filePath) {
-        DownloadInfo downloadInfo = null;
-        try{
-            downloadInfo = db.selector(DownloadInfo.class)
-                    .where("label", "=", taskName)
-                    .and("fileSavePath", "=", filePath)
-                    .findFirst();
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return downloadInfo;
-    }
 
     /**
      *保存或更新表表

+ 0 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -7,7 +7,6 @@ import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -26,8 +25,6 @@ import com.sheep.gamegroup.presenter.SplashContract;
 import com.sheep.gamegroup.presenter.SplashPresenter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.page.LoginActivity;
-import com.sheep.jiuyan.samllsheep.page.MainActivity;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import java.util.List;
@@ -35,7 +32,6 @@ import java.util.List;
 import javax.inject.Inject;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import pub.devrel.easypermissions.AfterPermissionGranted;
 import pub.devrel.easypermissions.EasyPermissions;

+ 1 - 21
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -2,68 +2,51 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.provider.MediaStore;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.view.View;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
-import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-import com.kfzs.appstore.utils.string.HexUtils;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.react.upfile.UpFileListener;
-import com.kfzs.duanduan.react.upfile.UpFileUtils;
-import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerTaskDetailComponent;
 import com.sheep.gamegroup.di.modules.TaskDetailModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
-import com.sheep.gamegroup.model.entity.UploadResult;
 import com.sheep.gamegroup.presenter.TaskDetailContract;
 import com.sheep.gamegroup.presenter.TaskDetailPresenter;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.gamegroup.view.dialog.DialogShowLoading;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
-import com.sheep.jiuyan.samllsheep.page.WebActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
 
-import java.io.File;
-
 import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import go.kfzssafe.Kfzssafe;
-import me.iwf.photopicker.PhotoPicker;
 
 /**
  * 任务详情页面
@@ -220,10 +203,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     G.showToast("任务截图为空");
                     return;
                 }
-                Intent intent = new Intent(activity, WebActivity.class);
-                intent.putExtra(WebActivity.INTENT_URL, taskEty.getScreenshots());
-                intent.putExtra(WebActivity.INTENT_TITLE, "任务提交示意");
-                startActivity(intent);
+                Jump2View.getInstance().goWeb(activity, taskEty.getScreenshots(), "任务提交示意");
                 break;
             case R.id.web_text:
                 break;

+ 1 - 10
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailCreditCardAct.java

@@ -21,11 +21,8 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.CreditCard;
-import com.sheep.gamegroup.model.entity.Ext;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -37,13 +34,10 @@ import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
-import com.sheep.jiuyan.samllsheep.page.WebActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import org.greenrobot.eventbus.EventBus;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -214,10 +208,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                     G.showToast("任务截图为空");
                     return;
                 }
-                Intent intent = new Intent(activity, WebActivity.class);
-                intent.putExtra(WebActivity.INTENT_URL, taskEty.getScreenshots());
-                intent.putExtra(WebActivity.INTENT_TITLE, "任务提交示意");
-                startActivity(intent);
+                Jump2View.getInstance().goWeb(activity, taskEty.getScreenshots(), "任务提交示意");
                 break;
             case R.id.web_text:
                 break;

+ 0 - 255
app/src/main/java/com/sheep/gamegroup/view/adapter/DownLoadTvAdp.java

@@ -1,255 +0,0 @@
-package com.sheep.gamegroup.view.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.alibaba.fastjson.JSONObject;
-import com.kfzs.duanduan.utils.dlg.DeviceUtils;
-import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.presenter.TaskDialogPresenter;
-import com.sheep.gamegroup.util.DeviceUtil;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.download.DownloadInfo;
-import com.sheep.jiuyan.samllsheep.download.DownloadManager;
-import com.sheep.jiuyan.samllsheep.download.DownloadState;
-import com.sheep.jiuyan.samllsheep.download.DownloadViewHolder;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-
-import org.xutils.common.Callback;
-import org.xutils.ex.DbException;
-import org.xutils.x;
-
-import java.io.File;
-import java.util.List;
-
-
-/**
- * Created by ljy on 2018/3/25.
- */
-
-public class DownLoadTvAdp extends BaseAdapter {
-    private Context mContext;
-    private final LayoutInflater mInflater;
-    private DownloadManager downloadManager;
-    private List<DownloadInfo> infoList;
-    private int taskType;
-    TaskDialogPresenter preference;
-    private TaskEty task_entity;
-
-    public DownLoadTvAdp(Context mContext,List<DownloadInfo> infoList) {
-        this.infoList = infoList;
-        this.mContext = mContext;
-        this.mInflater = LayoutInflater.from(mContext);
-        downloadManager = DownloadManager.getInstance();
-    }
-
-    /**
-     *
-     * @param taskType
-     */
-    public void setTaskState(int taskType){
-        this.taskType = taskType;
-    }
-    public void addTaskPreference(TaskDialogPresenter preference){
-        this.preference = preference;
-    }
-    public void addTaskEty(TaskEty task_entity){
-        this.task_entity = task_entity;
-    }
-
-
-    @Override
-    public int getCount() {
-        return infoList.size();
-    }
-
-    @Override
-    public Object getItem(int i) {
-        return infoList.get(i);
-    }
-
-    @Override
-    public long getItemId(int i) {
-        return i;
-    }
-
-
-    @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
-        DownloadItemViewHolder holder = null;
-        DownloadInfo downloadInfo = (DownloadInfo) getItem(i);
-        if (view == null) {
-            view = mInflater.inflate(R.layout.dowanload_tv_item, null);
-            holder = new DownloadItemViewHolder(view, downloadInfo);
-            view.setTag(holder);
-        } else {
-            holder = (DownloadItemViewHolder) view.getTag();
-            holder.update(downloadInfo);
-        }
-        if(taskType == 0){//开始任务
-            holder.start_task_tv.setText("开始任务");
-        }else if(taskType == 1){
-            holder.start_task_tv.setText("开始试玩");
-        }
-        else {
-            holder.refresh();
-            if (downloadInfo.getState().value() < DownloadState.FINISHED.value()) {
-                try {
-                    downloadManager.startDownload(
-                            downloadInfo.getPkgName(),
-                            downloadInfo.getUrl(),
-                            downloadInfo.getLabel(),
-                            downloadInfo.getFileSavePath(), "",
-                            downloadInfo.isAutoResume(),
-                            downloadInfo.isAutoRename(),
-                            holder);
-                } catch (DbException ex) {
-                    Toast.makeText(x.app(), "添加下载失败", Toast.LENGTH_LONG).show();
-                }
-            }
-        }
-
-        return view;
-    }
-
-    class DownloadItemViewHolder extends DownloadViewHolder implements View.OnClickListener {
-
-        private TextView start_task_tv;
-
-        public DownloadItemViewHolder(View view, DownloadInfo downloadInfo) {
-            super(view, downloadInfo);
-            start_task_tv = (TextView) view.findViewById(R.id.start_task_tv);
-            start_task_tv.setOnClickListener(this);
-        }
-
-        @Override
-        public void update(DownloadInfo downloadInfo) {
-            super.update(downloadInfo);
-        }
-
-        @Override
-        public void onWaiting() {
-            refresh();
-        }
-
-        @Override
-        public void onStarted() {
-            refresh();
-        }
-
-        @Override
-        public void onLoading(long total, long current) {
-            refresh();
-        }
-
-        @Override
-        public void onSuccess(File result) {
-            refresh();
-        }
-
-        @Override
-        public void onError(Throwable ex, boolean isOnCallback) {
-            refresh();
-        }
-
-        @Override
-        public void onCancelled(Callback.CancelledException cex) {
-            refresh();
-        }
-
-
-        public void refresh() {
-            start_task_tv.setText(downloadInfo.getProgress() + "%");
-            DownloadState state = downloadInfo.getState();
-            switch (state) {
-                case WAITING:
-                case STARTED:
-//                    if(downloadInfo.getProgress() == 0){
-//                        start_task_tv.setText("开始下载");
-//
-//                    }else if(downloadInfo.getProgress() == 100){
-//                        start_task_tv.setText("开始试玩");
-//                    }
-//                    else {
-//
-//                        start_task_tv.setText("继续");
-//                    }
-                    break;
-                case ERROR:
-                case STOPPED:
-                    start_task_tv.setText("继续");
-                    break;
-                case FINISHED:
-                    if (PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
-                        start_task_tv.setText("开始试玩");
-                    } else {
-                        start_task_tv.setText("安 装");
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        @Override
-        public void onClick(View view) {
-            switch (view.getId()) {
-                case R.id.start_task_tv:
-                    if(taskType == 0){
-                        startTask();
-                        return;
-                    }else if(taskType == 2){
-                        PackageUtil.startApp(SheepApp.mContext, getDownloadInfo().getPkgName());
-                        return;
-                    }
-                    DownloadState state = downloadInfo.getState();
-                    switch (state) {
-                        case WAITING:
-                        case STARTED:
-                            downloadManager.stopDownload(downloadInfo);
-                            break;
-                        case ERROR:
-                        case STOPPED:
-                            try {
-                                downloadManager.startDownload(
-                                        downloadInfo.getPkgName(),
-                                        downloadInfo.getUrl(),
-                                        downloadInfo.getLabel(),
-                                        downloadInfo.getFileSavePath(), "",
-                                        downloadInfo.isAutoResume(),
-                                        downloadInfo.isAutoRename(),
-                                        this);
-                            } catch (DbException ex) {
-                                Toast.makeText(x.app(), "添加下载失败", Toast.LENGTH_LONG).show();
-                            }
-                            break;
-                        case FINISHED:
-                            Toast.makeText(x.app(), "已经下载完成", Toast.LENGTH_LONG).show();
-                            if(PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())){
-                                PackageUtil.startApp(SheepApp.mContext, getDownloadInfo().getPkgName());
-                            }else{
-                                PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
-                            }
-
-                            break;
-                        default:
-                            break;
-                    }
-                    break;
-
-            }
-        }
-    }
-    private void startTask(){
-        JSONObject object = new JSONObject();
-        object.put("device_id", DeviceUtil.getDeviceId(mContext));
-        object.put("release_task_id", Integer.valueOf(task_entity.getRelease_task_id()+""));
-        preference.acceptedTask(object);
-    }
-}

+ 0 - 71
app/src/main/java/com/sheep/gamegroup/view/download/DownloadCallback.java

@@ -1,71 +0,0 @@
-package com.sheep.gamegroup.view.download;
-
-import android.app.Activity;
-
-import com.sheep.jiuyan.samllsheep.download.DownloadInfo;
-
-import org.xutils.common.Callback;
-
-import java.io.File;
-import java.lang.ref.WeakReference;
-
-/**
- * Created by ljy on 2018/3/24.
- */
-
-public class DownloadCallback implements
-        Callback.CommonCallback<File>,
-        Callback.ProgressCallback<File>,
-        Callback.Cancelable  {
-
-
-    private DownloadInfo downloadInfo;
-    private WeakReference<Activity> viewHolderRef;
-//    private DownloadManager downloadManager;
-    private boolean cancelled = false;
-    private Cancelable cancelable;
-    @Override
-    public void cancel() {
-
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return false;
-    }
-
-    @Override
-    public void onWaiting() {
-
-    }
-
-    @Override
-    public void onStarted() {
-
-    }
-
-    @Override
-    public void onLoading(long l, long l1, boolean b) {
-
-    }
-
-    @Override
-    public void onSuccess(File file) {
-
-    }
-
-    @Override
-    public void onError(Throwable throwable, boolean b) {
-
-    }
-
-    @Override
-    public void onCancelled(CancelledException e) {
-
-    }
-
-    @Override
-    public void onFinished() {
-
-    }
-}

+ 0 - 119
app/src/main/java/com/sheep/gamegroup/view/download/ProgressDownloader.java

@@ -1,119 +0,0 @@
-package com.sheep.gamegroup.view.download;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.FileChannel;
-
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.Interceptor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-
-/**
- * Created by ljy on 2018/3/27.
- */
-
-public class ProgressDownloader {
-    public static final String TAG = "ProgressDownloader";
-
-    private ProgressResponseBody.ProgressListener progressListener;
-    private String url;
-    private OkHttpClient client;
-    private File destination;
-    private Call call;
-
-    public ProgressDownloader(String url, File destination, ProgressResponseBody.ProgressListener progressListener) {
-        this.url = url;
-        this.destination = destination;
-        this.progressListener = progressListener;
-        //在下载、暂停后的继续下载中可复用同一个client对象
-        client = getProgressClient();
-    }
-    //每次下载需要新建新的Call对象
-    private Call newCall(long startPoints) {
-        Request request = new Request.Builder()
-                .url(url)
-                .header("RANGE", "bytes=" + startPoints + "-")//断点续传要用到的,指示下载的区间
-                .build();
-        return client.newCall(request);
-    }
-
-    public OkHttpClient getProgressClient() {
-        // 拦截器,用上ProgressResponseBody
-        Interceptor interceptor = new Interceptor() {
-            @Override
-            public Response intercept(Chain chain) throws IOException {
-                Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            }
-        };
-
-        return new OkHttpClient.Builder()
-                .addNetworkInterceptor(interceptor)
-                .build();
-    }
-
-    // startsPoint指定开始下载的点
-    public void download(final long startsPoint) {
-        call = newCall(startsPoint);
-        call.enqueue(new Callback() {
-            @Override
-            public void onFailure(Call call, IOException e) {
-
-            }
-
-            @Override
-            public void onResponse(Call call, Response response) throws IOException {
-                save(response, startsPoint);
-            }
-        });
-    }
-
-    public void pause() {
-        if(call!=null){
-            call.cancel();
-        }
-    }
-
-    private void save(Response response, long startsPoint) {
-        ResponseBody body = response.body();
-        InputStream in = body.byteStream();
-        FileChannel channelOut = null;
-        // 随机访问文件,可以指定断点续传的起始位置
-        RandomAccessFile randomAccessFile = null;
-        try {
-            randomAccessFile = new RandomAccessFile(destination, "rwd");
-            //Chanel NIO中的用法,由于RandomAccessFile没有使用缓存策略,直接使用会使得下载速度变慢,亲测缓存下载3.3秒的文件,用普通的RandomAccessFile需要20多秒。
-            channelOut = randomAccessFile.getChannel();
-            // 内存映射,直接使用RandomAccessFile,是用其seek方法指定下载的起始位置,使用缓存下载,在这里指定下载位置。
-            MappedByteBuffer mappedBuffer = channelOut.map(FileChannel.MapMode.READ_WRITE, startsPoint, body.contentLength());
-            byte[] buffer = new byte[1024];
-            int len;
-            while ((len = in.read(buffer)) != -1) {
-                mappedBuffer.put(buffer, 0, len);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }finally {
-            try {
-                in.close();
-                if (channelOut != null) {
-                    channelOut.close();
-                }
-                if (randomAccessFile != null) {
-                    randomAccessFile.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}

+ 0 - 70
app/src/main/java/com/sheep/gamegroup/view/download/ProgressResponseBody.java

@@ -1,70 +0,0 @@
-package com.sheep.gamegroup.view.download;
-
-import java.io.IOException;
-
-import okhttp3.MediaType;
-import okhttp3.ResponseBody;
-import okio.Buffer;
-import okio.BufferedSource;
-import okio.ForwardingSource;
-import okio.Okio;
-import okio.Source;
-
-/**
- * Created by ljy on 2018/3/27.
- */
-
-public class ProgressResponseBody extends ResponseBody {
-
-    public interface ProgressListener {
-        void onPreExecute(long contentLength);
-        void update(long totalBytes, boolean done);
-    }
-
-    private final ResponseBody responseBody;
-    private final ProgressListener progressListener;
-    private BufferedSource bufferedSource;
-
-    public ProgressResponseBody(ResponseBody responseBody,
-                                ProgressListener progressListener) {
-        this.responseBody = responseBody;
-        this.progressListener = progressListener;
-        if(progressListener!=null){
-            progressListener.onPreExecute(contentLength());
-        }
-    }
-
-    @Override
-    public MediaType contentType() {
-        return responseBody.contentType();
-    }
-
-    @Override
-    public long contentLength() {
-        return responseBody.contentLength();
-    }
-
-    @Override
-    public BufferedSource source() {
-        if (bufferedSource == null) {
-            bufferedSource = Okio.buffer(source(responseBody.source()));
-        }
-        return bufferedSource;
-    }
-
-    private Source source(Source source) {
-        return new ForwardingSource(source) {
-            long totalBytes = 0L;
-            @Override
-            public long read(Buffer sink, long byteCount) throws IOException {
-                long bytesRead = super.read(sink, byteCount);
-                // read() returns the number of bytes read, or -1 if this source is exhausted.
-                totalBytes += bytesRead != -1 ? bytesRead : 0;
-                if (null != progressListener) {
-                    progressListener.update(totalBytes, bytesRead == -1);
-                }
-                return bytesRead;
-            }
-        };
-    }
-}

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

@@ -38,10 +38,8 @@ public class SheepApp extends BaseApplication {
     public static SheepApp mSheepApp;
     public ConnectAddress connectAddress;
 
-    public static Map<String, Activity> mActivitys;
 
     private NetComponent netComponent;
-    private HttpComponent httpComponent;
 
     public static SheepApp get(Context context) {
 
@@ -69,38 +67,19 @@ public class SheepApp extends BaseApplication {
         mSheepApp = this;
         String flavor = SharedPreferences.getInstance().getString("flavor",BuildConfig.FLAVOR);
         connectAddress = ConnectAddress.valueOf(flavor);
-        regWx();
         registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
         initGoble();
         Bugly.init(getApplicationContext(), Config.BUGLY_APPID, BuildConfig.DEBUG);
         initNet();
     }
 
-    public HttpComponent getHttpComponent() {
-        return httpComponent;
-    }
-
-
-    public static void removeAllActivity() {
 
-        Iterator<Map.Entry<String, Activity>> it = mActivitys.entrySet().iterator();
-        while (it.hasNext()) {
-            Map.Entry<String, Activity> entry = it.next();
-            Activity a = entry.getValue();
-            a.finish();
-            it.remove();
-        }
-    }
 
 
     private void initNet() {
         netComponent = DaggerNetComponent.builder().netModule(new NetModule()).build();
-        httpComponent = DaggerHttpComponent.builder().httpModule(new HttpModule()).build();
     }
 
-    private void regWx() {
-        mActivitys = new HashMap<>();
-    }
 
     /**
      * 初始化系统常用参数

+ 0 - 300
app/src/main/java/com/sheep/jiuyan/samllsheep/adapter/DownListAdapter.java

@@ -1,300 +0,0 @@
-package com.sheep.jiuyan.samllsheep.adapter;
-
-import android.content.Context;
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.sheep.gamegroup.view.customview.FlikerProgressBar;
-import com.sheep.gamegroup.view.customview.SProgress;
-import com.sheep.gamegroup.view.customview.TextProgressBar;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.download.DownloadInfo;
-import com.sheep.jiuyan.samllsheep.download.DownloadManager;
-import com.sheep.jiuyan.samllsheep.download.DownloadState;
-import com.sheep.jiuyan.samllsheep.download.DownloadViewHolder;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-
-import org.xutils.common.Callback;
-import org.xutils.ex.DbException;
-import org.xutils.x;
-
-import java.io.File;
-
-
-/**
- * Created by Administrator on 2018/1/19.
- */
-
-public class DownListAdapter extends BaseAdapter {
-    private Context mContext;
-    private final LayoutInflater mInflater;
-    private DownloadManager downloadManager;
-
-    public DownListAdapter(Context context) {
-        mContext = context;
-        mInflater = LayoutInflater.from(mContext);
-        downloadManager = DownloadManager.getInstance();
-    }
-
-    @Override
-    public int getCount() {
-        if (downloadManager == null)
-            return 0;
-        return downloadManager.getDownloadListCount();
-    }
-
-    @Override
-    public Object getItem(int i) {
-        return downloadManager.getDownloadInfo(i);
-    }
-
-    @Override
-    public long getItemId(int i) {
-        return i;
-    }
-
-
-    @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
-        DownloadItemViewHolder holder = null;
-        DownloadInfo downloadInfo = downloadManager.getDownloadInfo(i);
-        if (view == null) {
-            view = mInflater.inflate(R.layout.down_item, null);
-            holder = new DownloadItemViewHolder(view, downloadInfo);
-            view.setTag(holder);
-        } else {
-            holder = (DownloadItemViewHolder) view.getTag();
-            holder.update(downloadInfo);
-        }
-        holder.refreshkem();
-        if (downloadInfo.getState().value() < DownloadState.FINISHED.value()) {
-            try {
-                downloadManager.startDownload(
-                        downloadInfo.getPkgName(),
-                        downloadInfo.getUrl(),
-                        downloadInfo.getLabel(),
-                        downloadInfo.getFileSavePath(), "",
-                        downloadInfo.isAutoResume(),
-                        downloadInfo.isAutoRename(),
-                        holder);
-            } catch (DbException ex) {
-                Toast.makeText(x.app(), "添加下载失败", Toast.LENGTH_LONG).show();
-            }
-        }
-        return view;
-    }
-
-    class DownloadItemViewHolder extends DownloadViewHolder implements View.OnClickListener {
-
-        private ImageView ImageView;
-        private TextView tv_game_name;
-        private ImageView iv_state;
-        private ImageView iv_remove;
-        private SProgress pb_download;
-        private TextView tv_prorgess;
-        private View ll_install;
-
-        public DownloadItemViewHolder(View view, DownloadInfo downloadInfo) {
-            super(view, downloadInfo);
-            ImageView = (ImageView) view.findViewById(R.id.img_icon);
-            tv_game_name = (TextView) view.findViewById(R.id.tv_game_name);
-            iv_state = (ImageView) view.findViewById(R.id.iv_state);
-            pb_download = (SProgress) view.findViewById(R.id.pb_download);
-            iv_remove = (ImageView) view.findViewById(R.id.iv_remove);
-            tv_prorgess = (TextView) view.findViewById(R.id.tv_prorgess);
-            ll_install = view.findViewById(R.id.ll_install);
-            Glide.with(mContext)
-                    .load(downloadInfo.getIcon())
-                    .apply(new RequestOptions().placeholder(R.drawable.icon)
-                    .dontAnimate())
-                    .into(ImageView);
-            iv_state.setOnClickListener(this);
-            iv_remove.setOnClickListener(this);
-            tv_prorgess.setOnClickListener(this);
-            ll_install.setOnClickListener(this);
-        }
-
-        @Override
-        public void update(DownloadInfo downloadInfo) {
-            super.update(downloadInfo);
-            Glide.with(mContext)
-                    .load(downloadInfo.getIcon())
-                    .apply(new RequestOptions().placeholder(R.drawable.icon)
-                    .dontAnimate())
-                    .into(ImageView);
-        }
-
-        @Override
-        public void onWaiting() {
-            refresh();
-        }
-
-        @Override
-        public void onStarted() {
-            refresh();
-        }
-
-        @Override
-        public void onLoading(long total, long current) {
-            refresh();
-        }
-
-        @Override
-        public void onSuccess(File result) {
-            refresh();
-        }
-
-        @Override
-        public void onError(Throwable ex, boolean isOnCallback) {
-            refresh();
-        }
-
-        @Override
-        public void onCancelled(Callback.CancelledException cex) {
-            refresh();
-        }
-
-        public void refresh() {
-            tv_game_name.setText(downloadInfo.getLabel());
-            pb_download.setProgress(downloadInfo.getProgress());
-            tv_prorgess.setText(downloadInfo.getProgress() + "%");
-            DownloadState state = downloadInfo.getState();
-            switch (state) {
-                case WAITING:
-                case STARTED:
-                    iv_state.setImageResource(R.drawable.icon_stop);
-                    break;
-                case ERROR:
-                case STOPPED:
-                    iv_state.setImageResource(R.drawable.icon_begin);
-                    break;
-                case FINISHED:
-                    iv_state.setVisibility(View.GONE);
-                    if (PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
-                        tv_prorgess.setText("已安装");
-                    } else {
-                        tv_prorgess.setText("安 装");
-                        PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
-                    }
-                    break;
-                default:
-                    iv_state.setImageResource(R.drawable.icon_begin);
-                    break;
-            }
-        }
-
-        public void refreshkem() {
-            tv_game_name.setText(downloadInfo.getLabel());
-            pb_download.setProgress(downloadInfo.getProgress());
-            tv_prorgess.setText(downloadInfo.getProgress() + "%");
-            DownloadState state = downloadInfo.getState();
-            switch (state) {
-                case WAITING:
-                case STARTED:
-                    iv_state.setImageResource(R.drawable.icon_stop);
-                    break;
-                case ERROR:
-                case STOPPED:
-                    iv_state.setImageResource(R.drawable.icon_begin);
-                    break;
-                case FINISHED:
-                    iv_state.setVisibility(View.GONE);
-                    if (PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
-                        tv_prorgess.setText("已安装");
-                    } else {
-                        tv_prorgess.setText("安 装");
-                    }
-                    break;
-                default:
-                    iv_state.setImageResource(R.drawable.icon_begin);
-                    break;
-            }
-        }
-
-        @Override
-        public void onClick(View view) {
-            switch (view.getId()) {
-                case R.id.iv_state:
-                    DownloadState state = downloadInfo.getState();
-                    switch (state) {
-                        case WAITING:
-                        case STARTED:
-                            downloadManager.stopDownload(downloadInfo);
-                            break;
-                        case ERROR:
-                        case STOPPED:
-                            try {
-                                downloadManager.startDownload(
-                                        downloadInfo.getPkgName(),
-                                        downloadInfo.getUrl(),
-                                        downloadInfo.getLabel(),
-                                        downloadInfo.getFileSavePath(), "",
-                                        downloadInfo.isAutoResume(),
-                                        downloadInfo.isAutoRename(),
-                                        this);
-                            } catch (DbException ex) {
-                                Toast.makeText(x.app(), "添加下载失败", Toast.LENGTH_LONG).show();
-                            }
-                            break;
-                        case FINISHED:
-                            Toast.makeText(x.app(), "已经下载完成", Toast.LENGTH_LONG).show();
-                            if(PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())){
-                                PackageUtil.startApp(SheepApp.mContext, getDownloadInfo().getPkgName());
-                            }else{
-                                PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
-                            }
-
-                            break;
-                        default:
-                            break;
-                    }
-                    break;
-                case R.id.iv_remove:
-                    try {
-                        downloadManager.removeDownload(downloadInfo);
-                        File file = new File(downloadInfo.getFileSavePath());
-                        if (file.exists()) {
-                            file.delete();
-                        }
-                        notifyDataSetChanged();
-                        refresh();
-                    } catch (DbException e) {
-                        Toast.makeText(x.app(), "移除任务失败", Toast.LENGTH_LONG).show();
-                    }
-                    break;
-
-                case R.id.tv_prorgess:
-                case R.id.ll_install:
-                    DownloadState states = downloadInfo.getState();
-                    switch (states) {
-                        case FINISHED:
-                            if (!PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
-                                PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
-                            }else{
-                                PackageUtil.startApp(SheepApp.mContext, getDownloadInfo().getPkgName());
-                            }
-                            break;
-                    }
-                    break;
-
-            }
-        }
-    }
-
-}
-
-
-
-
-
-

+ 0 - 56
app/src/main/java/com/sheep/jiuyan/samllsheep/base/AppActivity.java

@@ -1,56 +0,0 @@
-package com.sheep.jiuyan.samllsheep.base;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.event.FloatMsg;
-
-import org.greenrobot.eventbus.EventBus;
-
-/**
- * Created by Administrator on 2018/1/7.
- */
-
-public class AppActivity extends AppCompatActivity{
-    private String mName;
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mName = this.getClass().getSimpleName();
-        SheepApp.mActivitys.put(mName, this);
-    }
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (SheepApp.mSheepApp.mActivityAount > 0) {
-            FloatMsg floatMsg = new FloatMsg();
-            floatMsg.shouldShow = false;
-            EventBus.getDefault().post(floatMsg);
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        SheepApp.mActivitys.remove(mName);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        if (SheepApp.mSheepApp.mActivityAount <= 0) {
-            FloatMsg floatMsg = new FloatMsg();
-            floatMsg.shouldShow = true;
-            EventBus.getDefault().post(floatMsg);
-        }
-    }
-
-
-}

+ 2 - 7
app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseActivity.java

@@ -1,26 +1,21 @@
 package com.sheep.jiuyan.samllsheep.base;
 
-import android.app.Activity;
 import android.app.ProgressDialog;
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
 import android.widget.Toast;
 
 import com.sheep.gamegroup.util.ActivityManager;
 
-import org.greenrobot.eventbus.EventBus;
-
 import butterknife.ButterKnife;
 
 /**
  * Created by kemllor on 2017/12/15.
  */
 
-public abstract class BaseActivity extends AppActivity  {
+public abstract class BaseActivity extends AppCompatActivity {
 
     protected ProgressDialog  mPd;
 

+ 0 - 48
app/src/main/java/com/sheep/jiuyan/samllsheep/download/DefaultDownloadViewHolder.java

@@ -1,48 +0,0 @@
-package com.sheep.jiuyan.samllsheep.download;
-
-import android.view.View;
-import android.widget.Toast;
-
-import org.xutils.common.Callback;
-import org.xutils.x;
-
-import java.io.File;
-
-/**
- * Created by wyouflf on 15/11/11.
- */
-public class DefaultDownloadViewHolder extends DownloadViewHolder {
-
-    public DefaultDownloadViewHolder(View view, DownloadInfo downloadInfo) {
-        super(view, downloadInfo);
-    }
-
-    @Override
-    public void onWaiting() {
-
-    }
-
-    @Override
-    public void onStarted() {
-
-    }
-
-    @Override
-    public void onLoading(long total, long current) {
-
-    }
-
-    @Override
-    public void onSuccess(File result) {
-        Toast.makeText(x.app(), "下载完成", Toast.LENGTH_LONG).show();
-    }
-
-    @Override
-    public void onError(Throwable ex, boolean isOnCallback) {
-        Toast.makeText(x.app(), "下载失败", Toast.LENGTH_LONG).show();
-    }
-
-    @Override
-    public void onCancelled(Callback.CancelledException cex) {
-    }
-}

+ 0 - 205
app/src/main/java/com/sheep/jiuyan/samllsheep/download/DowanLoadManagerDialog.java

@@ -1,205 +0,0 @@
-package com.sheep.jiuyan.samllsheep.download;
-
-import org.xutils.DbManager;
-import org.xutils.common.Callback;
-import org.xutils.common.task.PriorityExecutor;
-import org.xutils.common.util.LogUtil;
-import org.xutils.db.converter.ColumnConverterFactory;
-import org.xutils.ex.DbException;
-import org.xutils.http.RequestParams;
-import org.xutils.x;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
-
-/**
- * Created by ljy on 2018/3/27.
- */
-
-public class DowanLoadManagerDialog {
-
-    static {
-        // 注册DownloadState在数据库中的值类型映射
-        ColumnConverterFactory.registerColumnConverter(DownloadState.class, new DownloadStateConverter());
-    }
-
-    private static volatile DowanLoadManagerDialog instance;
-
-    private final static int MAX_DOWNLOAD_THREAD = 2; // 有效的值范围[1, 3], 设置为3时, 可能阻塞图片加载.
-
-    private final DbManager db;
-    private final Executor executor = new PriorityExecutor(MAX_DOWNLOAD_THREAD, true);
-    DownloadInfo downloadInfos;
-    private  DownloadCallbackDialog downloadCallbackDialog;
-
-    private DowanLoadManagerDialog() {
-        DbManager.DaoConfig daoConfig = new DbManager.DaoConfig()
-                .setDbName("downloads")
-                .setDbVersion(1);
-        db = x.getDb(daoConfig);
-        try {
-            List<DownloadInfo> infoList = db.selector(DownloadInfo.class).findAll();
-            if (infoList != null) {
-                for (DownloadInfo info : infoList) {
-                    if (info.getState().value() < DownloadState.FINISHED.value()) {
-                        info.setState(DownloadState.STOPPED);
-                    }
-                    downloadInfos = info;
-                }
-            }
-        } catch (DbException ex) {
-            LogUtil.e(ex.getMessage(), ex);
-        }
-    }
-
-    /*package*/
-    public static DowanLoadManagerDialog getInstance() {
-        if (instance == null) {
-            synchronized (DowanLoadManagerDialog.class) {
-                if (instance == null) {
-                    instance = new DowanLoadManagerDialog();
-                }
-            }
-        }
-        return instance;
-    }
-
-    public void updateDownloadInfo(DownloadInfo info) throws DbException {
-        db.update(info);
-    }
-
-    public int getDownloadListCount() {
-        return 0;
-    }
-
-    public DownloadInfo getDownloadInfo(int index) {
-        return downloadInfos;
-    }
-
-    public synchronized void startDownload(DownloadInfo downloadInfo,
-                                           DownloadViewHolder viewHolder) throws DbException {
-
-
-        // create download info
-        db.saveBindingId(downloadInfo);
-
-        // start downloading
-        if (viewHolder == null) {
-            viewHolder = new DefaultDownloadViewHolder(null, downloadInfo);
-        } else {
-            viewHolder.update(downloadInfo);
-        }
-        DownloadCallbackDialog callback = new DownloadCallbackDialog(viewHolder);
-        callback.setDownloadManager(this);
-        callback.switchViewHolder(viewHolder);
-        RequestParams params = new RequestParams(downloadInfo.getUrl());
-        params.setAutoResume(downloadInfo.isAutoResume());
-        params.setAutoRename(downloadInfo.isAutoRename());
-        params.setSaveFilePath(downloadInfo.getFileSavePath());
-        params.setExecutor(executor);
-        params.setCancelFast(true);
-        Callback.Cancelable cancelable = x.http().get(params, callback);
-        callback.setCancelable(cancelable);
-        downloadCallbackDialog = callback;
-
-        downloadInfos = downloadInfo;
-    }
-
-
-    public void stopDownload(int index) {
-        DownloadInfo downloadInfo = downloadInfos;
-        stopDownload(downloadInfo);
-    }
-
-    public void stopDownload(DownloadInfo downloadInfo) {
-        Callback.Cancelable cancelable = downloadCallbackDialog;
-        if (cancelable != null) {
-            cancelable.cancel();
-        }
-    }
-
-    public void stopAllDownload() {
-        if (downloadInfos != null) {
-            Callback.Cancelable cancelable = downloadCallbackDialog;
-            if (cancelable != null) {
-                cancelable.cancel();
-            }
-        }
-    }
-
-    public void removeDownload(int index) throws DbException {
-        DownloadInfo downloadInfo = downloadInfos;
-        db.delete(downloadInfo);
-        stopDownload(downloadInfo);
-        downloadInfos = null;
-    }
-
-    public void removeDownload(DownloadInfo downloadInfo) throws DbException {
-        db.delete(downloadInfo);
-        stopDownload(downloadInfo);
-        downloadInfo = null;
-    }
-    public synchronized DownloadInfo startDownloadOne(String pkg, String url, String label, String savePath, String imageUrl,
-                                                      boolean autoResume, boolean autoRename,
-                                                      DownloadViewHolder viewHolder) throws DbException {
-
-        String fileSavePath = new File(savePath).getAbsolutePath();
-        DownloadInfo downloadInfo = db.selector(DownloadInfo.class)
-                .where("label", "=", label)
-                .and("fileSavePath", "=", fileSavePath)
-                .findFirst();
-        if (downloadInfo != null) {
-            DownloadCallbackDialog callback = downloadCallbackDialog;
-            if (callback != null) {
-                if (viewHolder == null) {
-                    viewHolder = new DefaultDownloadViewHolder(null, downloadInfo);
-                }
-                if (callback.switchViewHolder(viewHolder)) {
-                    return downloadInfo;
-                } else {
-                    callback.cancel();
-                }
-            }
-        }
-
-        // create download info
-        if (downloadInfo == null) {
-            downloadInfo = new DownloadInfo();
-            downloadInfo.setUrl(url);
-            downloadInfo.setAutoRename(autoRename);
-            downloadInfo.setAutoResume(autoResume);
-            downloadInfo.setLabel(label);
-            downloadInfo.setFileSavePath(fileSavePath);
-            downloadInfo.setIcon(imageUrl);
-            downloadInfo.setState(DownloadState.STARTED);
-            downloadInfo.setPkgName(pkg);
-            db.saveBindingId(downloadInfo);
-        }
-
-        // start downloading
-        if (viewHolder == null) {
-            viewHolder = new DefaultDownloadViewHolder(null, downloadInfo);
-        } else {
-            viewHolder.update(downloadInfo);
-        }
-        DownloadCallbackDialog callback = new DownloadCallbackDialog(viewHolder);
-        callback.setDownloadManager(this);
-        callback.switchViewHolder(viewHolder);
-        RequestParams params = new RequestParams(url);
-        params.setAutoResume(downloadInfo.isAutoResume());
-        params.setAutoRename(downloadInfo.isAutoRename());
-        params.setSaveFilePath(downloadInfo.getFileSavePath());
-        params.setExecutor(executor);
-        params.setCancelFast(true);
-        Callback.Cancelable cancelable = x.http().get(params, callback);
-        callback.setCancelable(cancelable);
-        downloadCallbackDialog = callback;
-
-        downloadInfos = downloadInfo;
-        return downloadInfo;
-    }
-
-}

+ 0 - 181
app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadCallback.java

@@ -1,181 +0,0 @@
-package com.sheep.jiuyan.samllsheep.download;
-
-import org.xutils.common.Callback;
-import org.xutils.common.util.LogUtil;
-import org.xutils.ex.DbException;
-
-import java.io.File;
-import java.lang.ref.WeakReference;
-
-/**
- * Created by wyouflf on 15/11/10.
- */
-/*package*/ class DownloadCallback implements
-        Callback.CommonCallback<File>,
-        Callback.ProgressCallback<File>,
-        Callback.Cancelable {
-
-    private DownloadInfo downloadInfo;
-    private WeakReference<DownloadViewHolder> viewHolderRef;
-    private DownloadManager downloadManager;
-    private boolean cancelled = false;
-    private Cancelable cancelable;
-
-    public DownloadCallback(DownloadViewHolder viewHolder) {
-        this.switchViewHolder(viewHolder);
-    }
-
-    public boolean switchViewHolder(DownloadViewHolder viewHolder) {
-        if (viewHolder == null)
-            return false;
-
-        synchronized (DownloadCallback.class) {
-            if (downloadInfo != null) {
-                if (this.isStopped()) {
-                    return false;
-                }
-            }
-            this.downloadInfo = viewHolder.getDownloadInfo();
-            this.viewHolderRef = new WeakReference<DownloadViewHolder>(viewHolder);
-        }
-        return true;
-    }
-
-    public void setDownloadManager(DownloadManager downloadManager) {
-        this.downloadManager = downloadManager;
-    }
-
-    public void setCancelable(Cancelable cancelable) {
-        this.cancelable = cancelable;
-    }
-
-    private DownloadViewHolder getViewHolder() {
-        if (viewHolderRef == null)
-            return null;
-        DownloadViewHolder viewHolder = viewHolderRef.get();
-        if (viewHolder != null) {
-            DownloadInfo downloadInfo = viewHolder.getDownloadInfo();
-            if (this.downloadInfo != null && this.downloadInfo.equals(downloadInfo)) {
-                return viewHolder;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public void onWaiting() {
-        try {
-            downloadInfo.setState(DownloadState.WAITING);
-            downloadManager.updateDownloadInfo(downloadInfo);
-        } catch (DbException ex) {
-            LogUtil.e(ex.getMessage(), ex);
-        }
-        DownloadViewHolder viewHolder = this.getViewHolder();
-        if (viewHolder != null) {
-            viewHolder.onWaiting();
-        }
-    }
-
-    @Override
-    public void onStarted() {
-        try {
-            downloadInfo.setState(DownloadState.STARTED);
-            downloadManager.updateDownloadInfo(downloadInfo);
-        } catch (DbException ex) {
-            LogUtil.e(ex.getMessage(), ex);
-        }
-        DownloadViewHolder viewHolder = this.getViewHolder();
-        if (viewHolder != null) {
-            viewHolder.onStarted();
-        }
-    }
-
-    @Override
-    public void onLoading(long total, long current, boolean isDownloading) {
-        if (isDownloading) {
-            try {
-                downloadInfo.setState(DownloadState.STARTED);
-                downloadInfo.setFileLength(total);
-                downloadInfo.setProgress((int) (current * 100 / total));
-                downloadManager.updateDownloadInfo(downloadInfo);
-            } catch (DbException ex) {
-                LogUtil.e(ex.getMessage(), ex);
-            }
-            DownloadViewHolder viewHolder = this.getViewHolder();
-            if (viewHolder != null) {
-                viewHolder.onLoading(total, current);
-            }
-        }
-    }
-
-    @Override
-    public void onSuccess(File result) {
-        synchronized (DownloadCallback.class) {
-            try {
-                downloadInfo.setState(DownloadState.FINISHED);
-                downloadManager.updateDownloadInfo(downloadInfo);
-            } catch (DbException ex) {
-                LogUtil.e(ex.getMessage(), ex);
-            }
-            DownloadViewHolder viewHolder = this.getViewHolder();
-            if (viewHolder != null) {
-                viewHolder.onSuccess(result);
-            }
-        }
-    }
-
-    @Override
-    public void onError(Throwable ex, boolean isOnCallback) {
-        synchronized (DownloadCallback.class) {
-            try {
-                downloadInfo.setState(DownloadState.ERROR);
-                downloadManager.updateDownloadInfo(downloadInfo);
-            } catch (DbException e) {
-                LogUtil.e(e.getMessage(), e);
-            }
-            DownloadViewHolder viewHolder = this.getViewHolder();
-            if (viewHolder != null) {
-                viewHolder.onError(ex, isOnCallback);
-            }
-        }
-    }
-
-    @Override
-    public void onCancelled(CancelledException cex) {
-        synchronized (DownloadCallback.class) {
-            try {
-                downloadInfo.setState(DownloadState.STOPPED);
-                downloadManager.updateDownloadInfo(downloadInfo);
-            } catch (DbException ex) {
-                LogUtil.e(ex.getMessage(), ex);
-            }
-            DownloadViewHolder viewHolder = this.getViewHolder();
-            if (viewHolder != null) {
-                viewHolder.onCancelled(cex);
-            }
-        }
-    }
-
-    @Override
-    public void onFinished() {
-        cancelled = false;
-    }
-
-    private boolean isStopped() {
-        DownloadState state = downloadInfo.getState();
-        return isCancelled() || state.value() > DownloadState.STARTED.value();
-    }
-
-    @Override
-    public void cancel() {
-        cancelled = true;
-        if (cancelable != null) {
-            cancelable.cancel();
-        }
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancelled;
-    }
-}

+ 0 - 182
app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadCallbackDialog.java

@@ -1,182 +0,0 @@
-package com.sheep.jiuyan.samllsheep.download;
-
-import org.xutils.common.Callback;
-import org.xutils.common.util.LogUtil;
-import org.xutils.ex.DbException;
-
-import java.io.File;
-import java.lang.ref.WeakReference;
-
-/**
- * Created by ljy on 2018/3/27.
- */
-
-public class DownloadCallbackDialog implements
-        Callback.CommonCallback<File>,
-        Callback.ProgressCallback<File>,
-        Callback.Cancelable {
-
-    private DownloadInfo downloadInfo;
-    private WeakReference<DownloadViewHolder> viewHolderRef;
-    private DowanLoadManagerDialog downloadManager;
-    private boolean cancelled = false;
-    private Cancelable cancelable;
-
-    public DownloadCallbackDialog(DownloadViewHolder viewHolder) {
-        this.switchViewHolder(viewHolder);
-    }
-
-    public boolean switchViewHolder(DownloadViewHolder viewHolder) {
-        if (viewHolder == null)
-            return false;
-
-        synchronized (DownloadCallback.class) {
-            if (downloadInfo != null) {
-                if (this.isStopped()) {
-                    return false;
-                }
-            }
-            this.downloadInfo = viewHolder.getDownloadInfo();
-            this.viewHolderRef = new WeakReference<DownloadViewHolder>(viewHolder);
-        }
-        return true;
-    }
-
-    public void setDownloadManager(DowanLoadManagerDialog downloadManager) {
-        this.downloadManager = downloadManager;
-    }
-
-    public void setCancelable(Cancelable cancelable) {
-        this.cancelable = cancelable;
-    }
-
-    private DownloadViewHolder getViewHolder() {
-        if (viewHolderRef == null)
-            return null;
-        DownloadViewHolder viewHolder = viewHolderRef.get();
-        if (viewHolder != null) {
-            DownloadInfo downloadInfo = viewHolder.getDownloadInfo();
-            if (this.downloadInfo != null && this.downloadInfo.equals(downloadInfo)) {
-                return viewHolder;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public void onWaiting() {
-        try {
-            downloadInfo.setState(DownloadState.WAITING);
-            downloadManager.updateDownloadInfo(downloadInfo);
-        } catch (DbException ex) {
-            LogUtil.e(ex.getMessage(), ex);
-        }
-        DownloadViewHolder viewHolder = this.getViewHolder();
-        if (viewHolder != null) {
-            viewHolder.onWaiting();
-        }
-    }
-
-    @Override
-    public void onStarted() {
-        try {
-            downloadInfo.setState(DownloadState.STARTED);
-            downloadManager.updateDownloadInfo(downloadInfo);
-        } catch (DbException ex) {
-            LogUtil.e(ex.getMessage(), ex);
-        }
-        DownloadViewHolder viewHolder = this.getViewHolder();
-        if (viewHolder != null) {
-            viewHolder.onStarted();
-        }
-    }
-
-    @Override
-    public void onLoading(long total, long current, boolean isDownloading) {
-        if (isDownloading) {
-            try {
-                downloadInfo.setState(DownloadState.STARTED);
-                downloadInfo.setFileLength(total);
-                downloadInfo.setProgress((int) (current * 100 / total));
-                downloadManager.updateDownloadInfo(downloadInfo);
-            } catch (DbException ex) {
-                LogUtil.e(ex.getMessage(), ex);
-            }
-            DownloadViewHolder viewHolder = this.getViewHolder();
-            if (viewHolder != null) {
-                viewHolder.onLoading(total, current);
-            }
-        }
-    }
-
-    @Override
-    public void onSuccess(File result) {
-        synchronized (DownloadCallback.class) {
-            try {
-                downloadInfo.setState(DownloadState.FINISHED);
-                downloadManager.updateDownloadInfo(downloadInfo);
-            } catch (DbException ex) {
-                LogUtil.e(ex.getMessage(), ex);
-            }
-            DownloadViewHolder viewHolder = this.getViewHolder();
-            if (viewHolder != null) {
-                viewHolder.onSuccess(result);
-            }
-        }
-    }
-
-    @Override
-    public void onError(Throwable ex, boolean isOnCallback) {
-        synchronized (DownloadCallback.class) {
-            try {
-                downloadInfo.setState(DownloadState.ERROR);
-                downloadManager.updateDownloadInfo(downloadInfo);
-            } catch (DbException e) {
-                LogUtil.e(e.getMessage(), e);
-            }
-            DownloadViewHolder viewHolder = this.getViewHolder();
-            if (viewHolder != null) {
-                viewHolder.onError(ex, isOnCallback);
-            }
-        }
-    }
-
-    @Override
-    public void onCancelled(CancelledException cex) {
-        synchronized (DownloadCallback.class) {
-            try {
-                downloadInfo.setState(DownloadState.STOPPED);
-                downloadManager.updateDownloadInfo(downloadInfo);
-            } catch (DbException ex) {
-                LogUtil.e(ex.getMessage(), ex);
-            }
-            DownloadViewHolder viewHolder = this.getViewHolder();
-            if (viewHolder != null) {
-                viewHolder.onCancelled(cex);
-            }
-        }
-    }
-
-    @Override
-    public void onFinished() {
-        cancelled = false;
-    }
-
-    private boolean isStopped() {
-        DownloadState state = downloadInfo.getState();
-        return isCancelled() || state.value() > DownloadState.STARTED.value();
-    }
-
-    @Override
-    public void cancel() {
-        cancelled = true;
-        if (cancelable != null) {
-            cancelable.cancel();
-        }
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancelled;
-    }
-}

+ 0 - 157
app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadInfo.java

@@ -1,157 +0,0 @@
-package com.sheep.jiuyan.samllsheep.download;
-
-import org.xutils.db.annotation.Column;
-import org.xutils.db.annotation.Table;
-
-/**
- * Author: wyouflf
- * Date: 13-11-10
- * Time: 下午8:11
- */
-@Table(name = "download", onCreated = "CREATE UNIQUE INDEX index_name ON download(label,fileSavePath)")
-public class DownloadInfo {
-
-    public DownloadInfo() {
-    }
-
-    @Column(name = "id", isId = true)
-    private long id;
-
-    @Column(name = "state")
-    private DownloadState state = DownloadState.STOPPED;
-
-    @Column(name = "url")
-    private String url;
-
-    @Column(name = "Icon")
-    private String Icon;
-
-
-    @Column(name = "label")
-    private String label;
-
-    @Column(name = "pkgName")
-    private String pkgName;
-
-    @Column(name = "fileSavePath")
-    private String fileSavePath;
-
-    @Column(name = "progress")
-    private int progress;
-
-    @Column(name = "fileLength")
-    private long fileLength;
-
-    @Column(name = "autoResume")
-    private boolean autoResume;
-
-    @Column(name = "autoRename")
-    private boolean autoRename;
-
-
-    public String getPkgName() {
-        return pkgName;
-    }
-
-    public void setPkgName(String pkgName) {
-        this.pkgName = pkgName;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public DownloadState getState() {
-        return state;
-    }
-
-    public void setState(DownloadState state) {
-        this.state = state;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public String getFileSavePath() {
-        return fileSavePath;
-    }
-
-    public void setFileSavePath(String fileSavePath) {
-        this.fileSavePath = fileSavePath;
-    }
-
-    public int getProgress() {
-        return progress;
-    }
-
-    public void setProgress(int progress) {
-        this.progress = progress;
-    }
-
-    public long getFileLength() {
-        return fileLength;
-    }
-
-    public void setFileLength(long fileLength) {
-        this.fileLength = fileLength;
-    }
-
-    public boolean isAutoResume() {
-        return autoResume;
-    }
-
-    public void setAutoResume(boolean autoResume) {
-        this.autoResume = autoResume;
-    }
-
-    public boolean isAutoRename() {
-        return autoRename;
-    }
-
-    public void setAutoRename(boolean autoRename) {
-        this.autoRename = autoRename;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof DownloadInfo)) return false;
-
-        DownloadInfo that = (DownloadInfo) o;
-
-        if (id != that.id) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return (int) (id ^ (id >>> 32));
-    }
-
-
-    public String getIcon() {
-        return Icon;
-    }
-
-    public void setIcon(String icon) {
-        Icon = icon;
-    }
-}

+ 0 - 250
app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadManager.java

@@ -1,250 +0,0 @@
-package com.sheep.jiuyan.samllsheep.download;
-
-import org.xutils.DbManager;
-import org.xutils.common.Callback;
-import org.xutils.common.task.PriorityExecutor;
-import org.xutils.common.util.LogUtil;
-import org.xutils.db.converter.ColumnConverterFactory;
-import org.xutils.ex.DbException;
-import org.xutils.http.RequestParams;
-import org.xutils.x;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
-
-/**
- * Author: wyouflf
- * Date: 13-11-10
- * Time: 下午8:10
- */
-public final class DownloadManager {
-
-    static {
-        // 注册DownloadState在数据库中的值类型映射
-        ColumnConverterFactory.registerColumnConverter(DownloadState.class, new DownloadStateConverter());
-    }
-
-    private static volatile DownloadManager instance;
-
-    private final static int MAX_DOWNLOAD_THREAD = 2; // 有效的值范围[1, 3], 设置为3时, 可能阻塞图片加载.
-
-    private final DbManager db;
-    private final Executor executor = new PriorityExecutor(MAX_DOWNLOAD_THREAD, true);
-    private final List<DownloadInfo> downloadInfoList = new ArrayList<DownloadInfo>();
-    private final ConcurrentHashMap<DownloadInfo, DownloadCallback>
-            callbackMap = new ConcurrentHashMap<DownloadInfo, DownloadCallback>(5);
-
-    private DownloadManager() {
-        DbManager.DaoConfig daoConfig = new DbManager.DaoConfig()
-                .setDbName("download")
-                .setDbVersion(1);
-        db = x.getDb(daoConfig);
-        try {
-            List<DownloadInfo> infoList = db.selector(DownloadInfo.class).findAll();
-            if (infoList != null) {
-                for (DownloadInfo info : infoList) {
-                    if (info.getState().value() < DownloadState.FINISHED.value()) {
-                        info.setState(DownloadState.STOPPED);
-                    }
-                    downloadInfoList.add(info);
-                }
-            }
-        } catch (DbException ex) {
-            LogUtil.e(ex.getMessage(), ex);
-        }
-    }
-
-    /*package*/
-    public static DownloadManager getInstance() {
-        if (instance == null) {
-            synchronized (DownloadManager.class) {
-                if (instance == null) {
-                    instance = new DownloadManager();
-                }
-            }
-        }
-        return instance;
-    }
-
-    public void updateDownloadInfo(DownloadInfo info) throws DbException {
-        db.update(info);
-    }
-
-    public int getDownloadListCount() {
-        return downloadInfoList.size();
-    }
-
-    public DownloadInfo getDownloadInfo(int index) {
-        return downloadInfoList.get(index);
-    }
-
-    public synchronized void startDownload(String pkg, String url, String label, String savePath, String imageUrl,
-                                           boolean autoResume, boolean autoRename,
-                                           DownloadViewHolder viewHolder) throws DbException {
-
-        String fileSavePath = new File(savePath).getAbsolutePath();
-        DownloadInfo downloadInfo = db.selector(DownloadInfo.class)
-                .where("label", "=", label)
-                .and("fileSavePath", "=", fileSavePath)
-                .findFirst();
-        if (downloadInfo != null) {
-            DownloadCallback callback = callbackMap.get(downloadInfo);
-            if (callback != null) {
-                if (viewHolder == null) {
-                    viewHolder = new DefaultDownloadViewHolder(null, downloadInfo);
-                }
-                if (callback.switchViewHolder(viewHolder)) {
-                    return;
-                } else {
-                    callback.cancel();
-                }
-            }
-        }
-
-        // create download info
-        if (downloadInfo == null) {
-            downloadInfo = new DownloadInfo();
-            downloadInfo.setUrl(url);
-            downloadInfo.setAutoRename(autoRename);
-            downloadInfo.setAutoResume(autoResume);
-            downloadInfo.setLabel(label);
-            downloadInfo.setFileSavePath(fileSavePath);
-            downloadInfo.setIcon(imageUrl);
-            downloadInfo.setState(DownloadState.STARTED);
-            downloadInfo.setPkgName(pkg);
-            db.saveBindingId(downloadInfo);
-        }
-
-        // start downloading
-        if (viewHolder == null) {
-            viewHolder = new DefaultDownloadViewHolder(null, downloadInfo);
-        } else {
-            viewHolder.update(downloadInfo);
-        }
-        DownloadCallback callback = new DownloadCallback(viewHolder);
-        callback.setDownloadManager(this);
-        callback.switchViewHolder(viewHolder);
-        RequestParams params = new RequestParams(url);
-        params.setAutoResume(downloadInfo.isAutoResume());
-        params.setAutoRename(downloadInfo.isAutoRename());
-        params.setSaveFilePath(downloadInfo.getFileSavePath());
-        params.setExecutor(executor);
-        params.setCancelFast(true);
-        Callback.Cancelable cancelable = x.http().get(params, callback);
-        callback.setCancelable(cancelable);
-        callbackMap.put(downloadInfo, callback);
-
-        if (downloadInfoList.contains(downloadInfo)) {
-            int index = downloadInfoList.indexOf(downloadInfo);
-            downloadInfoList.remove(downloadInfo);
-            downloadInfoList.add(index, downloadInfo);
-        } else {
-            downloadInfoList.add(downloadInfo);
-        }
-    }
-
-
-    public void stopDownload(int index) {
-        DownloadInfo downloadInfo = downloadInfoList.get(index);
-        stopDownload(downloadInfo);
-    }
-
-    public void stopDownload(DownloadInfo downloadInfo) {
-        Callback.Cancelable cancelable = callbackMap.get(downloadInfo);
-        if (cancelable != null) {
-            cancelable.cancel();
-        }
-    }
-
-    public void stopAllDownload() {
-        for (DownloadInfo downloadInfo : downloadInfoList) {
-            Callback.Cancelable cancelable = callbackMap.get(downloadInfo);
-            if (cancelable != null) {
-                cancelable.cancel();
-            }
-        }
-    }
-
-    public void removeDownload(int index) throws DbException {
-        DownloadInfo downloadInfo = downloadInfoList.get(index);
-        db.delete(downloadInfo);
-        stopDownload(downloadInfo);
-        downloadInfoList.remove(index);
-    }
-
-    public void removeDownload(DownloadInfo downloadInfo) throws DbException {
-        db.delete(downloadInfo);
-        stopDownload(downloadInfo);
-        downloadInfoList.remove(downloadInfo);
-    }
-    public synchronized DownloadInfo startDownloadOne(String pkg, String url, String label, String savePath, String imageUrl,
-                                                   boolean autoResume, boolean autoRename,
-                                                   DownloadViewHolder viewHolder) throws DbException {
-
-        String fileSavePath = new File(savePath).getAbsolutePath();
-        DownloadInfo downloadInfo = db.selector(DownloadInfo.class)
-                .where("label", "=", label)
-                .and("fileSavePath", "=", fileSavePath)
-                .findFirst();
-        if (downloadInfo != null) {
-            DownloadCallback callback = callbackMap.get(downloadInfo);
-            if (callback != null) {
-                if (viewHolder == null) {
-                    viewHolder = new DefaultDownloadViewHolder(null, downloadInfo);
-                }
-                if (callback.switchViewHolder(viewHolder)) {
-                    return downloadInfo;
-                } else {
-                    callback.cancel();
-                }
-            }
-        }
-
-        // create download info
-        if (downloadInfo == null) {
-            downloadInfo = new DownloadInfo();
-            downloadInfo.setUrl(url);
-            downloadInfo.setAutoRename(autoRename);
-            downloadInfo.setAutoResume(autoResume);
-            downloadInfo.setLabel(label);
-            downloadInfo.setFileSavePath(fileSavePath);
-            downloadInfo.setIcon(imageUrl);
-            downloadInfo.setState(DownloadState.STARTED);
-            downloadInfo.setPkgName(pkg);
-            db.saveBindingId(downloadInfo);
-        }
-
-        // start downloading
-        if (viewHolder == null) {
-            viewHolder = new DefaultDownloadViewHolder(null, downloadInfo);
-        } else {
-            viewHolder.update(downloadInfo);
-        }
-        DownloadCallback callback = new DownloadCallback(viewHolder);
-        callback.setDownloadManager(this);
-        callback.switchViewHolder(viewHolder);
-        RequestParams params = new RequestParams(url);
-        params.setAutoResume(downloadInfo.isAutoResume());
-        params.setAutoRename(downloadInfo.isAutoRename());
-        params.setSaveFilePath(downloadInfo.getFileSavePath());
-        params.setExecutor(executor);
-        params.setCancelFast(true);
-        Callback.Cancelable cancelable = x.http().get(params, callback);
-        callback.setCancelable(cancelable);
-        callbackMap.put(downloadInfo, callback);
-
-        if (downloadInfoList.contains(downloadInfo)) {
-            int index = downloadInfoList.indexOf(downloadInfo);
-            downloadInfoList.remove(downloadInfo);
-            downloadInfoList.add(index, downloadInfo);
-        } else {
-            downloadInfoList.add(downloadInfo);
-        }
-        return downloadInfo;
-    }
-
-
-}

+ 0 - 35
app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadState.java

@@ -1,35 +0,0 @@
-package com.sheep.jiuyan.samllsheep.download;
-
-/**
- * Created by wyouflf on 15/11/10.
- */
-public enum DownloadState {
-    WAITING(0), STARTED(1), FINISHED(2), STOPPED(3), ERROR(4);
-
-    private final int value;
-
-    DownloadState(int value) {
-        this.value = value;
-    }
-
-    public int value() {
-        return value;
-    }
-
-    public static DownloadState valueOf(int value) {
-        switch (value) {
-            case 0:
-                return WAITING;
-            case 1:
-                return STARTED;
-            case 2:
-                return FINISHED;
-            case 3:
-                return STOPPED;
-            case 4:
-                return ERROR;
-            default:
-                return STOPPED;
-        }
-    }
-}

+ 0 - 28
app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadStateConverter.java

@@ -1,28 +0,0 @@
-package com.sheep.jiuyan.samllsheep.download;
-
-        import android.database.Cursor;
-
-        import org.xutils.db.converter.ColumnConverter;
-        import org.xutils.db.sqlite.ColumnDbType;
-
-/**
- * Created by wyouflf on 15/11/10.
- */
-public class DownloadStateConverter implements ColumnConverter<DownloadState> {
-
-    @Override
-    public DownloadState getFieldValue(Cursor cursor, int index) {
-        int dbValue = cursor.getInt(index);
-        return DownloadState.valueOf(dbValue);
-    }
-
-    @Override
-    public Object fieldValue2DbValue(DownloadState fieldValue) {
-        return fieldValue.value();
-    }
-
-    @Override
-    public ColumnDbType getColumnDbType() {
-        return ColumnDbType.INTEGER;
-    }
-}

+ 0 - 47
app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadViewHolder.java

@@ -1,47 +0,0 @@
-package com.sheep.jiuyan.samllsheep.download;
-
-import android.app.Activity;
-import android.view.View;
-
-import org.xutils.common.Callback;
-import org.xutils.x;
-
-import java.io.File;
-
-/**
- * Created by wyouflf on 15/11/10.
- */
-public abstract class DownloadViewHolder {
-
-    protected DownloadInfo downloadInfo;
-
-    public DownloadViewHolder(View view, DownloadInfo downloadInfo) {
-        this.downloadInfo = downloadInfo;
-        x.view().inject(this, view);
-    }
-
-    public DownloadViewHolder(Activity activity, DownloadInfo downloadInfo) {
-        this.downloadInfo = downloadInfo;
-        x.view().inject(activity);
-    }
-
-    public final DownloadInfo getDownloadInfo() {
-        return downloadInfo;
-    }
-
-    public void update(DownloadInfo downloadInfo) {
-        this.downloadInfo = downloadInfo;
-    }
-
-    public abstract void onWaiting();
-
-    public abstract void onStarted();
-
-    public abstract void onLoading(long total, long current);
-
-    public abstract void onSuccess(File result);
-
-    public abstract void onError(Throwable ex, boolean isOnCallback);
-
-    public abstract void onCancelled(Callback.CancelledException cex);
-}

+ 0 - 9
app/src/main/java/com/sheep/jiuyan/samllsheep/event/FloatMsg.java

@@ -1,9 +0,0 @@
-package com.sheep.jiuyan.samllsheep.event;
-
-/**
- * Created by kemllor on 2017/12/20.
- */
-
-public class FloatMsg {
-    public boolean  shouldShow;
-}

+ 0 - 9
app/src/main/java/com/sheep/jiuyan/samllsheep/event/MainTab.java

@@ -1,9 +0,0 @@
-package com.sheep.jiuyan.samllsheep.event;
-
-/**
- * Created by kemllor on 2018/1/25.
- */
-
-public class MainTab {
-    public int index;
-}

+ 0 - 9
app/src/main/java/com/sheep/jiuyan/samllsheep/event/NewUserDialog.java

@@ -1,9 +0,0 @@
-package com.sheep.jiuyan.samllsheep.event;
-
-/**
- * Created by kemllor on 2018/1/24.
- */
-
-public class NewUserDialog {
-   public Boolean isDoneNewTask;  //是否完成新手任务。
-}

+ 0 - 280
app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/FloatService.java

@@ -1,280 +0,0 @@
-package com.sheep.jiuyan.samllsheep.floatwindow;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Service;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.graphics.PixelFormat;
-import android.graphics.Point;
-import android.os.Build;
-import android.os.IBinder;
-import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Toast;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.event.FloatMsg;
-import com.sheep.jiuyan.samllsheep.page.GameDetailActivity;
-import com.sheep.jiuyan.samllsheep.page.MainActivity;
-import com.sheep.jiuyan.samllsheep.page.ShotScreenActivity;
-import com.sheep.jiuyan.samllsheep.page.SplashActivity;
-import com.sheep.jiuyan.samllsheep.service.TopService;
-import com.sheep.jiuyan.samllsheep.utils.DeviceInfo;
-import com.sheep.jiuyan.samllsheep.utils.OpenService;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-import com.sheep.jiuyan.samllsheep.utils.PremissUtils;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.util.Map;
-
-
-public class FloatService extends Service implements View.OnClickListener {
-
-    private static final String TAG = "MainService";
-
-    LinearLayout mFloatwindow;
-    WindowManager.LayoutParams params;
-    WindowManager mWm;
-
-    ImageView floaticon;
-
-    //状态栏高度.
-    int statusBarHeight = -1;
-    private Point mSize;
-    private View mLeft;
-    private View mRight;
-
-    //不与Activity进行绑定.
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        Log.i(TAG, "MainService Created");
-        mSize = DeviceInfo.getDeviceSize(this);
-        createToucher();
-    }
-
-
-
-
-    private void createToucher() {
-        //赋值WindowManager&LayoutParam.
-        params = new WindowManager.LayoutParams();
-        if(mWm==null) {
-            mWm = (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE);
-        }
-        //设置type.系统提示型窗口,一般都在应用程序窗口之上.
-        //设置效果为背景透明.
-        params.format = PixelFormat.RGBA_8888;
-        //设置flags.不可聚焦及不可使用按钮对悬浮窗进行操控.
-        params.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
-                | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
-//
-//        //设置窗口初始停靠位置.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            //  大于等于 24 即为 7.0 及以上执行内容
-            Log.e("qx", "7.0");
-            params.type = WindowManager.LayoutParams.TYPE_PHONE; // 7.1
-        } else {
-            //  低于 24 即为 7.0 以下执行内容
-            params.type = WindowManager.LayoutParams.TYPE_TOAST;   // 4.4
-            Log.e("qx", "4.4");
-
-        }
-
-        params.gravity = Gravity.LEFT | Gravity.TOP;
-        params.x = 0;
-        params.y = DeviceInfo.dip2px(getApplicationContext(), 25);
-
-        //设置悬浮窗口长宽数据.
-        params.width = -2;
-        params.height = DeviceInfo.dip2px(getApplicationContext(), 40f);
-
-        LayoutInflater inflater = LayoutInflater.from(getApplication());
-        //获取浮动窗口视图所在布局.
-        mFloatwindow = (LinearLayout) inflater.inflate(R.layout.float_window, null);
-        //添加toucherlayout
-        Log.i(TAG, "toucherlayout-->left:" + mFloatwindow.getLeft());
-        Log.i(TAG, "toucherlayout-->right:" + mFloatwindow.getRight());
-        Log.i(TAG, "toucherlayout-->top:" + mFloatwindow.getTop());
-        Log.i(TAG, "toucherlayout-->bottom:" + mFloatwindow.getBottom());
-
-        //主动计算出当前View的宽高信息.
-        mFloatwindow.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
-
-        //用于检测状态栏高度.
-        int resourceId = getResources().getIdentifier("status_bar_height", "dimen", "android");
-        if (resourceId > 0) {
-            statusBarHeight = getResources().getDimensionPixelSize(resourceId);
-        }
-        Log.i(TAG, "状态栏高度为:" + statusBarHeight);
-
-        //浮动窗口按钮.
-        floaticon = (ImageView) mFloatwindow.findViewById(R.id.floate_icon);
-        mLeft = mFloatwindow.findViewById(R.id.ll_info_left);
-        mRight = mFloatwindow.findViewById(R.id.ll_info_right);
-        ImageView imgCommitRight = (ImageView) mFloatwindow.findViewById(R.id.img_commit_right);
-        ImageView imgCommitLeft = (ImageView) mFloatwindow.findViewById(R.id.img_commit_left);
-        ImageView imgOpenRight = (ImageView) mFloatwindow.findViewById(R.id.img_open_right);
-        ImageView imgOpenLeft = (ImageView) mFloatwindow.findViewById(R.id.img_open_left);
-
-        imgCommitRight.setOnClickListener(this);
-        imgCommitLeft.setOnClickListener(this);
-        imgOpenRight.setOnClickListener(this);
-        imgOpenLeft.setOnClickListener(this);
-        floaticon.setOnClickListener(this);
-
-        floaticon.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                params.x = (int) event.getRawX() - 20;
-                params.y = (int) event.getRawY() - 20 - statusBarHeight;
-                mWm.updateViewLayout(mFloatwindow, params);
-                switch (event.getAction()) {
-                    case MotionEvent.ACTION_UP:
-                    case MotionEvent.ACTION_CANCEL:
-                        int x = (int) event.getRawX();
-                        if (x > mSize.x / 2) {
-                            params.x = mSize.x;
-                        } else {
-                            params.x = 0;
-                        }
-                        mWm.updateViewLayout(mFloatwindow, params);
-                        break;
-                }
-                return false;
-            }
-        });
-    }
-
-    @Override
-    public void onDestroy() {
-        if (floaticon != null) {
-            mWm.removeView(mFloatwindow);
-        }
-        super.onDestroy();
-    }
-
-
-
-    /**
-     * 前往开启辅助服务界面
-     */
-    private void goAccess() {
-        Intent intent = new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(intent);
-
-        Intent intent2 = new Intent(this, TopService.class);
-        startService(intent2);
-
-    }
-
-
-    @Override
-    public void onClick(View v) {
-        Intent intent;
-        int i = v.getId();
-        if (i == R.id.img_commit_left || i == R.id.img_commit_right) {
-            mLeft.setVisibility(View.GONE);
-            mRight.setVisibility(View.GONE);
-            closeActivitys();
-            String pkg = PackageUtil.getLauncherTopApp(getApplicationContext());
-
-            if (TextUtils.isEmpty(pkg)) {
-                pkg = TopService.PackName;
-            }
-            if (TextUtils.isEmpty(pkg)) {
-                if (!new OpenService().isAccessibilitySettingsOn(this)) {
-                    AlertDialog.Builder  builder=    new AlertDialog.Builder(this)
-                            .setTitle("温馨提示!")
-                            .setMessage("亲!要赚钱需要手动开启小绵羊辅助功能哟!")
-                            .setPositiveButton("去开启", new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    goAccess();
-                                }
-                            });
-                    builder.setCancelable(false);
-                    builder.show();
-                    return ;
-                }
-
-            }
-            intent = new Intent(FloatService.this, ShotScreenActivity.class);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.putExtra("pkg", pkg);
-            startActivity(intent);
-
-        } else if (i == R.id.img_open_left || i == R.id.img_open_right) {
-            mLeft.setVisibility(View.GONE);
-            mRight.setVisibility(View.GONE);
-            if (!TextUtils.isEmpty(SpUtils.getOpenId(getApplicationContext()))) {
-                intent = new Intent(getApplicationContext(), MainActivity.class);
-            } else {
-                intent = new Intent(getApplicationContext(), SplashActivity.class);
-            }
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(intent);
-
-        } else if (i == R.id.floate_icon) {
-            int[] ints = new int[2];
-            v.getLocationOnScreen(ints);
-            if (ints[0] > mSize.x / 2) {
-                if (mLeft.getVisibility() == View.GONE) {
-                    mLeft.setVisibility(View.VISIBLE);
-                    mRight.setVisibility(View.GONE);
-                } else {
-                    mLeft.setVisibility(View.GONE);
-                }
-            } else {
-                if (mRight.getVisibility() == View.GONE) {
-                    mRight.setVisibility(View.VISIBLE);
-                    mLeft.setVisibility(View.GONE);
-                } else {
-                    mRight.setVisibility(View.GONE);
-                }
-            }
-
-        }
-    }
-
-    private void closeActivitys() {
-        for (Map.Entry<String, Activity> entry : SheepApp.mActivitys.entrySet()) {
-            entry.getValue().finish();
-        }
-    }
-
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(FloatMsg event) {
-        if (event.shouldShow) {
-            if (mFloatwindow != null && !mFloatwindow.isAttachedToWindow()) {
-                mWm.addView(mFloatwindow, params);
-            }
-        } else {
-            if (mFloatwindow != null && mFloatwindow.isAttachedToWindow())
-                mWm.removeViewImmediate(mFloatwindow);
-        }
-    }
-}

+ 0 - 21
app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/FloatWindow.java

@@ -1,21 +0,0 @@
-package com.sheep.jiuyan.samllsheep.floatwindow;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.widget.Toast;
-
-/**
- * Created by kemllor on 2017/12/13.
- */
-
-public class FloatWindow extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        finish();
-    }
-}

+ 0 - 214
app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/ShotScreen.java

@@ -1,214 +0,0 @@
-package com.sheep.jiuyan.samllsheep.floatwindow;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.PixelFormat;
-import android.hardware.display.DisplayManager;
-import android.hardware.display.VirtualDisplay;
-import android.media.Image;
-import android.media.ImageReader;
-import android.media.projection.MediaProjection;
-import android.media.projection.MediaProjectionManager;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Handler;
-import android.text.TextUtils;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.ref.SoftReference;
-import java.nio.ByteBuffer;
-
-/**
- * Created by kemllor on 2017/12/13.
- */
-
-public class ShotScreen {
-
-    private final SoftReference<Context> mRefContext;
-    private ImageReader mImageReader;
-
-    private MediaProjection mMediaProjection;
-    private VirtualDisplay mVirtualDisplay;
-
-    public String mLocalUrl = "";
-
-    private OnShotListener mOnShotListener;
-
-
-    public ShotScreen(Context context, Intent data) {
-        this.mRefContext = new SoftReference<>(context);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-
-
-            mMediaProjection = getMediaProjectionManager().getMediaProjection(Activity.RESULT_OK,
-                    data);
-
-            mImageReader = ImageReader.newInstance(
-                    getScreenWidth(),
-                    getScreenHeight(),
-                    PixelFormat.RGBA_8888,// a pixel两节省一些内存 个2个字节 此处RGB_565 必须和下面 buffer处理一致的格式
-                    1);
-        }
-    }
-
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    private void virtualDisplay() {
-
-        mVirtualDisplay = mMediaProjection.createVirtualDisplay("screen-mirror",
-                getScreenWidth(),
-                getScreenHeight(),
-                Resources.getSystem().getDisplayMetrics().densityDpi,
-                DisplayManager.VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR,
-                mImageReader.getSurface(), null, null);
-
-    }
-
-    public void startScreenShot(OnShotListener onShotListener, String loc_url) {
-        mLocalUrl = loc_url;
-        startScreenShot(onShotListener);
-    }
-
-
-    @TargetApi(Build.VERSION_CODES.KITKAT)
-    public void startScreenShot(OnShotListener onShotListener) {
-
-        mOnShotListener = onShotListener;
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-
-            virtualDisplay();
-
-            Handler handler = new Handler();
-
-            handler.postDelayed(new Runnable() {
-                                    @Override
-                                    public void run() {
-
-                                        Image image = mImageReader.acquireLatestImage();
-                                        //                                         AsyncTaskCompat.executeParallel(new SaveTask(), image);
-                                        new SaveTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, image);
-                                    }
-                                },
-                    1000);
-
-        }
-
-    }
-
-
-    public class SaveTask extends AsyncTask<Image, Void, Bitmap> {
-
-        @TargetApi(Build.VERSION_CODES.KITKAT)
-        @Override
-        protected Bitmap doInBackground(Image... params) {
-
-            if (params == null || params.length < 1 || params[0] == null) {
-
-                return null;
-            }
-
-            Image image = params[0];
-
-            int width = image.getWidth();
-            int height = image.getHeight();
-            final Image.Plane[] planes = image.getPlanes();
-            final ByteBuffer buffer = planes[0].getBuffer();
-            //每个像素的间距
-            int pixelStride = planes[0].getPixelStride();
-            //总的间距
-            int rowStride = planes[0].getRowStride();
-            int rowPadding = rowStride - pixelStride * width;
-            Bitmap bitmap = Bitmap.createBitmap(width + rowPadding / pixelStride, height,
-                    Bitmap.Config.ARGB_8888);
-            bitmap.copyPixelsFromBuffer(buffer);
-            bitmap = Bitmap.createBitmap(bitmap, 0, 0, width, height);
-            image.close();
-            File fileImage = null;
-            if (bitmap != null) {
-                try {
-                    if (TextUtils.isEmpty(mLocalUrl)) {
-                        mLocalUrl = getContext().getExternalFilesDir("screenshot").getAbsoluteFile()
-                                + "/task.png";
-                    }
-                    fileImage = new File(mLocalUrl);
-
-                    if (!fileImage.exists()) {
-                        fileImage.createNewFile();
-                    }
-                    FileOutputStream out = new FileOutputStream(fileImage);
-                    if (out != null) {
-                        bitmap.compress(Bitmap.CompressFormat.JPEG, 100, out);
-                        out.flush();
-                        out.close();
-                    }
-
-                } catch (FileNotFoundException e) {
-                    e.printStackTrace();
-                    fileImage = null;
-                } catch (IOException e) {
-                    e.printStackTrace();
-                    fileImage = null;
-                }
-            }
-
-            if (fileImage != null) {
-                return bitmap;
-            }
-            return null;
-        }
-
-        @TargetApi(Build.VERSION_CODES.KITKAT)
-        @Override
-        protected void onPostExecute(Bitmap bitmap) {
-            super.onPostExecute(bitmap);
-
-            if (bitmap != null && !bitmap.isRecycled()) {
-                bitmap.recycle();
-            }
-
-            if (mVirtualDisplay != null) {
-                mVirtualDisplay.release();
-            }
-
-            if (mOnShotListener != null) {
-                mOnShotListener.onFinish(mLocalUrl);
-            }
-
-        }
-    }
-
-
-    private MediaProjectionManager getMediaProjectionManager() {
-
-        return (MediaProjectionManager) getContext().getSystemService(
-                Context.MEDIA_PROJECTION_SERVICE);
-    }
-
-    private Context getContext() {
-        return mRefContext.get();
-    }
-
-
-    private int getScreenWidth() {
-        return Resources.getSystem().getDisplayMetrics().widthPixels;
-    }
-
-    private int getScreenHeight() {
-        return Resources.getSystem().getDisplayMetrics().heightPixels;
-    }
-
-
-    // a  call back listener
-    public interface OnShotListener {
-        void onFinish(String path);
-    }
-}

+ 0 - 35
app/src/main/java/com/sheep/jiuyan/samllsheep/net/BindUser.java

@@ -1,35 +0,0 @@
-package com.sheep.jiuyan.samllsheep.net;
-
-import android.app.Activity;
-import android.content.Context;
-import android.view.View;
-
-import com.sheep.jiuyan.samllsheep.page.entry.BindUserEntiey;
-import com.sheep.jiuyan.samllsheep.page.entry.WXTask;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-
-import java.util.HashMap;
-
-/**
- * Created by Administrator on 2018/1/7.
- */
-
-public class BindUser {
-    public static void  myBind(final Activity context, String token){
-        final HashMap<String, String> map = new HashMap<>();
-        map.put("token",token );
-        NetManager.get(Url.BINGACCOUNT, map, context, new SheepCallback<BindUserEntiey>(context) {
-
-            @Override
-            public void success(BindUserEntiey bindUser) {
-              SpUtils.login(context,bindUser.getOpenId());
-            }
-        });
-
-
-
-
-    }
-
-
-}

+ 0 - 119
app/src/main/java/com/sheep/jiuyan/samllsheep/net/NetManager.java

@@ -1,119 +0,0 @@
-package com.sheep.jiuyan.samllsheep.net;
-
-import android.content.Context;
-
-import com.readystatesoftware.chuck.ChuckInterceptor;
-import com.sheep.jiuyan.samllsheep.utils.AES;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import okhttp3.FormBody;
-import okhttp3.Headers;
-import okhttp3.MediaType;
-import okhttp3.MultipartBody;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-
-/**
- * Created by kemllor on 2017/12/14.
- */
-
-public class NetManager {
-
-    private static OkHttpClient mClint;
-
-    public static OkHttpClient getInstancce(Context context) {
-        if (mClint == null) {
-            ChuckInterceptor interceptor = new ChuckInterceptor(context);
-            interceptor.showNotification(false);
-
-            mClint = new OkHttpClient.Builder()
-                    .connectTimeout(30, TimeUnit.SECONDS)
-                    .readTimeout(30, TimeUnit.SECONDS)
-                    .writeTimeout(30, TimeUnit.SECONDS)
-                    .addInterceptor(interceptor)
-                    .build();
-        }
-        return mClint;
-    }
-
-
-    public static void get(String url, Map<String, String> parma, Context context, SheepCallback callback) {
-
-        if (parma != null) {
-            String param = "";
-            for (Map.Entry<String, String> el : parma.entrySet()) {
-                param += el.getKey() + "=" + el.getValue();
-                param += "&";
-            }
-            if (param.endsWith("&")) {
-                param = param.substring(0, param.length() - 1);
-            }
-            url += "?" + param;
-        }
-        Request request = new Request.Builder().url(url).get().build();
-        getInstancce(context).newCall(request).enqueue(callback);
-
-    }
-
-    public static void postForm(String url, Map<String, String> parma, Context context, SheepCallback callback) {
-        FormBody.Builder builder = new FormBody.Builder();
-        if (parma != null) {
-            for (Map.Entry<String, String> el : parma.entrySet()) {
-                builder.add(el.getKey(), el.getValue());
-            }
-
-        }
-        FormBody body = builder.build();
-        Request request = new Request.Builder().url(url).post(body).build();
-        getInstancce(context).newCall(request).enqueue(callback);
-    }
-
-    public static void post(String url, Map<String, String> parma, Context context, SheepCallback callback) {
-        JSONObject object = new JSONObject();
-        for (Map.Entry<String, String> el : parma.entrySet()) {
-            try {
-                object.put(el.getKey(), el.getValue());
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-        }
-        AES aes = new AES("kengdiewanyimmmp");
-        byte[] encrypt = aes.encrypt(object.toString().getBytes());
-        RequestBody body = RequestBody.create(MediaType.parse("text/html"), encrypt);
-        Request request = new Request.Builder().url(url).post(body).build();
-        getInstancce(context).newCall(request).enqueue(callback);
-    }
-
-    public static void upload(String url, Map<String, String> parma, File file, Context context, SheepCallback callback) {
-        String param = "";
-        for (Map.Entry<String, String> el : parma.entrySet()) {
-            param += el.getKey() + "=" + el.getValue();
-            param += "&";
-        }
-        url += "?" + param;
-        MediaType type = MediaType.parse("application/octet-stream");
-        RequestBody fileBody = RequestBody.create(type, file);
-
-        RequestBody multipartBody = new MultipartBody.Builder()
-                .setType(MultipartBody.FORM)
-                .addPart(Headers.of(
-                        "Content-Disposition",
-                        "form-data; name=\"file\"; filename=\"screenshot.png\""), fileBody)
-                .build();
-
-        Request request = new Request.Builder().url(url)
-                .addHeader("User-Agent", "android")
-                .header("Content-Type", "multipart/form-data")
-                .post(multipartBody)
-                .build();
-        getInstancce(context).newCall(request).enqueue(callback);
-    }
-}
-

+ 0 - 89
app/src/main/java/com/sheep/jiuyan/samllsheep/net/SheepCallback.java

@@ -1,89 +0,0 @@
-package com.sheep.jiuyan.samllsheep.net;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.widget.Toast;
-
-import com.google.gson.internal.$Gson$Types;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.GsonUtil;
-
-import java.io.IOException;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.Response;
-
-/**
- * Created by kemllor on 2017/12/21.
- */
-
-public abstract class SheepCallback<T> implements Callback {
-
-    Activity mActivity;
-    public Type mType;
-
-    public SheepCallback(Activity activity) {
-        mActivity = activity;
-        mType = getSuperclassTypeParameter(getClass());
-    }
-
-    @Override
-    public void onFailure(Call call, final IOException e) {
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Toast.makeText(SheepApp.mContext, "网络错误", Toast.LENGTH_SHORT).show();
-                failure(e);
-            }
-        });
-    }
-    @Override
-    public void onResponse(Call call, final Response response) throws IOException {
-        final int code = response.code();
-        final String string = response.body().string();
-        if (code == 200) {
-            final T data = (T) GsonUtil.getEntry(string, mType);
-            mActivity.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    success(data);
-                }
-            });
-
-        }else {
-            mActivity.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    otherCode(code, string);
-                }
-            });
-        }
-    }
-
-
-    public void otherCode(int code, String string) {
-        //       Toast.makeText(SheepApp.mContext, string, Toast.LENGTH_SHORT).show();
-        failure(new IOException(string));
-    }
-
-    public abstract void success(T t);
-
-    public void failure(IOException e) {
-
-    }
-
-    private static Type getSuperclassTypeParameter(Class<?> subclass) {
-        //得到带有泛型的类
-        Type superclass = subclass.getGenericSuperclass();
-        if (superclass instanceof Class) {
-            throw new RuntimeException("Missing type parameter.");
-        }
-        //取出当前类的泛型
-        ParameterizedType parameter = (ParameterizedType) superclass;
-        return $Gson$Types.canonicalize(parameter.getActualTypeArguments()[0]);
-    }
-
-}

+ 0 - 78
app/src/main/java/com/sheep/jiuyan/samllsheep/net/Url.java

@@ -1,78 +0,0 @@
-package com.sheep.jiuyan.samllsheep.net;
-
-import com.sheep.jiuyan.samllsheep.Config;
-
-/**
- * Created by kemllor on 2017/12/14.
- */
-
-public interface Url {
-    //上传图片&提交任务
-     String UPLOAD_IMG = Config.instance().mBaseUrl + "/v1/up/";
-    //获取任务列表
-    String PUBLISH_TASKS = Config.instance().mBaseUrl + "/v1/task_publish/getTasks/";
-    //绑定微信
-     String BIND_WX = Config.instance().mBaseUrl + "/v1/user/bindWx";
-    //获取机器人
-   String BIND_ROBOT = Config.instance().mBaseUrl + "/v1/user/getRobot";
-    //用户信息
-    String USER_INFO = Config.instance().mBaseUrl + "/v1/user/getUserInfo";
-    //提交记录
-    String USER_COMMIT = Config.instance().mBaseUrl + "/v1/user/getDoneTask";
-    //是否接受任务
-   String USER_CHECK_REGISTER = Config.instance().mBaseUrl + "/v1/task_publish/getRegisterTask";
-    //接受任务
-     String USER_REGISTER_TASK = Config.instance().mBaseUrl + "/v1/task_publish/registerTask";
-    //进行中的任务
-    String USER_PULL_TASK = Config.instance().mBaseUrl + "/v1/task_publish/getDoingTask";
-    //提现记录
-    String USER_WITHDRAW_RECORD = Config.instance().mBaseUrl + "/v1/withDraw/getHistroyCommit";
-    //提现
-     String USER_WITHDRAW = Config.instance().mBaseUrl + "/v1/withDraw/withDraw";
-    //新手任务
-     String WXTASK = Config.instance().mBaseUrl + "/v1/task_publish/getWxTask";
-    //资金记录
-    String MONEYRECORD = Config.instance().mBaseUrl + "/v1/user/getMoneyRecord";
-    //任务数量
-     String GET_TASK_COUNT = Config.instance().mBaseUrl + "/v1/user/getTaskCount";
-    //微信列表
-     String WXACCOUNT = Config.instance().mBaseUrl + "/v1/user/userChildWxList";
-    //微信任务列表
-     String TASK_LIST = Config.instance().mBaseUrl + "/v1/user/getChildTaskList";
-    //提交微信
-     String COMMIT_WXACCOUNT = Config.instance().mBaseUrl + "/v1/user/commitWx";
-
-     String BINGACCOUNT = Config.instance().mBaseUrl + "/v1/user/register";
-    //微信指导
-      String REQUEST_HOOK = Config.instance().mBaseUrl + "/static/index.html";
-    //提供微信号页面
-     String ADD_CHILD_WX = Config.instance().mBaseUrl + "/static/apply3.html";
-    //任务引导
-     String TASK_GUIDE = Config.instance().mBaseUrl + "/static/task_guidance.html";
-    //登录好玩
-    String LOGIN = Config.instance().mBaseUrl + "/v1/user/login";
-    //授权
-     String REGISTER_SHEEP = Config.instance().mBaseUrl + "/v1/user/register";
-    //注册好玩
-     String REGISTER_HW = Config.instance().mBaseUrl + "/v1/user/registerHw";
-    //邀请链接
-    String USER_INVITE_URL = Config.instance().mBaseUrl + "/v1/user/getInviteUrl";
-    //新手任务
-     String NEW_USER_TASK_LIST = Config.instance().mBaseUrl + "/v1/newbie/";
-    //好友信息
-     String USER_INVITE_INFO = Config.instance().mBaseUrl + "/v1/search/statistics";
-    //是否完成新手任务
-     String USER_ISFINISH_NEW_TASK = Config.instance().mBaseUrl + "/v1/newbie/can_receive";
-    //获取完成新手任务礼包
-     String GET_NEW_TASK_RED = Config.instance().mBaseUrl + "/v1/newbie/receive";
-    //新手任务奖励
-     String GET_NEW_TASK_MONEY = Config.instance().mBaseUrl + "/v1/newbie/know_the_sheep";
-      //重置密码中的发送验证码
-     String  GET_RESET_PWD_CODE=Config.instance().mBaseUrl + "/v1/user/findPwd";
-
-      //线下面对面推广
-     String FACE_2_FACE = Config.instance().mBaseUrl + "/static/poster.html";
-     //绑定手机账号
-     String   BINDUSER = Config.instance().mBaseUrl + "/v1/user/bind";
-
-}

+ 0 - 287
app/src/main/java/com/sheep/jiuyan/samllsheep/page/AskFriendActivity.java

@@ -1,287 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.app.AlertDialog;
-import android.media.MediaRouter;
-import android.net.Uri;
-import android.os.Environment;
-import android.provider.MediaStore;
-import android.text.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.drawable.ColorDrawable;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.bumptech.glide.Glide;
-import com.orhanobut.logger.Logger;
-import com.sheep.gamegroup.util.AppUtil;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.entry.InviteUrl;
-import com.sheep.jiuyan.samllsheep.page.entry.UerInviteInfo;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-import com.zhy.http.okhttp.OkHttpUtils;
-import com.zhy.http.okhttp.callback.FileCallBack;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-
-import okhttp3.Call;
-
-/**
- * Created by Administrator on 2018/1/24.
- */
-
-public class AskFriendActivity extends BaseActivity implements View.OnClickListener {
-    private TextView tv_reward_size;
-    private TextView tv_friend_size;
-    private TextView tv_proportion_size;
-    private RelativeLayout rl_emw;
-    private RelativeLayout rl_link;
-    private RelativeLayout rl_face;
-
-    private String shareLink;
-    private TextView tv_today_size;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_ask_friend;
-    }
-
-    @Override
-    public void initView() {
-        tv_reward_size = (TextView) findViewById(R.id.tv_reward_size);
-        tv_friend_size = (TextView) findViewById(R.id.tv_friend_size);
-        tv_today_size = (TextView) findViewById(R.id.tv_today_size);
-        tv_proportion_size = (TextView) findViewById(R.id.tv_proportion_size);
-        rl_emw = (RelativeLayout) findViewById(R.id.rl_emw);
-        rl_link = (RelativeLayout) findViewById(R.id.rl_link);
-        rl_face=(RelativeLayout) findViewById(R.id.rl_face);
-        TitleBarUtils.getInstance().setTitle(this, "邀请好友").setTitleFinish(this);
-
-    }
-
-    @Override
-    public void initListener() {
-        rl_emw.setOnClickListener(this);
-        rl_link.setOnClickListener(this);
-        rl_face.setOnClickListener(this);
-    }
-
-    @Override
-    public void initData() {
-        getShareLink();
-        getInviteInfo();
-    }
-
-    private void getInviteInfo() {
-        showProgress();
-        HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(this));
-        NetManager.get(Url.USER_INVITE_INFO, map, getApplicationContext(), new SheepCallback<UerInviteInfo>(this) {
-            @Override
-            public void success(UerInviteInfo uerInviteInfo) {
-                 hideProgress();
-                if (uerInviteInfo != null && uerInviteInfo.getUser() != null) {
-                    tv_reward_size.setText(uerInviteInfo.getUser().getCommission());
-                    tv_friend_size.setText(uerInviteInfo.getUser().getInviteNum());
-                    tv_proportion_size.setText(uerInviteInfo.getUser().getProportion());
-                    tv_today_size.setText(uerInviteInfo.getUser().getTodayNum());
-                }
-            }
-
-            @Override
-            public void failure(IOException e) {
-                super.failure(e);
-                hideProgress();
-            }
-        });
-
-
-
-    }
-
-    private void getShareLink() {
-        showProgress();
-        HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(this));
-        NetManager.get(Url.USER_INVITE_URL, map, getApplicationContext(), new SheepCallback<InviteUrl>(this) {
-            @Override
-            public void success(InviteUrl o) {
-                hideProgress();
-                if (o != null)
-                    shareLink = o.getUrl();
-            }
-            @Override
-            public void failure(IOException e) {
-                super.failure(e);
-                hideProgress();
-            }
-
-        });
-    }
-
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.rl_emw:
-                showEMW();
-                break;
-            case R.id.rl_link:
-                showLink();
-                break;
-            case R.id.rl_face:
-                Intent i=new  Intent(this,WebActivity.class);
-                i.putExtra(WebActivity.INTENT_URL,"file:///android_asset/poster.html");
-                i.putExtra(WebActivity.INTENT_TITLE,"ditui");
-                startActivity(i);
-                break;
-        }
-    }
-
-    private void showEMW() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(AskFriendActivity.this);
-        View view = View.inflate(this, R.layout.ema_dialog, null);
-        builder.setView(view);
-        final AlertDialog dialog = builder.create();
-        dialog.setCanceledOnTouchOutside(false);
-        dialog.getWindow().setDimAmount(0.1f);
-        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(0));
-        dialog.show();
-        ImageView iv_close = (ImageView) view.findViewById(R.id.iv_close);
-        iv_close.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                dialog.dismiss();
-            }
-        });
-
-        ImageView iv_ema = (ImageView) view.findViewById(R.id.iv_ema);
-        Glide.with(this)
-                .load(AppUtil.getQRLink(shareLink, 800))
-                .into(iv_ema);
-        LinearLayout ll_save = (LinearLayout) view.findViewById(R.id.ll_save);
-        ll_save.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-//                boolean isOk = saveImageToGallery(AskFriendActivity.this, mBitmap);
-//                if (isOk) {
-//                    Toast.makeText(AskFriendActivity.this, "保存成功", Toast.LENGTH_SHORT).show();
-//                } else {
-//                    Toast.makeText(AskFriendActivity.this, "保存失败,请重试", Toast.LENGTH_SHORT).show();
-//                }
-                downLoadImg(AppUtil.getQRLink(shareLink, 800));
-            }
-        });
-    }
-
-    //保存图片,更新系统图库
-    public boolean downLoadImg(String url) {
-        String storePath = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "Sheep";
-        File appDir = new File(storePath);
-        if (!appDir.exists()) {
-            appDir.mkdirs();
-        }
-        String fileName = System.currentTimeMillis() + ".jpg";
-        OkHttpUtils.get()
-                .url(url)
-                .build()
-                .execute(new FileCallBack(appDir.getAbsolutePath(), fileName) {
-                    @Override
-                    public void onError(Call call, Exception e, int id) {
-                        Logger.e("onError :" + e.getMessage());
-                        Toast.makeText(AskFriendActivity.this, "保存失败,请重试", Toast.LENGTH_SHORT).show();
-                    }
-
-                    @Override
-                    public void inProgress(float progress, long total, int id) {
-                        //super.inProgress(progress, total, id);
-                        Logger.e("inProgress"+(int)(100*progress));
-                    }
-
-                    @Override
-                    public void onResponse(File file, int id) {
-                        Logger.e("onResponse :" + file.getAbsolutePath());
-                        Toast.makeText(AskFriendActivity.this, "保存成功", Toast.LENGTH_SHORT).show();
-                    }
-                });
-        return true;
-    }
-
-    //保存图片,更新系统图库
-    public boolean saveImageToGallery(Context context, Bitmap bmp) {
-        String storePath = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "Sheep";
-        File appDir = new File(storePath);
-        if (!appDir.exists()) {
-            appDir.mkdir();
-        }
-        String fileName = System.currentTimeMillis() + ".jpg";
-        File file = new File(appDir, fileName);
-        try {
-            FileOutputStream fos = new FileOutputStream(file);
-            boolean isSuccess = bmp.compress(Bitmap.CompressFormat.JPEG, 100, fos);
-            fos.flush();
-            fos.close();
-            MediaStore.Images.Media.insertImage(context.getContentResolver(), file.getAbsolutePath(), fileName, null);
-            Uri uri = Uri.fromFile(file);
-            context.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, uri));
-            if (isSuccess) {
-                return true;
-            } else {
-                return false;
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-
-    private void showLink() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(AskFriendActivity.this);
-        View view = View.inflate(this, R.layout.link_dialog, null);
-        builder.setView(view);
-        final AlertDialog dialog = builder.create();
-        dialog.setCanceledOnTouchOutside(false);
-        dialog.getWindow().setDimAmount(0.1f);
-        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(0));
-        dialog.show();
-        ImageView iv_close = (ImageView) view.findViewById(R.id.iv_close);
-        iv_close.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                dialog.dismiss();
-            }
-        });
-
-        EditText et = (EditText) view.findViewById(R.id.et);
-        et.setText(shareLink);
-        ImageView iv_link = (ImageView) view.findViewById(R.id.iv_link);
-        iv_link.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                // 将文本内容放到系统剪贴板里。
-                cm.setText(shareLink);
-                Toast.makeText(AskFriendActivity.this, "复制成功,可以发给朋友们了。", Toast.LENGTH_SHORT).show();
-            }
-        });
-
-    }
-
-
-}

+ 0 - 211
app/src/main/java/com/sheep/jiuyan/samllsheep/page/BindPhoneActivity.java

@@ -1,211 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.content.Intent;
-import android.os.Handler;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.StringUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-/**
- * Created by Administrator on 2018/2/23.
- */
-
-public class BindPhoneActivity  extends BaseActivity implements View.OnClickListener{
-
-    EditText  et_phone;
-    EditText  et_code;
-    Button btn;
-    TextView  tv;
-    int mTime = 0;
-    Handler handler = new Handler();
-    Runnable runnable = new Runnable() {
-        @Override
-        public void run() {
-            mTime--;
-            if (mTime <= 0) {
-                tv.setText("重新发送");
-                tv.setEnabled(true);
-            } else {
-                tv.setText("重新发送(" + mTime + ")");
-                handler.postDelayed(this, 1000);
-            }
-        }
-    };
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_bind_phone;
-    }
-
-    @Override
-    public void initView() {
-        et_phone=(EditText)findViewById(R.id.et_phone);
-        et_code=(EditText)findViewById(R.id.et_code);
-        btn=(Button)findViewById(R.id.btn);
-        tv=(TextView)findViewById(R.id.tv);
-        TitleBarUtils.getInstance()
-                .setTitle(this, "绑定手机号")
-                .setTitleFinish(this);
-
-    }
-
-    @Override
-    public void initListener() {
-        btn.setOnClickListener(this);
-        tv.setOnClickListener(this);
-    }
-
-    @Override
-    public void initData() {
-
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()){
-            case R.id.btn:
-                bindPhone();
-                break;
-            case  R.id.tv:
-                sendCode();
-                break;
-
-
-        }
-
-
-    }
-
-    private  void  checkLoginIsOverdue(){
-         if(TextUtils.isEmpty(SpUtils.getAppToken(BindPhoneActivity.this))){
-             SpUtils.login(this,"");
-             SpUtils.saveAppToken(this,"");
-             Toast.makeText(this,"登录已过期!请重新登录...",Toast.LENGTH_LONG).show();
-             Intent i=new  Intent(this,LoginActivity.class);
-             startActivity(i);
-             finish();
-             return ;
-    }
-    }
-
-
-    private  void  sendCode(){
-        checkLoginIsOverdue();
-        tv.setEnabled(false);
-        String moble = et_phone.getText().toString().trim();
-        if (TextUtils.isEmpty(moble)) {
-            et_phone.setError("请输入手机号");
-            tv.setEnabled(true);
-
-            return;
-        }
-        if(!StringUtils.checkMobileNum(moble)){
-            et_phone.setError("请填写正确的手机号码");
-            tv.setEnabled(true);
-            return;
-        }
-
-        HashMap<String, String> map = new HashMap<>();
-        map.put("Mobile", moble);
-        map.put("Step", "1");
-        map.put("Token",  SpUtils.getAppToken(BindPhoneActivity.this));
-        showProgress();
-        NetManager.post(Url.BINDUSER, map, getApplicationContext(), new SheepCallback<String>(BindPhoneActivity.this) {
-            @Override
-            public void success(String o) {
-                hideProgress();
-                Toast.makeText(BindPhoneActivity.this, "验证码已发送", Toast.LENGTH_SHORT).show();
-                mTime = 60;
-                handler.postDelayed(runnable, 1000);
-            }
-
-            @Override
-            public void failure(IOException e) {
-                hideProgress();
-                tv.setEnabled(true);
-                String message = e.getMessage();
-                if (message.contains("参数错误")) {
-                    message = message.replace("参数错误", "");
-                }
-                message = message.trim();
-                Toast.makeText(BindPhoneActivity.this, message, Toast.LENGTH_SHORT).show();
-            }
-        });
-
-    }
-
-
-
-    private  void  bindPhone(){
-        checkLoginIsOverdue();
-        btn.setEnabled(false);
-        String moble = et_phone.getText().toString().trim();
-        String code = et_code.getText().toString().trim();
-        if (TextUtils.isEmpty(moble)) {
-            btn.setEnabled(true);
-            et_phone.setError("请输入手机号");
-            return;
-        }
-        if(!StringUtils.checkMobileNum(moble)){
-            et_phone.setError("请填写正确的手机号码");
-            btn.setEnabled(true);
-            return;
-        }
-        if (TextUtils.isEmpty(code)) {
-            btn.setEnabled(true);
-            et_code.setError("请输入验证码");
-            return;
-        }
-        if (code.length()!=6) {
-            btn.setEnabled(true);
-            et_code.setError("请填写6位手机验证码");
-            return;
-        }
-        showProgress();
-        HashMap<String, String> map = new HashMap<>();
-        map.put("Mobile", moble);
-        map.put("Step", "2");
-        map.put("Seccode", code);
-        map.put("Token",  SpUtils.getAppToken(BindPhoneActivity.this));
-        NetManager.post(Url.BINDUSER, map, getApplicationContext(), new SheepCallback<String>(BindPhoneActivity.this) {
-            @Override
-            public void success(String o) {
-               hideProgress();
-                Toast.makeText(BindPhoneActivity.this,"绑定手机号成功",Toast.LENGTH_LONG).show();
-                finish();
-            }
-
-            @Override
-            public void failure(IOException e) {
-                hideProgress();
-                btn.setEnabled(true);
-                String message = e.getMessage();
-                if (message.contains("参数错误")) {
-                    message = message.replace("参数错误", "");
-                }
-                message = message.trim();
-                Toast.makeText(BindPhoneActivity.this, message, Toast.LENGTH_SHORT).show();
-            }
-        });
-
-
-    }
-
-
-
-}

+ 0 - 99
app/src/main/java/com/sheep/jiuyan/samllsheep/page/BindWxActivity.java

@@ -1,99 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.support.design.widget.TextInputEditText;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-public class BindWxActivity extends BaseActivity implements View.OnClickListener {
-    private TextInputEditText mEtWx;
-    private TextView mTvWx;
-    private TextView mRobot;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.bind_wx_activity;
-    }
-
-    @Override
-    public void initView() {
-        mEtWx = (TextInputEditText) findViewById(R.id.et_wx);
-        mTvWx = (TextView) findViewById(R.id.tv_wx);
-        mRobot = (TextView) findViewById(R.id.tv_robot);
-        TitleBarUtils.getInstance()
-                .setTitle(this, "绑定微信")
-                .setTitleFinish(this);
-    }
-
-    @Override
-    public void initListener() {
-        mTvWx.setOnClickListener(this);
-    }
-
-    @Override
-    public void initData() {
-        showProgress();
-        NetManager.get(Url.BIND_ROBOT, null, getApplicationContext(), new SheepCallback<String>(this) {
-            @Override
-            public void success(String robot) {
-                hideProgress();
-                mRobot.setText(String.format("添加好友->佣金发放号:%s", robot));
-            }
-
-            @Override
-            public void failure(IOException e) {
-                hideProgress();
-                Toast.makeText(BindWxActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
-            }
-        });
-    }
-
-
-    @Override
-    public void onClick(View v) {
-        int i = v.getId();
-        if (i == R.id.tv_wx) {
-            bindWx();
-        }
-    }
-
-    private void bindWx() {
-        String wxId = mEtWx.getText().toString().trim();
-        String openId = SpUtils.getOpenId(getApplicationContext());
-        if (TextUtils.isEmpty(openId)) {
-            //            startActivity(new Intent(this, LoginActivity.class));
-        } else {
-
-            HashMap<String, String> map = new HashMap<>();
-            map.put("wx_id", wxId);
-            map.put("wx_open_id", openId);
-            showProgress();
-            NetManager.get(Url.BIND_WX, map, getApplicationContext(), new SheepCallback<String>(this) {
-                @Override
-                public void success(String s) {
-                    hideProgress();
-                    Toast.makeText(BindWxActivity.this, s, Toast.LENGTH_SHORT).show();
-                    finish();
-                }
-
-                @Override
-                public void failure(IOException e) {
-                    hideProgress();
-                    Toast.makeText(BindWxActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
-                }
-            });
-        }
-    }
-}

+ 0 - 422
app/src/main/java/com/sheep/jiuyan/samllsheep/page/GameDetailActivity.java

@@ -1,422 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.provider.MediaStore;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.AlertDialog;
-import android.text.Html;
-import android.text.TextUtils;
-import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.app.hubert.library.NewbieGuide;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.sheep.gamegroup.util.DeviceUtil;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
-import com.sheep.jiuyan.samllsheep.utils.DeviceUtils;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-
-/**
- * Created by kemllor on 2018/1/16.
- * 游戏详情
- */
-
-public class GameDetailActivity extends BaseActivity {
-
-    private final static String HTML_FORMAT = "任务数量:<font color=\"#ef712c\">当前数量</font>/总数";
-    private TaskPublish mTask;
-    private RelativeLayout mDingwei1;
-    private ImageView mImgIcon;
-    private TextView mTxtTitle;
-    private TextView mTvCount;
-    private TextView mTvTime;
-    private TextView mTvBouns;
-    private TextView mTvText1;
-    private TextView mTvMoney;
-    private Button mBtnTaskItem;
-    private Button mBtnUpImag;
-    private WebView mWebText;
-    private LinearLayout mLlInfos;
-    private AlertDialog mDialog;
-    private AlertDialog mReDialog;
-    private View mPb;
-    private View mBtnStandard;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.game_detail_activity;
-    }
-
-    @Override
-    public void initView() {
-        findViews();
-        NewbieGuide.with(this)//传入fragment
-                .setLabel("guide")//设置引导层标示,必传!否则报错
-                .setLayoutRes(R.layout.splash_1)//自定义的提示layout,不要添加背景色,引导层背景色通过setBackgroundColor()设置
-                .alwaysShow(false)
-                .show();//直接显示引导层
-
-    }
-
-
-    private void findViews() {
-        mDingwei1 = (RelativeLayout) findViewById(R.id.dingwei1);
-        mImgIcon = (ImageView) findViewById(R.id.img_icon);
-        mTxtTitle = (TextView) findViewById(R.id.tv_game_name);
-        mTvCount = (TextView) findViewById(R.id.tv_count);
-        mTvTime = (TextView) findViewById(R.id.tv_time);
-        mTvBouns = (TextView) findViewById(R.id.tv_bouns);
-        mTvText1 = (TextView) findViewById(R.id.tv_text1);
-        mTvMoney = (TextView) findViewById(R.id.tv_money);
-        mBtnTaskItem = (Button) findViewById(R.id.btn_task_item);
-        mBtnUpImag = (Button) findViewById(R.id.btn_up_imag);
-        mWebText = (WebView) findViewById(R.id.web_text);
-        mLlInfos = (LinearLayout) findViewById(R.id.ll_infos);
-        mPb = findViewById(R.id.pb_commit);
-        mBtnStandard = findViewById(R.id.btn_standard);
-        findViewById(R.id.tv_guide).setVisibility(View.VISIBLE);
-
-        TitleBarUtils.getInstance().setTitle(this, "任务详情")
-                .setTitleFinish(this);
-        mWebText.setWebChromeClient(new WebChromeClient() {
-
-        });
-        mWebText.getSettings().setJavaScriptEnabled(true);
-        mWebText.setWebViewClient(new WebViewClient() {
-            @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-                view.loadUrl(request.getUrl().toString());
-                return true;
-            }
-        });
-    }
-
-    @Override
-    public void initListener() {
-        mBtnTaskItem.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (PackageUtil.isAppInstalled(SheepApp.mContext, mTask.getTask().getPkg())) {
-                    PackageUtil.startApp(SheepApp.mContext, mTask.getTask().getPkg());
-                } else {
-                    Intent intent = new Intent(GameDetailActivity.this, XDownLoadActivity.class);
-                    intent.putExtra("task", mTask.getTask());
-                    startActivity(intent);
-                }
-            }
-        });
-        mBtnUpImag.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mBtnUpImag.setEnabled(false);
-                checkIsRegisterTask();
-            }
-        });
-        mBtnStandard.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(GameDetailActivity.this, WebActivity.class);
-                intent.putExtra(WebActivity.INTENT_URL, mTask.getTask().getScreenshots());
-                intent.putExtra(WebActivity.INTENT_TITLE, "任务提交示意");
-                startActivity(intent);
-            }
-        });
-        findViewById(R.id.tv_guide).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(GameDetailActivity.this, WebActivity.class);
-                intent.putExtra(WebActivity.INTENT_URL, Url.TASK_GUIDE);
-                intent.putExtra(WebActivity.INTENT_TITLE, "如何做任务");
-                startActivity(intent);
-            }
-        });
-    }
-
-    private void checkIsRegisterTask() {
-        showProgress();
-        HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(this));
-        map.put("publish_id", mTask.getId() + "");
-        NetManager.get(Url.USER_CHECK_REGISTER, map, getApplicationContext(), new SheepCallback<String>(this) {
-            @Override
-            public void success(String ok) {
-                hideProgress();
-                if (TextUtils.equals(ok, "ok")) {
-                    uploadImag();
-                } else {
-
-                    showRecommitDialog("用户同时只能领取一个任务,是否领取此任务?");
-                }
-                mBtnUpImag.setEnabled(true);
-            }
-
-            @Override
-            public void failure(IOException e) {
-                hideProgress();
-                mBtnUpImag.setEnabled(true);
-
-            }
-        });
-    }
-
-    private void uploadImag() {
-        Intent intent = new Intent(Intent.ACTION_PICK,
-                android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-        startActivityForResult(intent, 1);
-    }
-
-
-    private void startTask(final TaskPublish task) {
-        HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(this));
-        map.put("task_id", task.getId() + "");
-        map.put("imei",  DeviceUtil.getDeviceId(getApplicationContext()));
-        showProgress();
-        NetManager.get(Url.USER_REGISTER_TASK, map, getApplicationContext(), new SheepCallback<String>(this) {
-            @Override
-            public void success(String o) {
-                hideProgress();
-                String pkg = task.getTask().getPkg();
-                if (!TextUtils.isEmpty(pkg)) {
-                    boolean installed = PackageUtil.isAppInstalled(getApplicationContext(), pkg);
-                    if (installed) {
-                        PackageUtil.startApp(getApplicationContext(), pkg);
-                    } else {
-                        Intent intent = new Intent(GameDetailActivity.this, XDownLoadActivity.class);
-                        intent.putExtra("task", task.getTask());
-                        startActivity(intent);
-                    }
-                } else {
-                    Toast.makeText(GameDetailActivity.this, "任务已经领取,快去完成吧", Toast.LENGTH_SHORT).show();
-                }
-            }
-
-            @Override
-            public void failure(IOException e) {
-                super.failure(e);
-                hideProgress();
-            }
-        });
-
-    }
-
-    private void showRecommitDialog(String s) {
-        if (mReDialog == null) {
-            mReDialog = new AlertDialog.Builder(GameDetailActivity.this)
-                    .setMessage(s)
-                    .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            startTask(mTask);
-                            mReDialog.dismiss();
-                        }
-                    }).setNegativeButton("取消", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            mReDialog.dismiss();
-                        }
-                    }).create();
-        }
-        mReDialog.setMessage(s);
-        mReDialog.show();
-    }
-
-
-
-    private void  showNotDoingTask(){
-
-        if(!TextUtils.isEmpty(SpUtils.getImagePath(this))){
-
-           new android.app.AlertDialog.Builder(this)
-                    .setTitle("温馨提示!")
-                    .setMessage("亲!还有未上传的截图哟!是否去上传?")
-                    .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            commitTask(SpUtils.getImagePath(GameDetailActivity.this));
-                        }
-                    }).setNegativeButton("取消",null).show();
-
-
-        }
-
-
-
-
-    }
-
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        //获取图片路径
-        if (requestCode == 1 && resultCode == Activity.RESULT_OK && data != null) {
-            Uri selectedImage = data.getData();
-            String[] filePathColumns = {MediaStore.Images.Media.DATA};
-            Cursor c = getContentResolver().query(selectedImage, filePathColumns, null, null, null);
-            c.moveToFirst();
-            int columnIndex = c.getColumnIndex(filePathColumns[0]);
-            String imagePath = c.getString(columnIndex);
-            commitTask(imagePath);
-            c.close();
-        }
-    }
-
-    private void commitTask(String path) {
-        mPb.setVisibility(View.VISIBLE);
-        String topApp = "";
-        Intent intent = getIntent();
-        if (intent != null) {
-            topApp = intent.getStringExtra("pkg");
-        }
-        HashMap<String, String> parma = new HashMap<>();
-        parma.put("task_pkg", topApp);
-        parma.put("publish_id", mTask.getId() + "");
-        parma.put("wx_open_id", SpUtils.getOpenId(this));
-        showProgress();
-        NetManager.upload(Url.UPLOAD_IMG, parma, new File(path), getApplicationContext(), new SheepCallback<String>(this) {
-            @Override
-            public void success(String s) {
-                hideProgress();
-                SpUtils.setImagePath(GameDetailActivity.this,"");
-                Toast.makeText(GameDetailActivity.this, s, Toast.LENGTH_SHORT).show();
-                if(mPb!=null) {
-                    mPb.setVisibility(View.GONE);
-                }
-            }
-
-            @Override
-            public void failure(IOException e) {
-                hideProgress();
-                if(mPb!=null) {
-                    mPb.setVisibility(View.GONE);
-                }
-                Toast.makeText(GameDetailActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
-
-            }
-        });
-    }
-
-    @Override
-    public void initData() {
-        Intent intent = getIntent();
-        mTask = (TaskPublish) intent.getSerializableExtra("data");
-        if (mTask != null) {
-            try {
-                mTvTime.setText(String.format("截止日期:%s", mTask.getOverTime().split(" ")[0]));
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            mTvBouns.setText(mTask.getTask().getBonus());
-            mTvMoney.setText(mTask.getTask().getPrice());
-            Glide.with(SheepApp.mContext)
-                    .load(mTask.getTask().getIcon())
-                    .apply(new RequestOptions().placeholder(R.drawable.icon)
-                    .dontAnimate())
-                    .into(mImgIcon);
-            mTxtTitle.setText(mTask.getTask().getTitle());
-            mWebText.loadUrl(mTask.getTask().getGuide());
-            mTvCount.setText(Html.fromHtml(HTML_FORMAT.replace("当前数量", mTask.getSurplusCount() + "")
-                    .replace("总数", mTask.getTotalCouont() + "")));
-            if (PackageUtil.isAppInstalled(SheepApp.mContext, mTask.getTask().getPkg())) {
-                mBtnTaskItem.setText("开始游戏");
-            } else {
-                mBtnTaskItem.setText("下载游戏");
-            }
-        }
-        HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
-        showProgress();
-        NetManager.get(Url.USER_PULL_TASK, map, SheepApp.mContext, new SheepCallback<TaskPublish>(GameDetailActivity.this) {
-            @Override
-            public void success(final TaskPublish taskPublish) {
-                hideProgress();
-                if (taskPublish != null) {
-                    int thisId = mTask.getId();
-                    int pullId = taskPublish.getId();
-                    if (thisId == pullId) {
-                        mLlInfos.addView(getStep("领取任务", "已完成", 0));
-                        if (PackageUtil.isAppInstalled(SheepApp.mContext, mTask.getTask().getPkg())) {
-                            mLlInfos.addView(getStep("下载游戏", "已完成", 0));
-                            mLlInfos.addView(getStep("完成任务", "进行中", 1));
-                        } else {
-                            mLlInfos.addView(getStep("下载游戏", "待完成", 2));
-                        }
-                    } else {
-                        mLlInfos.addView(getStep("领取任务", "待完成", 2));
-                    }
-                } else {
-                    mLlInfos.addView(getStep("领取任务", "待完成", 2));
-                }
-            }
-
-            @Override
-            public void otherCode(int code, String string) {
-                hideProgress();
-                mLlInfos.addView(getStep("领取任务", "待完成", 2));
-            }
-
-            @Override
-            public void failure(IOException e) {
-                super.failure(e);
-                hideProgress();
-            }
-        });
-
-        showNotDoingTask();
-
-    }
-
-
-    private View getStep(String step, String state, int color) {
-        View view = View.inflate(this, R.layout.task_step_info, null);
-        ImageView img = (ImageView) view.findViewById(R.id.img_tab);
-        TextView tvStep = (TextView) view.findViewById(R.id.tv_step);
-        TextView tvStatus = (TextView) view.findViewById(R.id.tv_status);
-        if (color == 0) {
-            img.setImageResource(R.drawable.garden_green);
-            tvStep.setTextColor(getResources().getColor(R.color.green));
-            tvStatus.setTextColor(getResources().getColor(R.color.green));
-        } else if (color == 1) {
-            img.setImageResource(R.drawable.garden_yellow);
-            tvStep.setTextColor(getResources().getColor(R.color.yellow_text_light));
-            tvStatus.setTextColor(getResources().getColor(R.color.yellow_text_light));
-        } else {
-            img.setImageResource(R.drawable.garden_gray);
-            tvStep.setTextColor(getResources().getColor(R.color.black_text_gray));
-            tvStatus.setTextColor(getResources().getColor(R.color.black_text_gray));
-        }
-
-        tvStep.setText(step);
-        tvStatus.setText(state);
-        return view;
-    }
-}

+ 0 - 152
app/src/main/java/com/sheep/jiuyan/samllsheep/page/InputWXAccountActivity.java

@@ -1,152 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.content.Intent;
-import android.support.design.widget.TextInputEditText;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-/**
- * Created by Administrator on 2018/1/6.
- */
-
-public class InputWXAccountActivity extends BaseActivity implements View.OnClickListener{
-    private LinearLayout  mLl1;
-    private LinearLayout  mLl2;
-    private LinearLayout  mLl3;
-    private LinearLayout  mLl4;
-
-    private TextInputEditText et_account_1;
-    private TextInputEditText et_account_2;
-    private TextInputEditText et_account_3;
-    private TextInputEditText et_account_4;
-
-
-    private TextInputEditText et_pwd_1;
-    private TextInputEditText et_pwd_2;
-    private TextInputEditText et_pwd_3;
-    private TextInputEditText et_pwd_4;
-
-    private TextView tv_wx;
-
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.input_wx_account_activity;
-    }
-
-    @Override
-    public void initView() {
-
-        mLl1=(LinearLayout)findViewById(R.id.ll_1);
-        mLl2=(LinearLayout)findViewById(R.id.ll_2);
-        mLl3=(LinearLayout)findViewById(R.id.ll_3);
-        mLl4=(LinearLayout)findViewById(R.id.ll_4);
-
-
-        et_account_1=(TextInputEditText)findViewById(R.id.et_account_1);
-        et_account_2=(TextInputEditText)findViewById(R.id.et_account_2);
-        et_account_3=(TextInputEditText)findViewById(R.id.et_account_3);
-        et_account_4=(TextInputEditText)findViewById(R.id.et_account_4);
-
-        et_pwd_1=(TextInputEditText)findViewById(R.id.et_pwd_1);
-        et_pwd_2=(TextInputEditText)findViewById(R.id.et_pwd_2);
-        et_pwd_3=(TextInputEditText)findViewById(R.id.et_pwd_3);
-        et_pwd_4=(TextInputEditText)findViewById(R.id.et_pwd_4);
-
-        tv_wx=(TextView) findViewById(R.id.tv_wx);
-        TitleBarUtils.getInstance()
-                .setTitle(this,"账户信息")
-                .setTitleFinish(this);
-    }
-
-    @Override
-    public void initListener() {
-        tv_wx.setOnClickListener(this);
-    }
-
-    @Override
-    public void initData() {
-        Intent i=getIntent();
-        int  count =i.getIntExtra("count",0);
-
-        switch (count){
-            case 0:
-                mLl1.setVisibility(View.VISIBLE);
-                mLl2.setVisibility(View.VISIBLE);
-                mLl3.setVisibility(View.VISIBLE);
-                mLl4.setVisibility(View.VISIBLE);
-                break;
-            case 1:
-                mLl4.setVisibility(View.GONE);
-            break;
-            case 2:
-                mLl3.setVisibility(View.GONE);
-                mLl4.setVisibility(View.GONE);
-                break;
-            case 3:
-                mLl2.setVisibility(View.GONE);
-                mLl3.setVisibility(View.GONE);
-                mLl4.setVisibility(View.GONE);
-                break;
-            case 4:
-                mLl1.setVisibility(View.GONE);
-                mLl2.setVisibility(View.GONE);
-                mLl3.setVisibility(View.GONE);
-                mLl4.setVisibility(View.GONE);
-                break;
-        }
-    }
-
-    private  void  upload(){
-        HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(this));
-        map.put("wx_1", et_account_1.getText().toString());
-        map.put("wx_2", et_account_2.getText().toString());
-        map.put("wx_3", et_account_3.getText().toString());
-        map.put("wx_4", et_account_4.getText().toString());
-        map.put("ps_1", et_pwd_1.getText().toString());
-        map.put("ps_2", et_pwd_2.getText().toString());
-        map.put("ps_3", et_pwd_3.getText().toString());
-        map.put("ps_4", et_pwd_4.getText().toString());
-        showProgress();
-
-        NetManager.get(Url.COMMIT_WXACCOUNT, map, getApplicationContext(), new SheepCallback<String>(this) {
-
-
-            @Override
-            public void success(String s) {
-                hideProgress();
-                  Toast.makeText(InputWXAccountActivity.this,"数据上传成功",Toast.LENGTH_LONG).show();
-            }
-
-            @Override
-            public void failure(IOException e) {
-                super.failure(e);
-                hideProgress();
-            }
-        });
-    }
-
-    @Override
-    public void onClick(View view) {
-        int i = view.getId();
-        if (i == R.id.tv_wx) {
-            upload();
-
-        }
-    }
-}

+ 0 - 195
app/src/main/java/com/sheep/jiuyan/samllsheep/page/LoginActivity.java

@@ -1,195 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Build;
-import android.provider.Settings;
-import android.support.annotation.RequiresApi;
-import android.support.design.widget.TextInputEditText;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.sheep.jiuyan.samllsheep.Config;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.floatwindow.FloatService;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.entry.BindUserEntiey;
-import com.sheep.jiuyan.samllsheep.utils.PremissUtils;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-/**
- * Created by kemllor on 2017/12/21.
- */
-
-public class LoginActivity extends BaseActivity {
-    private AlertDialog mDialog;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.login_actvity;
-    }
-    @Override
-    public void initData() {
-        Intent i=getIntent();
-        if(i!=null&&i.hasExtra("phone")){
-            mEtAccount.setText(i.getStringExtra("phone"));
-        }
-    }
-
-    private EditText mEtAccount;
-    private EditText mEtPsw;
-    private ImageView mImgLogin;
-    private TextView mTvWx;
-    private TextView mTvRegister;
-    private TextView mTvForgetPwd;
-
-
-    private void findViews() {
-        mEtAccount = (EditText) findViewById(R.id.et_account);
-        mEtPsw = (EditText) findViewById(R.id.et_psw);
-        mImgLogin = (ImageView) findViewById(R.id.img_login);
-        mTvWx = (TextView) findViewById(R.id.tv_wx);
-        mTvRegister = (TextView) findViewById(R.id.tv_register);
-        mTvForgetPwd = (TextView) findViewById(R.id.tv_forget_pwd);
-    }
-
-
-    @Override
-    public void initView() {
-        findViews();
-    }
-
-    @Override
-    public void initListener() {
-        mTvRegister.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(LoginActivity.this, RegisterActivity.class);
-                startActivity(intent);
-                finish();
-            }
-        });
-        mTvWx.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mTvWx.setEnabled(false);
-                loginFromHw();
-            }
-        });
-
-        mTvForgetPwd.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(LoginActivity.this, ResetPWDActivity.class);
-                startActivity(intent);
-                finish();
-            }
-        });
-
-    }
-
-    private void initDialog() {
-        if (mDialog == null) {
-            final View view = View.inflate(this, R.layout.baseurl_dialog, null);
-            final RadioGroup mRgUrl = (RadioGroup) view.findViewById(R.id.rg_url);
-            final TextInputEditText mEtUrl = (TextInputEditText) view.findViewById(R.id.et_url);
-            TextView tvEnter = (TextView) view.findViewById(R.id.tv_enter);
-            for (String url : Config.instance().mUrlList) {
-                RadioButton button = new RadioButton(this);
-                button.setText(url);
-                mRgUrl.addView(button);
-            }
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            mDialog = builder.setView(view).create();
-            mDialog.setCanceledOnTouchOutside(true);
-            tvEnter.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    String url = mEtUrl.getText().toString().trim();
-                    if (TextUtils.isEmpty(url)) {
-                        int id = mRgUrl.getCheckedRadioButtonId();
-                        if (id != -1) {
-                            RadioButton btn = (RadioButton) view.findViewById(id);
-                            url = btn.getText().toString().trim();
-                        }
-                    }
-                    if (!TextUtils.isEmpty(url)) {
-                        Config.instance().setBaseUrl(url);
-                    }
-                    mDialog.dismiss();
-                }
-            });
-        }
-        mDialog.show();
-    }
-
-    private void loginFromHw() {
-        String account = mEtAccount.getText().toString().trim();
-        String psw = mEtPsw.getText().toString().trim();
-        if (TextUtils.isEmpty(account)) {
-            Toast.makeText(this, "请输入帐号", Toast.LENGTH_SHORT).show();
-            mTvWx.setEnabled(true);
-            return;
-        }
-        if (TextUtils.isEmpty(psw)) {
-            Toast.makeText(this, "请输入密码", Toast.LENGTH_SHORT).show();
-            mTvWx.setEnabled(true);
-            return;
-        }
-        HashMap<String, String> map = new HashMap<>();
-        map.put("account", account);
-        map.put("pwd", psw);
-        showProgress();
-        NetManager.post(Url.LOGIN, map, getApplicationContext(), new SheepCallback<String>(LoginActivity.this) {
-            @Override
-            public void success(String o) {
-                HashMap<String, String> map = new HashMap<>();
-                map.put("token", o);
-                SpUtils.saveAppToken(LoginActivity.this,o);
-                NetManager.get(Url.REGISTER_SHEEP, map, getApplicationContext(), new SheepCallback<BindUserEntiey>(LoginActivity.this) {
-                    @Override
-                    public void success(BindUserEntiey o) {
-                        hideProgress();
-                        SpUtils.login(LoginActivity.this, o.getOpenId());
-                        Intent intent = new Intent(LoginActivity.this, MainActivity.class);
-                        startActivity(intent);
-                        finish();
-                    }
-
-                    @Override
-                    public void failure(IOException e) {
-                        hideProgress();
-                        String message = e.getMessage();
-                        if (message.contains("参数错误")) {
-                            message = message.replace("参数错误", "");
-                        }
-                        message = message.trim();
-                        Toast.makeText(LoginActivity.this, message, Toast.LENGTH_SHORT).show();
-                        mTvWx.setEnabled(true);
-                    }
-                });
-            }
-
-            @Override
-            public void failure(IOException e) {
-                hideProgress();
-                Toast.makeText(LoginActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
-                mTvWx.setEnabled(true);
-            }
-        });
-    }
-}

+ 0 - 503
app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java

@@ -1,503 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.TextInputEditText;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.Animation;
-import android.view.animation.RotateAnimation;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.app.hubert.library.NewbieGuide;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.sheep.jiuyan.samllsheep.Config;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.download.DownloadManager;
-import com.sheep.jiuyan.samllsheep.event.MainTab;
-import com.sheep.jiuyan.samllsheep.event.NewUserDialog;
-import com.sheep.jiuyan.samllsheep.floatwindow.FloatService;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.adapter.AdpMainPageViewPager;
-import com.sheep.jiuyan.samllsheep.page.entry.User;
-import com.sheep.jiuyan.samllsheep.page.fragment.FgtMainPageOffline;
-import com.sheep.jiuyan.samllsheep.page.fragment.FgtMainPageTask;
-import com.sheep.jiuyan.samllsheep.page.view.RappTabLayout;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.PremissUtils;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.StringUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-
-import static android.support.v4.view.ViewPager.SCROLL_STATE_IDLE;
-
-
-/*
-* author:kemllor
-* version:1.0.0
-* copyright:云端助手
-* date:2017-12-15
-* file: MainActivity.class
-*/
-public class MainActivity extends BaseActivity {
-    private RappTabLayout mRappTabLayout;
-    private ViewPager mViewPager;
-    private AdpMainPageViewPager mAdpMainPageViewPager;
-    private SwipeRefreshLayout mSwipeRefreshLayout;
-    private FgtMainPageTask mFgtMainPageTask;
-    private FgtMainPageOffline mFgtMainPageOffline;
-    private AppBarLayout mAppBarLayout;
-    private boolean mIsTopest = true;//下滑是否在最顶端
-    private boolean mIsLeftest = true;//右滑时是否在最左端
-    private ImageView mImgBag;
-    private AlertDialog mDialog;
-
-    private ImageButton btn;
-    private AlertDialog mRedDialog;
-    private TextView mTvRedMoney;
-    private View mView;
-
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        NewbieGuide.with(this)//传入fragment
-                .setLabel("guide2")//设置引导层标示,必传!否则报错
-                .setLayoutRes(R.layout.splash_2)//自定义的提示layout,不要添加背景色,引导层背景色通过setBackgroundColor()设置
-                .alwaysShow(false)
-                .show();//直接显示引导层
-        Intent intent = getIntent();
-        String tag = intent.getStringExtra("tag");
-        if (TextUtils.equals(tag, "once")) {
-            showNewDialog();
-        }
-        super.onCreate(savedInstanceState);
-        startOpenXFK();
-        goToQX();
-
-
-
-}
-
-
-
-
-
-
-
-    private  void  goToQX(){
-        if (Build.VERSION.SDK_INT >= 23) {
-            boolean has = PremissUtils.hasPermission(MainActivity.this);
-            if (!has) {
-                AlertDialog.Builder  builder=  new AlertDialog.Builder(this)
-                        .setTitle("温馨提示!")
-                        .setMessage("亲!要赚钱需要手动开启读取其他应用权限功能哟!")
-
-                        .setPositiveButton("去开启", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                PremissUtils.openUsageAccessPage(MainActivity.this);
-                            }
-                        });
-                builder.setCancelable(false);
-                builder .show();
-            }
-        }
-
-    }
-
-
-    private  void  startOpenXFK(){
-        Intent intent = new Intent(MainActivity.this, FloatService.class);
-        startService(intent);
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.main_activity;
-    }
-
-    @Override
-    public void initListener() {
-/*
-if (BuildConfig.DEBUG)
-            mImgBag.setOnLongClickListener(new View.OnLongClickListener() {
-                @Override
-                public boolean onLongClick(View v) {
-                    initDialog();
-                    return true;
-                }
-            });*/
-        //防止右滑一部分后,还能下拉刷新。
-        mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                mIsLeftest = positionOffsetPixels < 8;
-                reSetSwipeRefreshLayout();
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-                if (state == SCROLL_STATE_IDLE) {
-                    mSwipeRefreshLayout.setEnabled(mIsTopest);
-                }
-            }
-        });
-        //防止下拉刷新效果差
-        mAppBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
-            @Override
-            public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-                mIsTopest = verticalOffset >= 0;
-                reSetSwipeRefreshLayout();
-            }
-        });
-
-        mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                mFgtMainPageTask.initData(false);
-                mFgtMainPageOffline.initData(false);
-            }
-        });
-        findViewById(R.id.linearLayout).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(MainActivity.this, UserCenterActivity.class);
-                startActivity(intent);
-            }
-        });
-        findViewById(R.id.txt_get_cash).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-                    HashMap<String, String> map = new HashMap<>();
-                    map.put("wx_open_id", SpUtils.getOpenId(MainActivity.this));
-                    NetManager.get(Url.USER_INFO, map, getApplicationContext(), new SheepCallback<User>(MainActivity.this) {
-                        @Override
-                        public void success(User user) {
-                            hideProgress();
-                            if(!TextUtils.isEmpty(user.getBalance())){
-                                try {
-                                    float money =Float.parseFloat(user.getBalance());
-                                    if(money>=20){
-                                        Intent intent = new Intent(MainActivity.this, WithdrawActivity.class);
-                                        intent.putExtra("money", user.getBalance());
-                                        startActivity(intent);
-                                    }else{
-                                        Toast.makeText(MainActivity.this,"亲!最低提现金额是20元哟!赶紧去做任务吧",Toast.LENGTH_LONG).show();
-                                    }
-
-                                }catch (Exception e){
-                                      Toast.makeText(MainActivity.this,"亲!最低提现金额是20元哟!赶紧去做任务吧",Toast.LENGTH_LONG).show();
-                                }
-
-                            }else{
-                                Toast.makeText(MainActivity.this,"亲!最低提现金额是20元哟!赶紧去做任务吧",Toast.LENGTH_LONG).show();
-
-                            }
-
-
-                        }
-
-                        @Override
-                        public void failure(IOException e) {
-                            hideProgress();
-                            Toast.makeText(MainActivity.this,"系统异常,请稍后访问",Toast.LENGTH_LONG).show();
-
-                        }
-                    });
-            }
-        });
-        findViewById(R.id.img_share).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent i = new Intent(MainActivity.this, AskFriendActivity.class);
-                startActivity(i);
-            }
-        });
-
-        mImgBag.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mImgBag.clearAnimation();
-                showNewDialog();
-            }
-        });
-    }
-
-    private void reSetSwipeRefreshLayout() {
-        if (!mIsLeftest ) {
-            mSwipeRefreshLayout.setEnabled(false);
-        } else if (!mIsTopest ) {
-            mSwipeRefreshLayout.setEnabled(false);
-        } else {
-            mSwipeRefreshLayout.setEnabled(true);
-        }
-    }
-
-    @Override
-    public void initData() {
-        ((TextView) findViewById(R.id.txt_main_activity_money))
-                .setText("¥" + StringUtils.strToMoney(G.mUser.getBalance()) );
-        ((TextView) findViewById(R.id.txt_main_activity_nick))
-                .setText(G.mUser.getNickName());
-        Glide.with(this)
-                .load(G.mUser.getIcon())
-                .apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon)
-                .dontAnimate())
-                .into((ImageView) findViewById(R.id.img_user));
-
-        if (G.mUser.getReceived_red_packet() == 1) {
-            mImgBag.clearAnimation();
-            mImgBag.setVisibility(View.GONE);
-        } else {
-            mImgBag.setVisibility(View.VISIBLE);
-            startAnimation(mImgBag);
-        }
-        //        reSetSwipeRefreshLayout();
-    }
-
-    public void refresh(boolean bool) {
-        mSwipeRefreshLayout.setRefreshing(bool);
-      /*   mSwipeRefreshLayout.setEnabled(!bool);*/
-    }
-
-    private void showNewDialog() {
-        if (mDialog == null) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this, R.style.Theme_Transparent);
-            View view = View.inflate(this, R.layout.new_user_dialog, null);
-            builder.setView(view);
-            mDialog = builder.create();
-            view.findViewById(R.id.img_close).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mDialog.dismiss();
-                }
-            });
-            view.findViewById(R.id.img_begin_new).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Intent intent = new Intent(MainActivity.this, NewUserGuideActivity.class);
-                    startActivity(intent);
-                    mDialog.dismiss();
-                }
-            });
-            mDialog.setCanceledOnTouchOutside(false);
-            mDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-                @Override
-                public void onDismiss(DialogInterface dialog) {
-                    startAnimation(mImgBag);
-                }
-            });
-        }
-        mDialog.show();
-    }
-
-    private void initDialog() {
-        if (mDialog == null) {
-            final View view = View.inflate(this, R.layout.baseurl_dialog, null);
-            final RadioGroup mRgUrl = (RadioGroup) view.findViewById(R.id.rg_url);
-            final TextInputEditText mEtUrl = (TextInputEditText) view.findViewById(R.id.et_url);
-            TextView tvEnter = (TextView) view.findViewById(R.id.tv_enter);
-            for (String url : Config.instance().mUrlList) {
-                RadioButton button = new RadioButton(this);
-                button.setText(url);
-                mRgUrl.addView(button);
-            }
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            mDialog = builder.setView(view).create();
-            mDialog.setCanceledOnTouchOutside(true);
-            tvEnter.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    String url = mEtUrl.getText().toString().trim();
-                    if (TextUtils.isEmpty(url)) {
-                        int id = mRgUrl.getCheckedRadioButtonId();
-                        if (id != -1) {
-                            RadioButton btn = (RadioButton) view.findViewById(id);
-                            url = btn.getText().toString().trim();
-                        }
-                    }
-                    if (!TextUtils.isEmpty(url)) {
-                        Config.instance().setBaseUrl(url);
-                    }
-                    mDialog.dismiss();
-                }
-            });
-        }
-        mDialog.show();
-    }
-
-    @Override
-    public void initView() {
-        ((TextView) findViewById(R.id.txt_baseactivity_title)).setText("我的奖金");
-        btn = (ImageButton) findViewById(R.id.ibtn_baseactivity_right);
-        btn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent i = new Intent(MainActivity.this, XDownLoadActivity.class);
-                startActivity(i);
-            }
-        });
-        btn.setVisibility(View.VISIBLE);
-
-        findViewById(R.id.img_baseactivity_title).setVisibility(View.GONE);
-        mImgBag = (ImageView) findViewById(R.id.img_red);
-        mRappTabLayout = (RappTabLayout) findViewById(R.id.tab_main_activity);
-        mViewPager = (ViewPager) findViewById(R.id.viewpager_main_activity);
-        mSwipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_main_activity);
-        mAppBarLayout = (AppBarLayout) findViewById(R.id.app_layout_main_activity);
-        mView = findViewById(R.id.cl_coor);
-        mSwipeRefreshLayout.setProgressViewOffset(true, getResources().getDimensionPixelOffset(R.dimen.layout_heigh_default), G.getRealPix(80));
-        mAdpMainPageViewPager = new AdpMainPageViewPager(getSupportFragmentManager());
-        mFgtMainPageTask = new FgtMainPageTask();
-        mAdpMainPageViewPager.add(mFgtMainPageTask);
-        mFgtMainPageOffline = new FgtMainPageOffline();
-        mAdpMainPageViewPager.add(mFgtMainPageOffline);
-        mViewPager.setAdapter(mAdpMainPageViewPager);
-        mRappTabLayout.setLine(G.getRealPix(20), G.getRealPix(4))
-                .setLineMargin(0, G.getRealPix(2), 0, 0)
-                .setLineColor(getResources().getColor(R.color.black_text_deep))
-                .setupWithViewPager(mViewPager, R.layout.tab_ripple);
-        TitleBarUtils.getInstance().setTitleFinish(this);
-    }
-
-    private void startAnimation(View view) {
-        RotateAnimation rAnima = new RotateAnimation(-5, 5);
-        rAnima.setDuration(500);
-        rAnima.setRepeatCount(-1);
-        rAnima.setRepeatMode(Animation.REVERSE);
-        rAnima.setInterpolator(new AccelerateDecelerateInterpolator());
-        view.startAnimation(rAnima);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (DownloadManager.getInstance().getDownloadListCount() > 0) {
-            btn.setImageResource(R.drawable.icon_download_red);
-        } else {
-            btn.setImageResource(R.drawable.icon_download);
-        }
-
-
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-       /* FloatMsg floatMsg = new FloatMsg();
-        floatMsg.shouldShow = true;
-        EventBus.getDefault().post(floatMsg);*/
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(NewUserDialog done) {
-        if (done.isDoneNewTask) {
-            HashMap<String, String> map = new HashMap<>();
-            map.put("open_id", SpUtils.getOpenId(this));
-            NetManager.postForm(Url.GET_NEW_TASK_RED, map, getApplicationContext(), new SheepCallback<String>(this) {
-                @Override
-                public void success(String money) {
-                    showRedbagDialog(money);
-                }
-
-                @Override
-                public void failure(IOException e) {
-                    super.failure(e);
-                }
-            });
-
-        }
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(MainTab tab) {
-        mRappTabLayout.selectTab(tab.index);
-    }
-
-    private void showRedbagDialog(String money) {
-        try {
-            if (mRedDialog == null) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this, R.style.Theme_Transparent);
-                View view = View.inflate(this, R.layout.new_user_red_dialog, null);
-                builder.setView(view);
-                mRedDialog = builder.create();
-                view.findViewById(R.id.img_close).setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        mRedDialog.dismiss();
-                    }
-                });
-                view.findViewById(R.id.btn_get_money).setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        mRedDialog.dismiss();
-                        mFgtMainPageTask.initData(false);
-                    }
-                });
-                mTvRedMoney = (TextView) view.findViewById(R.id.tv_money);
-                mRedDialog.setCanceledOnTouchOutside(false);
-            }
-            mTvRedMoney.setText(money);
-            mRedDialog.show();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    long last = 0;
-
-    @Override
-    public void onBackPressed() {
-        long now = System.currentTimeMillis();
-        if (now - last > 1500) {
-            Toast.makeText(this, "双击返回退出程序", Toast.LENGTH_SHORT).show();
-        } else {
-            super.onBackPressed();
-        }
-        last = System.currentTimeMillis();
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-         if(PremissUtils.MY_PERMISSIONS_REQUEST_PACKAGE_USAGE_STATS==requestCode){
-             goToQX();
-         }
-
-    }
-}

+ 0 - 206
app/src/main/java/com/sheep/jiuyan/samllsheep/page/MoneyHistroyActivity.java

@@ -1,206 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.text.TextUtils;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.entry.MoneyHistroy;
-import com.sheep.jiuyan.samllsheep.page.entry.MoneyRecord;
-import com.sheep.jiuyan.samllsheep.utils.FileUtil;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Created by kemllor on 2017/12/29.
- */
-
-public class MoneyHistroyActivity extends BaseActivity {
-    private ListView mLv;
-    private MoneyAdapter mAdapter;
-    List<MoneyRecord> mData;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.money_histroy_activity;
-    }
-
-    @Override
-    public void initView() {
-        mLv = (ListView) findViewById(R.id.lv);
-        TitleBarUtils.getInstance()
-                .setTitle(this, "资金记录")
-                .setTitleFinish(this);
-        mLv.setDividerHeight(0);
-    }
-
-    @Override
-    public void initListener() {
-    }
-
-    private void showView(List<MoneyRecord> orders) {
-        mData = orders;
-        if (mAdapter == null) {
-            mAdapter = new MoneyAdapter();
-            mLv.setAdapter(mAdapter);
-        } else {
-            mAdapter.notifyDataSetChanged();
-        }
-    }
-
-    private void getTask() {
-        final HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(this));
-        showProgress();
-        NetManager.get(Url.MONEYRECORD, map, getApplicationContext(), new SheepCallback<List<MoneyRecord>>(this) {
-            @Override
-            public void success(List<MoneyRecord> orders) {
-                hideProgress();
-                showView(orders);
-            }
-
-            @Override
-            public void failure(IOException e) {
-                super.failure(e);
-                hideProgress();
-            }
-        });
-    }
-
-    @Override
-    public void initData() {
-        getTask();
-    }
-
-
-    private class MoneyAdapter extends BaseAdapter {
-
-        @Override
-        public int getViewTypeCount() {
-            return 2;
-        }
-
-        @Override
-        public int getCount() {
-            if (mData != null)
-                return mData.size();
-            else
-                return 0;
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return position;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            if (TextUtils.isEmpty(mData.get(position).getMonth())) {
-                return 1;
-            } else
-                return 0;
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            int type = getItemViewType(position);
-            if (type == 0) {
-                convertView = getTabView(position, convertView, parent);
-            } else if (type == 1) {
-                convertView = getInfoView(position, convertView, parent);
-            }
-            return convertView;
-        }
-
-        private View getTabView(final int position, View convertView,
-                                ViewGroup parent) {
-            final TablViewHolder holder;
-            if (convertView == null) {
-                convertView = View.inflate(MoneyHistroyActivity.this, R.layout.money_history_item_tab, null);
-                holder = new TablViewHolder(convertView);
-                convertView.setTag(holder);
-            } else {
-                holder = (TablViewHolder) convertView.getTag();
-            }
-            MoneyRecord record = mData.get(position);
-            holder.mTvMonth.setText(record.getMonth());
-            return convertView;
-        }
-
-        private View getInfoView(final int position, View convertView,
-                                 ViewGroup parent) {
-            final InfoViewHolder holder;
-            if (convertView == null) {
-                convertView = View.inflate(MoneyHistroyActivity.this, R.layout.money_history_item, null);
-                holder = new InfoViewHolder(convertView);
-                convertView.setTag(holder);
-            } else {
-                holder = (InfoViewHolder) convertView.getTag();
-            }
-            MoneyRecord record = mData.get(position);
-            holder.mTvClass.setText(record.getData().getDesc());
-            if (record.getData().getMoney().startsWith("-")) {
-                holder.mTvMoney.setTextColor(getResources().getColor(R.color.green));
-            } else {
-                holder.mTvMoney.setTextColor(getResources().getColor(R.color.orange_text_light));
-            }
-            holder.mTvMoney.setText(record.getData().getMoney());
-            String date = FileUtil.transForDate(record.getData().getCreateTime());
-            holder.mTvTime.setText(date);
-            return convertView;
-        }
-    }
-
-
-
-
-    class TablViewHolder {
-        private TextView mTvIn;
-        private TextView mTvOut;
-        private TextView mTvMonth;
-
-        public TablViewHolder(View view) {
-            mTvIn = (TextView) view.findViewById(R.id.tv_in);
-            mTvOut = (TextView) view.findViewById(R.id.tv_out);
-            mTvMonth = (TextView) view.findViewById(R.id.tv_month);
-        }
-    }
-
-    class InfoViewHolder {
-        private TextView mTvDesc;
-        private TextView mTvClass;
-        private TextView mTvTime;
-        private TextView mTvMoney;
-        private ImageView mTvIcon;
-
-        public InfoViewHolder(View view) {
-            mTvDesc = (TextView) view.findViewById(R.id.tv_desc);
-            mTvClass = (TextView) view.findViewById(R.id.tv_class);
-            mTvIcon = (ImageView) view.findViewById(R.id.img_icon);
-            mTvTime = (TextView) view.findViewById(R.id.tv_time);
-            mTvMoney = (TextView) view.findViewById(R.id.tv_money);
-        }
-
-    }
-}

+ 0 - 154
app/src/main/java/com/sheep/jiuyan/samllsheep/page/NewUserGuideActivity.java

@@ -1,154 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.content.Intent;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.event.MainTab;
-import com.sheep.jiuyan.samllsheep.event.NewUserDialog;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.adapter.AdpMainActivity;
-import com.sheep.jiuyan.samllsheep.page.adapter.AdpNewUserTask;
-import com.sheep.jiuyan.samllsheep.page.entry.NewUserTask;
-import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Created by kemllor on 2018/1/25.
- */
-
-public class NewUserGuideActivity extends BaseActivity {
-
-    private RecyclerView mRecyclerView;
-    private AdpNewUserTask mAdapter;
-    private NewUserTask mClickItem;
-    private View mBtnRed;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.new_user_guide_activity;
-    }
-
-    @Override
-    public void initView() {
-        mBtnRed = findViewById(R.id.btn_get_red);
-        mAdapter = new AdpNewUserTask(this);
-        mAdapter.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mClickItem = (NewUserTask) view.getTag(AdpNewUserTask.TAG_TASK);
-                if (!TextUtils.isEmpty(mClickItem.getUrl())) {
-                    Intent intent = new Intent(NewUserGuideActivity.this, WebActivity.class);
-                    intent.putExtra(WebActivity.INTENT_LOAD_JS, "1");
-                    intent.putExtra(WebActivity.INTENT_URL, mClickItem.getUrl());
-                    intent.putExtra(WebActivity.INTENT_TITLE, mClickItem.getTaskname());
-                    startActivity(intent);
-                    if (mClickItem.getFlag() == 0) {
-                        getMoney(mClickItem.getId());
-                    }
-                } else {
-                    if (mClickItem.getFlag() == 1) {
-                        getMoney(mClickItem.getId());
-                    } else if (mClickItem.getFlag() == 0) {
-                        MainTab tab = new MainTab();
-                        tab.index = 0;
-                        EventBus.getDefault().post(tab);
-                        finish();
-                    }
-                }
-            }
-        });
-        mRecyclerView = (RecyclerView) findViewById(R.id.rv_task);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
-        mRecyclerView.setAdapter(mAdapter);
-        TitleBarUtils.getInstance().setTitle(this, "新手引导").setTitleFinish(this);
-    }
-
-    //领取奖金;
-    private void getMoney(int id) {
-        HashMap<String, String> map = new HashMap<>();
-        map.put("open_id", SpUtils.getOpenId(this));
-        map.put("task_id", "" + id);
-        showProgress();
-        NetManager.postForm(Url.GET_NEW_TASK_MONEY, map, getApplicationContext(), new SheepCallback<String>(this) {
-            @Override
-            public void success(String s) {
-                hideProgress();
-                if (TextUtils.equals(s, "OK")) {
-                    initData();
-                    Toast.makeText(NewUserGuideActivity.this, "获取奖励(^.^)", Toast.LENGTH_SHORT).show();
-                }
-            }
-
-            @Override
-            public void failure(IOException e) {
-                hideProgress();
-                Toast.makeText(NewUserGuideActivity.this,"数据请求失败",Toast.LENGTH_LONG).show();
-
-            }
-        });
-    }
-
-    @Override
-    public void initListener() {
-        mBtnRed.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                NewUserDialog dialog = new NewUserDialog();
-                dialog.isDoneNewTask = true;
-                EventBus.getDefault().post(dialog);
-                finish();
-            }
-        });
-    }
-
-    @Override
-    public void initData() {
-        HashMap<String, String> map = new HashMap<>();
-        map.put("open_id", SpUtils.getOpenId(this));
-        showProgress();
-        NetManager.get(Url.NEW_USER_TASK_LIST, map, getApplicationContext(), new SheepCallback<List<NewUserTask>>(this) {
-
-            @Override
-            public void success(List<NewUserTask> newUserTasks) {
-                hideProgress();
-                mAdapter.clear();
-                mAdapter.addAll(newUserTasks);
-                mAdapter.notifyDataSetChanged();
-            }
-
-            @Override
-            public void failure(IOException e) {
-                hideProgress();
-            }
-        });
-
-        NetManager.get(Url.USER_ISFINISH_NEW_TASK, map, getApplicationContext(), new SheepCallback<Boolean>(this) {
-
-            @Override
-            public void success(Boolean aBoolean) {
-                mBtnRed.setEnabled(aBoolean);
-            }
-
-            @Override
-            public void failure(IOException e) {
-            }
-        });
-
-    }
-}

+ 0 - 239
app/src/main/java/com/sheep/jiuyan/samllsheep/page/RegisterActivity.java

@@ -1,239 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.content.Intent;
-import android.os.Handler;
-import android.support.v7.widget.AppCompatEditText;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.entry.BindUserEntiey;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.StringUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-import okhttp3.Call;
-
-/**
- * Created by kemllor on 2018/1/22.
- */
-
-public class RegisterActivity extends BaseActivity {
-
-    private AppCompatEditText mEtAccount;
-    private AppCompatEditText mEtCode;
-    private TextView mBtnCode;
-    private AppCompatEditText mEtPsw;
-    private AppCompatEditText mEtInvite;
-    private TextView mTvWx;
-
-
-    private  boolean  isSendCodeSuccess=false;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.register_activity;
-    }
-
-    @Override
-    public void initView() {
-        findViews();
-    }
-
-
-    private void findViews() {
-        mEtAccount = (AppCompatEditText) findViewById(R.id.et_account);
-        mEtCode = (AppCompatEditText) findViewById(R.id.et_code);
-        mBtnCode = (TextView) findViewById(R.id.btn_code);
-        mEtPsw = (AppCompatEditText) findViewById(R.id.et_psw);
-        mEtInvite = (AppCompatEditText) findViewById(R.id.et_invite);
-        mTvWx = (TextView) findViewById(R.id.tv_wx);
-    }
-
-
-    @Override
-    public void initListener() {
-        mTvWx.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                register();
-            }
-        });
-        mBtnCode.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                getCode();
-            }
-        });
-        findViewById(R.id.tv_login).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(RegisterActivity.this, LoginActivity.class);
-                startActivity(intent);
-                finish();
-            }
-        });
-    }
-
-    private void getCode() {
-        mBtnCode.setEnabled(false);
-        String moble = mEtAccount.getText().toString().trim();
-        if (TextUtils.isEmpty(moble)) {
-            mEtAccount.setError("请输入手机号");
-            mBtnCode.setEnabled(true);
-
-            return;
-        }
-        if(!StringUtils.checkMobileNum(moble)){
-            mEtAccount.setError("请填写正确的手机号码");
-            mBtnCode.setEnabled(true);
-            return;
-        }
-        HashMap<String, String> map = new HashMap<>();
-        map.put("mobile", moble);
-        map.put("step", "1");
-        NetManager.post(Url.REGISTER_HW, map, getApplicationContext(), new SheepCallback<String>(RegisterActivity.this) {
-            @Override
-            public void success(String o) {
-
-                isSendCodeSuccess=true;
-                Toast.makeText(RegisterActivity.this, "验证码已发送", Toast.LENGTH_SHORT).show();
-                mTime = 60;
-                handler.postDelayed(runnable, 1000);
-            }
-
-            @Override
-            public void failure(IOException e) {
-
-                mBtnCode.setEnabled(true);
-                String message = e.getMessage();
-                if (message.contains("参数错误")) {
-                    message = message.replace("参数错误", "");
-                }
-                message = message.trim();
-                Toast.makeText(RegisterActivity.this, message, Toast.LENGTH_SHORT).show();
-            }
-        });
-    }
-
-    int mTime = 0;
-    Handler handler = new Handler();
-    Runnable runnable = new Runnable() {
-        @Override
-        public void run() {
-            mTime--;
-            if (mTime <= 0) {
-                mBtnCode.setText("重新发送");
-                mBtnCode.setEnabled(true);
-            } else {
-                mBtnCode.setText("重新发送(" + mTime + ")");
-                handler.postDelayed(this, 1000);
-            }
-        }
-    };
-
-
-    private void register() {
-        mTvWx.setEnabled(false);
-        String moble = mEtAccount.getText().toString().trim();
-        String psw = mEtPsw.getText().toString().trim();
-        String code = mEtCode.getText().toString().trim();
-        String inviteCode = mEtInvite.getText().toString().trim();
-        if (TextUtils.isEmpty(moble)) {
-            mTvWx.setEnabled(true);
-            mEtAccount.setError("请输入手机号");
-            return;
-        }
-
-        if(!StringUtils.checkMobileNum(moble)){
-            mEtAccount.setError("请填写正确的手机号码");
-            mTvWx.setEnabled(true);
-            return;
-        }
-
-        if (TextUtils.isEmpty(code)) {
-            mTvWx.setEnabled(true);
-            mEtCode.setError("请输入验证码");
-            return;
-        }
-        if (code.length()!=6) {
-            mTvWx.setEnabled(true);
-            mEtCode.setError("请填写6位手机验证码");
-            return;
-        }
-
-        if (TextUtils.isEmpty(psw)) {
-            mTvWx.setEnabled(true);
-            mEtPsw.setError("请输入密码");
-            return;
-        }
-        if (psw.length()<6) {
-            mTvWx.setEnabled(true);
-            mEtPsw.setError("密码长度必须大于6位");
-            return;
-        }
-        HashMap<String, String> map = new HashMap<>();
-        map.put("mobile", moble);
-        map.put("psw", psw);
-        map.put("code", code);
-        map.put("step", "2");
-        map.put("invite", inviteCode);
-        showProgress();
-        NetManager.post(Url.REGISTER_HW, map, getApplicationContext(), new SheepCallback<String>(RegisterActivity.this) {
-            @Override
-            public void success(String token) {
-                hideProgress();
-                loginAuto(token);
-            }
-
-            @Override
-            public void failure(IOException e) {
-                hideProgress();
-                String message = e.getMessage();
-                if (message.contains("参数错误")) {
-                    message = message.replace("参数错误", "");
-                }
-                message = message.trim();
-                Toast.makeText(RegisterActivity.this, message, Toast.LENGTH_SHORT).show();
-                mTvWx.setEnabled(true);
-            }
-        });
-    }
-
-    private void loginAuto(String token) {
-        HashMap<String, String> map = new HashMap<>();
-        map.put("token", token);
-        showProgress();
-        NetManager.get(Url.REGISTER_SHEEP, map, getApplicationContext(), new SheepCallback<BindUserEntiey>(RegisterActivity.this) {
-            @Override
-            public void success(BindUserEntiey o) {
-                hideProgress();
-                SpUtils.login(RegisterActivity.this, o.getOpenId());
-                Intent intent = new Intent(RegisterActivity.this, MainActivity.class);
-                intent.putExtra("tag", "once");
-                startActivity(intent);
-                finish();
-            }
-            @Override
-            public void failure(IOException e) {
-                hideProgress();
-                Toast.makeText(RegisterActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
-                mTvWx.setEnabled(true);
-            }
-        });
-    }
-    @Override
-    public void initData() {
-
-    }
-}

+ 0 - 261
app/src/main/java/com/sheep/jiuyan/samllsheep/page/ResetPWDActivity.java

@@ -1,261 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-import android.content.Intent;
-import android.os.Handler;
-import android.support.v7.widget.AppCompatEditText;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.utils.StringUtils;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-
-/**
- * Created by Administrator on 2018/2/5.
- */
-
-public class ResetPWDActivity extends BaseActivity  implements View.OnClickListener{
-
-    private TextView  mTvNext;
-    private  RelativeLayout rl_rset_pwd;
-    private  RelativeLayout rl_set_pwd;
-
-    private AppCompatEditText et_account;
-    private AppCompatEditText et_psw;
-    private TextView  tv_send;
-
-    private AppCompatEditText et_pwd1;
-    private AppCompatEditText et_pwd2;
-    private TextView tv_submit;
-    private int mTime = 0;
-    private String mPhone;
-
-    private Handler handler = new Handler();
-    Runnable runnable = new Runnable() {
-        @Override
-        public void run() {
-            mTime--;
-            if (mTime <= 0) {
-                tv_send.setText("重新发送");
-                tv_send.setEnabled(true);
-            } else {
-                tv_send.setText("重新发送(" + mTime + ")");
-                handler.postDelayed(this, 1000);
-            }
-        }
-    };
-
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.reset_pwd_activity;
-    }
-
-    @Override
-    public void initView() {
-        mTvNext=(TextView)findViewById(R.id.tv_next);
-        rl_rset_pwd=(RelativeLayout)findViewById(R.id.rl_rset_pwd);
-        rl_set_pwd=(RelativeLayout)findViewById(R.id.rl_set_pwd);
-        et_account=(AppCompatEditText)findViewById(R.id.et_account);
-        et_psw=(AppCompatEditText)findViewById(R.id.et_psw);
-        et_pwd1=(AppCompatEditText)findViewById(R.id.et_pwd1);
-        et_pwd2=(AppCompatEditText)findViewById(R.id.et_pwd2);
-        tv_send=(TextView)findViewById(R.id.tv_send);
-        tv_submit=(TextView)findViewById(R.id.tv_submit);
-    }
-
-    @Override
-    public void initListener() {
-        mTvNext.setOnClickListener(this);
-        tv_send.setOnClickListener(this);
-        tv_submit.setOnClickListener(this);
-    }
-    @Override
-    public void initData() {
-
-
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()){
-            case R.id.tv_next:
-                goNext();
-                break;
-            case R.id.tv_send:
-                sendCode();
-                break;
-            case R.id.tv_submit:
-                reSetPWD();
-                break;
-        }
-    }
-    private  void  hideSetPWD(){
-        HashMap<String, String> map = new HashMap<>();
-        map.put("Account", mPhone);
-        map.put("Step", "2");
-        map.put("SmsSeccode", et_psw.getText().toString().trim());
-        showProgress();
-        NetManager.post(Url.GET_RESET_PWD_CODE, map, getApplicationContext(), new SheepCallback<String>(ResetPWDActivity.this) {
-            @Override
-            public void success(String o) {
-                hideProgress();
-                rl_set_pwd.setVisibility(View.VISIBLE);
-                rl_rset_pwd.setVisibility(View.GONE);
-
-            }
-
-            @Override
-            public void failure(IOException e) {
-                hideProgress();
-                Toast.makeText(ResetPWDActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
-            }
-        });
-
-
-    }
-
-    private  void  sendCode(){
-        String moble = et_account.getText().toString().trim();
-        if (TextUtils.isEmpty(moble)) {
-            et_account.setError("请输入手机号");
-            tv_send.setEnabled(true);
-
-            return;
-        }
-        if(!StringUtils.checkMobileNum(moble)){
-            et_account.setError("请填写正确的手机号码");
-            tv_send.setEnabled(true);
-            return;
-        }
-        HashMap<String, String> map = new HashMap<>();
-        map.put("Account", moble);
-        map.put("Step", "1");
-        NetManager.post(Url.GET_RESET_PWD_CODE, map, getApplicationContext(), new SheepCallback<String>(ResetPWDActivity.this) {
-            @Override
-            public void success(String o) {
-
-                Toast.makeText(ResetPWDActivity.this, "验证码已发送", Toast.LENGTH_SHORT).show();
-                mTime = 60;
-                handler.postDelayed(runnable, 1000);
-            }
-
-            @Override
-            public void failure(IOException e) {
-                tv_send.setEnabled(true);
-                Toast.makeText(ResetPWDActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
-            }
-        });
-
-    }
-
-
-    private  void  reSetPWD(){
-        String pw1 = et_pwd1.getText().toString().trim();
-        String pw2 = et_pwd2.getText().toString().trim();
-        if (TextUtils.isEmpty(pw1)) {
-            et_pwd1.setError("请输入密码");
-            return;
-        }
-
-        if (TextUtils.isEmpty(pw2)) {
-            et_pwd2.setError("请再次输入密码");
-            return;
-        }
-        if(!pw1.equals(pw2)){
-            et_pwd2.setError("密码不一致");
-            return;
-        }
-
-        HashMap<String, String> map = new HashMap<>();
-        map.put("Account", mPhone);
-        map.put("Step", "3");
-        map.put("SmsSeccode", et_psw.getText().toString().trim());
-        map.put("NewPass", pw1);
-        showProgress();
-        NetManager.post(Url.GET_RESET_PWD_CODE, map, getApplicationContext(), new SheepCallback<String>(ResetPWDActivity.this) {
-            @Override
-            public void success(String o) {
-                hideProgress();
-                Toast.makeText(ResetPWDActivity.this, "密码修复成功,请重新登录", Toast.LENGTH_SHORT).show();
-                Intent i=new  Intent(ResetPWDActivity.this,LoginActivity.class);
-                i.putExtra("phone",mPhone);
-                startActivity(i);
-
-            }
-
-            @Override
-            public void failure(IOException e) {
-                hideProgress();
-                tv_send.setEnabled(true);
-                String message = e.getMessage();
-                if (message.contains("参数错误")) {
-                    message = message.replace("参数错误", "");
-                }
-                message = message.trim();
-                Toast.makeText(ResetPWDActivity.this, message, Toast.LENGTH_SHORT).show();
-            }
-        });
-
-
-
-
-    }
-
-
-
-
-
-
-
-
-    private  void  goNext(){
-
-        String moble = et_account.getText().toString().trim();
-        if (TextUtils.isEmpty(moble)) {
-            et_account.setError("请输入手机号");
-            return;
-        }
-
-        if(!StringUtils.checkMobileNum(moble)){
-            et_account.setError("请填写正确的手机号码");
-            return;
-        }
-
-        String  code=et_psw.getText().toString().trim();
-        if (TextUtils.isEmpty(code)) {
-            et_psw.setError("请输入验证码");
-            return;
-        }
-        if (code.length()!=6) {
-            et_psw.setError("请填写6位手机验证码");
-            return;
-        }
-        mPhone=et_account.getText().toString().trim();
-
-
-        hideSetPWD();
-
-
-
-
-
-
-    }
-
-
-
-
-
-
-}

+ 0 - 185
app/src/main/java/com/sheep/jiuyan/samllsheep/page/ShotScreenActivity.java

@@ -1,185 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.media.projection.MediaProjectionManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Environment;
-import android.text.TextUtils;
-import android.view.Window;
-import android.widget.Toast;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.floatwindow.ShotScreen;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import static java.security.AccessController.getContext;
-
-/**
- * Created by kemllor on 2017/12/13.
- */
-
-public class ShotScreenActivity extends Activity {
-    public static final int REQUEST_MEDIA_PROJECTION = 0x2893;
-    private String mPath;
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        requestScreenShot();
-    }
-
-
-    public void requestScreenShot() {
-        if (Build.VERSION.SDK_INT >= 21) {
-            startActivityForResult(
-                    ((MediaProjectionManager) getSystemService(Context.MEDIA_PROJECTION_SERVICE))
-                            .createScreenCaptureIntent(), REQUEST_MEDIA_PROJECTION);
-        } else {
-            String path = doCaptureScreeKITKAT();
-            if (path != null) {
-                commitTask(path);
-            } else {
-                toast("版本过低,无法自动截屏,请手动截图从任务攻略界面上传");
-                finish();
-            }
-        }
-    }
-
-    private void toast(String str) {
-        Toast.makeText(ShotScreenActivity.this, str, Toast.LENGTH_LONG).show();
-    }
-
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        switch (requestCode) {
-            case REQUEST_MEDIA_PROJECTION: {
-                if (resultCode == -1 && data != null) {
-                    ShotScreen shotter = new ShotScreen(ShotScreenActivity.this, data);
-                    shotter.startScreenShot(new ShotScreen.OnShotListener() {
-                        @Override
-                        public void onFinish(String path) {
-                            setContentView(R.layout.shotscreen_activity);
-                            commitTask(path);
-                        }
-                    });
-                }
-            }
-        }
-    }
-
-    private void commitTask(final String path) {
-        String topApp = "";
-       final Intent intent = getIntent();
-        if (intent != null) {
-            topApp = intent.getStringExtra("pkg");
-        }
-        if(TextUtils.isEmpty(topApp)){
-            AlertDialog.Builder  builder=    new AlertDialog.Builder(this)
-                    .setTitle("自动上传失败!")
-                    .setMessage("亲!请到任务列表选择你当前的任务 手动上传哟!")
-                    .setPositiveButton("去上传!", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                             Intent    intent = new Intent(getApplicationContext(), MainActivity.class);
-                             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                             startActivity(intent);
-                             SpUtils.setImagePath(ShotScreenActivity.this,path);
-                        }
-                    });
-            builder.setCancelable(false);
-            builder.show();
-            return ;
-        }
-        HashMap<String, String> parma = new HashMap<>();
-        parma.put("task_pkg", topApp);
-        parma.put("wx_open_id", SpUtils.getOpenId(this));
-        NetManager.upload(Url.UPLOAD_IMG, parma, new File(path), getApplicationContext(), new SheepCallback<String>(this) {
-            @Override
-            public void success(String s) {
-                Toast.makeText(ShotScreenActivity.this, s, Toast.LENGTH_SHORT).show();
-                finish();
-            }
-            @Override
-            public void failure(IOException e) {
-                Toast.makeText(ShotScreenActivity.this, "上传截图失败,亲!请从新上传", Toast.LENGTH_SHORT).show();
-                finish();
-            }
-        });
-    }
-
-    /**
-     * 截图
-     */
-    public String doCaptureScreeKITKAT() {
-        String dir = "/sdcard/Sheep";
-        File file = new File(dir);
-        if (!file.exists()) {
-            file.mkdirs();
-        }
-        mPath = dir + "/task.png";
-        List<String> command = new ArrayList<>();
-        command.add("screencap -p /sdcard/test.png");
-        return getScreenShotStream(command.toArray(new String[]{}));
-    }
-
-    /**
-     * 获取截屏流,转换成位图
-     */
-    public String getScreenShotStream(String[] commands) {
-        if (commands == null || commands.length == 0)
-            return null;
-        Process process = null;
-        DataOutputStream os;
-        try {
-            process = Runtime.getRuntime().exec("screencap -p /sdcard/test.png");
-            os = new DataOutputStream(process.getOutputStream());
-            for (String command : commands) {
-                if (command == null) {
-                    continue;
-                }
-                os.write(command.getBytes());
-                os.writeBytes("/n");
-                os.flush();
-            }
-            os.writeBytes("exit/n");
-            os.flush();
-            os.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (process != null) {
-                    process.exitValue();
-                }
-            } catch (IllegalThreadStateException e) {
-                process.destroy();
-            }
-        }
-        File fileImage = new File(mPath);
-        if (fileImage.exists()) {
-            return mPath;
-        }
-        return null;
-    }
-
-
-}

+ 0 - 155
app/src/main/java/com/sheep/jiuyan/samllsheep/page/SplashActivity.java

@@ -1,155 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.Manifest;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Handler;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.Toast;
-
-import com.kfzs.duanduan.ActMain;
-import com.mylhyl.acp.Acp;
-import com.mylhyl.acp.AcpListener;
-import com.mylhyl.acp.AcpOptions;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.view.activity.LoginAct;
-import com.sheep.gamegroup.view.activity.PersonalCenterAct;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
-import com.sheep.jiuyan.samllsheep.utils.PermissionFloatWindowUtils;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-
-import java.util.List;
-
-/**
- * Created by kemllor on 2018/1/24.
- */
-
-public class SplashActivity extends BaseActivity {
-
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.splash_activity;
-    }
-
-    @Override
-    public void initView() {
-    }
-
-    @Override
-    public void initListener() {
-
-
-    }
-
-    @Override
-    public void initData() {
-        OpenXFK();
-
-
-    }
-
-    /**
-     * 申请读写权限6.0
-     */
-    private void getSA() {
-             Acp.getInstance(this).request(new AcpOptions.Builder()
-                        .setPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE
-                                ,Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE
-                        )
-                        .build(),
-                new AcpListener() {
-                    @Override
-                    public void onGranted() {
-                        ClassFileHelper.getInstance().createSDDirection();
-
-                        new Handler().postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                goMain();
-                            }
-                        },2000);
-                    }
-
-                    @Override
-                    public void onDenied(List<String> permissions) {
-                        Toast.makeText(SplashActivity.this, "亲!权限拒绝可能会导致某些功能无法使用", Toast.LENGTH_LONG).show();
-
-                    }
-                });
-
-    }
-
-
-    private  void  goMain(){
-//        SpUtils.login(getApplicationContext(), "12@1c421522bb7e44d3cd6a8d59a54df182");
-        String openId = SpUtils.getOpenId(getApplicationContext());
-        if (!TextUtils.isEmpty(openId)) {
-//            Jump2View.getInstance().goHomePageView(SplashActivity.this, null);
-            startActivity(new Intent(this, MainActivity.class));
-            finish();
-        } else {
-            startActivity(new Intent(this, LoginActivity.class));
-            finish();
-            finish();
-        }
-
-    }
-
-
-    private  void  OpenXFK(){
-        // 增加权限
-        final PermissionFloatWindowUtils permissionFloatWindowUtils = PermissionFloatWindowUtils.getInstance();
-        boolean checkResult = permissionFloatWindowUtils.checkCanShowFloatWindow(this);
-        if (!checkResult) {
-            final AlertDialog alertDialog = new AlertDialog.Builder(this)
-                    .setTitle("温馨提示!")
-                    .setMessage("需要开启悬浮框权限才能参与赚钱哟!")
-                    .setPositiveButton("去开启", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialogInterface, int i) {
-                            permissionFloatWindowUtils.grantShowFloatWindowPermission(SplashActivity.this);
-                        }
-                    })
-                    .setCancelable(false)
-                    .create();
-            alertDialog.setCanceledOnTouchOutside(false);
-            alertDialog.show();
-        }else{
-            getSA();
-        }
-
-
-    }
-
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if(requestCode==PermissionFloatWindowUtils.REQUEST_OVERLAY_PERMISSION){
-
-            if(resultCode==1){
-                getSA();
-            }else{
-                OpenXFK();
-
-            }
-
-
-        }
-
-
-    }
-
-
-
-
-
-
-
-}

+ 0 - 359
app/src/main/java/com/sheep/jiuyan/samllsheep/page/TaskRecordActivity.java

@@ -1,359 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.os.Message;
-import android.support.v7.app.AlertDialog;
-import android.text.TextUtils;
-import android.text.format.DateFormat;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.PopupWindow;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.sheep.gamegroup.util.DeviceUtil;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.entry.Commit;
-import com.sheep.jiuyan.samllsheep.page.view.MyPopupWindow;
-import com.sheep.jiuyan.samllsheep.utils.DeviceUtils;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-import com.zhy.adapter.abslistview.CommonAdapter;
-import com.zhy.adapter.abslistview.ViewHolder;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-import static com.sheep.jiuyan.samllsheep.SheepApp.mContext;
-
-/**
- * Created by kemllor on 2017/12/26.
- */
-
-public class TaskRecordActivity extends BaseActivity {
-
-    public static final int REFRESH_ADAPTER = 1;
-    public static final int REFRESH_IMAGEVIEW = 0;
-
-    private ListView mLvTask;
-    private CommonAdapter mAdapter;
-    private List<Commit> mCommits;
-    private List<Commit> mCommitsStatus = new ArrayList<>();;
-    private AlertDialog mDialog;
-    private AlertDialog mReDialog;
-    private PopupWindow popupWindow;
-    private TextView tv_linearLayout_baseactivity_right;
-    private ArrayList<String> dateList = new ArrayList<>();
-    private LinearLayout linearLayout_baseactivity_right;
-    private ImageView iv_linearLayout_baseactivity_right;
-    private int status = 0;//commit:Status 1(未审核),2(通过),3(未通过)
-
-    Handler mhandler = new Handler(){
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-            try{
-                switch (msg.what){
-                    case REFRESH_IMAGEVIEW:
-                        MyPopupWindow.newInstance().setSelectOr(TaskRecordActivity.this, iv_linearLayout_baseactivity_right, (Boolean) msg.obj);
-
-                        break;
-                    case REFRESH_ADAPTER:
-                        status = (int) msg.obj;
-                        tv_linearLayout_baseactivity_right.setText(dateList.get(status));
-                        filtrate(status);
-                        break;
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-        }
-    };
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.task_record_activity;
-    }
-
-    @Override
-    public void initView() {
-        linearLayout_baseactivity_right = findViewById(R.id.linearLayout_baseactivity_right);
-        mLvTask = (ListView) findViewById(R.id.lv_task);
-        mLvTask.setDividerHeight(0);
-        tv_linearLayout_baseactivity_right = findViewById(R.id.tv_linearLayout_baseactivity_right);
-        iv_linearLayout_baseactivity_right = findViewById(R.id.iv_linearLayout_baseactivity_right);
-        linearLayout_baseactivity_right.setVisibility(View.VISIBLE);
-
-        MyPopupWindow.newInstance().setSelectOr(TaskRecordActivity.this, iv_linearLayout_baseactivity_right, false);
-    }
-
-    @Override
-    public void initListener() {
-        mLvTask.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                final Commit commit = mCommitsStatus.get(position);
-                if (mDialog == null) {
-                    mDialog = new AlertDialog.Builder(TaskRecordActivity.this)
-                            .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    dispatch(commit);
-                                    mDialog.dismiss();
-                                }
-                            }).setNegativeButton("取消", new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    mDialog.dismiss();
-                                }
-                            }).create();
-                }
-                mDialog.setMessage(getTip(commit.getStatus()));
-                mDialog.show();
-            }
-        });
-
-        //右按钮
-        linearLayout_baseactivity_right.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Message m = new Message();
-                // 使用isShowing()检查popup窗口是否在显示状态
-                if (popupWindow != null && !popupWindow.isShowing()) {
-                    popupWindow.showAsDropDown(tv_linearLayout_baseactivity_right, 0, -1);
-                    m.obj = true;
-                }else{
-                    m.obj = false;
-                }
-
-                m.what = REFRESH_IMAGEVIEW;
-                mhandler.sendMessage(m);
-            }
-        });
-    }
-
-    private void dispatch(final Commit commit) {
-        if (commit.getStatus() == 3) {
-            HashMap<String, String> map = new HashMap<>();
-            map.put("wx_open_id", SpUtils.getOpenId(this));
-            showProgress();
-            NetManager.get(Url.USER_CHECK_REGISTER, map, getApplicationContext(), new SheepCallback<String>(this) {
-                @Override
-                public void success(String ok) {
-                    hideProgress();
-                    if (TextUtils.equals(ok, "ok")) {
-                        startRecommitTask(commit);
-                    } else {
-                        showRecommitDialog("你有任务正在进行,是否取消,接受新任务?", commit);
-                    }
-                }
-
-                @Override
-                public void failure(IOException e) {
-                    super.failure(e);
-                    hideProgress();
-                }
-            });
-        }
-    }
-
-    private void showRecommitDialog(String s, final Commit commit) {
-        if (mReDialog == null) {
-            mReDialog = new AlertDialog.Builder(TaskRecordActivity.this)
-                    .setMessage(s)
-                    .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            startRecommitTask(commit);
-                            mReDialog.dismiss();
-                        }
-                    }).setNegativeButton("取消", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            mReDialog.dismiss();
-                        }
-                    }).create();
-        }
-        mReDialog.show();
-    }
-
-    private void startRecommitTask(final Commit commit) {
-        HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(this));
-        map.put("task_id", commit.getTaskPublishId() + "");
-        map.put("imei",  DeviceUtil.getDeviceId(mContext));
-        showProgress();
-        NetManager.get(Url.USER_REGISTER_TASK, map, getApplicationContext(), new SheepCallback<String>(this) {
-            @Override
-            public void success(String o) {
-                hideProgress();
-                String pkg = commit.getTask().getPkg();
-                if (!TextUtils.isEmpty(pkg)) {
-                    boolean installed = PackageUtil.isAppInstalled(getApplicationContext(), pkg);
-                    if (installed) {
-                      /*  FloatMsg floatMsg = new FloatMsg();
-                        floatMsg.shouldShow = true;
-                        EventBus.getDefault().post(floatMsg);*/
-                        PackageUtil.startApp(getApplicationContext(), pkg);
-                    } else {
-                        Intent intent = new Intent(TaskRecordActivity.this, XDownLoadActivity.class);
-                        intent.putExtra("task", commit.getTask());
-                        startActivity(intent);
-                    }
-                } else {
-                    Toast.makeText(TaskRecordActivity.this, "任务已经重新激活,快去完成吧", Toast.LENGTH_SHORT).show();
-                }
-            }
-
-            @Override
-            public void failure(IOException e) {
-                super.failure(e);
-                hideProgress();
-            }
-        });
-
-    }
-
-    private String getTip(int status) {
-        String str = null;
-        switch (status) {
-            case 1:
-                str = "您提交的任务正在排队审核,请耐心等待,很快就好";
-                break;
-            case 2:
-                str = "您提交的任务已经通过审核,羊毛已经入库~~";
-                break;
-            case 3:
-                str = "您提交的任务审核未通过,是否重新提交";
-                break;
-        }
-        return str;
-    }
-
-    @Override
-    public void initData() {
-        Intent intent = getIntent();
-        String title = intent.getStringExtra("title");
-        String date = "";
-        if (!TextUtils.isEmpty(title)) {
-            TitleBarUtils.getInstance()
-                    .setTitle(this, title)
-                    .setTitleFinish(this);
-            date = DateFormat.format("yyyy-MM-dd", new Date()).toString() + " 00:00:00";
-        } else {
-            TitleBarUtils.getInstance()
-                    .setTitle(this, "任务记录")
-                    .setTitleFinish(this);
-        }
-        HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(this));
-        map.put("date", date);
-        showProgress();
-        NetManager.get(Url.USER_COMMIT, map, getApplicationContext(), new SheepCallback<List<Commit>>(this) {
-            @Override
-            public void success(List<Commit> commits) {
-                hideProgress();
-                mCommits = commits;
-                filtrate(status);
-                mAdapter.notifyDataSetChanged();
-            }
-
-            @Override
-            public void failure(IOException e) {
-                super.failure(e);
-                hideProgress();
-            }
-        });
-        mAdapter = new CommonAdapter<Commit>(TaskRecordActivity.this, R.layout.task_record_item, mCommitsStatus) {
-            @Override
-            protected void convert(ViewHolder viewHolder, Commit item, int position) {
-                String time = null;
-                try {
-                    String[] tmp1 = item.getCreateTime().split("-");
-                    String[] tmp2 = tmp1[2].split(" ")[1].split(":");
-                    time = tmp1[1] + "/" + tmp1[2].split(" ")[0] + "\n" + tmp2[0] + ":" + tmp2[1];
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                viewHolder.setText(R.id.tv_time, time);
-                getState(viewHolder.<TextView>getView(R.id.tv_state), item.getStatus());
-                viewHolder.setText(R.id.txt_baseactivity_title, item.getTask().getTitle());
-                Glide.with(TaskRecordActivity.this)
-                        .load(item.getTask().getIcon())
-                        .apply(new RequestOptions().placeholder(R.drawable.icon)
-                        .dontAnimate())
-                        .into(viewHolder.<ImageView>getView(R.id.img_icon));
-                String strMoney=TextUtils.isEmpty(item.getCompleteMoney())?item.getTask().getPrice():item.getCompleteMoney();
-                viewHolder.setText(R.id.tv_money, "¥" + strMoney);
-                TextView failed = viewHolder.getView(R.id.tv_failed);
-                if (!TextUtils.isEmpty(item.getFailDesc())) {
-                    failed.setVisibility(View.VISIBLE);
-                    failed.setText(item.getFailDesc());
-                } else {
-                    failed.setVisibility(View.GONE);
-                }
-            }
-
-            private void getState(TextView view, int state) {
-                switch (state) {
-                    case 1:
-                        view.setText("审核中");
-                        view.setBackgroundResource(R.drawable.sp_btn_common);
-                        break;
-                    case 2:
-                        view.setText("已审核");
-                        view.setBackgroundResource(R.drawable.sp_btn_common_green);
-                        break;
-                    case 3:
-                        view.setText("未通过");
-                        view.setBackgroundResource(R.drawable.sp_btn_common_orange);
-                        break;
-                }
-            }
-        };
-        mLvTask.setAdapter(mAdapter);
-
-        //popupwindow 刷选列表
-        dateList.clear();
-        dateList.add(" 全部 ");
-        dateList.add("审核中");
-        dateList.add("已审核");
-        dateList.add("未通过");
-        tv_linearLayout_baseactivity_right.setText(dateList.get(0));
-        popupWindow = MyPopupWindow.newInstance().getPopupWindow(this, dateList, tv_linearLayout_baseactivity_right, mhandler);
-    }
-
-    /**
-     * 筛选 date
-     */
-    private void filtrate(int status){
-
-        mCommitsStatus.clear();
-        if(status == 0){
-            mCommitsStatus.addAll(mCommits);
-        }
-        for(Commit c: mCommits){
-            if(c.getStatus() == status){
-                mCommitsStatus.add(c);
-            }
-        }
-        mAdapter.notifyDataSetChanged();
-    }
-}

+ 0 - 228
app/src/main/java/com/sheep/jiuyan/samllsheep/page/UserCenterActivity.java

@@ -1,228 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.app.AlertDialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.entry.User;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.StringUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-
-
-/**
- * Created by kemllor on 2017/12/13.
- */
-
-/**
- * author:kemllor
- * version:1.0.0
- * copyright:云端助手
- * date:2017-12-15
- * file: UserCenterActivity.class
- */
-
-public class UserCenterActivity extends BaseActivity implements View.OnClickListener {
-    private ImageView mImgIcon;
-    private TextView mTvNick;
-    private TextView mTvMoney;
-    private TextView mTvCode;
-    private TextView mTvWithdraw;
-    private TextView mTvTask;
-    private TextView mTvWithdrawHostroy;
-    private User mUser;
-    private LinearLayout mLlMoneyHostroy;
-    private TextView tv_wx_aacount;
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.usercenter_activity;
-    }
-
-    @Override
-    public void initListener() {
-        mTvWithdraw.setOnClickListener(this);
-        mTvTask.setOnClickListener(this);
-        mTvWithdrawHostroy.setOnClickListener(this);
-        mLlMoneyHostroy.setOnClickListener(this);
-        tv_wx_aacount.setOnClickListener(this);
-        findViewById(R.id.tv_friend).setOnClickListener(this);
-    }
-
-    @Override
-    public void initData() {
-
-    }
-
-
-
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(this));
-        showProgress();
-        NetManager.get(Url.USER_INFO, map, getApplicationContext(), new SheepCallback<User>(this) {
-                    @Override
-                    public void success(User user) {
-                        hideProgress();
-                        mUser = user;
-                        G.mUser = user;
-                        mTvNick.setText(user.getNickName());
-                        mTvMoney.setText(StringUtils.strToMoney(user.getBalance()));
-                        mTvCode.setText("我的邀请码  " + user.getInvitationCode());
-                        Glide.with(getApplicationContext()).load(user.getIcon()).apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon).dontAnimate()).into(mImgIcon);
-                        if(TextUtils.isEmpty(user.getMobile())){
-                            //做弹框
-                            showBindPhoneDialog();
-                        }
-
-                    }
-
-                    @Override
-                    public void failure(IOException e) {
-                        super.failure(e);
-                        hideProgress();
-
-                    }
-                }
-        );
-
-    }
-
-    private  void  showBindPhoneDialog(){
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(UserCenterActivity.this);
-        View view = View.inflate(this, R.layout.bind_user_dialog, null);
-        builder.setView(view);
-        final AlertDialog dialog = builder.create();
-        dialog.show();
-        ImageView iv_close = (ImageView) view.findViewById(R.id.iv_close);
-        iv_close.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                dialog.dismiss();
-            }
-        });
-
-        Button btn = (Button) view.findViewById(R.id.btn);
-        btn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-               Intent i=new Intent(UserCenterActivity.this,BindPhoneActivity.class);
-                UserCenterActivity.this.startActivity(i);
-                dialog.dismiss();
-            }
-        });
-
-
-
-    }
-
-
-
-    @Override
-    public void initView() {
-        mImgIcon = (ImageView) findViewById(R.id.img_icon);
-        mTvNick = (TextView) findViewById(R.id.tv_nick);
-        mTvMoney = (TextView) findViewById(R.id.tv_money);
-        mTvCode = (TextView) findViewById(R.id.tv_invitation_code);
-        mTvWithdraw = (TextView) findViewById(R.id.tv_withdraw);
-        mTvTask = (TextView) findViewById(R.id.tv_task);
-        mTvWithdrawHostroy = (TextView) findViewById(R.id.tv_withdraw_hostroy);
-        tv_wx_aacount = (TextView) findViewById(R.id.tv_wx_aacount);
-
-        mLlMoneyHostroy = (LinearLayout) findViewById(R.id.ll_money_hostroy);
-
-        TitleBarUtils.getInstance()
-                .setTitle(this, "个人中心")
-                .setTitleFinish(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-        Intent intent;
-        int i = v.getId();
-        if (i == R.id.tv_withdraw) {
-            if (checkLogin()) {
-                intent = new Intent(UserCenterActivity.this, WithdrawActivity.class);
-                if (mUser != null)
-                    intent.putExtra("money", mUser.getBalance());
-                startActivity(intent);
-            } else {
-                toLogin();
-            }
-
-        }
-//        else if (i == R.id.tv_task) {
-//            if (checkLogin()) {
-//                intent = new Intent(UserCenterActivity.this, TaskRecordActivity.class);
-//                startActivity(intent);
-//            } else {
-//                toLogin();
-//            }
-//
-//        }
-          else if (i == R.id.ll_money_hostroy) {
-            if (checkLogin()) {
-                intent = new Intent(UserCenterActivity.this, MoneyHistroyActivity.class);
-                startActivity(intent);
-            } else {
-                toLogin();
-            }
-
-
-        } else if (i == R.id.tv_wx_aacount) {
-            if (checkLogin()) {
-                intent = new Intent(UserCenterActivity.this, WXAccountActivity.class);
-                startActivity(intent);
-            } else {
-                toLogin();
-            }
-
-
-        } else if (i == R.id.tv_friend) {
-            if (checkLogin()) {
-                intent = new Intent(UserCenterActivity.this, AskFriendActivity.class);
-                startActivity(intent);
-            } else {
-                toLogin();
-            }
-        }
-    }
-
-    private void toLogin() {
-        //        Intent intent = new Intent(UserCenterActivity.this, LoginActivity.class);
-        //        startActivity(intent);
-    }
-
-    private boolean checkLogin() {
-        return SpUtils.isLogin(getApplicationContext());
-    }
-
-}

+ 0 - 100
app/src/main/java/com/sheep/jiuyan/samllsheep/page/WXAccountActivity.java

@@ -1,100 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.entry.WXAccount;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-import com.zhy.adapter.abslistview.CommonAdapter;
-import com.zhy.adapter.abslistview.ViewHolder;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Created by kemllor on 2017/12/29.
- */
-
-public class WXAccountActivity extends BaseActivity {
-    private ListView mLv;
-    private CommonAdapter<WXAccount> mAdapter;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.wx_account_activity;
-    }
-
-    @Override
-    public void initView() {
-        mLv = (ListView) findViewById(R.id.lv);
-        TitleBarUtils.getInstance()
-                .setTitle(this, "账户信息")
-                .setTitleFinish(this);
-    }
-
-    @Override
-    public void initListener() {
-    }
-
-    private void showView(List<WXAccount> orders) {
-        mAdapter = new CommonAdapter<WXAccount>(WXAccountActivity.this, R.layout.wx_account_item, orders) {
-            @Override
-            protected void convert(ViewHolder viewHolder, WXAccount item, int position) {
-
-                viewHolder.setText(R.id.tv_account, item.getWxId());
-
-                viewHolder.setText(R.id.tv_desc, item.getAction());
-                getState(viewHolder.<TextView>getView(R.id.tv_status), item.getStatus());
-
-
-            }
-
-            private void getState(TextView view, int state) {
-                switch (state) {
-                    case 0:
-                        view.setText("未审核");
-                        view.setBackgroundResource(R.color.theme);
-                        break;
-                    case 1:
-                        view.setText("正常");
-                        view.setBackgroundResource(R.color.green);
-                        break;
-                    case 2:
-                        view.setText("异常");
-                        view.setBackgroundResource(R.color.sheep_red);
-                        break;
-                }
-            }
-        };
-        mLv.setAdapter(mAdapter);
-    }
-    private void getTask() {
-        final HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(this));
-        showProgress();
-        NetManager.get(Url.WXACCOUNT, map, getApplicationContext(), new SheepCallback<List<WXAccount>>(this) {
-            @Override
-            public void success(List<WXAccount> orders) {
-                hideProgress();
-                showView(orders);
-            }
-            @Override
-            public void failure(IOException e) {
-                super.failure(e);
-                hideProgress();
-            }
-        });
-    }
-
-    @Override
-    public void initData() {
-        getTask();
-    }
-}

+ 0 - 247
app/src/main/java/com/sheep/jiuyan/samllsheep/page/WebActivity.java

@@ -1,247 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.text.TextUtils;
-import android.view.View;
-import android.webkit.JavascriptInterface;
-import android.webkit.JsResult;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.event.NewUserDialog;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.entry.InviteUrl;
-import com.sheep.jiuyan.samllsheep.page.entry.WXAccount;
-import com.sheep.jiuyan.samllsheep.page.view.SlowlyProgressBar;
-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 java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Created by kemllor on 2018/1/2.
- */
-
-public class WebActivity extends BaseActivity {
-
-    private WebView mWeb;
-    public final static String INTENT_URL = "url";
-    public final static String INTENT_TITLE = "INTENT_TITLE";
-    public final static String INTENT_LOAD_JS = "INTENT_LOAD_JS";//只要此INTENT有就会载入
-    public final static String INTENT_NEW_USER = "INTENT_NEW_USER";//新手引导
-    public final static String TASK_COUNT = "TASK_COUNT";//任务完成数
-    private SlowlyProgressBar slowlyProgressBar;
-    private static String  mLinkUrl;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.web_activity;
-    }
-
-    @Override
-    public void initView() {
-        if (!getIntent().hasExtra(INTENT_URL)) {
-            G.showToast("网址打开失败!");
-            finish();
-            return;
-        }
-        mWeb = (WebView) findViewById(R.id.web);
-
-        slowlyProgressBar =
-                new SlowlyProgressBar
-                        (
-                                (ProgressBar) findViewById(R.id.ProgressBar)
-                        );
-        mWeb.setWebViewClient(new WebViewClient() {
-
-            @Override
-            public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                slowlyProgressBar.onProgressStart();
-            }
-        });
-
-        mWeb.setWebChromeClient(new WebChromeClient() {
-
-            @Override
-            public void onProgressChanged(WebView view, int newProgress) {
-                if(slowlyProgressBar!=null){
-                    slowlyProgressBar.onProgressChange(newProgress);
-                }
-
-
-            }
-        });
-
-        mWeb.getSettings().setJavaScriptEnabled(true);
-        mWeb.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                view.loadUrl(url);
-                return true;
-            }
-        });
-        TitleBarUtils.getInstance()
-                .setTitle(this, getIntent().hasExtra(INTENT_TITLE) ?
-                        getIntent().getStringExtra(INTENT_TITLE) : "任务攻略")
-                .setTitleFinish(this);
-
-        if (getIntent().hasExtra(INTENT_LOAD_JS)) {
-            mWeb.addJavascriptInterface(new PublicJavaScript(), "PublicJavaScript");
-        }
-        if(getIntent().getStringExtra(INTENT_TITLE).equals("ditui")){
-            TitleBarUtils.getInstance().setShowOrHide(this,false);
-            mWeb.addJavascriptInterface(new PublicJavaScript(), "PublicJavaScript");
-            getShareLink();
-        }
-
-    }
-
-
-
-    /**
-     * JS调用方法
-     */
-    public class PublicJavaScript {
-        @JavascriptInterface
-        public void submit(String user, String pass, String phone) {
-            if (TextUtils.isEmpty(user)) {
-                Toast.makeText(WebActivity.this, "请输入微信帐号", Toast.LENGTH_SHORT).show();
-                return;
-            }
-            if (TextUtils.isEmpty(pass)) {
-                Toast.makeText(WebActivity.this, "请输入微信密码", Toast.LENGTH_SHORT).show();
-                return;
-            }
-            if (TextUtils.isEmpty(phone)) {
-                Toast.makeText(WebActivity.this, "请输入常用手机号", Toast.LENGTH_SHORT).show();
-                return;
-            }
-            HashMap<String, String> map = new HashMap<>();
-            map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
-            map.put("wx_1", user);
-            map.put("ps_1", pass);
-            map.put("phone", phone);
-            showProgress();
-            NetManager.get(Url.COMMIT_WXACCOUNT, map, WebActivity.this,
-                    new SheepCallback<String>(WebActivity.this) {
-                        @Override
-                        public void success(String string) {
-                            hideProgress();
-                            G.showToast("申请成功!");
-                            finish();
-                        }
-
-                        @Override
-                        public void failure(IOException e) {
-                            hideProgress();
-                            Toast.makeText(WebActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
-                        }
-                    });
-        }
-
-        @JavascriptInterface
-        public void finish() {
-            WebActivity.this.finish();
-        }
-
-        @JavascriptInterface
-        public void setTitle(String title) {
-            TitleBarUtils.getInstance().setTitle(WebActivity.this, title);
-        }
-
-        @RequiresApi(api = Build.VERSION_CODES.KITKAT)
-        @JavascriptInterface
-        public void getCode() {
-                mWeb.post(new Runnable() {
-                    @Override
-                    public void run() {
-
-                        // 注意调用的JS方法名要对应上
-
-
-                        mWeb.loadUrl( "javascript:showCode('" + mLinkUrl + "')");
-                    }
-                });
-
-
-
-        }
-
-
-    }
-
-
-    private void getShareLink() {
-        HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(this));
-        showProgress();
-        NetManager.get(Url.USER_INVITE_URL, map, getApplicationContext(), new SheepCallback<InviteUrl>(this) {
-            @Override
-            public void success(InviteUrl o) {
-                hideProgress();
-                if (o != null)
-                    mLinkUrl = o.getUrl();
-            }
-
-            @Override
-            public void failure(IOException e) {
-                super.failure(e);
-                hideProgress();
-
-            }
-        });
-    }
-
-
-
-
-
-    @Override
-    public void initListener() {
-    }
-
-    @Override
-    public void initData() {
-        String url = getIntent().getStringExtra(INTENT_URL);
-        mWeb.loadUrl(url);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        LinearLayout parent = (LinearLayout) mWeb.getParent();
-        parent.removeView(mWeb);
-        mWeb.destroy();
-    }
-
-    @Override
-    public void finish() {
-        super.finish();
-        if(slowlyProgressBar!=null){
-            slowlyProgressBar.destroy();
-            slowlyProgressBar = null;
-        }
-    }
-
-
-}

+ 0 - 214
app/src/main/java/com/sheep/jiuyan/samllsheep/page/WithdrawActivity.java

@@ -1,214 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.GridView;
-import android.widget.RadioButton;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.entry.User;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.StringUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-/**
- * Created by kemllor on 2017/12/13.
- */
-
-public class WithdrawActivity extends BaseActivity implements View.OnClickListener {
-    private TextView mMoney;
-    private GridView mGvMoney;
-    int[] mMoneys = new int[]{20,30, 50, 100};
-    private TextView mTvWx;
-    private GvAdapter mAdapter;
-    private AlertDialog mDialog;
-    private TextView mTvMsg;
-    private  String  accountMoney;
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.withdraw_activity;
-    }
-
-    @Override
-    public void initListener() {
-        mTvWx.setOnClickListener(this);
-    }
-
-    @Override
-    public void initData() {
-       Intent i=getIntent();
-        if(i.hasExtra("money")){
-            accountMoney=i.getStringExtra("money");
-            mMoney.setText("账户金额:"+ StringUtils.strToMoney(accountMoney));
-        }
-    }
-
-    @Override
-    public void initView() {
-        mMoney = (TextView) findViewById(R.id.tv_money);
-        mTvWx = (TextView) findViewById(R.id.tv_wx);
-        mGvMoney = (GridView) findViewById(R.id.gv_money);
-        mAdapter = new GvAdapter();
-        mGvMoney.setAdapter(mAdapter);
-        TitleBarUtils.getInstance()
-                .setTitle(this, "提  现")
-                .setTitleFinish(this);
-
-    }
-
-    @Override
-    public void onClick(View v) {
-        int i = v.getId();
-        if (i == R.id.tv_wx) {
-            commit();
-        }
-    }
-
-    //提现
-    private void commit() {
-            if (mAdapter.checked == -1) {
-                Toast.makeText(this, "请选择提现金额", Toast.LENGTH_SHORT).show();
-                return;
-            }
-
-        try {
-            float money =Float.parseFloat(accountMoney);
-            if(money<mMoneys[mAdapter.checked]){
-                Toast.makeText(this,"亲!金额不足哟",Toast.LENGTH_LONG).show();
-                return ;
-            }
-
-        }catch (Exception e){
-
-            Toast.makeText(this,"亲!金额不足哟",Toast.LENGTH_LONG).show();
-            return ;
-        }
-            HashMap<String, String> map = new HashMap<>();
-            map.put("money", mMoneys[mAdapter.checked] + "");
-            map.put("wx_open_id", SpUtils.getOpenId(this));
-            showProgress();
-            NetManager.get(Url.USER_WITHDRAW, map, getApplicationContext(), new SheepCallback<String>(this) {
-                @Override
-                public void success(String o) {
-                    hideProgress();
-                    showMsgDialog(o);
-                }
-
-                @Override
-                public void otherCode(int code, String string) {
-                    hideProgress();
-                    if (code == 404) {
-                         android.app.AlertDialog alertDialog = new android.app.AlertDialog.Builder(WithdrawActivity.this)
-                                .setTitle("温馨提示!")
-                                .setMessage("未绑定微信号不能体现哟!")
-                                .setPositiveButton("马上去绑定", new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialogInterface, int i) {
-                                        startActivity(new Intent(WithdrawActivity.this, BindWxActivity.class));
-                                    }
-                                })
-                                .setNegativeButton("稍后",null)
-                                .setCancelable(false)
-                                .create();
-                        alertDialog.setCanceledOnTouchOutside(false);
-                        alertDialog.show();
-                    }else {
-                        showMsgDialog(string);
-                    }
-
-
-                }
-            });
-
-    }
-
-    private void showMsgDialog(String msg) {
-        if (mDialog == null) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(WithdrawActivity.this, R.style.Theme_AppCompat_Dialog);
-            View view = View.inflate(this, R.layout.simple_dialog, null);
-            view.setBackgroundResource(R.drawable.texe_background_round_white_10dp);
-            View enter = view.findViewById(R.id.tv_enter);
-            mTvMsg = (TextView) view.findViewById(R.id.tv_msg);
-
-            enter.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mDialog.dismiss();
-                }
-            });
-            mDialog = builder.setView(view)
-                    .create();
-        }
-        mTvMsg.setText(msg.replace("\"", ""));
-        mDialog.show();
-    }
-
-    private class GvAdapter extends BaseAdapter {
-        int checked = -1;
-
-
-        @Override
-        public int getCount() {
-            return mMoneys.length;
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return position;
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public View getView(final int position, View convertView, ViewGroup parent) {
-            View item = View.inflate(getApplicationContext(), R.layout.withdraw_item, null);
-            final RadioButton btn = (RadioButton) item.findViewById(R.id.rb_money);
-            final View check = item.findViewById(R.id.img_checked);
-            btn.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    checked = position;
-                    ViewGroup gv = (ViewGroup) btn.getParent().getParent().getParent();
-                    for (int i = 0; i < mMoneys.length; i++) {
-                        RadioButton child = (RadioButton) ((ViewGroup) ((ViewGroup) gv.getChildAt(i)).getChildAt(0)).getChildAt(0);
-                        View view = ((ViewGroup) ((ViewGroup) gv.getChildAt(i)).getChildAt(0)).getChildAt(1);
-                        child.setSelected(false);
-                        view.setVisibility(View.GONE);
-                    }
-                    btn.setSelected(true);
-                    check.setVisibility(View.VISIBLE);
-
-                }
-            });
-            btn.setText(mMoneys[position] + "  元");
-            return item;
-        }
-
-        public int getChecked() {
-            return checked;
-        }
-    }
-}

+ 0 - 104
app/src/main/java/com/sheep/jiuyan/samllsheep/page/WithdrawRecordActivity.java

@@ -1,104 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.entry.Order;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-import com.zhy.adapter.abslistview.CommonAdapter;
-import com.zhy.adapter.abslistview.ViewHolder;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Created by kemllor on 2017/12/29.
- */
-
-public class WithdrawRecordActivity extends BaseActivity {
-    private ListView mLvRecord;
-    private CommonAdapter<Order> mAdapter;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.withdraw_record_activity;
-    }
-
-    @Override
-    public void initView() {
-        mLvRecord = (ListView) findViewById(R.id.lv_record);
-        TitleBarUtils.getInstance()
-                .setTitle(this, "提现记录")
-                .setTitleFinish(this);
-        mLvRecord.setDividerHeight(0);
-    }
-
-    @Override
-    public void initListener() {
-    }
-
-    @Override
-    public void initData() {
-        final HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(this));
-        showProgress();
-        NetManager.get(Url.USER_WITHDRAW_RECORD, map, getApplicationContext(), new SheepCallback<List<Order>>(this) {
-            @Override
-            public void success(List<Order> orders) {
-                hideProgress();
-                mAdapter = new CommonAdapter<Order>(WithdrawRecordActivity.this, R.layout.withdraw_record_item, orders) {
-                    @Override
-                    protected void convert(ViewHolder viewHolder, Order item, int position) {
-                        String[] tmp1 = item.getRequestTime().split("-");
-                        String[] tmp2 = tmp1[2].split(" ")[1].split(":");
-                        String time = tmp1[1] + "/" + tmp1[2].split(" ")[0] + "\n" + tmp2[0] + ":" + tmp2[1];
-                        viewHolder.setText(R.id.tv_time, time);
-                        viewHolder.setText(R.id.tv_money, item.getMoney());
-                        viewHolder.setText(R.id.tv_wx, item.getWxId());
-                        getState(viewHolder.<TextView>getView(R.id.tv_state), item.getStatus());
-                        TextView failed = viewHolder.getView(R.id.tv_failed);
-                        if (!TextUtils.isEmpty(item.getAction())) {
-                            failed.setVisibility(View.VISIBLE);
-                            failed.setText(item.getAction());
-                        }
-                    }
-
-                    private void getState(TextView view, int state) {
-                        switch (state) {
-                            case 1:
-                                view.setText("处理中");
-                                view.setBackgroundResource(R.color.theme);
-                                break;
-                            case 2:
-                                view.setText("已付款");
-                                view.setBackgroundResource(R.color.green);
-                                break;
-                            case 3:
-                                view.setText("付款异常");
-                                view.setBackgroundResource(R.color.sheep_red);
-                                break;
-                        }
-                    }
-                };
-                mLvRecord.setAdapter(mAdapter);
-            }
-
-            @Override
-            public void failure(IOException e) {
-                super.failure(e);
-                hideProgress();
-
-            }
-        });
-    }
-}

+ 0 - 167
app/src/main/java/com/sheep/jiuyan/samllsheep/page/WxAccountDetail.java

@@ -1,167 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.content.Intent;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.PopupWindow;
-import android.widget.TextView;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.net.NetManager;
-import com.sheep.jiuyan.samllsheep.net.SheepCallback;
-import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.adapter.AdpChangeUser;
-import com.sheep.jiuyan.samllsheep.page.adapter.AdpWxDetailList;
-import com.sheep.jiuyan.samllsheep.page.entry.WXAccount;
-import com.sheep.jiuyan.samllsheep.page.entry.WxDetailList;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  WxAccountDetail</p>
- * @ <p>Description:</p>
- * @ date:  2018/1/16 21:38
- * @ QQ:    315096953
- */
-public class WxAccountDetail extends BaseActivity {
-
-    public final static String INTENT_WXID_STR = "INTENT_WXID_STR";
-    public final static String INTENT_NAME = "DATA";
-    private RecyclerView mRecyclerView;//列表
-    private TextView mTxtAccount;//当前微信号
-    private AdpWxDetailList mAdpWxDetailList;
-    private PopupWindow mPopupWindow;
-    private AdpChangeUser mAdpChangeUser;
-
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.wx_account_detail;
-    }
-
-    @Override
-    public void initView() {
-        mRecyclerView = (RecyclerView) findViewById(R.id.recy_wx_account_detail);
-        mTxtAccount = (TextView) findViewById(R.id.txt_wx_account_detail);
-        mAdpWxDetailList = new AdpWxDetailList(this);
-        mAdpChangeUser = new AdpChangeUser(this);
-
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
-        mRecyclerView.setAdapter(mAdpWxDetailList);
-        TitleBarUtils.getInstance()
-                .setTitle(this, "挂机帐号")
-                .setTitleFinish(this);
-    }
-
-    @Override
-    public void initListener() {
-        findViewById(R.id.img_wx_account_detail)
-                .setOnClickListener(cls_ChangeUser);
-    }
-
-
-    private List<WXAccount> mWxlist;
-    /**
-     * 切换用户的实现
-     */
-    private View.OnClickListener cls_ChangeUser = new View.OnClickListener() {
-        @Override
-        public void onClick(View view) {
-            if (mPopupWindow == null) {
-                final View view1 = View.inflate(WxAccountDetail.this, R.layout.pop_change_user, null);
-                mPopupWindow = new PopupWindow(view1, G.WIDTH, -2);
-                View foot = View.inflate(WxAccountDetail.this, R.layout.foot_pop_change_user, null);
-                foot.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        Intent intent = new Intent(WxAccountDetail.this, WebActivity.class);
-                        intent.putExtra(WebActivity.INTENT_URL, Url.ADD_CHILD_WX);
-                        intent.putExtra(WebActivity.INTENT_TITLE, "添加微信号");
-                        intent.putExtra(WebActivity.INTENT_LOAD_JS, true);
-                        WxAccountDetail.this.startActivity(intent);
-                        mPopupWindow.dismiss();
-                    }
-                });
-                final ListView listView = (ListView) view1.findViewById(R.id.list_pop_change_user);
-                listView.addFooterView(foot);
-                mPopupWindow.setContentView(view1);
-                mPopupWindow.setOutsideTouchable(true);
-                HashMap<String, String> map = new HashMap<>();
-                map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
-                NetManager.get(Url.WXACCOUNT, map, SheepApp.mContext, new SheepCallback<List<WXAccount>>(WxAccountDetail.this) {
-                    @Override
-                    public void success(List<WXAccount> wxAccounts) {
-                        mWxlist = wxAccounts;
-                        mAdpChangeUser.addAll(wxAccounts);
-                        //测试
-                        listView.setAdapter(mAdpChangeUser);
-                        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-                            @Override
-                            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                                int id = mWxlist.get(i).getId();
-                                mTxtAccount.setText(mWxlist.get(i).getWxId());
-                                refreshWx(id + "");
-                                mPopupWindow.dismiss();
-                            }
-                        });
-                    }
-
-                    @Override
-                    public void failure(IOException e) {
-                        super.failure(e);
-                    }
-                });
-            }
-            mPopupWindow.showAsDropDown(view);
-        }
-    };
-
-    private void refreshWx(String id) {
-        HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
-        map.put("wx_id", id);
-        showProgress();
-        NetManager.get(Url.TASK_LIST, map, this, new SheepCallback<List<WxDetailList>>(this) {
-            @Override
-            public void success(List<WxDetailList> tasks) {
-                hideProgress();
-                if (mAdpWxDetailList != null) {
-                    mAdpWxDetailList.clear();
-                }
-                if (tasks != null && tasks.size() > 0) {
-                    mAdpWxDetailList.addAll(tasks);
-                    mAdpWxDetailList.notifyDataSetChanged();
-                }
-            }
-
-            @Override
-            public void failure(IOException e) {
-                super.failure(e);
-                hideProgress();
-            }
-        });
-    }
-
-
-    @Override
-    public void initData() {
-        Intent intent = getIntent();
-        String wxName = intent.getStringExtra(INTENT_NAME);
-        String wxID = intent.getStringExtra(INTENT_WXID_STR);
-        mTxtAccount.setText(wxName);
-        refreshWx(wxID);
-    }
-
-
-}

+ 0 - 84
app/src/main/java/com/sheep/jiuyan/samllsheep/page/XDownLoadActivity.java

@@ -1,84 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.content.Intent;
-import android.os.Environment;
-import android.os.SystemClock;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-
-import com.bumptech.glide.Glide;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.adapter.DownListAdapter;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.download.DownloadManager;
-import com.sheep.jiuyan.samllsheep.download.DownloadState;
-import com.sheep.jiuyan.samllsheep.page.entry.Task;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
-import com.sheep.jiuyan.samllsheep.utils.FileUtil;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import org.xutils.ex.DbException;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Created by Administrator on 2018/1/22.
- */
-
-public class XDownLoadActivity extends BaseActivity {
-
-    private ListView lv;
-    DownListAdapter mAdapter;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.download_activity;
-    }
-
-    @Override
-    public void initView() {
-        lv = (ListView) findViewById(R.id.lv);
-        TitleBarUtils.getInstance()
-                .setTitle(this, "任务下载")
-                .setTitleFinish(this);
-    }
-
-    @Override
-    public void initListener() {
-        lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-
-            }
-        });
-    }
-
-    @Override
-    public void initData() {
-        Intent intent = getIntent();
-        Task task = (Task) intent.getSerializableExtra("task");
-        if (task != null) {
-            ClassFileHelper.getInstance().createSDDirection();
-            File mApkPath = new File(ClassFileHelper.DIR, task.getPkg() + ClassFileHelper.FILE_SUFFIX);
-            if (!mApkPath.exists()) {
-                try {
-                    DownloadManager.getInstance().startDownload(task.getPkg(),
-                            task.getDownLoadUrl(), task.getTitle(),
-                            mApkPath.getAbsolutePath(), task.getIcon(), true, false, null);
-                } catch (DbException e) {
-                    e.printStackTrace();
-                }
-            } else {
-                PackageUtil.installApk(getApplicationContext(), mApkPath.getAbsolutePath());
-            }
-        }
-
-
-        mAdapter = new DownListAdapter(this);
-        lv.setAdapter(mAdapter);
-    }
-}

+ 0 - 39
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpChangeUser.java

@@ -1,39 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.adapter;
-
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.page.entry.User;
-import com.sheep.jiuyan.samllsheep.page.entry.WXAccount;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpChangeUser</p>
- * @ <p>Description:</p>
- * @ date:  2018/1/17 12:01
- * @ QQ:    315096953
- */
-
-public class AdpChangeUser extends AdpCommonList<WXAccount> {
-
-    public AdpChangeUser(Context context) {
-        super(context);
-    }
-
-    @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
-        view = View.inflate(mContext, R.layout.item_pop_change_user, null);
-        TextView wxID = (TextView) view.findViewById(R.id.txt_item_pop_change_user_nick);
-        wxID.setText(mListDatas.get(i).getWxId());
-        return view;
-    }
-
-    @Nullable
-    public CharSequence[] getAutofillOptions() {
-        return new CharSequence[0];
-    }
-}

+ 0 - 54
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpCommonList.java

@@ -1,54 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.adapter;
-
-import android.content.Context;
-import android.widget.BaseAdapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpCommonList</p>
- * @ <p>Description:</p>
- * @ date:  2017/12/28 10:29
- * @ QQ:    315096953
- */
-
-public abstract class AdpCommonList<T> extends BaseAdapter {
-
-    protected Context mContext;
-    protected List<T> mListDatas = new ArrayList<>();
-
-
-    public void clear() {
-        mListDatas.clear();
-    }
-
-    public void addAll(List<T> list) {
-        mListDatas.addAll(list);
-    }
-
-    public void add(T t) {
-        mListDatas.add(t);
-    }
-
-    public AdpCommonList(Context context) {
-        mContext = context;
-    }
-
-    @Override
-    public int getCount() {
-        return mListDatas.size();
-    }
-
-    @Override
-    public T getItem(int i) {
-        return mListDatas.get(i);
-    }
-
-    @Override
-    public long getItemId(int i) {
-        return 0;
-    }
-
-}

+ 0 - 101
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpCommonRecy.java

@@ -1,101 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.adapter;
-
-import android.content.Context;
-import android.support.annotation.LayoutRes;
-import android.support.v7.widget.RecyclerView;
-import android.view.ViewGroup;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpCommonRecy</p>
- * @ <p>Description:通用的RecyAdp</p>
- * @ date:  2017/11/28 11:01
- * @ QQ:    315096953
- */
-
-public abstract class AdpCommonRecy<T> extends RecyclerView.Adapter<ViewHolder> {
-    protected Context mContext;
-    protected List<T> mListDatas = new ArrayList<>();
-
-    public AdpCommonRecy(Context context) {
-        mContext = context;
-    }
-
-    public Context getmContext() {
-        return mContext;
-    }
-
-    public List<T> getmListDatas() {
-        return mListDatas;
-    }
-
-    public void addAll(List<T> list) {
-        this.mListDatas.addAll(list);
-    }
-
-    public void add(T t) {
-        this.mListDatas.add(t);
-    }
-
-    public void clear() {
-        this.mListDatas.clear();
-         notifyDataSetChanged();
-    }
-
-    public T getItem(int position) {
-        return this.mListDatas.get(position);
-    }
-
-    /**
-     * 根据viewType返回layout的布局id
-     *
-     * @param viewType
-     * @return
-     */
-    public abstract @LayoutRes
-    int getViewIdByType(int viewType);
-
-    @Override
-    public int getItemViewType(int position) {
-        return super.getItemViewType(position);
-    }
-
-    @Override
-    public ViewHolder onCreateViewHolder(final ViewGroup parent, int viewType) {
-        ViewHolder viewHolder = ViewHolder.get(mContext, null, parent,
-                getViewIdByType(viewType), -1);
-        onCreated(viewHolder, viewType);
-        return viewHolder;
-    }
-
-    @Override
-    public void onBindViewHolder(ViewHolder holder, int position) {
-        holder.setmPosition(position);
-        convert(holder, mListDatas.get(position));
-    }
-
-    /**
-     * 主要的组件绑定实现
-     *
-     * @param holder
-     * @param t
-     */
-    public abstract void convert(ViewHolder holder, T t);
-
-    /**
-     * 首次创建视图时的操作
-     *
-     * @param holder
-     * @param viewType
-     */
-    public abstract void onCreated(ViewHolder holder, int viewType);
-
-    @Override
-    public int getItemCount() {
-        return mListDatas.size();
-    }
-
-}

+ 0 - 133
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpMainActivity.java

@@ -1,133 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.adapter;
-
-import android.content.Context;
-import android.content.Intent;
-import android.text.Html;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.page.GameDetailActivity;
-import com.sheep.jiuyan.samllsheep.page.XDownLoadActivity;
-import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-
-import java.io.File;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpMainActivity</p>
- * @ <p>Description:</p>
- * @ date:  2018/1/16 13:29
- * @ QQ:    315096953
- */
-
-public class AdpMainActivity extends AdpCommonRecy<TaskPublish> {
-
-    public final static int TAG_TASK = R.id.tagid1;
-    private final static int TAG_URL = R.id.tagid2;
-    private final static String HTML_FORMAT = "任务数量:<font color=\"#ef712c\">当前数量</font>/总数";
-
-    /**
-     * 点击后的监听处理,一定要先设置再setAdapter
-     */
-    private View.OnClickListener onClickListener;
-
-    public AdpMainActivity(Context context) {
-        super(context);
-    }
-
-    public void setOnClickListener(View.OnClickListener onClickListener) {
-        this.onClickListener = onClickListener;
-    }
-
-    @Override
-    public int getViewIdByType(int viewType) {
-        return R.layout.task_item;
-    }
-
-    @Override
-    public void convert(ViewHolder holder, final TaskPublish taskPublish) {
-
-        holder.itemView.setTag(TAG_TASK, taskPublish);
-        holder.getView(R.id.tv_guide, TextView.class)
-                .setTag(TAG_URL, taskPublish.getTask().getGuide());
-
-        holder.getView(R.id.txt_baseactivity_title, TextView.class)
-                .setText(taskPublish.getTask().getTitle());
-        holder.getView(R.id.tv_count, TextView.class)
-                .setText(Html.fromHtml(HTML_FORMAT.replace("当前数量", taskPublish.getSurplusCount() + "")
-                        .replace("总数", taskPublish.getTotalCouont() + "")));
-        try {
-            holder.getView(R.id.tv_time, TextView.class)
-                    .setText(String.format("截止日期:%s", taskPublish.getOverTime().split(" ")[0]));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        holder.getView(R.id.tv_money, TextView.class)
-                .setText(taskPublish.getTask().getPrice());
-        holder.getView(R.id.tv_bouns, TextView.class)
-                .setText(taskPublish.getTask().getBonus());
-        Glide.with(mContext)
-                .load(taskPublish.getTask().getIcon())
-                .apply(new RequestOptions().placeholder(R.drawable.icon)
-                .dontAnimate())
-                .into(holder.getView(R.id.img_icon, ImageView.class));
-
-        if (PackageUtil.isAppInstalled(SheepApp.mContext, taskPublish.getTask().getPkg())) {
-            holder.getView(R.id.btn_task_item, TextView.class).setText("开始游戏");
-            holder.getView(R.id.btn_task_item, TextView.class).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    PackageUtil.startApp(mContext, taskPublish.getTask().getPkg());
-                }
-            });
-        } else if(ClassFileHelper.getInstance().isInstallFile(taskPublish.getTask().getTitle())) {
-
-            holder.getView(R.id.btn_task_item, TextView.class).setText("安装游戏");
-            holder.getView(R.id.btn_task_item, TextView.class).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                  String path=ClassFileHelper.DIR+File.separator+taskPublish.getTask().getPkg()+".apk";
-                  PackageUtil.installApk(mContext,path);
-                }
-            });
-        }else{
-            holder.getView(R.id.btn_task_item, TextView.class).setText("下载游戏");
-            holder.getView(R.id.btn_task_item, TextView.class).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Intent intent = new Intent(mContext, XDownLoadActivity.class);
-                    intent.putExtra("task", taskPublish.getTask());
-                    mContext.startActivity(intent);
-                }
-            });
-        }
-
-        holder.getView(R.id.tv_guide).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(mContext, GameDetailActivity.class);
-                intent.putExtra("data", taskPublish);
-                mContext.startActivity(intent);
-            }
-        });
-    }
-
-    @Override
-    public void onCreated(ViewHolder holder, int viewType) {
-        if (onClickListener != null) {
-            holder.itemView.setOnClickListener(onClickListener);
-        }
-    }
-
-
-
-
-
-}

+ 0 - 58
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpMainPageViewPager.java

@@ -1,58 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.adapter;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.view.ViewGroup;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpMainPageViewPager</p>
- * @ <p>Description:</p>
- * @ date:  2018/1/16 14:57
- * @ QQ:    315096953
- */
-
-public class AdpMainPageViewPager extends FragmentPagerAdapter {
-
-    private List<Fragment> fragmentList = new ArrayList<>();
-    private String[] mStrTitles = {"任务", "挂机"};
-
-    public AdpMainPageViewPager(FragmentManager fm) {
-        super(fm);
-    }
-
-    public void add(Fragment fragment) {
-        fragmentList.add(fragment);
-    }
-
-    @Override
-    public Fragment getItem(int position) {
-        return fragmentList.get(position);
-    }
-
-    @Override
-    public int getCount() {
-        return fragmentList.size();
-    }
-
-    @Override
-    public Object instantiateItem(ViewGroup container, int position) {
-        return super.instantiateItem(container, position);
-    }
-
-    @Override
-    public void destroyItem(ViewGroup container, int position, Object object) {
-        super.destroyItem(container, position, object);
-    }
-
-    @Override
-    public CharSequence getPageTitle(int position) {
-        return mStrTitles[position];
-    }
-
-
-}

+ 0 - 91
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpNewUserTask.java

@@ -1,91 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.adapter;
-
-import android.content.Context;
-import android.content.Intent;
-import android.text.Html;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.page.GameDetailActivity;
-import com.sheep.jiuyan.samllsheep.page.XDownLoadActivity;
-import com.sheep.jiuyan.samllsheep.page.entry.NewUserTask;
-import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpMainActivity</p>
- * @ <p>Description:</p>
- * @ date:  2018/1/16 13:29
- * @ QQ:    315096953
- */
-
-public class AdpNewUserTask extends AdpCommonRecy<NewUserTask> {
-
-    public final static int TAG_TASK = R.id.tagid1;
-
-    /**
-     * 点击后的监听处理,一定要先设置再setAdapter
-     */
-    private View.OnClickListener onClickListener;
-
-    public AdpNewUserTask(Context context) {
-        super(context);
-    }
-
-    public void setOnClickListener(View.OnClickListener onClickListener) {
-        this.onClickListener = onClickListener;
-    }
-
-    @Override
-    public int getViewIdByType(int viewType) {
-        return R.layout.new_user_item;
-    }
-
-    @Override
-    public void convert(final ViewHolder holder, final NewUserTask newTask) {
-        holder.itemView.setTag(TAG_TASK, newTask);
-        holder.getView(R.id.tv_task_title, TextView.class)
-                .setText(newTask.getTaskname());
-        holder.getView(R.id.tv_task_desc, TextView.class)
-                .setText(newTask.getDesc());
-        TextView money = holder.getView(R.id.tv_money, TextView.class);
-        money.setText("+" + newTask.getMoney());
-
-        TextView status = holder.getView(R.id.tv_status, TextView.class);
-        status.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                holder.itemView.callOnClick();
-            }
-        });
-        if (newTask.getFlag() == 2) {
-            status.setText("已领取");
-            money.setVisibility(View.GONE);
-            status.setVisibility(View.VISIBLE);
-            status.setBackgroundResource(R.drawable.sp_btn_common_green);
-        } else if (newTask.getFlag() == 1) {
-            status.setText("去领奖");
-            money.setVisibility(View.GONE);
-            status.setVisibility(View.VISIBLE);
-            status.setBackgroundResource(R.drawable.sp_btn_common_orange);
-        } else {
-            status.setVisibility(View.GONE);
-            money.setVisibility(View.VISIBLE);
-        }
-
-
-    }
-
-    @Override
-    public void onCreated(ViewHolder holder, int viewType) {
-        if (onClickListener != null) {
-            holder.itemView.setOnClickListener(onClickListener);
-        }
-    }
-
-}

+ 0 - 87
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpTaskList.java

@@ -1,87 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.adapter;
-
-import android.content.Context;
-import android.content.Intent;
-import android.view.View;
-import android.widget.TextView;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.page.WxAccountDetail;
-import com.sheep.jiuyan.samllsheep.page.entry.WXAccount;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpTaskList</p>
- * @ <p>Description:</p>
- * @ date:  2018/1/16 21:06
- * @ QQ:    315096953
- */
-
-public class AdpTaskList extends AdpCommonRecy<WXAccount> {
-
-    private final static int TAG_WXID = R.id.tagid1;
-    private final static int TAG_WXNAME = R.id.tagid2;
-
-    public AdpTaskList(Context context) {
-        super(context);
-    }
-
-    @Override
-    public int getViewIdByType(int viewType) {
-        return R.layout.item_fgt_main_page_offline_task;
-    }
-
-    @Override
-    public void convert(ViewHolder holder, final WXAccount wxAccount) {
-        holder.itemView.setTag(TAG_WXID, wxAccount.getId() + "");
-        holder.itemView.setTag(TAG_WXNAME, wxAccount.getWxId());
-        holder.getView(R.id.txt_item_fgt_main_page_offline_task_user, TextView.class)
-                .setText(wxAccount.getWxId());
-        holder.getView(R.id.txt_item_fgt_main_page_offline_task_statu, TextView.class)
-                .setText(getStatusStr(wxAccount.getStatus()));
-        holder.getView(R.id.txt_item_fgt_main_page_offline_task_descp, TextView.class)
-                .setText(wxAccount.getAction());
-        holder.itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (wxAccount.getStatus()==1) {
-                    Intent intent = new Intent(mContext, WxAccountDetail.class);
-                    intent.putExtra(WxAccountDetail.INTENT_WXID_STR, view.getTag(TAG_WXID) + "");
-                    intent.putExtra(WxAccountDetail.INTENT_NAME, view.getTag(TAG_WXNAME) + "");
-                    mContext.startActivity(intent);
-                }
-            }
-        });
-    }
-
-    /**
-     * 根据微信号的statu返回状态描述
-     *
-     * @param statu
-     * @return
-     */
-    private String getStatusStr(int statu) {
-        switch (statu) {
-            case 0:
-                return "未审核";
-            case 1:
-                return "正常";
-            case 2:
-                return "异常";
-        }
-        return "无";
-    }
-
-    @Override
-    public void onCreated(ViewHolder holder, int viewType) {
-        holder.itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(mContext, WxAccountDetail.class);
-                intent.putExtra(WxAccountDetail.INTENT_WXID_STR, view.getTag(TAG_WXID) + "");
-                intent.putExtra(WxAccountDetail.INTENT_NAME, view.getTag(TAG_WXNAME) + "");
-                mContext.startActivity(intent);
-            }
-        });
-    }
-}

+ 0 - 45
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpWxDetailList.java

@@ -1,45 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.adapter;
-
-import android.content.Context;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.page.entry.WxDetailList;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpWxDetailList</p>
- * @ <p>Description:</p>
- * @ date:  2018/1/16 21:55
- * @ QQ:    315096953
- */
-
-public class AdpWxDetailList extends AdpCommonRecy<WxDetailList> {
-
-    public AdpWxDetailList(Context context) {
-        super(context);
-    }
-
-    @Override
-    public int getViewIdByType(int viewType) {
-        return R.layout.item_wx_account_detail;
-    }
-
-    @Override
-    public void convert(ViewHolder holder, WxDetailList wxDetailList) {
-        Glide.with(mContext)
-                .load(wxDetailList.getTask().getIcon())
-                .into(holder.getView(R.id.img_item_wx_account_detail_logo, ImageView.class));
-        holder.getView(R.id.txt_item_wx_account_detail_title, TextView.class)
-                .setText(wxDetailList.getTask().getDesc());
-        holder.getView(R.id.txt_item_wx_account_detail_task, TextView.class)
-                .setText("目票Todo");
-    }
-
-    @Override
-    public void onCreated(ViewHolder holder, int viewType) {
-
-    }
-}

+ 0 - 123
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/TaskAdapter.java

@@ -1,123 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.adapter;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.page.WebActivity;
-import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by kemllor on 2017/12/13.
- */
-
-public class TaskAdapter extends RecyclerView.Adapter<TaskAdapter.ViewHolder> {
-
-    Activity mActivity;
-    private List<TaskPublish> datas;
-    private ItemClickCallBack clickCallBack;
-
-    public void setClickCallBack(ItemClickCallBack clickCallBack) {
-        this.clickCallBack = clickCallBack;
-    }
-
-    public interface ItemClickCallBack<T> {
-        void onItemClick(T pos);
-    }
-
-
-    public TaskAdapter(ArrayList<TaskPublish> datas, Activity activity) {
-        this.datas = datas;
-        mActivity = activity;
-    }
-
-    public void setData(List<TaskPublish> datas) {
-        this.datas = datas;
-    }
-
-    //创建新View,被LayoutManager所调用
-    @Override
-    public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
-        View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.task_item, viewGroup, false);
-        return new ViewHolder(view);
-    }
-
-    //将数据与界面进行绑定的操作
-    @Override
-    public void onBindViewHolder(ViewHolder viewHolder, final int position) {
-        viewHolder.mTvTitle.setText(datas.get(position).getTask().getTitle());
-        viewHolder.mTvCount.setText(datas.get(position).getSurplusCount() + "/" + datas.get(position).getTotalCouont());
-        try {
-            viewHolder.mTvTime.setText(String.format("截止日期:%s", datas.get(position).getOverTime().split(" ")[0]));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        viewHolder.mTvMoney.setText(datas.get(position).getTask().getPrice());
-        viewHolder.mTvBouns.setText(datas.get(position).getTask().getBonus());
-        Glide.with(mActivity)
-                .load(datas.get(position).getTask().getIcon())
-                .apply(new RequestOptions().placeholder(R.drawable.sheep)
-                .dontAnimate())
-                .into(viewHolder.mImgIcon);
-        viewHolder.mRootView.setOnClickListener(
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        if (clickCallBack != null) {
-                            clickCallBack.onItemClick(datas.get(position));
-                        }
-                    }
-                }
-        );
-        viewHolder.mTvGuide.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(mActivity, WebActivity.class);
-                intent.putExtra("url", datas.get(position).getTask().getGuide());
-                mActivity.startActivity(intent);
-            }
-        });
-    }
-
-    //获取数据的数量
-    @Override
-    public int getItemCount() {
-        return datas.size();
-        //        return 5;
-    }
-
-    //自定义的ViewHolder,持有每个Item的的所有界面元素
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-        public ImageView mImgIcon;
-        public TextView mTvTitle;
-        public TextView mTvTime;
-        public TextView mTvCount;
-        public TextView mTvGuide;
-        public TextView mTvMoney;
-        public TextView mTvBouns;
-        public View mRootView;
-
-        public ViewHolder(View view) {
-            super(view);
-            mRootView = view;
-            mImgIcon = (ImageView) view.findViewById(R.id.img_icon);
-            mTvTitle = (TextView) view.findViewById(R.id.txt_baseactivity_title);
-            mTvTime = (TextView) view.findViewById(R.id.tv_time);
-            mTvCount = (TextView) view.findViewById(R.id.tv_count);
-            mTvGuide = (TextView) view.findViewById(R.id.tv_guide);
-            mTvMoney = (TextView) view.findViewById(R.id.tv_money);
-            mTvBouns = (TextView) view.findViewById(R.id.tv_bouns);
-        }
-    }
-}

+ 0 - 87
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/ViewHolder.java

@@ -1,87 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.adapter;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.Build;
-import android.util.SparseArray;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.AlphaAnimation;
-import android.widget.TextView;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  ViewHolder</p>
- * @ <p>Description:</p>
- * @ date:  2017/11/28 11:05
- * @ QQ:    315096953
- */
-
-public class ViewHolder extends android.support.v7.widget.RecyclerView.ViewHolder {
-    private SparseArray<View> mViews;
-    private int mPosition;
-
-    public ViewHolder(Context context, View itemView, ViewGroup parent, int position) {
-        super(itemView);
-        this.mPosition = position;
-        this.mViews = new SparseArray();
-    }
-
-    public static ViewHolder get(Context context, View convertView, ViewGroup parent, int layoutId, int position) {
-        if (convertView == null) {
-            View holder2 = LayoutInflater.from(context).inflate(layoutId, parent, false);
-            ViewHolder holder1 = new ViewHolder(context, holder2, parent, position);
-            return holder1;
-        } else {
-            ViewHolder holder = (ViewHolder) convertView.getTag();
-            holder.mPosition = position;
-            return holder;
-        }
-    }
-
-    public <T extends View> T getView(int viewId) {
-        View view = this.mViews.get(viewId);
-        if (view == null) {
-            view = this.itemView.findViewById(viewId);
-            this.mViews.put(viewId, view);
-        }
-        return (T) view;
-    }
-
-    public <T extends View> T getView(int viewId, Class<T> t) {
-        return (T) getView(viewId);
-    }
-
-    @SuppressLint({"NewApi"})
-    public ViewHolder setAlpha(int viewId, float value) {
-        if (Build.VERSION.SDK_INT >= 11) {
-            this.getView(viewId).setAlpha(value);
-        } else {
-            AlphaAnimation alpha = new AlphaAnimation(value, value);
-            alpha.setDuration(0L);
-            alpha.setFillAfter(true);
-            this.getView(viewId).startAnimation(alpha);
-        }
-        return this;
-    }
-
-    public ViewHolder setVisible(int viewId, boolean visible) {
-        this.getView(viewId).setVisibility(visible ? View.VISIBLE : View.GONE);
-        return this;
-    }
-
-    public ViewHolder setText(int viewId, String text) {
-        this.getView(viewId, TextView.class).setText(text);
-        return this;
-    }
-
-    public int getmPosition() {
-        return mPosition;
-    }
-
-    public void setmPosition(int mPosition) {
-        this.mPosition = mPosition;
-    }
-}
-

+ 0 - 19
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/BindUserEntiey.java

@@ -1,19 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.entry;
-
-import java.io.Serializable;
-
-/**
- * Created by Administrator on 2018/1/7.
- */
-
-public class BindUserEntiey  implements Serializable{
-    private  String  OpenId;
-
-    public String getOpenId() {
-        return OpenId;
-    }
-
-    public void setOpenId(String openId) {
-        OpenId = openId;
-    }
-}

+ 0 - 113
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/Commit.java

@@ -1,113 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.entry;
-
-import java.io.Serializable;
-
-/**
- * Created by kemllor on 2017/12/26.
- */
-
-public class Commit implements Serializable {
-
-    /**
-     * Id : 3
-     * Task : {"Id":1,"Type":1,"DownLoadUrl":"http://img3.redocn.com/20120602/Redocn_2012060202412086.jpg","Guide":"asd","Desc":"asdasd","Icon":"http://img3.redocn.com/20120602/Redocn_2012060202412086.jpg","Title":"asds","Price":"5.00","Pkg":"com.kfzs.duanduan"}
-     * TaskImg : http://element-cn.eleme.io/static/hamburger.50e4091.png
-     * TaskPkg : asdasd
-     * Status : 1
-     * CreateTime : asdasd
-     * CheckTime : 2017-12-19 11:32:55
-     * FailDesc :
-     */
-
-    private int Id;
-    private Task Task;
-    private String TaskImg;
-    private int TaskPublishId;
-    private String TaskPkg;
-    private int Status;
-    private String CreateTime;
-    private String CheckTime;
-    private String FailDesc;
-    private String  CompleteMoney;
-
-
-    public int getTaskPublishId() {
-        return TaskPublishId;
-    }
-
-    public void setTaskPublishId(int taskPublishId) {
-        TaskPublishId = taskPublishId;
-    }
-
-    public int getId() {
-        return Id;
-    }
-
-    public void setId(int Id) {
-        this.Id = Id;
-    }
-
-    public Task getTask() {
-        return Task;
-    }
-
-    public void setTask(Task Task) {
-        this.Task = Task;
-    }
-
-    public String getTaskImg() {
-        return TaskImg;
-    }
-
-    public void setTaskImg(String TaskImg) {
-        this.TaskImg = TaskImg;
-    }
-
-    public String getTaskPkg() {
-        return TaskPkg;
-    }
-
-    public void setTaskPkg(String TaskPkg) {
-        this.TaskPkg = TaskPkg;
-    }
-
-    public int getStatus() {
-        return Status;
-    }
-
-    public void setStatus(int Status) {
-        this.Status = Status;
-    }
-
-    public String getCreateTime() {
-        return CreateTime;
-    }
-
-    public void setCreateTime(String CreateTime) {
-        this.CreateTime = CreateTime;
-    }
-
-    public String getCheckTime() {
-        return CheckTime;
-    }
-
-    public void setCheckTime(String CheckTime) {
-        this.CheckTime = CheckTime;
-    }
-
-    public String getFailDesc() {
-        return FailDesc;
-    }
-
-    public void setFailDesc(String FailDesc) {
-        this.FailDesc = FailDesc;
-    }
-
-    public String getCompleteMoney() {
-        return CompleteMoney;
-    }
-
-    public void setCompleteMoney(String completeMoney) {
-        CompleteMoney = completeMoney;
-    }
-}

+ 0 - 45
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/HaoWanMsg.java

@@ -1,45 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.entry;
-
-import java.io.Serializable;
-
-/**
- * Created by kemllor on 2018/1/22.
- */
-
-public class HaoWanMsg implements Serializable {
-
-
-    /**
-     * code : 430
-     * msg : 参数错误 参数错误
-     * data : null
-     */
-
-    private int code;
-    private String msg;
-    private Object data;
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public Object getData() {
-        return data;
-    }
-
-    public void setData(Object data) {
-        this.data = data;
-    }
-}

+ 0 - 19
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/InviteUrl.java

@@ -1,19 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.entry;
-
-import java.io.Serializable;
-
-/**
- * Created by kemllor on 2018/1/25.
- */
-
-public class InviteUrl implements Serializable {
-    String Url;
-
-    public String getUrl() {
-        return Url;
-    }
-
-    public void setUrl(String url) {
-        Url = url;
-    }
-}

+ 0 - 43
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/Money.java

@@ -1,43 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page.entry;
-
-import java.io.Serializable;
-
-/**
- * Created by kemllor on 2017/12/26.
- */
-
-public class Money implements Serializable{
-    /**
-     * Hostroy : 30
-     * Today : 5
-     * Balance : 35
-     */
-
-    private String Hostroy;
-    private String Today;
-    private String Balance;
-
-    public String getHostroy() {
-        return Hostroy;
-    }
-
-    public void setHostroy(String Hostroy) {
-        this.Hostroy = Hostroy;
-    }
-
-    public String getToday() {
-        return Today;
-    }
-
-    public void setToday(String Today) {
-        this.Today = Today;
-    }
-
-    public String getBalance() {
-        return Balance;
-    }
-
-    public void setBalance(String Balance) {
-        this.Balance = Balance;
-    }
-}

+ 0 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/MoneyHistroy.java


Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů