Merge branch 'sheep_develop' of 10.8.230.114:xmy_android/small_sheep_android into sheep_develop

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -36,7 +36,7 @@ public abstract class SheepSubscriber<T> implements Observer<T> {
     public void onSubscribe(Disposable d) {
         if (!NetUtil.isConnected(context)) {
             if (SheepApp.getInstance().getCurrentActivity() != null) {
-                SheepApp.getInstance().getCurrentActivity().runOnUiThread(() -> G.shortToast("当前网络不可用，请检查网络情况"));
+                SheepApp.getInstance().getCurrentActivity().runOnUiThread(this::showNoNetView);
             }
             // 一定好主动调用下面这一句,取消本次Subscriber订阅
             if (!d.isDisposed()) {
@@ -46,6 +46,15 @@ public abstract class SheepSubscriber<T> implements Observer<T> {
         }
     }
 
+    public static long showTipTime;
+    public void showNoNetView(){
+        long curTime = System.currentTimeMillis();
+        if(showTipTime == 0 || curTime - showTipTime > 5000L) {//5秒内只提示一次
+            showTipTime = curTime;
+            G.shortToast("当前网络不可用，请检查网络情况");
+        }
+    }
+
     @Override
     public void onError(Throwable e) {
         try {

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

@@ -1285,17 +1285,17 @@ public class Jump2View {
      * @param context
      */
     public void startListenerShotService(Context context) {
-        if (DataUtil.IS_LISTEN_SCREEN_SHOT && (!IS_RECORD_PATH || !TextUtils.isEmpty(DataUtil.getInstance().getUserId()))) {
-            if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                Intent intent = new Intent(context, ListenerShotNewService.class);
-                intent.putExtra(AutoCheckService.EXTRA_KEY_USER_ID, DataUtil.getInstance().getUserId());//记录用户截图方案需要记录当前用户id
-                context.startForegroundService(intent);
-            } else {
-                Intent intent = new Intent(context, ListenerShotService.class);
-                intent.putExtra(AutoCheckService.EXTRA_KEY_USER_ID, DataUtil.getInstance().getUserId());//记录用户截图方案需要记录当前用户id
-                context.startService(intent);
-            }
-        }
+//        if (DataUtil.IS_LISTEN_SCREEN_SHOT && (!IS_RECORD_PATH || !TextUtils.isEmpty(DataUtil.getInstance().getUserId()))) {
+//            if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+//                Intent intent = new Intent(context, ListenerShotNewService.class);
+//                intent.putExtra(AutoCheckService.EXTRA_KEY_USER_ID, DataUtil.getInstance().getUserId());//记录用户截图方案需要记录当前用户id
+//                context.startForegroundService(intent);
+//            } else {
+//                Intent intent = new Intent(context, ListenerShotService.class);
+//                intent.putExtra(AutoCheckService.EXTRA_KEY_USER_ID, DataUtil.getInstance().getUserId());//记录用户截图方案需要记录当前用户id
+//                context.startService(intent);
+//            }
+//        }
     }
 
 

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

@@ -270,6 +270,12 @@ public class SysAppUtil {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
+                    public void showNoNetView() {
+                        NetUtil.CAN_CONNECT_SERVICE = false;
+                        action1.onNext(-1);
+                    }
+
+                    @Override
                     public void onNext(BaseMessage baseMessage) {
                         NetUtil.CAN_CONNECT_SERVICE = true;
                         action1.onNext(0);

app/src/main/java/com/sheep/gamegroup/util/js/BaseActWeb.java

@@ -6,7 +6,9 @@ import android.webkit.WebView;
 import com.sheep.gamegroup.absBase.BaseUMActivity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -14,6 +16,7 @@ import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 
+import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
@@ -102,9 +105,16 @@ public abstract class BaseActWeb extends BaseUMActivity {
         loadJs(String.format(Locale.CHINA, "callback(\"onCancel\", %s)", share_media.getName()));
     }
 
+    protected boolean addSheepUserAgent = true;
     protected void webViewLoadUrl(com.tencent.smtt.sdk.WebView webView, String url){
-        webView.loadUrl(url);
-        WebViewCacheInterceptorInst.getInstance().loadUrl(url, webView.getSettings().getUserAgentString());
+        if(addSheepUserAgent){
+            Map<String, String> extraHeaders = new HashMap<>();
+            extraHeaders.put("User-Agent", BuildConfig.APPLICATION_ID + "/" + SysAppUtil.getUserAgent());
+            webViewLoadUrl(webView, extraHeaders, url);
+        } else {
+            webView.loadUrl(url);
+            WebViewCacheInterceptorInst.getInstance().loadUrl(url, webView.getSettings().getUserAgentString());
+        }
     }
     protected void webViewLoadUrl(com.tencent.smtt.sdk.WebView webView, Map<String, String> map, String url){
         webView.loadUrl(url, map);

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

@@ -203,14 +203,12 @@ public class GameCertificationActivity extends BaseActivity {
             Jump2View.getInstance().goLoginView(activity, SheepApp.getInstance().getGameCode());
         } else {
             if (userEntity == null) {
-                CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
-                    @Override
-                    public void call(UserEntity userEntity) {
-                        if (userEntity == null) {
-                            Jump2View.getInstance().goLoginView(activity, SheepApp.getInstance().getGameCode());
-                        } else {
-                            initWidget();
-                        }
+                CommonUtil.getInstance().updateUserInfo(result -> {
+                    if (result == null) {
+                        Jump2View.getInstance().goLoginView(activity, SheepApp.getInstance().getGameCode());
+                    } else {
+                        userEntity = result;
+                        initWidget();
                     }
                 });
             } else {

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

@@ -257,8 +257,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, allTaskAcceptedTaskList));
                     }
                     //正在进行中的任务下面的线是否显示
-                    if (recyclerview_line != null)
-                        recyclerview_line.setVisibility(isAcceptedTaskListEmpty ? View.GONE : View.VISIBLE);
+                    ViewUtil.setVisibility(recyclerview_line, !isAcceptedTaskListEmpty);
 
                     //发布的任务列表----注：3.0开始已经没有展示，使用viewpager展示
                     if (!ListUtil.isEmpty(releaseEtyLists)) {
@@ -555,7 +554,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             }
         });
 //        ((ViewGroup) activity.getWindow().getDecorView()).addView(titleCardLayout);
-        titleCardLayout.setVisibility(View.GONE);
+        ViewUtil.setVisibility(titleCardLayout, false);
     }
 
     /**
@@ -754,9 +753,9 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             public void onScrollChange(NestedScrollView nestedScrollView, int x, int y, int oldX, int oldY) {
                 listTitle.getLocationInWindow(locate);
                 if (locate[1] < 0 && titleCardLayout.getVisibility() == View.GONE) {
-                    titleCardLayout.setVisibility(View.VISIBLE);
+                    ViewUtil.setVisibility(titleCardLayout, true);
                 } else if (locate[1] > 20 && titleCardLayout.getVisibility() == View.VISIBLE) {
-                    titleCardLayout.setVisibility(View.GONE);
+                    ViewUtil.setVisibility(titleCardLayout, false);
                 }
                 //设置搜索框颜色变化
 //                float ratio = Math.min(bannerHeight, y) * 1.0f / bannerHeight;
@@ -863,7 +862,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         //公告
         List<BulletinEnty> cacheBulletinEtyList = DataUtil.getInstance().getCacheList(ApiKey.bulletin, BulletinEnty.class);
         if (ListUtil.isEmpty(cacheBulletinEtyList)) {
-            homepageItemNoticeLayout.setVisibility(View.GONE);
+            ViewUtil.setVisibility(homepageItemNoticeLayout, false);
         } else {
             bulletinEntyLists.clear();
             bulletinEntyLists.addAll(cacheBulletinEtyList);
@@ -872,7 +871,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         //轮播
         List<SlideshowEty> cacheSlideshowEtyList = DataUtil.getInstance().getCacheList(ApiKey.slideshow, SlideshowEty.class);
         if (ListUtil.isEmpty(cacheSlideshowEtyList)) {
-            banner.setVisibility(View.GONE);
+            ViewUtil.setVisibility(banner, false);
         } else {
             for (SlideshowEty slideshowEty : cacheSlideshowEtyList) {
                 slideshowEtyLists.add(slideshowEty);
@@ -883,13 +882,13 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         //首页list
         List<HomeListEntity> cacheHomeListEtyList = DataUtil.getInstance().getCacheList(ApiKey.home_list, HomeListEntity.class);
         if (ListUtil.isEmpty(cacheHomeListEtyList)) {
-            home_list_gridview_layout.setVisibility(View.GONE);
-            full_home_list_rv.setVisibility(View.GONE);
+            ViewUtil.setVisibility(home_list_gridview_layout, false);
+            ViewUtil.setVisibility(full_home_list_rv, false);
         } else {
-            home_list_gridview_layout.setVisibility(View.VISIBLE);
+            ViewUtil.setVisibility(home_list_gridview_layout, true);
             fullHomeList.clear();
             CommonUtil.getInstance().splitHomeList(cacheHomeListEtyList, homeListEntitys, fullHomeList);
-            full_home_list_rv.setVisibility(fullHomeList.isEmpty() ? View.GONE : View.VISIBLE);
+            ViewUtil.setVisibility(full_home_list_rv, !fullHomeList.isEmpty());
             boolean isShowQB = false;
             boolean isShowMd = false;
             for (int i = 0; i < homeListEntitys.size(); i++) {
@@ -909,10 +908,10 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             addNewTask();
             SheepApp.getInstance().setShowQB(isShowQB);
             SheepApp.getInstance().setShowMidong(isShowMd);
-            full_home_list_rv.getAdapter().notifyDataSetChanged();
+            ViewUtil.notifyDataSetChanged(full_home_list_rv);
             adpHomeListGrideview.notifyDataSetChanged();
             adpHomeListListview.notifyDataSetChanged();
-            home_list_gridview_listview.setVisibility(homeListEntitysListview.isEmpty() ? View.GONE : View.VISIBLE);
+            ViewUtil.setVisibility(home_list_gridview_listview, !homeListEntitysListview.isEmpty());
         }
         refreshData();
     }
@@ -925,11 +924,9 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             @Override
             public void onNext(Integer result) {
                 if (result != 0) {//无网络
-                    if (check_net_ll != null)
-                        check_net_ll.setVisibility(View.VISIBLE);
+                    ViewUtil.setVisibility(check_net_ll, true);
                 } else {
-                    if (check_net_ll != null)
-                        check_net_ll.setVisibility(View.GONE);
+                    ViewUtil.setVisibility(check_net_ll, false);
                 }
                 notifyDataSetChanged();
             }
@@ -1107,7 +1104,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @Override
     public void failData2View(Object o) {
-        G.showToast("网络错误");
+//        G.showToast("网络错误");
 
     }
 
@@ -1161,12 +1158,12 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 //                    G.showToast(" 未查询到正在运行的任务！");
                     break;
                 default:
-                    G.showToast(" 网络错误！");
+//                    G.showToast(" 网络错误！");
                     break;
             }
         } catch (Exception e) {
             e.printStackTrace();
-            G.showToast(" 网络错误！");
+//            G.showToast(" 网络错误！");
         }
         allTaskAcceptedTaskList.clear();
         mHandler.sendEmptyMessage(WHAT_LOAD_RUN_TASK);
@@ -1216,7 +1213,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         if (isNewData) {
             List<SlideshowEty> slideshowEtyList = baseMessage.getDataList(SlideshowEty.class);
             if (ListUtil.isEmpty(slideshowEtyList)) {
-                banner.setVisibility(View.GONE);
+                ViewUtil.setVisibility(banner, false);
             } else {
                 slideshowEtyLists.clear();
                 slideshowTitleList.clear();
@@ -1240,7 +1237,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         if (isNewData) {
             List<BulletinEnty> bulletinEntyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), BulletinEnty.class);
             if (ListUtil.isEmpty(bulletinEntyList)) {
-                homepageItemNoticeLayout.setVisibility(View.GONE);
+                ViewUtil.setVisibility(homepageItemNoticeLayout, false);
             } else {
                 bulletinEntyLists.clear();
                 bulletinEntyLists.addAll(bulletinEntyList);
@@ -1255,16 +1252,16 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         if (isNewData) {
             List<HomeListEntity> homeListEntityList = baseMessage.getDataList(HomeListEntity.class);
             if (ListUtil.isEmpty(homeListEntityList)) {
-                home_list_gridview_layout.setVisibility(View.GONE);
-                full_home_list_rv.setVisibility(View.GONE);
+                ViewUtil.setVisibility(home_list_gridview_layout, false);
+                ViewUtil.setVisibility(full_home_list_rv, false);
             } else {
-                home_list_gridview_layout.setVisibility(View.VISIBLE);
+                ViewUtil.setVisibility(home_list_gridview_layout, true);
                 homeListEntitys.clear();
                 homeListEntitysGridview.clear();
                 homeListEntitysListview.clear();
                 fullHomeList.clear();
                 CommonUtil.getInstance().splitHomeList(homeListEntityList, homeListEntitys, fullHomeList);
-                full_home_list_rv.setVisibility(fullHomeList.isEmpty() ? View.GONE : View.VISIBLE);
+                ViewUtil.setVisibility(full_home_list_rv, !fullHomeList.isEmpty());
                 boolean isShowQB = false;
                 boolean isShowMd = false;
                 for (int i = 0; i < homeListEntitys.size(); i++) {
@@ -1287,7 +1284,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                 ViewUtil.notifyDataSetChanged(full_home_list_rv);
                 adpHomeListGrideview.notifyDataSetChanged();
                 adpHomeListListview.notifyDataSetChanged();
-                home_list_gridview_listview.setVisibility(homeListEntitysListview.isEmpty() ? View.GONE : View.VISIBLE);
+                ViewUtil.setVisibility(home_list_gridview_listview, !homeListEntitysListview.isEmpty());
             }
         }
     }
@@ -1295,7 +1292,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     @Override
     public void failhomeList(BaseMessage baseMessage) {
         if (homeListEntitys.isEmpty() && fullHomeList.isEmpty())
-            home_list_gridview_layout.setVisibility(View.GONE);
+            ViewUtil.setVisibility(home_list_gridview_layout, false);
 
     }
 
@@ -1327,9 +1324,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @Override
     public void onPause() {
-        if (titleCardLayout != null) {
-            titleCardLayout.setVisibility(View.GONE);
-        }
+        ViewUtil.setVisibility(titleCardLayout, false);
         super.onPause();
         if (upview1 != null) {
             //停止滚动
@@ -1398,12 +1393,16 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @Override
     public void onStop() {
-        super.onStop();
         //结束轮播
-        banner.stopAutoPlay();
+        if(banner != null)
+            banner.stopAutoPlay();
+        super.onStop();
     }
 
     private void bindBanner() {
+        if(banner == null){
+            return;
+        }
         //结束轮播
         banner.stopAutoPlay();
         banner.setVisibility(View.VISIBLE);
@@ -1460,7 +1459,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
      * 公共
      */
     private void inviteNotice(final List<BulletinEnty> bulletinEntyList) {
-        homepageItemNoticeLayout.setVisibility(View.GONE);
+        ViewUtil.setVisibility(homepageItemNoticeLayout, false);
         homepageItemNoticeMv.removeAllViews();
         for (final BulletinEnty entity : bulletinEntyList) {
             StringBuilder sb = new StringBuilder();

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

@@ -242,7 +242,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="7dp"
-                    android:text="绵羊币消费场景"
+                    android:text="管家推介"
                     android:textColor="#ff333333"
                     android:textSize="14sp" />
                 <LinearLayout

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

@@ -15,15 +15,8 @@
     <RelativeLayout
         android:id="@+id/thumb"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:background="#000000"
-        android:scaleType="fitCenter" />
-
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_centerInParent="true"/>
 
 </RelativeLayout>

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

@@ -12,7 +12,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="30dp"
-        android:layout_marginBottom="17dp"
         android:drawableStart="@drawable/selector_like"
         android:drawablePadding="9dp"
         android:onClick="onClickVideoLike"
@@ -27,7 +26,6 @@
         android:id="@+id/video_comment_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="17dp"
         android:drawableStart="@mipmap/ic_comment"
         android:drawablePadding="9dp"
         android:onClick="onClickVideoComment"
@@ -42,7 +40,6 @@
         android:id="@+id/video_share_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="17dp"
         android:drawableStart="@mipmap/ic_share"
         android:visibility="gone"
         android:drawablePadding="9dp"
@@ -59,8 +56,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="18dp"
         android:layout_marginEnd="80dp"
-        android:layout_marginBottom="11dp"
-        android:paddingTop="20dp"
+        android:layout_marginBottom="5dp"
+        android:paddingTop="5dp"
         android:text="天气真好出来散散步，草木的香味，这就是向往的生活 "
         android:textColor="#fffefefe"
         android:textSize="14sp"

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

@@ -9,7 +9,7 @@
     <ImageView
         android:id="@+id/video_back_iv"
         android:layout_width="66dp"
-        android:layout_height="76dp"
+        android:layout_height="56dp"
         android:layout_marginTop="24dp"
         android:onClick="onClickBackImg"
         android:scaleType="centerInside"
@@ -20,10 +20,13 @@
     <ImageView
         android:id="@+id/video_avatar_iv"
         android:layout_width="76dp"
-        android:layout_height="76dp"
+        android:layout_height="66dp"
         android:layout_marginTop="15dp"
         android:onClick="onClickAvatar"
-        android:padding="18dp"
+        android:paddingTop="18dp"
+        android:paddingStart="18dp"
+        android:paddingEnd="18dp"
+        android:paddingBottom="8dp"
         android:src="@drawable/avatar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -40,12 +43,14 @@
     <android.support.design.widget.CheckableImageButton
         android:id="@+id/video_focus_iv"
         android:layout_width="34dp"
-        android:layout_height="34dp"
+        android:layout_height="24dp"
         android:layout_marginTop="56dp"
         android:layout_marginEnd="20dp"
         android:background="@null"
         android:onClick="onClickVideoFocus"
-        android:padding="10dp"
+        android:paddingTop="10dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
         android:src="@drawable/selector_focus"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />