Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

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

@@ -877,7 +877,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         homepage_item_banner_layout.setVisibility(View.VISIBLE);
         if (mImageGlarryStr != null) {
             mImageGlarryStr.init(slideshowEtyLists, ImageView.ScaleType.CENTER_CROP, conversion2);
-            mImageGlarryStr.notifyDataSetChanged();
             return;
         }
         mImageGlarryStr = new ImageGlarryDrawable<>((Activity) mContext, viewpager_banner, group_banner);

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

@@ -140,8 +140,8 @@ public class ImageGlarryDrawable<T> {
             }
             return this;
         }
-
         mViewPager.setAdapter(pagerAdapter);
+        pagerAdapter.notifyDataSetChanged();
         mViewPager.setCurrentItem(0);
         mViewPager.addOnPageChangeListener(onPageChangeListener);
         mViewPager.setOnTouchListener(onTouchListener);

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

@@ -318,7 +318,6 @@ public class ActFindGame extends BaseActivity {
         homepage_item_banner_layout.setVisibility(View.VISIBLE);
         if (mImageGlarryStr != null) {
             mImageGlarryStr.init(pictureList, ImageView.ScaleType.CENTER_CROP, conversion2);
-            mImageGlarryStr.notifyDataSetChanged();
             return;
         }
         mImageGlarryStr = new ImageGlarryDrawable<>(this, viewpager_banner, group_banner);

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

@@ -28,6 +28,7 @@ import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
@@ -80,7 +81,12 @@ public class ActWeb extends BaseCompatActivity {
         initWebViewSettings(mWebView);
         webViewSettings = mWebView.getSettings();
         webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
-        WebView.setWebContentsDebuggingEnabled(true);
+        try {
+            if(TestUtil.isTest())
+                WebView.setWebContentsDebuggingEnabled(true);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }

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

@@ -112,7 +112,6 @@ public class GameTaskOrderListAct extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        listData.clear();
                         List<GameTaskOrderEnty> arrayList = baseMessage.getDatas(GameTaskOrderEnty.class);
                         if(arrayList != null && arrayList.size()>0){
                             listData.addAll(arrayList);