Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

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

@@ -39,6 +39,7 @@ import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.greendao.DDProviderHelper;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
+import com.sheep.gamegroup.helper.TaskHelper;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.Ext;
@@ -148,6 +149,7 @@ public class CommonUtil {
     public static String GAME_OPEN = "开始试玩";
     public static String GAME_RESERVATION = "预约游戏";
     public static String TASK_OFFLINE = "任务已下线";
+    public static String TASK_AUDIT = "audit";
     private static CommonUtil commonUtil;
 
     public static CommonUtil getInstance() {
@@ -2522,4 +2524,31 @@ public class CommonUtil {
             }
         }
     }
+
+    /**
+     * 给任务设置标签
+     */
+    public void setTaskTag(Context context, View itemView, TaskReleaseEty taskReleaseEty, String show_type ){
+        int from = 0;
+        if(show_type.equals(TASK_AUDIT)){
+            from = 2;
+        }else
+        if(!TextUtils.isEmpty(show_type))
+            from = 1;
+        switch (from) {
+            case 1://来自主页
+                TaskHelper.setTaskTypeText((TextView) itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
+                TaskHelper.setTaskTagText((TextView) itemView.findViewById(R.id.item_num_tv1), taskReleaseEty);
+                TaskHelper.setNumText((TextView) itemView.findViewById(R.id.item_num_tv2), taskReleaseEty);
+                break;
+            case 2:
+                TaskHelper.setTaskTagText((TextView) itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
+                break;
+            default:
+                TaskHelper.setTaskTagText((TextView) itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
+                TaskHelper.setNumText((TextView) itemView.findViewById(R.id.item_num_tv1), taskReleaseEty);
+                break;
+        }
+
+    }
 }

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

@@ -264,6 +264,7 @@ public class Jump2View {
             MyDbManager.getInstance().saveOrUpdate(newbie_task_record);
             checkOrGoHomePage((Activity) context);
         } else {
+            G.showToast(context.getString(R.string.login_success));
             context.startActivity(intent);
         }
     }

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

@@ -570,12 +570,15 @@ public class SysAppUtil {
 
                             @Override
                             public void onResponse(File response, int id) {
-                                if(view instanceof TextView && response != null && response.exists()) {
-                                    TextView btnLeftTextView = (TextView) view;
-                                    btnLeftTextView.setEnabled(true);
-                                    btnLeftTextView.setText("立即安装");
+                                if(response != null && response.exists()) {
+                                    if(view instanceof TextView){
+                                        TextView btnLeftTextView = (TextView) view;
+                                        btnLeftTextView.setEnabled(true);
+                                        btnLeftTextView.setText("立即安装");
+                                    }
+
+                                    installApk(response);
                                 }
-                                installApk(file);
                             }
                         });
                     }

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

@@ -4,7 +4,9 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.graphics.PixelFormat;
+import android.os.Build;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -16,11 +18,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 
-import com.tencent.smtt.export.external.interfaces.IX5WebChromeClient;
-import com.tencent.smtt.sdk.WebChromeClient;
-import com.tencent.smtt.sdk.WebSettings;
-import com.tencent.smtt.sdk.WebView;
-import com.tencent.smtt.sdk.WebViewClient;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -91,7 +92,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     protected final FrameLayout.LayoutParams COVER_SCREEN_PARAMS = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
     private View customView;
     private FrameLayout fullscreenContainer;
-    private IX5WebChromeClient.CustomViewCallback customViewCallback;
+    private WebChromeClient.CustomViewCallback customViewCallback;
 
 
     @BindView(R.id.refresh)
@@ -165,24 +166,43 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
 
     public void initWebView() {
+//        getWindow().setFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
+//                WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
+
         WebChromeClient wvcc = new WebChromeClient();
-        WebSettings webSettings = webView.getSettings();
-        webSettings.setJavaScriptEnabled(true);
-        webSettings.setUseWideViewPort(true); // 关键点
-        webSettings.setAllowFileAccess(true); // 允许访问文件
-        webSettings.setSupportZoom(true); // 支持缩放
-        webSettings.setLoadWithOverviewMode(true);//是否支持全屏
-        webSettings.setDomStorageEnabled(true);
-        webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); // 加载缓存内容
-        webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);// 自适应屏幕
+        WebSettings webSetting = webView.getSettings();
+        webSetting.setJavaScriptEnabled(true);
+        webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
+        webSetting.setAllowFileAccess(true);
+        webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
+        webSetting.setSupportZoom(true);
+        webSetting.setBuiltInZoomControls(true);
+        webSetting.setUseWideViewPort(true);
+        webSetting.setSupportMultipleWindows(true);
+        webSetting.setAppCacheEnabled(true);
+        webSetting.setDatabaseEnabled(true);
+        webSetting.setDomStorageEnabled(true);
+        webSetting.setGeolocationEnabled(true);
+        webSetting.setAppCacheMaxSize(Long.MAX_VALUE);
+        webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
+        webSetting.setRenderPriority(WebSettings.RenderPriority.HIGH);
+        webSetting.setCacheMode(android.webkit.WebSettings.LOAD_NO_CACHE);
+
+
+        webSetting.setCacheMode(android.webkit.WebSettings.LOAD_DEFAULT);
+        webSetting.setLoadWithOverviewMode(true);
         getWindow().setFormat(PixelFormat.TRANSLUCENT);
         webView.setWebChromeClient(wvcc);
         WebViewClient wvc = new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                webView.loadUrl(url);
-                Jump2View.getInstance().goWeb(ActFindInformation.this, url);
-                return true;
+                //Android8.0以下的需要返回true 并且需要loadUrl；8.0之后效果相反
+                if(Build.VERSION.SDK_INT<26) {
+                    webView.loadUrl(url);
+                    Jump2View.getInstance().goWeb(ActFindInformation.this, url);
+                    return true;
+                }
+                return false;
             }
         };
         webView.setWebChromeClient(new WebChromeClient() {
@@ -200,7 +220,8 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
             }
 
             @Override
-            public void onShowCustomView(View view, IX5WebChromeClient.CustomViewCallback callback) {
+            public void onShowCustomView(View view, CustomViewCallback callback) {
+                super.onShowCustomView(view, callback);
                 showCustomView(view, callback);
                 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);//设置横屏
             }
@@ -209,6 +230,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
             public void onHideCustomView() {
                 hideCustomView();
                 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//设置竖屏
+                super.onHideCustomView();
             }
         });
         webView.setWebViewClient(wvc);
@@ -218,7 +240,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
      * 视频播放全屏
      */
 
-    private void showCustomView(View view, IX5WebChromeClient.CustomViewCallback callback) {
+    private void showCustomView(View view, WebChromeClient.CustomViewCallback callback) {
         // if a view already exists then immediately terminate the new one
         if (customView != null) {
             callback.onCustomViewHidden();
@@ -428,7 +450,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
             findItem = data;
             list.clear();
             list.add("top");
-            list.add("bottom");
+//            list.add("bottom");
             notifyDataSetChanged();
             if (findItem.getRelease_task_id() != 0) {//包含任务
                 taskHelper.initAcceptedTask(ActFindInformation.this, findItem.getRelease_task_id());
@@ -625,7 +647,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
         taskHelper.onResume();
         try {
             if (webView != null) {
-                webView.resumeTimers();
+//                webView.resumeTimers();
                 webView.onResume();
                 webView.getClass().getMethod("onResume").invoke(webView, (Object[]) null);
             }
@@ -636,17 +658,17 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
     @Override
     protected void onDestroy() {
-        super.onDestroy();
         LogUtil.logI("释放资源");
         EventBus.getDefault().unregister(this);
         taskHelper.destroy();
         if (webView != null) {
-            webView.onPause();
-            webView.freeMemory();
-            webView.removeAllViews();
+//            webView.onPause();
+//            webView.freeMemory();
+//            webView.removeAllViews();
             webView.destroy();
-            webView = null;
+//            webView = null;
         }
+        super.onDestroy();
         ActFindInformation.this.finish();
     }
 
@@ -673,7 +695,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
         super.onPause();
         if (webView != null) {
             webView.onPause();
-            webView.pauseTimers();
+//            webView.pauseTimers();
             try {
                 webView.getClass().getMethod("onPause").invoke(webView, (Object[]) null);
             } catch (Exception e) {
@@ -681,4 +703,29 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
             }
         }
     }
+
+    @Override
+    public void onBackPressed() {
+        if (webView != null && webView.canGoBack()) {
+            webView.goBack();
+            return;
+        }
+        super.onBackPressed();
+    }
+
+
+    @Override
+    public void onConfigurationChanged(Configuration config) {
+        super.onConfigurationChanged(config);
+        switch (config.orientation) {
+            case Configuration.ORIENTATION_LANDSCAPE:
+                getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+                getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                break;
+            case Configuration.ORIENTATION_PORTRAIT:
+                getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                getWindow().addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+                break;
+        }
+    }
 }

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.View;
 
 import com.jcodecraeer.xrecyclerview.XRecyclerView;
@@ -91,6 +92,46 @@ public abstract class BaseListActivity<T> extends BaseActivity {
         bottomLine = ViewUtil.setBottomLine(view_list);
         view_list.setLayoutManager(new LinearLayoutManager(SheepApp.getInstance()));
         view_list.setAdapter(getAdapter());
+        view_list.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            boolean isSlidingToLast;
+            @Override
+            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+                super.onScrollStateChanged(recyclerView, newState);
+
+                RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
+
+                if(layoutManager instanceof LinearLayoutManager){
+                    LinearLayoutManager linearLayoutManager = (LinearLayoutManager) layoutManager;
+
+                    //获取最后一个完全显示的item的position
+                    int lastVisibleItem = linearLayoutManager.findLastCompletelyVisibleItemPosition();
+                    int totalCount = linearLayoutManager.getItemCount();
+                    Log.e("lastvisi_item_-----", lastVisibleItem+","+totalCount);
+
+                    if(newState == RecyclerView.SCROLL_STATE_IDLE && isSlidingToLast){//滑动到了底部
+                        if(ListUtil.size(list) >= per_page*page){
+
+
+                        }
+
+                    }
+                }
+            }
+
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                Log.e("dx-----", dx+","+dy);
+                if (dy > 0) {
+                    //大于0表示正在向下滚动
+                    isSlidingToLast = true;
+                } else {
+                    //小于等于0表示停止或向上滚动
+                    isSlidingToLast = false;
+                }
+
+            }
+        });
 
     }
 

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

@@ -26,6 +26,7 @@ import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import javax.inject.Inject;
@@ -115,33 +116,42 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
                         toFinish();
                     }
                 });
+        int skip_login = SpUtils.getOrder(SpUtils.SKIP_LOGIN_FLAG);
         switch (where_from) {
             case FROM_SPLASH://非第一次登录(如：登录后直接重启)，老用户需要绑定手机号
-                titleBarUtils.setRightBtn(this, "跳过", 0, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-//                        Intent intent = new Intent(activity, ActMain.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//                        activity.startActivity(intent);
-//                        activity.finish();
-                        startMainAct();
-                    }
-                });
+                if(skip_login == 1){
+
+                    startMainAct();
+                }else {
+                    titleBarUtils.setRightBtn(this, "跳过", 0, new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+
+                            SpUtils.saveOrder(SpUtils.SKIP_LOGIN_FLAG, 1);
+                            startMainAct();
+                        }
+                    });
+                }
+
                 break;
             case FROM_LOGIN://用户可以跳过
-                titleBarUtils.setRightBtn(this, "跳过", 0, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        Jump2View.getInstance().checkLabel(activity, new Action1<BaseMessage>() {
-                            @Override
-                            public void call(BaseMessage baseMessage) {
-//                                Intent intent = new Intent(activity, ActMain.class);
-//                                activity.startActivity(intent);
-//                                activity.finish();
-                                startMainAct();
-                            }
-                        });
-                    }
-                });
+                if(skip_login == 1){
+
+                    startMainAct();
+                }else {
+                    titleBarUtils.setRightBtn(this, "跳过", 0, new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            Jump2View.getInstance().checkLabel(activity, new Action1<BaseMessage>() {
+                                @Override
+                                public void call(BaseMessage baseMessage) {
+                                    SpUtils.saveOrder(SpUtils.SKIP_LOGIN_FLAG, 1);
+                                    startMainAct();
+                                }
+                            });
+                        }
+                    });
+                }
                 break;
             case 30001:
             default:
@@ -164,24 +174,19 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
     private void startMainAct() {
         Intent intent = new Intent(activity, ActMain.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         activity.startActivity(intent);
+        G.showToast(activity.getString(R.string.login_success));
         activity.finish();
     }
 
     private void toFinish() {
         switch (where_from) {
             case FROM_SPLASH://非第一次登录(如：登录后直接重启)，老用户需要绑定手机号
-//                Intent intent = new Intent(activity, ActMain.class);
-//                startActivity(intent);
-//                finish();
                 startMainAct();
                 break;
             case FROM_LOGIN://第一次登录，老用户需要绑定手机号
                 Jump2View.getInstance().checkLabel(activity, new Action1<BaseMessage>() {
                     @Override
                     public void call(BaseMessage baseMessage) {
-//                        Intent intent = new Intent(activity, ActMain.class);
-//                        activity.startActivity(intent);
-//                        activity.finish();
                         startMainAct();
                     }
                 });

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

@@ -29,9 +29,12 @@ public class FeedbackAct extends BaseActivity {
     TextInputEditText feedbookEt;
     @BindView(R.id.feedbook_email_et)
     TextInputEditText feedbookEmailEt;
+    @BindView(R.id.feedbook_qq_et)
+    TextInputEditText feedbook_qq_et;
 
     private String Content;
     private String Email;
+    private String qq;
 
     @Override
     protected int getLayoutId() {
@@ -68,6 +71,7 @@ public class FeedbackAct extends BaseActivity {
         USER_FEEDBACK_COMMIT.onEvent();
         Content = feedbookEt.getText() + "";
         Email = feedbookEmailEt.getText() + "";
+        qq = feedbook_qq_et.getText() + "";
         if (android.text.TextUtils.isEmpty(Content)) {
             G.showToast(getResources().getString(R.string.feedback_notice_input_advice));
             return;
@@ -75,6 +79,7 @@ public class FeedbackAct extends BaseActivity {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("Content", Content);
         jsonObject.put("Email", Email + "");
+        jsonObject.put("QQ", qq + "");
         SheepApp.getInstance()
                 .getNetComponent()
                 .getApiService()

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

@@ -259,7 +259,6 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
     @Override
     public void NetSuccess(int code, String msg, String invitation_code) {
-        G.showToast(msg);
         hideProgress();
         if(TextUtils.isEmpty(SheepApp.getInstance().getGameCode())){
             Jump2View.getInstance().goHomePageView(this, invitation_code);

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

@@ -15,6 +15,7 @@ import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.presenter.TaskListPresenter;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.TimeUtil;
@@ -90,7 +91,7 @@ public class TaskListItemAdp extends BaseAdapter {
         }
 
         ViewUtil.setText(holder.name_tv, ety.getRelease_task().getName());
-        ViewUtil.setText(holder.date_tv, TimeUtil.getDate(TimeUtil.FORMAT, NumberFormatUtils.parseLong(ety.getUpdate_time())));
+        ViewUtil.setText(holder.date_tv, context.getString(R.string.commit_time_point) + TimeUtil.getDate(TimeUtil.FORMAT, NumberFormatUtils.parseLong(ety.getUpdate_time())));
         String stateStr;
         if(ety.getStatus() == 3){
             stateStr = String.format(Locale.CHINA, "+%s元", ety.getRelease_task().getBonusText());
@@ -99,6 +100,7 @@ public class TaskListItemAdp extends BaseAdapter {
             stateStr = String.format(Locale.CHINA, "%s元", ety.getRelease_task().getBonusText());
             holder.price_tv.setTextColor(context.getResources().getColor(R.color.time_created));
         }
+        CommonUtil.getInstance().setTaskTag(context, convertView, ety.getRelease_task(),CommonUtil.TASK_AUDIT);
         holder.price_tv.setText(stateStr);
         convertView.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -565,7 +565,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 }
                 viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName() + "");
-                setCommonViewData(viewHolder.itemView, taskReleaseEty);
+                CommonUtil.getInstance().setTaskTag(context, viewHolder.itemView, taskReleaseEty,show_type);
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_money)).setText("+" + taskReleaseEty.getBonusText() + "元");
 
                 GlideImageLoader.setGameImage((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv), taskEty.getIcon());
@@ -696,27 +696,6 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
     }
 
     /**
-     * 一样相同组件与数据的设置
-     * @param itemView
-     * @param taskReleaseEty
-     */
-    private void setCommonViewData(View itemView, TaskReleaseEty taskReleaseEty) {
-        if(!TextUtils.isEmpty(show_type))
-            from = 1;
-        switch (from) {
-            case 1://来自主页
-                TaskHelper.setTaskTypeText((TextView) itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
-                TaskHelper.setTaskTagText((TextView) itemView.findViewById(R.id.item_num_tv1), taskReleaseEty);
-                TaskHelper.setNumText((TextView) itemView.findViewById(R.id.item_num_tv2), taskReleaseEty);
-                break;
-            default:
-                TaskHelper.setTaskTagText((TextView) itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
-                TaskHelper.setNumText((TextView) itemView.findViewById(R.id.item_num_tv1), taskReleaseEty);
-                break;
-        }
-    }
-
-    /**
      * 暂时这么处理，也许以后也是列表了
      * @param holder
      * @param etyList
@@ -764,7 +743,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
 
 
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName()+"");
-                setCommonViewData(viewHolder.itemView, taskReleaseEty);
+                CommonUtil.getInstance().setTaskTag(context, viewHolder.itemView, taskReleaseEty,show_type);
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ taskReleaseEty.getBonusText() +"元");
                 if(!taskReleaseEty.getDeadline().equals("永久")){
                     ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(

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

@@ -96,7 +96,7 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
         refreshLayout.setOnRefreshListener(new OnRefreshListener() {
             @Override
             public void onRefresh(RefreshLayout refreshlayout) {
-                refreshlayout.finishRefresh(1000/*,false*/);//传入false表示刷新失败
+                refreshlayout.finishRefresh(100/*,false*/);//传入false表示刷新失败
                 refreshData();
             }
         });
@@ -107,13 +107,14 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
                     page += 1;
                     initData();
                 }else {
-                    refreshlayout.finishLoadMore(1000/*,false*/);//传入false表示加载失败
+                    refreshlayout.finishLoadMore(100/*,false*/);//传入false表示加载失败
                     setNoMore(true);
                 }
 
             }
         });
         view_list.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            boolean isSlidingToLast;
             @Override
             public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
                 super.onScrollStateChanged(recyclerView, newState);
@@ -136,7 +137,7 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
                     int totalCount = linearLayoutManager.getItemCount();
                     Log.e("lastvisi_item_-----", lastVisibleItem+","+totalCount);
 
-                    if(newState == RecyclerView.SCROLL_STATE_IDLE && lastVisibleItem == totalCount -1){//滑动到了底部
+                    if(newState == RecyclerView.SCROLL_STATE_IDLE && isSlidingToLast){//滑动到了底部
                         if(ListUtil.size(list) >= per_page*page){
 
                             refreshLayout.autoLoadMore();
@@ -145,6 +146,20 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
                     }
                 }
             }
+
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                Log.e("dx-----", dx+","+dy);
+                if (dy > 0) {
+                    //大于0表示正在向下滚动
+                    isSlidingToLast = true;
+                } else {
+                    //小于等于0表示停止或向上滚动
+                    isSlidingToLast = false;
+                }
+
+            }
         });
 
 //        bottomLine = ViewUtil.setBottomLine(refreshLayout, getNoMoreCallBack());
@@ -162,6 +177,7 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
     }
 
     protected List<T> list = ListUtil.emptyList();
+    protected List<T> listCacheOneList = ListUtil.emptyList();
     protected List<T> lastCacheList = ListUtil.emptyList();
     //默认先获取缓存
     protected boolean isFirstGetACache(){
@@ -189,6 +205,15 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
                 }
             }
         });
+        getData(urlKey);
+    }
+
+    /**
+     * 获取数据
+     * @return
+     */
+    public void getData(final String urlKey){
+
         getApi(SheepApp.getInstance().getNetComponent().getApiService())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -264,9 +289,9 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
         }
         CommonUtil.getInstance().updateEmptyView(empty_view, list.isEmpty());
         if(page == 1){
-            refreshLayout.finishRefresh(1000/*,false*/);//传入false表示加载失败
+            refreshLayout.finishRefresh(100/*,false*/);//传入false表示加载失败
         } else {
-            refreshLayout.finishLoadMore(1000/*,false*/);//传入false表示加载失败
+            refreshLayout.finishLoadMore(100/*,false*/);//传入false表示加载失败
         }
         view_list.getAdapter().notifyDataSetChanged();
         notifyData();

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

@@ -11,6 +11,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 public class SpUtils {
 
+    public static String SKIP_LOGIN_FLAG = "skip_login";
+
     public static String getToken(Context context) {
         SharedPreferences user = context.getSharedPreferences("user", Context.MODE_PRIVATE);
         return user.getString("wx_openId", "");

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

@@ -56,7 +56,7 @@
                     style="@style/edt_style_gray"
                     android:layout_marginBottom="@dimen/content_padding_20"/>
                 <LinearLayout
-                    android:id="@+id/feedbook_email_layout"
+                    android:id="@+id/feedbook_qq_layout"
                     android:layout_below="@+id/feedbook_et"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -67,7 +67,36 @@
                         android:layout_height="wrap_content"
                         style="@style/txt_style_15_black"
                         android:textSize="@dimen/text_size_12"
-                        android:text="@string/contact_qq_email"
+                        android:text="@string/contact_qq"
+                        android:layout_gravity="center_vertical"/>
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/feedbook_qq_et"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="5dp"
+                        android:hint="@string/feedback_notice_input_email_address"
+                        android:gravity="top"
+                        android:text=""
+                        android:lines="2"
+                        android:inputType="textEmailAddress"
+                        style="@style/edt_style_gray"
+                        android:layout_gravity="center_vertical"/>
+                </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/feedbook_email_layout"
+                    android:layout_below="@+id/feedbook_qq_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:layout_marginTop="@dimen/content_padding_8">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/txt_style_15_black"
+                        android:textSize="@dimen/text_size_12"
+                        android:text="@string/contact_email"
                         android:layout_gravity="center_vertical"/>
 
                     <android.support.design.widget.TextInputEditText

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

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:padding="@dimen/content_padding"
     android:background="@color/white">
 
@@ -54,11 +55,11 @@
         android:background="@color/theme_app_divider_color"
         android:layout_marginTop="@dimen/content_padding_10"
         app:layout_constraintTop_toBottomOf="@+id/find_information_time"/>
-    <com.sheep.gamegroup.view.customview.WebViewForScrollView
+    <WebView
         android:id="@+id/find_information_content_wb"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/content_padding_10"
         app:layout_constraintTop_toBottomOf="@+id/find_information_line"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        tools:ignore="WebViewLayout" />
 </android.support.constraint.ConstraintLayout>

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

@@ -35,12 +35,48 @@
                 android:ellipsize="end"
                 android:layout_marginTop="@dimen/content_padding_small"/>
 
+
+            <LinearLayout
+                android:id="@+id/tag_layout"
+                android:layout_below="@+id/name_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/item_num_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:textColor="#cc8e8e8e"
+                    android:textSize="10sp" />
+
+                <TextView
+                    android:id="@+id/item_num_tv1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/content_padding"
+                    android:text=""
+                    android:textColor="#cc8e8e8e"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
+                <TextView
+                    android:id="@+id/item_num_tv2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/content_padding"
+                    android:text=""
+                    android:textColor="#cc8e8e8e"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
+            </LinearLayout>
             <TextView
                 android:id="@+id/date_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="2018/02/14 14:41"
-                android:layout_below="@+id/name_tv"
+                android:layout_below="@+id/tag_layout"
                 android:textSize="@dimen/text_size_2"
                 android:textColor="@color/txt_black_818181"
                 android:layout_marginBottom="@dimen/content_padding_small"/>