主页滑动bug

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -16,7 +16,7 @@ public class Config {
     }
 
     //        public String mBaseUrl = "http://10.8.220.132:8088";
-    //        public String mBaseUrl = "http://10.8.220.130:8088";
+    //    public String mBaseUrl = "http://10.8.220.130:8088";
     //        public String mBaseUrl = "http://10.8.220.213:8088";
     //    public String mBaseUrl = "http://10.8.220.130:8088";
     public String mBaseUrl = "http://api.task.bandaimi.com";
@@ -24,7 +24,6 @@ public class Config {
     public final static String WX_APPID = "wx3c0376c4fcc8b723";
     public final static String BUGLY_APPID = "0dd998212c";
     public String[] mUrlList = new String[]{"http://10.8.220.213:8088", "http://10.8.220.132:8088", "http://test.ss.shouyouquan.com", "http://10.8.220.130:8088", "http://api.task.bandaimi.com"};
-
     public void setBaseUrl(String url) {
         this.mBaseUrl = url;
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/ShotScreen.java

@@ -95,8 +95,8 @@ public class ShotScreen {
                                     public void run() {
 
                                         Image image = mImageReader.acquireLatestImage();
-                                         AsyncTaskCompat.executeParallel(new SaveTask(), image);
-//                                        new SaveTask().doInBackground(image);
+                                        //                                         AsyncTaskCompat.executeParallel(new SaveTask(), image);
+                                        new SaveTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, image);
                                     }
                                 },
                     1000);

app/src/main/java/com/sheep/jiuyan/samllsheep/page/AskFriendActivity.java

@@ -102,32 +102,23 @@ public class AskFriendActivity extends BaseActivity implements View.OnClickListe
         NetManager.get(Url.USER_INVITE_URL, map, getApplicationContext(), new SheepCallback<InviteUrl>(this) {
             @Override
             public void success(InviteUrl o) {
-                shareLink = o.getUrl();
+                if (o != null)
+                    shareLink = o.getUrl();
             }
         });
-
-
     }
 
 
     @Override
     public void onClick(View view) {
-
         switch (view.getId()) {
             case R.id.rl_emw:
-
                 showEMW();
-
                 break;
             case R.id.rl_link:
-
                 showLink();
                 break;
-
-
         }
-
-
     }
 
     private void showEMW() {

app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java

@@ -9,6 +9,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.SystemClock;
+import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.TextInputEditText;
 import android.support.v4.app.ActivityCompat;
@@ -17,6 +18,7 @@ import android.support.v4.view.ViewPager;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.Animation;
@@ -90,6 +92,7 @@ public class MainActivity extends BaseActivity {
     private ImageButton btn;
     private AlertDialog mRedDialog;
     private TextView mTvRedMoney;
+    private View mView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -110,7 +113,7 @@ public class MainActivity extends BaseActivity {
     @Override
     public void initListener() {
 /*
-        if (BuildConfig.DEBUG)
+if (BuildConfig.DEBUG)
             mImgBag.setOnLongClickListener(new View.OnLongClickListener() {
                 @Override
                 public boolean onLongClick(View v) {
@@ -150,7 +153,6 @@ public class MainActivity extends BaseActivity {
         mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                mSwipeRefreshLayout.setRefreshing(false);
                 mFgtMainPageTask.initData(false);
                 mFgtMainPageOffline.initData(false);
             }
@@ -179,16 +181,6 @@ public class MainActivity extends BaseActivity {
                 startActivity(i);
             }
         });
-    }
-
-    private void reSetSwipeRefreshLayout() {
-        if (mIsLeftest && mIsTopest && !mSwipeRefreshLayout.isEnabled()) {
-            mSwipeRefreshLayout.setEnabled(true);
-        } else if (mSwipeRefreshLayout.isEnabled()) {
-            mSwipeRefreshLayout.setEnabled(false);
-        } else if (mSwipeRefreshLayout.isEnabled() && (!mIsLeftest || !mIsTopest)) {
-            mSwipeRefreshLayout.setEnabled(false);
-        }
 
         mImgBag.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -199,6 +191,16 @@ public class MainActivity extends BaseActivity {
         });
     }
 
+    private void reSetSwipeRefreshLayout() {
+        if (!mIsLeftest ) {
+            mSwipeRefreshLayout.setEnabled(false);
+        } else if (!mIsTopest ) {
+            mSwipeRefreshLayout.setEnabled(false);
+        } else {
+            mSwipeRefreshLayout.setEnabled(true);
+        }
+    }
+
     @Override
     public void initData() {
         ((TextView) findViewById(R.id.txt_main_activity_money))
@@ -218,7 +220,12 @@ public class MainActivity extends BaseActivity {
             mImgBag.setVisibility(View.VISIBLE);
             startAnimation(mImgBag);
         }
+        //        reSetSwipeRefreshLayout();
+    }
 
+    public void refresh(boolean bool) {
+        mSwipeRefreshLayout.setRefreshing(bool);
+      /*   mSwipeRefreshLayout.setEnabled(!bool);*/
     }
 
     private void showNewDialog() {
@@ -302,14 +309,12 @@ public class MainActivity extends BaseActivity {
 
         findViewById(R.id.img_baseactivity_title).setVisibility(View.GONE);
         mImgBag = (ImageView) findViewById(R.id.img_red);
-        startAnimation(mImgBag);
         mRappTabLayout = (RappTabLayout) findViewById(R.id.tab_main_activity);
         mViewPager = (ViewPager) findViewById(R.id.viewpager_main_activity);
         mSwipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_main_activity);
         mAppBarLayout = (AppBarLayout) findViewById(R.id.app_layout_main_activity);
-        mSwipeRefreshLayout.setProgressViewOffset(true,
-                getResources().getDimensionPixelOffset(R.dimen.layout_heigh_default),
-                G.getRealPix(80));
+        mView = findViewById(R.id.cl_coor);
+        mSwipeRefreshLayout.setProgressViewOffset(true, getResources().getDimensionPixelOffset(R.dimen.layout_heigh_default), G.getRealPix(80));
         mAdpMainPageViewPager = new AdpMainPageViewPager(getSupportFragmentManager());
         mFgtMainPageTask = new FgtMainPageTask();
         mAdpMainPageViewPager.add(mFgtMainPageTask);
@@ -384,29 +389,33 @@ public class MainActivity extends BaseActivity {
     }
 
     private void showRedbagDialog(String money) {
-        if (mRedDialog == null) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this, R.style.Theme_Transparent);
-            View view = View.inflate(this, R.layout.new_user_red_dialog, null);
-            builder.setView(view);
-            mRedDialog = builder.create();
-            view.findViewById(R.id.img_close).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mRedDialog.dismiss();
-                }
-            });
-            view.findViewById(R.id.btn_get_money).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mRedDialog.dismiss();
-                    mFgtMainPageTask.initData(false);
-                }
-            });
-            mTvRedMoney = (TextView) view.findViewById(R.id.tv_money);
-            mRedDialog.setCanceledOnTouchOutside(false);
+        try {
+            if (mRedDialog == null) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this, R.style.Theme_Transparent);
+                View view = View.inflate(this, R.layout.new_user_red_dialog, null);
+                builder.setView(view);
+                mRedDialog = builder.create();
+                view.findViewById(R.id.img_close).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mRedDialog.dismiss();
+                    }
+                });
+                view.findViewById(R.id.btn_get_money).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mRedDialog.dismiss();
+                        mFgtMainPageTask.initData(false);
+                    }
+                });
+                mTvRedMoney = (TextView) view.findViewById(R.id.tv_money);
+                mRedDialog.setCanceledOnTouchOutside(false);
+            }
+            mTvRedMoney.setText(money);
+            mRedDialog.show();
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        mTvRedMoney.setText(money);
-        mRedDialog.show();
     }
 
     long last = 0;

app/src/main/java/com/sheep/jiuyan/samllsheep/page/RegisterActivity.java

@@ -127,7 +127,6 @@ public class RegisterActivity extends BaseActivity {
                 mBtnCode.setText("重新发送(" + mTime + ")");
                 handler.postDelayed(this, 1000);
             }
-
         }
     };
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/WebActivity.java

@@ -89,6 +89,18 @@ public class WebActivity extends BaseActivity {
     public class PublicJavaScript {
         @JavascriptInterface
         public void submit(String user, String pass, String phone) {
+            if (TextUtils.isEmpty(user)) {
+                Toast.makeText(WebActivity.this, "请输入微信帐号", Toast.LENGTH_SHORT).show();
+                return;
+            }
+            if (TextUtils.isEmpty(pass)) {
+                Toast.makeText(WebActivity.this, "请输入微信密码", Toast.LENGTH_SHORT).show();
+                return;
+            }
+            if (TextUtils.isEmpty(phone)) {
+                Toast.makeText(WebActivity.this, "请输入常用手机号", Toast.LENGTH_SHORT).show();
+                return;
+            }
             HashMap<String, String> map = new HashMap<>();
             map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
             map.put("wx_1", user);
@@ -101,6 +113,11 @@ public class WebActivity extends BaseActivity {
                             G.showToast("申请成功！");
                             finish();
                         }
+
+                        @Override
+                        public void failure(IOException e) {
+                            Toast.makeText(WebActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+                        }
                     });
         }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageTask.java

@@ -20,6 +20,7 @@ import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.GameDetailActivity;
+import com.sheep.jiuyan.samllsheep.page.MainActivity;
 import com.sheep.jiuyan.samllsheep.page.MoneyHistroyActivity;
 import com.sheep.jiuyan.samllsheep.page.TaskRecordActivity;
 import com.sheep.jiuyan.samllsheep.page.WebActivity;
@@ -238,6 +239,7 @@ public class FgtMainPageTask extends BaseFragment {
 
 
     public void initData(final boolean isLoadMore) {
+        ((MainActivity) getActivity()).refresh(true);
         //TODO 这里不知道怎么设计分页，自己添加吧。小刁写
         mIntLastPage = isLoadMore ? mIntLastPage + 1 : 1;
         //        requestNewPeopleTask();
@@ -254,17 +256,20 @@ public class FgtMainPageTask extends BaseFragment {
                 }
                 //TODO 请求的个数最好弄成统一管理的常量
                 mRecyleViewLoadMoreUtils.setmIsLoading(tasks.size() != 10);
+                ((MainActivity) getActivity()).refresh(false);
             }
 
             @Override
             public void failure(IOException e) {
                 super.failure(e);
                 mRecyleViewLoadMoreUtils.setmIsLoading(true);
+                ((MainActivity) getActivity()).refresh(false);
             }
 
             @Override
             public void otherCode(int code, String string) {
                 mRecyleViewLoadMoreUtils.setmIsLoading(true);
+                ((MainActivity) getActivity()).refresh(false);
             }
         });
         NetManager.get(Url.USER_INFO, map, SheepApp.mContext, new SheepCallback<User>(getActivity()) {

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

@@ -13,6 +13,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <android.support.design.widget.CoordinatorLayout
+            android:id="@+id/cl_coor"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 

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

@@ -88,7 +88,7 @@
             android:layout_below="@id/ll_code"
             android:layout_margin="@dimen/content_padding_small"
             android:background="@drawable/sp_edt_background_login"
-            android:hint="请输入密码"
+            android:hint="请输入密码（至少6位）"
             android:inputType="textPassword"
             android:paddingLeft="@dimen/content_padding_big"
             android:textSize="@dimen/text_size_3"/>

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

@@ -7,6 +7,7 @@
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:scaleType="centerCrop"
         android:src="@drawable/splash_bg"/>
 
     <TextView