修复试玩赚钱中各种bug；优化界面；可以用代码实现的图片用代码实现，效果更好，包更小

app/src/main/java/com/kfzs/duanduan/ActDownloadMgr.java

@@ -177,9 +177,9 @@ public class ActDownloadMgr extends BaseCompatActivity {
         EventDownloadHandler.newInstance(this, new EventDownloadHandler.OnDownCallback() {
             @Override
             public void downloading(String url, Integer progress) {
-                KFProgressButton targetBtn = (KFProgressButton) lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_BUTTON + url);
-                ProgressBar pbProgress = (ProgressBar) lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_PROGRESS + url);
-                TextView tvProgress = (TextView) lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_TEXTVIEW + url);
+                KFProgressButton targetBtn = lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_BUTTON + url);
+                ProgressBar pbProgress = lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_PROGRESS + url);
+                TextView tvProgress = lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_TEXTVIEW + url);
                 if (tvProgress == null) {
                     return;
                 }
@@ -193,7 +193,7 @@ public class ActDownloadMgr extends BaseCompatActivity {
 
             @Override
             public void downloadFinish(String downloadUrl) {
-                TextView tvProgress = (TextView) lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_TEXTVIEW + info.getDownloadUrl());
+                TextView tvProgress = lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_TEXTVIEW + info.getDownloadUrl());
                 tvProgress.setText(R.string.download_completed);
 
                 setTaskStatusByDownloadUrl(info.getDownloadUrl(), DownloadTaskService.STATUS_FINISH, info.getApkPath());
@@ -206,7 +206,7 @@ public class ActDownloadMgr extends BaseCompatActivity {
 
             @Override
             public void downloadFail(String url) {
-                KFProgressButton targetBtn = (KFProgressButton) lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_BUTTON + url);
+                KFProgressButton targetBtn = lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_BUTTON + url);
                 targetBtn.setText(R.string.download_fail);
                 setTaskStatusByDownloadUrl(url, DownloadTaskService.STATUS_FAIL, "");
             }
@@ -406,9 +406,9 @@ public class ActDownloadMgr extends BaseCompatActivity {
         String speed = task.getConvertSpeed();    //转换单位后的下载速度，单位转换需要在配置文件中打开
         System.out.println("Aria "+task.getKey()+",p " + p + ", speed = " + speed);
         String url = task.getKey();
-        KFProgressButton targetBtn = (KFProgressButton) lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_BUTTON + url);
-        ProgressBar pbProgress = (ProgressBar) lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_PROGRESS + url);
-        TextView tvProgress = (TextView) lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_TEXTVIEW + url);
+        KFProgressButton targetBtn = lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_BUTTON + url);
+        ProgressBar pbProgress = lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_PROGRESS + url);
+        TextView tvProgress = lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_TEXTVIEW + url);
         if (tvProgress == null) {
             return;
         }
@@ -447,14 +447,14 @@ public class ActDownloadMgr extends BaseCompatActivity {
     @Download.onTaskFail void taskFail(DownloadTask task) {
 //        downloadTaskService.setDownloadTaskStatus(task.getKey(), DownloadTaskService.STATUS_FAIL);
         String url = task.getKey();
-        KFProgressButton targetBtn = (KFProgressButton) lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_BUTTON + url);
+        KFProgressButton targetBtn = lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_BUTTON + url);
         targetBtn.setText(R.string.download_fail);
         setTaskStatusByDownloadUrl(url, DownloadTaskService.STATUS_FAIL, task.getDownloadPath());
     }
 
     @Download.onTaskComplete void taskComplete(DownloadTask task) {
 //        downloadTaskService.setDownloadTaskFinish(task.getKey(), task.getDownloadPath());
-        TextView tvProgress = (TextView) lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_TEXTVIEW + task.getKey());
+        TextView tvProgress = lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_TEXTVIEW + task.getKey());
         tvProgress.setText(R.string.download_completed);
 
         setTaskStatusByDownloadUrl(task.getKey(), DownloadTaskService.STATUS_FINISH, task.getDownloadPath());

app/src/main/java/com/kfzs/duanduan/ActMain.java

@@ -89,7 +89,7 @@ public class ActMain extends BaseCompatActivity{
         ButterKnife.bind(this);
         EventBus.getDefault().register(this);
 
-        mImgDot = (ImageView) findViewById(R.id.img_download_manager_dot);
+        mImgDot = findViewById(R.id.img_download_manager_dot);
         tabsHelper.init();
         mDownloadTaskService = new DownloadTaskService(this);
 //        mDownloadTaskService.restoreDownloadTaskStatus();

app/src/main/java/com/kfzs/duanduan/ActSearch.java

@@ -183,7 +183,7 @@ public class ActSearch extends BaseCompatActivity {
      */
     private void loadHotTagView() {
 
-        TagFlowLayout tagList = (TagFlowLayout) findViewById(R.id.search_tagflow_layout);
+        TagFlowLayout tagList = findViewById(R.id.search_tagflow_layout);
         tagList.setMaxSelectCount(1);
         hotWordAdapter = new TagAdapter<HotWordsOuterClass.HotWords>(lHotWords) {
             @Override
@@ -241,7 +241,7 @@ public class ActSearch extends BaseCompatActivity {
      */
     private void initTabGame() {
         View view = View.inflate(this, R.layout.list_search, null);
-        ListView listView = (ListView) view.findViewById(R.id.list_list_search);
+        ListView listView = view.findViewById(R.id.list_list_search);
         listView.setEmptyView(view.findViewById(R.id.download_mgr_empty_view));
         mAdpSearchGame = new AdpSearchGame(this);
         mAdpSearchGame.setmInstallButtonMgrMap(mInstallButtonMgrMap);
@@ -255,7 +255,7 @@ public class ActSearch extends BaseCompatActivity {
      */
     private void initTabNewGame() {
         View view = View.inflate(this, R.layout.list_search, null);
-        ListView listView = (ListView) view.findViewById(R.id.list_list_search);
+        ListView listView = view.findViewById(R.id.list_list_search);
         listView.setEmptyView(view.findViewById(R.id.download_mgr_empty_view));
 
         //mAdpSearchNewGame = new AdpSearchNewGame(this);
@@ -270,7 +270,7 @@ public class ActSearch extends BaseCompatActivity {
      */
     private void initTabTest() {
         View view = View.inflate(this, R.layout.list_search, null);
-        ListView listView = (ListView) view.findViewById(R.id.list_list_search);
+        ListView listView = view.findViewById(R.id.list_list_search);
         listView.setEmptyView(view.findViewById(R.id.download_mgr_empty_view));
 
         //mAdpSearchTest = new AdpSearchTest(this);

app/src/main/java/com/kfzs/duanduan/PicBottomSheetActivity.java

@@ -70,7 +70,7 @@ public abstract class PicBottomSheetActivity extends BaseCompatActivity {
     }
 
     protected void initBottomSheetLayoutByID(@IdRes int bottomSheetID, @StringRes int titleStringID) {
-        bottomSheetLayout = (BottomSheetLayout) findViewById(bottomSheetID);
+        bottomSheetLayout = findViewById(bottomSheetID);
         chooseTitleString = getString(titleStringID);
         if (bottomSheetLayout != null || !TextUtils.isEmpty(chooseTitleString)) {
             bottomSheetLayout.setPeekOnDismiss(true);

app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCardProgressQuery.java

@@ -58,6 +58,7 @@ public class FgtCreditCardProgressQuery extends BaseFragment {
 
     public void initData() {
         list.clear();
+        adapter.notifyDataSetChanged();
         empty_view.setVisibility(View.INVISIBLE);
         SheepApp.getInstance().getNetComponent().getApiService().getCreditCardScheduleList()
                 .subscribeOn(Schedulers.io())

app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCardTaskList.java

@@ -71,6 +71,7 @@ public class FgtCreditCardTaskList extends BaseFragment {
 
     private void initData() {
         list.clear();
+        adapter.notifyDataSetChanged();
         empty_view.setVisibility(View.INVISIBLE);
         SheepApp.getInstance().getNetComponent().getApiService().getReleaseTaskCreditCard()
                         .subscribeOn(Schedulers.io())

app/src/main/java/com/kfzs/duanduan/fragment/FgtGameDetail.java

@@ -159,20 +159,20 @@ public class FgtGameDetail extends BaseCompatFragment {
     };
 
     private void initViewById() {
-        mRvImags = (RecyclerView) mContentView.findViewById(R.id.recy_fgt_game_detail);
-        mGameDesc = (TextView) mContentView.findViewById(R.id.tv_game_desc);
-        mGsIcon1 = (ImageView) mContentView.findViewById(R.id.img_fgt_fgt_detail_1);
-        mGsIcon2 = (ImageView) mContentView.findViewById(R.id.img_fgt_fgt_detail_2);
-        mGsIcon3 = (ImageView) mContentView.findViewById(R.id.img_fgt_fgt_detail_3);
-        mGsIcon4 = (ImageView) mContentView.findViewById(R.id.img_fgt_fgt_detail_4);
-        mGsName1 = (TextView) mContentView.findViewById(R.id.txt_fgt_game_detail_1);
-        mGsName2 = (TextView) mContentView.findViewById(R.id.txt_fgt_fgt_detail_2);
-        mGsName3 = (TextView) mContentView.findViewById(R.id.txt_fgt_fgt_detail_3);
-        mGsName4 = (TextView) mContentView.findViewById(R.id.txt_fgt_fgt_detail_4);
-        mGsBtn1 = (KFProgressButton) mContentView.findViewById(R.id.downbtn_fgt_game_detail_1);
-        mGsBtn2 = (KFProgressButton) mContentView.findViewById(R.id.downbtn_fgt_game_detail_2);
-        mGsBtn3 = (KFProgressButton) mContentView.findViewById(R.id.downbtn_fgt_game_detail_3);
-        mGsBtn4 = (KFProgressButton) mContentView.findViewById(R.id.downbtn_fgt_game_detail_4);
+        mRvImags = mContentView.findViewById(R.id.recy_fgt_game_detail);
+        mGameDesc = mContentView.findViewById(R.id.tv_game_desc);
+        mGsIcon1 = mContentView.findViewById(R.id.img_fgt_fgt_detail_1);
+        mGsIcon2 = mContentView.findViewById(R.id.img_fgt_fgt_detail_2);
+        mGsIcon3 = mContentView.findViewById(R.id.img_fgt_fgt_detail_3);
+        mGsIcon4 = mContentView.findViewById(R.id.img_fgt_fgt_detail_4);
+        mGsName1 = mContentView.findViewById(R.id.txt_fgt_game_detail_1);
+        mGsName2 = mContentView.findViewById(R.id.txt_fgt_fgt_detail_2);
+        mGsName3 = mContentView.findViewById(R.id.txt_fgt_fgt_detail_3);
+        mGsName4 = mContentView.findViewById(R.id.txt_fgt_fgt_detail_4);
+        mGsBtn1 = mContentView.findViewById(R.id.downbtn_fgt_game_detail_1);
+        mGsBtn2 = mContentView.findViewById(R.id.downbtn_fgt_game_detail_2);
+        mGsBtn3 = mContentView.findViewById(R.id.downbtn_fgt_game_detail_3);
+        mGsBtn4 = mContentView.findViewById(R.id.downbtn_fgt_game_detail_4);
 
         mRvImags.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
         mRvImags.setNestedScrollingEnabled(false);
@@ -202,7 +202,7 @@ public class FgtGameDetail extends BaseCompatFragment {
                         public void onClick(View v) {
                             Intent picEnlargeIntent = new Intent(getActivity(), ActPicturesEnlarge.class);
                             picEnlargeIntent.putExtra(KFIntentKeys.EXTRA_CURRENT_PICTURE_INDEX, (position));
-                            picEnlargeIntent.putExtra(KFIntentKeys.EXTRA_CURRENT_PICTURE_COLLECTIONS, (Serializable) mUrlsCollection);
+                            picEnlargeIntent.putExtra(KFIntentKeys.EXTRA_CURRENT_PICTURE_COLLECTIONS, mUrlsCollection);
                             getActivity().startActivity(picEnlargeIntent);
                         }
                     });

app/src/main/java/com/kfzs/duanduan/fragment/FgtMainGame.java

@@ -91,7 +91,7 @@ public class FgtMainGame extends BaseCompatFragment {
     protected void initView(Bundle savedInstanceState) {
         EventBus.getDefault().register(this);
         setContentView(R.layout.fgt_main_game);
-        mRecyView = (RecyclerView) mContentView.findViewById(R.id.recy_fgt_main_game);
+        mRecyView = mContentView.findViewById(R.id.recy_fgt_main_game);
         mSwipeRefreshLayout = mContentView.findViewById(R.id.refresh);
         mRecyView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mAdpMainPageRecy = new AdpMainPageRecy(getActivity(), mRecyView);

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -2,13 +2,11 @@ package com.kfzs.duanduan.fragment;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v4.view.ViewPager;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -30,12 +28,10 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.react.ReactUtil;
-import com.kfzs.duanduan.view.ImageGlarry;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
@@ -61,14 +57,13 @@ import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.AppUtil;
 import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.ConnectAddress;
 import com.sheep.gamegroup.util.ImageGlarryDrawable;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.PreferenceUtils;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
-import com.sheep.gamegroup.view.customview.GlideCircleTransform;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTask1;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskRegistSuccess;
@@ -95,7 +90,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
-import jp.wasabeef.glide.transformations.CropCircleTransformation;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -148,9 +142,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @BindView(R.id.recyclerview)
     RecyclerView recyclerview;
 
-    @BindView(R.id.test_change)
-    TextView test_change;
-
     @Inject
     SmallSheepPresenter pagePresenter;
     @Inject
@@ -193,7 +184,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         setContentView(R.layout.homepage_act_layout);
         initView();
         initListener();
-        testChange();
+        TestUtil.testChange(getActivity(), (TextView) getViewById(R.id.test_change));
     }
 
     public void initView() {
@@ -369,7 +360,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
     @OnClick({ R.id.user_layout, R.id.withdrawal, R.id.try_play_layout,
-            R.id.invitation_layout, R.id.lying_layout, R.id.newbie_task, R.id.card_layout, R.id.icon_layout})
+            R.id.invitation_layout, R.id.lying_layout, R.id.newbie_task, R.id.card_layout, R.id.icon_layout, R.id.info_layout})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.user_layout:
@@ -415,6 +406,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         });
                 break;
             case R.id.icon_layout://头像
+            case R.id.info_layout://其它信息
                 Jump2View.getInstance().goPersonnalCenterView(activity, null);
                 break;
         }
@@ -879,36 +871,4 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
 
     }
-    private void testChange(){
-        if(BuildConfig.DEBUG || !"sheep".equals(BuildConfig.FLAVOR)){
-            test_change.setVisibility(View.VISIBLE);
-            test_change.setText(SheepApp.getInstance().getConnectAddress().getName());
-            test_change.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-
-                    final String[] items = {"张伟", "测试服", "正式服"};
-                    AlertDialog dialog = new AlertDialog.Builder(activity).setTitle("请选择要切换的服务器")
-                            .setItems(items, new DialogInterface.OnClickListener() {
-
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    switch (items[which]){
-                                        case "张伟":
-                                            SheepApp.getInstance().setConnectAddress(ConnectAddress.sheepzhangwei);
-                                            break;
-                                        case "测试服":
-                                            SheepApp.getInstance().setConnectAddress(ConnectAddress.sheeptest);
-                                            break;
-                                        case "正式服":
-                                            SheepApp.getInstance().setConnectAddress(ConnectAddress.sheep);
-                                            break;
-                                    }
-                                }
-                            }).create();
-                    dialog.show();
-                }
-            });
-        }
-    }
 }

app/src/main/java/com/kfzs/duanduan/fragment/PictureViewPagerAdapter.java

@@ -64,7 +64,7 @@ public class PictureViewPagerAdapter extends PagerAdapter {
     @Override
     public void destroyItem(ViewGroup container, int position, Object object) {
         super.destroyItem(container, position, object);
-        ((ViewPager) container).removeView((View) object);
+        container.removeView((View) object);
     }
 
 
@@ -97,7 +97,7 @@ public class PictureViewPagerAdapter extends PagerAdapter {
                 }
             });
             child = ivChildItem;
-            ((ViewPager) container).addView(ivChildItem, position);
+            container.addView(ivChildItem, position);
 
         } else if (openModel == ViewPagerOpenModel.PICTURE_ENLARGE) {
             RelativeLayout parent = new RelativeLayout(that);
@@ -128,7 +128,7 @@ public class PictureViewPagerAdapter extends PagerAdapter {
                 ((ViewPager) container).setCurrentItem(mIntFirstShowPos);
                 mIntFirstShowPos = 0;//仅第一次设置生效
             }
-            ((ViewPager) container).addView(parent, position);
+            container.addView(parent, position);
         }
 
 

app/src/main/java/com/kfzs/duanduan/utils/StatusBarUtils.java

@@ -89,7 +89,7 @@ public class StatusBarUtils {
     public static void setColorForSwipeBack(Activity activity, @ColorInt int color, int statusBarAlpha) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
 
-            ViewGroup contentView = ((ViewGroup) activity.findViewById(android.R.id.content));
+            ViewGroup contentView = activity.findViewById(android.R.id.content);
             View rootView = contentView.getChildAt(0);
             int statusBarHeight = getStatusBarHeight(activity);
             if (rootView != null && rootView instanceof CoordinatorLayout) {
@@ -140,7 +140,7 @@ public class StatusBarUtils {
             return;
         }
         transparentStatusBar(activity);
-        ViewGroup contentView = (ViewGroup) activity.findViewById(android.R.id.content);
+        ViewGroup contentView = activity.findViewById(android.R.id.content);
         // 移除半透明矩形,以免叠加
         View fakeStatusBarView = contentView.findViewById(FAKE_STATUS_BAR_VIEW_ID);
         if (fakeStatusBarView != null) {
@@ -528,7 +528,7 @@ public class StatusBarUtils {
      * @param statusBarAlpha 透明值
      */
     private static void addTranslucentView(Activity activity, int statusBarAlpha) {
-        ViewGroup contentView = (ViewGroup) activity.findViewById(android.R.id.content);
+        ViewGroup contentView = activity.findViewById(android.R.id.content);
         View fakeTranslucentView = contentView.findViewById(FAKE_TRANSLUCENT_VIEW_ID);
         if (fakeTranslucentView != null) {
             if (fakeTranslucentView.getVisibility() == View.GONE) {
@@ -574,7 +574,7 @@ public class StatusBarUtils {
      * 设置根布局参数
      */
     private static void setRootView(Activity activity) {
-        ViewGroup parent = (ViewGroup) activity.findViewById(android.R.id.content);
+        ViewGroup parent = activity.findViewById(android.R.id.content);
         for (int i = 0, count = parent.getChildCount(); i < count; i++) {
             View childView = parent.getChildAt(i);
             if (childView instanceof ViewGroup) {

app/src/main/java/com/kfzs/duanduan/utils/dlg/TitleBarUtils.java

@@ -39,7 +39,7 @@ public class TitleBarUtils {
      * @return
      */
     public TitleBarUtils setTitle(Activity activity, String title) {
-        TextView titleView = (TextView) activity.findViewById(R.id.txt_baseactivity_title);
+        TextView titleView = activity.findViewById(R.id.txt_baseactivity_title);
         titleView.setVisibility(View.VISIBLE);
         titleView.setText(title == null ? "" : title);
         return mTitleBarUtils;
@@ -53,7 +53,7 @@ public class TitleBarUtils {
      * @return
      */
     public TitleBarUtils setTitleColor(Activity activity, int color) {
-        TextView titleView = (TextView) activity.findViewById(R.id.txt_baseactivity_title);
+        TextView titleView = activity.findViewById(R.id.txt_baseactivity_title);
         titleView.setTextColor(color);
         return mTitleBarUtils;
     }
@@ -85,8 +85,8 @@ public class TitleBarUtils {
      * @param onClickListener 如果为null,不改监听
      */
     public void setTitleListen(Activity activity, int drawableID, View.OnClickListener onClickListener) {
-        TextView titleView = (TextView) activity.findViewById(R.id.txt_baseactivity_title);
-        ImageView imageView= (ImageView) activity.findViewById(R.id.img_baseactivity_title);
+        TextView titleView = activity.findViewById(R.id.txt_baseactivity_title);
+        ImageView imageView= activity.findViewById(R.id.img_baseactivity_title);
         if (drawableID == 0) {
             imageView.setVisibility(View.INVISIBLE);
         } else if (drawableID == -2) {
@@ -112,8 +112,8 @@ public class TitleBarUtils {
      */
     public void setRightBotton(Activity activity, String btnText, int backgroundColorResId,
                                View.OnClickListener onClickListener) {
-        Button button = (Button) activity.findViewById(R.id.btn_baseactivity_right);
-        ImageButton imageButton = (ImageButton) activity.findViewById(R.id.ibtn_baseactivity_right);
+        Button button = activity.findViewById(R.id.btn_baseactivity_right);
+        ImageButton imageButton = activity.findViewById(R.id.ibtn_baseactivity_right);
         button.setVisibility(View.VISIBLE);
         imageButton.setVisibility(View.GONE);
         if (backgroundColorResId == 0) {
@@ -143,8 +143,8 @@ public class TitleBarUtils {
      * @param onClickListener    点击时的操作。
      */
     public void setRightImgBotton(Activity activity, int backgroundImgResId, View.OnClickListener onClickListener) {
-        Button button = (Button) activity.findViewById(R.id.btn_baseactivity_right);
-        ImageButton imageButton = (ImageButton) activity.findViewById(R.id.ibtn_baseactivity_right);
+        Button button = activity.findViewById(R.id.btn_baseactivity_right);
+        ImageButton imageButton = activity.findViewById(R.id.ibtn_baseactivity_right);
 
         button.setVisibility(View.GONE);
         imageButton.setVisibility(View.VISIBLE);

app/src/main/java/com/kfzs/duanduan/view/AppHomepageAdvertisementDialog.java

@@ -65,9 +65,9 @@ public class AppHomepageAdvertisementDialog extends Dialog {
      * 初始化界面控件    
      */
     private void initView() {
-        shutBtn = (ImageButton) findViewById(R.id.dialog_shut_btn);
-        downloadBtn = (Button) findViewById(R.id.dialog_download_btn);
-        backgroundImg = (ImageView) findViewById(R.id.dialog_background_img);
+        shutBtn = findViewById(R.id.dialog_shut_btn);
+        downloadBtn = findViewById(R.id.dialog_download_btn);
+        backgroundImg = findViewById(R.id.dialog_background_img);
 
     }
 

app/src/main/java/com/kfzs/duanduan/view/DialogStorageLow.java

@@ -94,8 +94,8 @@ public class DialogStorageLow {
         params.gravity = Gravity.CENTER;
 
         final View mView = LayoutInflater.from(context).inflate(R.layout.diag_show_install, null);
-        Button tv_itemdialog_ok = (Button) mView.findViewById(R.id.btn_diag_show_install_manage);
-        Button tv_itemdialog_close = (Button) mView.findViewById(R.id.btn_diag_show_install_cancle);
+        Button tv_itemdialog_ok = mView.findViewById(R.id.btn_diag_show_install_manage);
+        Button tv_itemdialog_close = mView.findViewById(R.id.btn_diag_show_install_cancle);
 
         tv_itemdialog_ok.setOnClickListener(new View.OnClickListener() {
             @Override

app/src/main/java/com/kfzs/duanduan/view/FilterWindow.java

@@ -93,7 +93,7 @@ public class FilterWindow implements View.OnClickListener {
             }
         });
 
-       lvConditions = (ListView)contentView.findViewById(R.id.popupwindow_query_condition_listview);
+       lvConditions = contentView.findViewById(R.id.popupwindow_query_condition_listview);
        lvConditions.addFooterView(initListViewFooterButtonArea());
        qcAdapter = new FilterWindowAdapter(mContext);
 
@@ -194,7 +194,7 @@ public class FilterWindow implements View.OnClickListener {
 
                 String selectedTagIndex = "";
                 for(int i = 0 ; i < conditions.size() ; i ++){
-                    TagFlowLayout tflContent = (TagFlowLayout)contentView.findViewWithTag(FilterWindowAdapter.FLOW_LAYOUT_TAG + i);
+                    TagFlowLayout tflContent = contentView.findViewWithTag(FilterWindowAdapter.FLOW_LAYOUT_TAG + i);
                     if (tflContent == null){
                         return ;
                     }
@@ -219,8 +219,8 @@ public class FilterWindow implements View.OnClickListener {
 
         View tvFooter = LayoutInflater.from(mContext).inflate(R.layout.listview_item_query_condition_footer,null);
 
-        btnReset  = (Button)tvFooter.findViewById(R.id.popupwindow_query_condition_btn_reset);
-        btnSubmit = (Button)tvFooter.findViewById(R.id.popupwindow_query_condition_btn_submit);
+        btnReset  = tvFooter.findViewById(R.id.popupwindow_query_condition_btn_reset);
+        btnSubmit = tvFooter.findViewById(R.id.popupwindow_query_condition_btn_submit);
         btnReset.setOnClickListener(this);
         btnSubmit.setOnClickListener(this);
 

app/src/main/java/com/sheep/gamegroup/model/entity/Ext.java

@@ -7,6 +7,7 @@ package com.sheep.gamegroup.model.entity;
 public class Ext {
     private int id;
     private String query_url;
+    private String url;
 
     public int getId() {
         return id;
@@ -23,4 +24,12 @@ public class Ext {
     public void setQuery_url(String query_url) {
         this.query_url = query_url;
     }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
 }

app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java

@@ -205,4 +205,8 @@ public class TaskEty implements Serializable{
         }
         return extInfo;
     }
+
+    public boolean needDownloadApp() {
+        return task_type == 1 || task_type == 3;
+    }
 }

app/src/main/java/com/sheep/gamegroup/util/ListUtil.java

@@ -0,0 +1,18 @@
+package com.sheep.gamegroup.util;
+
+
+import java.util.List;
+
+/**
+ * Created by realicing on 2018/5/3.
+ * realicing@sina.com
+ */
+public class ListUtil {
+    public static <T> boolean hasIndex(List<T> list, int i) {
+        return !ListUtil.isEmpty(list) && list.size() > i;
+    }
+
+    private static <T> boolean isEmpty(List<T> list) {
+        return list == null || list.isEmpty();
+    }
+}

app/src/main/java/com/sheep/gamegroup/util/NetUtil.java

@@ -103,7 +103,7 @@ public class NetUtil {
     public void sendAppDownload(Context context, JSONObject o){
         ApiService apiService = SheepApp.getInstance().getNetComponent().getApiService();
 
-        apiService.taskDownloadNotify((JSONObject) o)
+        apiService.taskDownloadNotify(o)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {

app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -0,0 +1,49 @@
+package com.sheep.gamegroup.util;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
+import android.view.View;
+import android.widget.TextView;
+
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+
+/**
+ * Created by realicing on 2018/5/3.
+ * realicing@sina.com
+ */
+public class TestUtil {
+    public static void testChange(final Activity activity, TextView test_change){
+        if(BuildConfig.DEBUG || !"sheep".equals(BuildConfig.FLAVOR)){
+            test_change.setVisibility(View.VISIBLE);
+            test_change.setText(SheepApp.getInstance().getConnectAddress().getName());
+            test_change.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+
+                    final String[] items = {"张伟", "测试服", "正式服"};
+                    AlertDialog dialog = new AlertDialog.Builder(activity).setTitle("请选择要切换的服务器")
+                            .setItems(items, new DialogInterface.OnClickListener() {
+
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    switch (items[which]){
+                                        case "张伟":
+                                            SheepApp.getInstance().setConnectAddress(ConnectAddress.sheepzhangwei);
+                                            break;
+                                        case "测试服":
+                                            SheepApp.getInstance().setConnectAddress(ConnectAddress.sheeptest);
+                                            break;
+                                        case "正式服":
+                                            SheepApp.getInstance().setConnectAddress(ConnectAddress.sheep);
+                                            break;
+                                    }
+                                }
+                            }).create();
+                    dialog.show();
+                }
+            });
+        }
+    }
+}

app/src/main/java/com/sheep/gamegroup/util/ViewHolder.java

@@ -52,7 +52,7 @@ public class ViewHolder extends android.support.v7.widget.RecyclerView.ViewHolde
     }
 
     public <T extends View> T getView(int viewId) {
-        View view = (View)this.mViews.get(viewId);
+        View view = this.mViews.get(viewId);
         if(view == null) {
             view = this.mConvertView.findViewById(viewId);
             this.mViews.put(viewId, view);
@@ -62,7 +62,7 @@ public class ViewHolder extends android.support.v7.widget.RecyclerView.ViewHolde
     }
 
     public <T extends View> T getView(int viewId, Class<T> t) {
-        View view = (View)this.mViews.get(viewId);
+        View view = this.mViews.get(viewId);
         if(view == null) {
             view = this.mConvertView.findViewById(viewId);
             this.mViews.put(viewId, view);
@@ -76,25 +76,25 @@ public class ViewHolder extends android.support.v7.widget.RecyclerView.ViewHolde
     }
 
     public ViewHolder setText(int viewId, String text) {
-        TextView tv = (TextView)this.getView(viewId);
+        TextView tv = this.getView(viewId);
         tv.setText(text);
         return this;
     }
 
     public ViewHolder setImageResource(int viewId, int resId) {
-        ImageView view = (ImageView)this.getView(viewId);
+        ImageView view = this.getView(viewId);
         view.setImageResource(resId);
         return this;
     }
 
     public ViewHolder setImageBitmap(int viewId, Bitmap bitmap) {
-        ImageView view = (ImageView)this.getView(viewId);
+        ImageView view = this.getView(viewId);
         view.setImageBitmap(bitmap);
         return this;
     }
 
     public ViewHolder setImageDrawable(int viewId, Drawable drawable) {
-        ImageView view = (ImageView)this.getView(viewId);
+        ImageView view = this.getView(viewId);
         view.setImageDrawable(drawable);
         return this;
     }
@@ -112,13 +112,13 @@ public class ViewHolder extends android.support.v7.widget.RecyclerView.ViewHolde
     }
 
     public ViewHolder setTextColor(int viewId, int textColor) {
-        TextView view = (TextView)this.getView(viewId);
+        TextView view = this.getView(viewId);
         view.setTextColor(textColor);
         return this;
     }
 
     public ViewHolder setTextColorRes(int viewId, int textColorRes) {
-        TextView view = (TextView)this.getView(viewId);
+        TextView view = this.getView(viewId);
         view.setTextColor(this.mContext.getResources().getColor(textColorRes));
         return this;
     }
@@ -144,7 +144,7 @@ public class ViewHolder extends android.support.v7.widget.RecyclerView.ViewHolde
     }
 
     public ViewHolder linkify(int viewId) {
-        TextView view = (TextView)this.getView(viewId);
+        TextView view = this.getView(viewId);
         Linkify.addLinks(view, Linkify.ALL);
         return this;
     }
@@ -155,7 +155,7 @@ public class ViewHolder extends android.support.v7.widget.RecyclerView.ViewHolde
 
         for(int var5 = 0; var5 < var4; ++var5) {
             int viewId = var3[var5];
-            TextView view = (TextView)this.getView(viewId);
+            TextView view = this.getView(viewId);
             view.setTypeface(typeface);
             view.setPaintFlags(view.getPaintFlags() | 128);
         }
@@ -164,32 +164,32 @@ public class ViewHolder extends android.support.v7.widget.RecyclerView.ViewHolde
     }
 
     public ViewHolder setProgress(int viewId, int progress) {
-        ProgressBar view = (ProgressBar)this.getView(viewId);
+        ProgressBar view = this.getView(viewId);
         view.setProgress(progress);
         return this;
     }
 
     public ViewHolder setProgress(int viewId, int progress, int max) {
-        ProgressBar view = (ProgressBar)this.getView(viewId);
+        ProgressBar view = this.getView(viewId);
         view.setMax(max);
         view.setProgress(progress);
         return this;
     }
 
     public ViewHolder setMax(int viewId, int max) {
-        ProgressBar view = (ProgressBar)this.getView(viewId);
+        ProgressBar view = this.getView(viewId);
         view.setMax(max);
         return this;
     }
 
     public ViewHolder setRating(int viewId, float rating) {
-        RatingBar view = (RatingBar)this.getView(viewId);
+        RatingBar view = this.getView(viewId);
         view.setRating(rating);
         return this;
     }
 
     public ViewHolder setRating(int viewId, float rating, int max) {
-        RatingBar view = (RatingBar)this.getView(viewId);
+        RatingBar view = this.getView(viewId);
         view.setMax(max);
         view.setRating(rating);
         return this;
@@ -208,7 +208,7 @@ public class ViewHolder extends android.support.v7.widget.RecyclerView.ViewHolde
     }
 
     public ViewHolder setChecked(int viewId, boolean checked) {
-        Checkable view = (Checkable)this.getView(viewId);
+        Checkable view = this.getView(viewId);
         view.setChecked(checked);
         return this;
     }

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

@@ -65,6 +65,13 @@ public class ActNewbieTaskList extends BaseActivity {
 
     }
 
+    private void setRefresh(){
+        if(swipe_container.isRefreshing()){
+            return;
+        }
+        swipe_container.setRefreshing(true);
+        initData();
+    }
     @Override
     public void initData() {
         etyList.clear();
@@ -99,7 +106,7 @@ public class ActNewbieTaskList extends BaseActivity {
         if(isFirst){
             isFirst = false;
         } else {
-            initData();
+            setRefresh();
         }
     }
 }

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

@@ -203,7 +203,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     private void startStask() {
         DownloadTarget task = null;
         //Todo 暂时判断信用卡，也许以后会增加其他类型，服务器传过来
-        if(task_entity.getTask_type() != 2){
+        if(task_entity.needDownloadApp()){
             if(TextUtils.isEmpty(task_entity.getDownload_link()) || !task_entity.getDownload_link().contains("http")){
                 G.showToast("下载地址错误!");
                 return;

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

@@ -74,7 +74,6 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
             @Override
             public void onRefresh() {
                 initData();
-                refresh.setRefreshing(false);
             }
         });
         recyclerview.addOnScrollListener(new RecyclerView.OnScrollListener() {
@@ -100,9 +99,15 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
             isFirst = false;
             return;
         }
+        setRefresh();
+    }
+    private void setRefresh(){
+        if(refresh.isRefreshing()){
+            return;
+        }
+        refresh.setRefreshing(true);
         initData();
     }
-
     @Override
     public void initData() {
         if(presenter == null){
@@ -155,6 +160,7 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
         }
         lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.PROMPT_ON_HOOK, list));
         lieMakeMoneyAdp.notifyDataSetChanged();
+        refresh.setRefreshing(false);
     }
 
     @Override
@@ -163,5 +169,6 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
         lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.START_ON_HOOK, null));
         lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.PROMPT_ON_HOOK, null));
         lieMakeMoneyAdp.notifyDataSetChanged();
+        refresh.setRefreshing(false);
     }
 }

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

@@ -1,16 +1,10 @@
 package com.sheep.gamegroup.view.activity;
 
-import android.Manifest;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-
 import com.sheep.gamegroup.absBase.BaseUMActivity;
 import com.sheep.gamegroup.di.components.DaggerLoginComponent;
 import com.sheep.gamegroup.di.modules.LoginModule;
@@ -18,6 +12,7 @@ import com.sheep.gamegroup.presenter.LoginContract;
 import com.sheep.gamegroup.presenter.LoginPresenter;
 import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -30,7 +25,6 @@ import java.util.Map;
 import javax.inject.Inject;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
@@ -61,6 +55,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
                 .loginModule(new LoginModule(this))
                 .build()
                 .inject(this);
+        TestUtil.testChange(this, (TextView) findViewById(R.id.test_change));
 
     }
 

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

@@ -140,7 +140,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
     @Override
     public void initData() {
-        if(taskId != -1){
+        if(taskId != -1 && !isGetTaskDesc){
+            isGetTaskDesc = true;
             presenter.taskDesc(taskId);
             return;
         }
@@ -435,9 +436,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         PackageUtil.startApp(SheepApp.mContext, taskEty.getPackage_names());
                         break;
                     case 10:
-                        if(!TextUtils.isEmpty(taskEty.getExt())){
+                        if(taskEty == null || taskEty.getExtInfo() == null || TextUtils.isEmpty(taskEty.getExtInfo().getUrl())){
+                            G.showToast("服务器数据错误，请联系客服或者稍候重试");
+                        } else {
                             Jump2View.getInstance()
-                                    .goWebview(activity, taskEty.getExt());
+                                    .goWebview(activity, taskEty.getExtInfo().getUrl());
                         }
                         break;
                 }
@@ -477,9 +480,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
     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);
+        ImageView img = view.findViewById(R.id.img_tab);
+        TextView tvStep = view.findViewById(R.id.tv_step);
+        TextView tvStatus = view.findViewById(R.id.tv_status);
         if (color == 0) {
             img.setImageResource(R.drawable.garden_green);
             tvStep.setTextColor(getResources().getColor(R.color.green));
@@ -507,7 +510,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 //                            onGetNetImageUrl(data);
         dismissLoaddingDialog();
         G.showToast("提交成功，等待审核!");
-        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
+//        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
         UMConfigUtils.finishTask();
         finish();
     }
@@ -523,11 +526,13 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     public void taskDescSuccess(BaseMessage baseMessage) {
         taskReleaseEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
         initWigget();
+        isGetTaskDesc = false;
     }
 
     @Override
     public void taskDescFaile(BaseMessage baseMessage) {
         G.showToast(baseMessage.getMsg()+"");
+        isGetTaskDesc = false;
     }
 
 
@@ -615,7 +620,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     public void onNext(BaseMessage baseMessage) {
                         hideProgress();
                         initData();
-                        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
+//                        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
                     }
                 });
     }
@@ -700,9 +705,13 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             btnTaskItem.setText(CommonUtil.START_INSTALL);
         }
     }
-
+    private boolean isGetTaskDesc = false;
     @Override
     protected void onResume() {
         super.onResume();
+        if(taskId != -1 && !isGetTaskDesc){
+            isGetTaskDesc = true;
+            presenter.taskDesc(taskId);
+        }
     }
 }

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

@@ -309,9 +309,9 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
 
     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);
+        ImageView img = view.findViewById(R.id.img_tab);
+        TextView tvStep = view.findViewById(R.id.tv_step);
+        TextView tvStatus = view.findViewById(R.id.tv_status);
         if (color == 0) {
             img.setImageResource(R.drawable.garden_green);
             tvStep.setTextColor(getResources().getColor(R.color.green));

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

@@ -188,7 +188,7 @@ public class TaskListAct extends AbsChooseImageActivity implements TaskListContr
 //                            onGetNetImageUrl(data);
         dismissLoaddingDialog();
         G.showToast("提交成功，等待审核!");
-        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
+//        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
         UMConfigUtils.finishTask();
 //        finish();
 

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

@@ -41,7 +41,6 @@ public class TryMakeMoneyact extends BaseActivity {
     @Override
     public void initView() {
         activity = this;
-        EventBus.getDefault().register(this);
         TitleBarUtils
                 .getInstance()
                 .setTitle(activity, "试玩赚钱")
@@ -54,27 +53,6 @@ public class TryMakeMoneyact extends BaseActivity {
 //        mAdapter.add(FgtTryMakeMoney2.newInstance(1), titles[1]);
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
-        indicator.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-            @Override
-            public void onTabSelected(TabLayout.Tab tab) {
-                if(0 == tab.getPosition()){
-                    mAdapter.getItem(tab.getPosition()).onResume();
-                } else {
-                    mAdapter.getItem(tab.getPosition()).onResume();
-                }
-            }
-
-            @Override
-            public void onTabUnselected(TabLayout.Tab tab) {
-
-            }
-
-            @Override
-            public void onTabReselected(TabLayout.Tab tab) {
-
-            }
-        });
-
     }
 
     @Override
@@ -85,24 +63,4 @@ public class TryMakeMoneyact extends BaseActivity {
     public void initData() {
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
-    @Subscribe
-    public void onEventMainThread(BigEvent event){
-        switch (event.getEventTypes()){
-            case ONFRESH_TRYMAKEMANY_PAGE:
-                try{
-                    if(mAdapter != null){
-                        mAdapter.getItem(0).onResume();
-                    }
-                }catch (Exception e){
-                    e.printStackTrace();
-                }
-                break;
-        }
-    }
 }

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdb2.java

@@ -166,7 +166,7 @@ public class TryMakeMoneyAdb2 extends BaseAdapter {
         Glide.with(context)
                 .load(taskAcceptedEty.getRelease_task().getTask().getIcon()+"")
                 .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head))
-                .into((ImageView) viewHolder.item_icon_iv);
+                .into(viewHolder.item_icon_iv);
         convertView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -197,7 +197,7 @@ public class TryMakeMoneyAdb2 extends BaseAdapter {
             countdown_tv.setVisibility(View.VISIBLE);
             String sr = "若<font color='#ff2d4b'><small>" + "" + "</small></font>后任务未完成，该任务自动取消，您可以重新接受该任务";
             countdown_tv.setText(sr+"");
-            SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer( taskAcceptedEty.getRelease_task().getCancel_duration() * 1000, 1000,(int)taskAcceptedEty.getRelease_task().getCancel_duration()) {
+            SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer( taskAcceptedEty.getRelease_task().getCancel_duration() * 1000, 1000, taskAcceptedEty.getRelease_task().getCancel_duration()) {
                 @Override
                 public void onTimerRest() {
                     countdown_tv.setText("");

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -32,6 +32,7 @@ import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -211,7 +212,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getLast_num()+"份");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getBonus() +"元");
 
-                ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setOnClickListener(new View.OnClickListener() {
+                viewHolder.itemView.findViewById(R.id.detail_task_tv).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
 //                        G.showToast("任务详情");
@@ -233,7 +234,9 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-
+                        if(!ListUtil.hasIndex(etyList, i)){
+                            return;
+                        }
                         TaskEty taskEty = etyList.get(i).getTask();
                         taskEty.setRunTask(0);
                         taskEty.setBonus(etyList.get(i).getBonus());
@@ -296,7 +299,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getRelease_task().getDeadline()))+"");
 
                 ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setText("取消任务");
-                ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setOnClickListener(new View.OnClickListener() {
+                viewHolder.itemView.findViewById(R.id.detail_task_tv).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
 
@@ -347,7 +350,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                     countdown_tv.setVisibility(View.VISIBLE);
                     String sr = "若<font color='#ff2d4b'><small>" + "" + "</small></font>后任务未完成，该任务自动取消，您可以重新接受该任务";
                     countdown_tv.setText(sr+"");
-                    SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer( etyList.get(i).getEnd_time() * 1000, 1000,(int)etyList.get(i).getRelease_task().getCancel_duration()) {
+                    SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer( etyList.get(i).getEnd_time() * 1000, 1000, etyList.get(i).getRelease_task().getCancel_duration()) {
                         @Override
                         public void onTimerRest() {
                             countdown_tv.setText("");

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -3,22 +3,17 @@ package com.sheep.gamegroup.view.fragment;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.RelativeLayout;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.event.BigEvent;
 import com.sheep.gamegroup.di.components.DaggerFgtTryMakeMoneyComponent;
-import com.sheep.gamegroup.di.components.DaggerTryMakeMoneyComponent;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.RecyleObj;
@@ -70,21 +65,15 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     private List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
     private int type = 0;
 
-    Handler mhandler = new Handler(){
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
+    private void notifyDataSetChanged(){
+        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
+        tryMakeMoneyAdp.refreshAdapter();
+        if(tryMakeMoneyAdp.isEmpty() && releaseEtyLists.isEmpty()){
 
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
-            tryMakeMoneyAdp.refreshAdapter();
-            if(tryMakeMoneyAdp.isEmpty() && releaseEtyLists.isEmpty()){
-
-                empty_view.setVisibility(View.VISIBLE);
-            }
-//            recyclerview.setAdapter(tryMakeMoneyAdp);
+            empty_view.setVisibility(View.VISIBLE);
         }
-    };
-
+        refresh.setRefreshing(false);
+    }
     public static FgtTryMakeMoney newInstance(int type){
         FgtTryMakeMoney fgtTryMakeMoney = new FgtTryMakeMoney();
         Bundle bundle = new Bundle();
@@ -156,7 +145,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             @Override
             public void onRefresh() {
                 initData();
-                refresh.setRefreshing(false);
             }
         });
         recyclerview.addOnScrollListener(new RecyclerView.OnScrollListener() {
@@ -175,6 +163,13 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             }
         });
     }
+    public void reFresh(){
+        if(refresh.isRefreshing()){
+            return;
+        }
+        refresh.setRefreshing(true);
+        initData();
+    }
     public void initData() {
         empty_view.setVisibility(View.GONE);
         position = 0;
@@ -235,7 +230,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     @Override
     public void giveUpTaskSuccesView(Object o) {
         G.showToast("取消任务成功");
-        initData();
+        reFresh();
     }
 
     @Override
@@ -258,7 +253,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         }catch (Exception e){
             e.printStackTrace();
         }
-        mhandler.sendEmptyMessage(0);
+        notifyDataSetChanged();
     }
 
     @Override
@@ -277,7 +272,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             e.printStackTrace();
             G.showToast(" 网络错误！");
         }
-        mhandler.sendEmptyMessage(0);
+        notifyDataSetChanged();
     }
 
     /**
@@ -299,7 +294,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             e.printStackTrace();
         }
         if(type == 2){
-            mhandler.sendEmptyMessage(0);
+            notifyDataSetChanged();
         }else {
             presenter.returnTask(null);
         }
@@ -310,7 +305,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void failReleaseTask2View(Object o) {
 
         if(type == 2){
-            mhandler.sendEmptyMessage(0);
+            notifyDataSetChanged();
         }else {
             presenter.returnTask(null);
         }
@@ -320,7 +315,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void onEventMainThread(BigEvent event){
         switch (event.getEventTypes()){
             case ONFRESH_TRYMAKEMANY_PAGE:
-                initData();
+                reFresh();
                 break;
         }
     }
@@ -376,7 +371,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void onResume() {
         super.onResume();
         if (presenter != null) {
-            initData();
+            reFresh();
         }
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/TitleBarUtils.java

@@ -40,7 +40,7 @@ public class TitleBarUtils {
      * @return
      */
     public TitleBarUtils setTitle(Activity activity, String title) {
-        TextView titleView = (TextView) activity.findViewById(R.id.txt_baseactivity_title);
+        TextView titleView = activity.findViewById(R.id.txt_baseactivity_title);
         titleView.setVisibility(View.VISIBLE);
         titleView.setText(title == null ? "" : title);
         return mTitleBarUtils;
@@ -54,7 +54,7 @@ public class TitleBarUtils {
      * @return
      */
     public TitleBarUtils setTitleColor(Activity activity, int color) {
-        TextView titleView = (TextView) activity.findViewById(R.id.txt_baseactivity_title);
+        TextView titleView = activity.findViewById(R.id.txt_baseactivity_title);
         titleView.setTextColor(color);
         return mTitleBarUtils;
     }
@@ -86,8 +86,8 @@ public class TitleBarUtils {
      * @param onClickListener 如果为null,不改监听
      */
     public TitleBarUtils setTitleListen(Activity activity, int drawableID, View.OnClickListener onClickListener) {
-        TextView titleView = (TextView) activity.findViewById(R.id.txt_baseactivity_title);
-        ImageView imageView = (ImageView) activity.findViewById(R.id.img_baseactivity_title);
+        TextView titleView = activity.findViewById(R.id.txt_baseactivity_title);
+        ImageView imageView = activity.findViewById(R.id.img_baseactivity_title);
         if (drawableID == 0) {
             imageView.setVisibility(View.INVISIBLE);
         } else if (drawableID == -2) {
@@ -114,8 +114,8 @@ public class TitleBarUtils {
      */
     public void setRightBotton(Activity activity, String btnText, int backgroundColorResId,
                                View.OnClickListener onClickListener) {
-        Button button = (Button) activity.findViewById(R.id.btn_baseactivity_right);
-        ImageButton imageButton = (ImageButton) activity.findViewById(R.id.ibtn_baseactivity_right);
+        Button button = activity.findViewById(R.id.btn_baseactivity_right);
+        ImageButton imageButton = activity.findViewById(R.id.ibtn_baseactivity_right);
         button.setVisibility(View.VISIBLE);
         imageButton.setVisibility(View.GONE);
         if (backgroundColorResId == 0) {
@@ -145,8 +145,8 @@ public class TitleBarUtils {
      * @param onClickListener    点击时的操作。
      */
     public void setRightImgBotton(Activity activity, int backgroundImgResId, View.OnClickListener onClickListener) {
-        Button button = (Button) activity.findViewById(R.id.btn_baseactivity_right);
-        ImageButton imageButton = (ImageButton) activity.findViewById(R.id.ibtn_baseactivity_right);
+        Button button = activity.findViewById(R.id.btn_baseactivity_right);
+        ImageButton imageButton = activity.findViewById(R.id.ibtn_baseactivity_right);
 
         button.setVisibility(View.GONE);
         imageButton.setVisibility(View.VISIBLE);

app/src/main/res/drawable/sel_circle_dot.xml

@@ -3,6 +3,6 @@
     <item android:drawable="@drawable/shape_circle_normal" android:state_checked="true"/>
     <item android:drawable="@drawable/shape_circle_normal" android:state_selected="true"/>
     <item android:drawable="@drawable/shape_circle_gray" android:state_checked="false"/>
-    <item android:drawable="@drawable/shape_circle_gray" android:state_enabled="false"></item>
+    <item android:drawable="@drawable/shape_circle_gray" android:state_enabled="false" />
 
 </selector>

app/src/main/res/drawable/shape_black_ring.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval" >
-<!--70%透明度-->
-    <stroke android:color="#b2000000"
-        android:width="3dp"/>
-
-    <corners android:radius="10dp" />
-</shape>

app/src/main/res/drawable/sl_white_gray.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/detail_bgColor" android:state_pressed="true"></item>
-    <item android:drawable="@color/white"></item>
+    <item android:drawable="@color/detail_bgColor" android:state_pressed="true" />
+    <item android:drawable="@color/white" />
 </selector>

app/src/main/res/drawable/sp_bg_circle_ash.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="#D4D4D4"/>
+</shape>

app/src/main/res/drawable/sp_bg_circle_main.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="#2EBBF2"/>
+</shape>

app/src/main/res/drawable/sp_rectangle_bg_white_radius.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid
-        android:color="@color/white"/>
 
+    <solid android:color="#F7F7F7"/>
     <corners
-        android:radius="10dp"/>
+        android:radius="@dimen/radius_20"/>
 
 </shape>

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

@@ -21,6 +21,6 @@
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"></FrameLayout>
+        android:layout_height="match_parent" />
 
 </LinearLayout>

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

@@ -90,7 +90,7 @@
         <android.support.v4.view.ViewPager
             android:id="@+id/viewpager_act_search"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"></android.support.v4.view.ViewPager>
+            android:layout_height="match_parent" />
 
     </LinearLayout>
 

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 

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

@@ -2,17 +2,92 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white_light"
     android:orientation="vertical">
 
-    <ImageView
+    <android.support.constraint.ConstraintLayout
         android:id="@+id/task_progress_iv"
+        android:paddingTop="@dimen/content_padding_20"
+        android:paddingBottom="@dimen/content_padding_20"
+        android:background="@color/white"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:scaleType="fitXY"
-        android:src="@drawable/credit_card_process" />
-
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/credit_card_task_list_tip_tv_1"
+            style="@style/style_circle_main_tv"
+            android:text="申请办卡"
+            app:layout_constraintStart_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/credit_card_task_list_tip_tv_2"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+        <TextView
+            android:id="@+id/credit_card_task_list_tip_tv_2"
+            style="@style/style_circle_main_tv"
+            android:text="预留信息"
+            app:layout_constraintStart_toEndOf="@+id/credit_card_task_list_tip_tv_1"
+            app:layout_constraintEnd_toStartOf="@+id/credit_card_task_list_tip_tv_3"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+        <TextView
+            android:id="@+id/credit_card_task_list_tip_tv_3"
+            style="@style/style_circle_main_tv"
+            android:text="银行审批"
+            app:layout_constraintStart_toEndOf="@+id/credit_card_task_list_tip_tv_2"
+            app:layout_constraintEnd_toStartOf="@+id/credit_card_task_list_tip_tv_4"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+        <TextView
+            android:id="@+id/credit_card_task_list_tip_tv_4"
+            style="@style/style_circle_main_tv"
+            android:text="上传截图"
+            app:layout_constraintStart_toEndOf="@+id/credit_card_task_list_tip_tv_3"
+            app:layout_constraintEnd_toStartOf="@+id/credit_card_task_list_tip_tv_5"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+        <TextView
+            android:id="@+id/credit_card_task_list_tip_tv_5"
+            style="@style/style_circle_main_tv"
+            android:text="奖励发放"
+            app:layout_constraintStart_toEndOf="@+id/credit_card_task_list_tip_tv_4"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+        <View
+            android:id="@+id/credit_card_task_list_tip_circle_1"
+            style="@style/style_circle_main_v"
+            android:layout_marginBottom="@dimen/content_padding_15"
+            app:layout_constraintBottom_toTopOf="@+id/credit_card_task_list_tip_tv_1"
+            app:layout_constraintStart_toStartOf="@+id/credit_card_task_list_tip_tv_1"
+            app:layout_constraintEnd_toEndOf="@+id/credit_card_task_list_tip_tv_1"/>
+        <View
+            android:id="@+id/credit_card_task_list_tip_circle_2"
+            style="@style/style_circle_main_v"
+            app:layout_constraintBaseline_toBaselineOf="@+id/credit_card_task_list_tip_circle_1"
+            app:layout_constraintStart_toStartOf="@+id/credit_card_task_list_tip_tv_2"
+            app:layout_constraintEnd_toEndOf="@+id/credit_card_task_list_tip_tv_2"/>
+        <View
+            android:id="@+id/credit_card_task_list_tip_circle_3"
+            style="@style/style_circle_main_v"
+            app:layout_constraintBaseline_toBaselineOf="@+id/credit_card_task_list_tip_circle_1"
+            app:layout_constraintStart_toStartOf="@+id/credit_card_task_list_tip_tv_3"
+            app:layout_constraintEnd_toEndOf="@+id/credit_card_task_list_tip_tv_3"/>
+        <View
+            android:id="@+id/credit_card_task_list_tip_circle_4"
+            style="@style/style_circle_main_v"
+            app:layout_constraintBaseline_toBaselineOf="@+id/credit_card_task_list_tip_circle_1"
+            app:layout_constraintStart_toStartOf="@+id/credit_card_task_list_tip_tv_4"
+            app:layout_constraintEnd_toEndOf="@+id/credit_card_task_list_tip_tv_4"/>
+        <View
+            android:id="@+id/credit_card_task_list_tip_circle_5"
+            style="@style/style_circle_main_v"
+            app:layout_constraintBaseline_toBaselineOf="@+id/credit_card_task_list_tip_circle_1"
+            app:layout_constraintStart_toStartOf="@+id/credit_card_task_list_tip_tv_5"
+            app:layout_constraintEnd_toEndOf="@+id/credit_card_task_list_tip_tv_5"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:background="#2EBBF2"
+            app:layout_constraintTop_toTopOf="@+id/credit_card_task_list_tip_circle_1"
+            app:layout_constraintBottom_toBottomOf="@+id/credit_card_task_list_tip_circle_1"
+            app:layout_constraintStart_toStartOf="@+id/credit_card_task_list_tip_circle_1"
+            app:layout_constraintEnd_toEndOf="@+id/credit_card_task_list_tip_circle_5"/>
+    </android.support.constraint.ConstraintLayout>
     <include
         android:id="@+id/empty_view"
         layout="@layout/empty_view"

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

@@ -18,6 +18,6 @@
         android:layout_alignParentBottom="true"
         android:gravity="center"
         android:orientation="horizontal"
-        android:paddingTop="4dp"></RadioGroup>
+        android:paddingTop="4dp" />
 
 </RelativeLayout>

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

@@ -16,7 +16,7 @@
             android:layout_height="wrap_content"
             android:background="@color/app"
             android:orientation="vertical"
-            android:scrollbars="none"></android.support.v7.widget.RecyclerView>
+            android:scrollbars="none" />
     </android.support.v4.widget.SwipeRefreshLayout>
 
 </LinearLayout>

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

@@ -33,7 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
-        android:layout_marginTop="4dp"></android.support.v7.widget.RecyclerView>
+        android:layout_marginTop="4dp" />
 
     <View
         android:layout_width="match_parent"

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

@@ -19,6 +19,6 @@
             android:id="@+id/recyclerview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"></android.support.v7.widget.RecyclerView>
+            android:orientation="vertical" />
     </android.support.v4.widget.SwipeRefreshLayout>
 </RelativeLayout>

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

@@ -2,7 +2,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:clipChildren="true"
     android:background="@color/bg_gray">
 

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

@@ -20,5 +20,5 @@
         android:gravity="center|right"
         android:orientation="horizontal"
         android:layout_marginRight="@dimen/content_padding_small"
-        android:paddingTop="4dp"></RadioGroup>
+        android:paddingTop="4dp" />
 </RelativeLayout>

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

@@ -30,6 +30,7 @@
 
     </RelativeLayout>
     <RelativeLayout
+        android:id="@+id/info_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical">

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

@@ -7,7 +7,7 @@
     <ListView
         android:id="@+id/list_list_search"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"></ListView>
+        android:layout_height="match_parent" />
 
     <include layout="@layout/empty_view" />
 

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

@@ -34,12 +34,12 @@
             android:layout_above="@+id/tel_login_tv"
             android:layout_centerHorizontal="true"
             >
+
             <View
                 android:layout_width="10dp"
                 android:layout_height="1dp"
                 android:background="@color/txt_white"
-                android:layout_gravity="center_vertical"
-                ></View>
+                android:layout_gravity="center_vertical" />
 
             <ImageView
                 android:layout_marginLeft="15dp"
@@ -56,8 +56,7 @@
                 android:layout_width="2dp"
                 android:layout_height="2dp"
                 android:background="@color/txt_white"
-                android:layout_gravity="center_vertical"
-                ></View>
+                android:layout_gravity="center_vertical" />
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -66,14 +65,26 @@
                 android:src="@mipmap/x_ic_login_qq"
                 android:id="@+id/iv_qq"
                 />
+
             <View
                 android:layout_marginLeft="15dp"
                 android:layout_width="10dp"
                 android:layout_height="1dp"
                 android:background="@color/txt_white"
-                android:layout_gravity="center_vertical"
-                ></View>
+                android:layout_gravity="center_vertical" />
         </LinearLayout>
     </RelativeLayout>
 
+    <TextView
+        android:id="@+id/test_change"
+        style="@style/style_button_small_yellow"
+        android:layout_width="wrap_content"
+        android:layout_height="30dp"
+        android:paddingStart="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
+        android:layout_margin="@dimen/content_padding_10"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:text="切换服务器"
+        android:visibility="gone"/>
 </RelativeLayout>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -8,15 +9,72 @@
     <include
         layout="@layout/title"/>
 
-    <ImageView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
-        android:src="@mipmap/task_process_show"/>
-
+        android:paddingStart="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+        <TextView
+            style="@style/style_ash_tv"
+            android:text="接受任务"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1"/>
+        <View
+            android:layout_width="6dp"
+            android:layout_height="6dp"
+            android:background="@drawable/sp_bg_circle_ash"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1"/>
+        <TextView
+            style="@style/style_ash_tv"
+            android:text="完成任务提交"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1"/>
+        <View
+            android:layout_width="6dp"
+            android:layout_height="6dp"
+            android:background="@drawable/sp_bg_circle_ash"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1"/>
+        <TextView
+            style="@style/style_ash_tv"
+            android:text="后台审核通过"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1"/>
+        <View
+            android:layout_width="6dp"
+            android:layout_height="6dp"
+            android:background="@drawable/sp_bg_circle_ash"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1"/>
+        <TextView
+            style="@style/style_ash_tv"
+            android:text="领取奖励"/>
+    </LinearLayout>
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
+        app:tabIndicatorColor="#4bc1fe"
+        app:tabGravity="fill"
+        app:tabSelectedTextColor="#4bc1fe"
+        app:tabTextColor="#444444"
+        app:tabMode="fixed" />
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"

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

@@ -19,7 +19,7 @@
        android:orientation="vertical">
 
 
-    <include layout="@layout/title"></include>
+       <include layout="@layout/title" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -340,8 +340,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/content_padding_20"
                 android:background="@drawable/shape_page"
-                android:paddingStart="7dp"
-                android:paddingEnd="7dp"
+                android:paddingStart="17dp"
+                android:paddingEnd="17dp"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
                 android:textSize="12sp"
@@ -367,8 +367,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/content_padding_10"
                 android:background="@drawable/shape_page"
-                android:paddingStart="7dp"
-                android:paddingEnd="7dp"
+                android:paddingStart="17dp"
+                android:paddingEnd="17dp"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
                 android:textSize="12sp"

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

@@ -5,7 +5,8 @@
               android:orientation="vertical"
     android:background="@color/white_light"
     android:baselineAligned="false">
-    <include layout="@layout/title"></include>
+
+    <include layout="@layout/title" />
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/values/attrs.xml

@@ -3,14 +3,14 @@
     <declare-styleable name="MutiProgress">
         <attr name="nodesNum" format="integer"/> <!-- 节点数量 -->
         <attr name="nodeRadius" format="dimension"/>
-        <attr name="progressingDrawable" format="reference"></attr>
+        <attr name="progressingDrawable" format="reference" />
         <attr name="unprogressingDrawable" format="reference" />  <!-- 未完成的节点图标 -->
         <attr name="progresFailDrawable" format="reference" />
         <attr name="progresSuccDrawable" format="reference" />
 
-        <attr name="processingLineColor" format="color"></attr>
-        <attr name="currNodeNO" format="integer"></attr>   <!-- 当前所到达的节点编号  0开始计算-->
-        <attr name="currNodeState" format="integer"></attr>   <!-- 当前所到达的节点状态，0：失败  1：成功 -->
+        <attr name="processingLineColor" format="color" />
+        <attr name="currNodeNO" format="integer" />   <!-- 当前所到达的节点编号  0开始计算-->
+        <attr name="currNodeState" format="integer" />   <!-- 当前所到达的节点状态，0：失败  1：成功 -->
     </declare-styleable>
 
     <declare-styleable name="FlikerProgressBar">

app/src/main/res/values/dd_styles.xml

@@ -114,4 +114,26 @@
     <style name="TablLayoutTextStyle">
         <item name="android:textSize">14sp</item>
     </style>
+    <style name="style_ash_tv">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">26dp</item>
+        <item name="android:paddingStart">@dimen/content_padding_10</item>
+        <item name="android:paddingEnd">@dimen/content_padding_10</item>
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">#767676</item>
+        <item name="android:gravity">center</item>
+        <item name="android:background">@drawable/sp_bg_rectangle_ash</item>
+    </style>
+    <style name="style_circle_main_v">
+        <item name="android:layout_width">18dp</item>
+        <item name="android:layout_height">18dp</item>
+        <item name="android:background">@drawable/sp_bg_circle_main</item>
+    </style>
+    <style name="style_circle_main_tv">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">#353235</item>
+        <item name="android:textSize">15sp</item>
+    </style>
 </resources>

app/src/main/res/values/drawables.xml

@@ -1 +0,0 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android"></resources>

app/src/main/res/values/str_gamebook_strings.xml

@@ -1 +1 @@
-<resources></resources>
+<resources />

app/src/main/res/values/str_management_strings.xml

@@ -1 +1 @@
-<resources></resources>
+<resources />

app/src/main/res/values/str_menu_strings.xml

@@ -1 +1 @@
-<resources></resources>
+<resources />

app/src/main/res/values/str_setting_strings.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources />

app/src/main/res/values/strings.xml

@@ -1,6 +1,5 @@
 <resources>
     <string name="app_name">小绵羊</string>
-    <string name="accessibility_service_description">开启观察权限</string>
     <string name="sprogress_string">当前进度%.1f%%</string>
     <string name="get_captcha">获取验证码</string>
     <string name="input_your_phone">请输入你的手机号</string>
@@ -13,6 +12,6 @@
     <string name="no_bind_wx_notice_text">未绑定微信号，无法入账到你的微信零钱</string>
     <string name="no_bind_tel_notice_text">我们已将你的手机号与该帐号绑定，如有变更，请点击</string>
     <string name="coming_soon">敬请期待</string>
-    <string name="last_page"> &#060; </string>
-    <string name="next_page"> &#062; </string>
+    <string name="last_page">&#060;</string>
+    <string name="next_page">&#062;</string>
 </resources>

app/src/main/res/values/style_theme.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowContentOverlay">@null</item>

app/src/main/res/xml/accessibility.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<accessibility-service
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accessibilityEventTypes="typeWindowStateChanged"
-    android:accessibilityFeedbackType="feedbackGeneric"
-    android:accessibilityFlags="flagIncludeNotImportantViews"
-    android:description="@string/accessibility_service_description"
-    />
-