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

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameGroupOrGameDetail.java

@@ -50,6 +50,7 @@ import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter2;
 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.PackageUtil;
 
 import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;
@@ -81,7 +82,7 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
         StatusBarUtils.setTranslucent(this);
         super.onCreate(savedInstanceState);
     }
-
+    public static final String AUTO_DOWNLOAD = "auto_download";//自动下载的标识
     @Override
     protected int getLayoutId() {
         return R.layout.act_game_group_or_game_detail;
@@ -138,12 +139,14 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
     private FgtGameComment fgtGameComment;
 
     private int id;
+    private boolean isAutoDownload;
     private GameGroup gameGroup;
 
     @Override
     public void initView() {
         Intent intent = getIntent();
         id = intent.getIntExtra("id", 0);
+        isAutoDownload = intent.getBooleanExtra(AUTO_DOWNLOAD, false);
         gameGroup = DataUtil.getObject(intent, GameGroup.class);
         EventBus.getDefault().register(this);
         //tagList
@@ -280,6 +283,12 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
         CommonUtil.getInstance().palyGameDetailBtnValue(false, gameEntity, gc_game_app_detail_bt2, 0);
         fgtGameDetail.loadData(gameEntity);
         ViewUtil.setVisibility(gc_game_app_detail_bt3, gameEntity.getApp().hasGameDiscountId());
+
+        if(isAutoDownload){//可以进行自动下载
+            if(!PackageUtil.isAppInstalled(SheepApp.getInstance(), gameEntity.getApp().getPackage_name())) {//未安装的情况才进行下载
+                gc_game_app_detail_bt2.performLongClick();
+            }
+        }
     }
     //更新评分
     public void updateScore(float score) {

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

@@ -201,6 +201,7 @@ import me.iwf.photopicker.PhotoPreview;
 import okhttp3.Call;
 import rx.functions.Action1;
 
+import static com.sheep.gamegroup.module.game.activity.ActGameGroupOrGameDetail.AUTO_DOWNLOAD;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.ASK_MAKE_MONEY_INVITATION;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_ITEM;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_DOWNLOAD_WELFARE_LIST;
@@ -1860,11 +1861,20 @@ public class Jump2View {
      * @param item
      */
     public void goEntity(Applications item) {
+        goEntity(item, false);
+    }
+
+    /**
+     * 发现模块--游戏详情界面
+     *
+     * @param item
+     */
+    public void goEntity(Applications item, boolean isAutoDownload) {
         if(item == null){
             G.showToast(R.string.please_contact_customer_service);
             return;
         }
-        goPlayGameDetail(item.getId());
+        goPlayGameDetail(item.getId(), isAutoDownload);
     }
 
     /**
@@ -2861,11 +2871,19 @@ public class Jump2View {
      * 小绵羊3.4.10新增 -- 游戏组游戏详情 界面
      */
     public void goPlayGameDetail(int id) {
+        goPlayGameDetail(id, false);
+    }
+
+    /**
+     * 小绵羊3.4.10新增 -- 游戏组游戏详情 界面
+     */
+    public void goPlayGameDetail(int id, boolean isAutoDownload) {
         GAME_PLAY_GAME_DETAIL.onEvent();
         if (id > 0){
             Activity activity = SheepApp.getInstance().getCurrentActivity();
             Intent intent = new Intent(activity, ActGameGroupOrGameDetail.class);
             intent.putExtra("id", id);
+            intent.putExtra(AUTO_DOWNLOAD, isAutoDownload);
             activity.startActivity(intent);
         } else {
             G.showToast(R.string.please_contact_customer_service);

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

@@ -83,6 +83,7 @@ import com.sheep.gamegroup.model.entity.RobTask;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.module.game.activity.ActGameGroupOrGameDetail;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsCheckResq;
 import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsResp;
@@ -1453,7 +1454,7 @@ public class ViewUtil {
         setGameImage(dialog_icon_iv, applications.getIcon());
         setText(dialog_name_tv, applications.getName());
         dialog_btn_tv.setOnClickListener(view1 -> {
-            Jump2View.getInstance().goEntity(applications);
+            Jump2View.getInstance().goEntity(applications, true);
             onClickListener.onClick(view);
             dismiss(dialog, 0);
         });

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

@@ -137,8 +137,6 @@ public class ActMain extends BaseActYmPermissionCheck {
     RelativeLayout main_layout;
     @BindView(R.id.person_center_red_dot)
     View person_center_red_dot;
-    @BindView(R.id.home_new_spring_activitys_drl)
-    View home_new_spring_activitys_drl;
 
     @Override
     protected int getLayoutId() {
@@ -251,7 +249,6 @@ public class ActMain extends BaseActYmPermissionCheck {
     }
 
     private void changeVisible(int lastPosition, int position) {
-        ViewUtil.setVisibility(home_new_spring_activitys_drl, position != MainTab.FgtSmallSheep.ordinal());
     }
 
     /**
@@ -484,9 +481,4 @@ public class ActMain extends BaseActYmPermissionCheck {
         ViewUtil.setVisibility(person_center_red_dot, false);
     }
 
-    //跳转新春活动
-    @OnClick(R.id.home_new_spring_activitys_drl)
-    public void goNewSpringActivitys(View v) {
-        Jump2View.getInstance().goNewSpringActivitys();
-    }
 }

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

@@ -14,7 +14,6 @@ import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.SlideshowEty;
 import com.sheep.gamegroup.model.entity.WebParams;
-import com.sheep.gamegroup.module.home.api.MainAction;
 import com.sheep.gamegroup.util.ActionUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;

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

@@ -184,24 +184,24 @@ public class FgtPersonalCenter extends BaseFragment {
 
     private void initData() {
         //代理
-        CommonUtil.getInstance().getAgencyState(activity, new Action1<BaseMessage>() {
-            @Override
-            public void call(BaseMessage baseMessage) {
-                try {
-                    if (baseMessage != null) {
-                        AgentEntity agentEntity = baseMessage.getData(AgentEntity.class);
-                        if (agentEntity != null && agentEntity.getIs_banned() == 0) {
-                            //设置是否显示代理服务
-                            proxy_service_layout_line.setVisibility(View.VISIBLE);
-                            proxy_service_layout.setVisibility(View.VISIBLE);
-                        }
-
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        });
+//        CommonUtil.getInstance().getAgencyState(activity, new Action1<BaseMessage>() {
+//            @Override
+//            public void call(BaseMessage baseMessage) {
+//                try {
+//                    if (baseMessage != null) {
+//                        AgentEntity agentEntity = baseMessage.getData(AgentEntity.class);
+//                        if (agentEntity != null && agentEntity.getIs_banned() == 0) {
+//                            //设置是否显示代理服务
+//                            proxy_service_layout_line.setVisibility(View.VISIBLE);
+//                            proxy_service_layout.setVisibility(View.VISIBLE);
+//                        }
+//
+//                    }
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//        });
         initUserInfo();
         String newVersionUrl = ACache.get(SheepApp.getInstance()).getAsString("version_url");
         personal_center_version_new.setVisibility(TextUtils.isEmpty(newVersionUrl) ? View.GONE : View.VISIBLE);

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

@@ -524,7 +524,7 @@ public class SheepApp extends MultiDexApplication {
             if (activityRef != null) activityRef.clear();
             activityRef = new WeakReference<>(activity);
             if (activity != null) {
-                if (activity instanceof SplashAct || activity instanceof LoginAct || activity instanceof MiddleSchemeAct || activity instanceof ActBindMobileRegister) { // 可以是不用登录就存在的Act
+                if (DataUtil.getInstance().getUserEntity() == null || activity instanceof SplashAct || activity instanceof LoginAct || activity instanceof MiddleSchemeAct || activity instanceof ActBindMobileRegister) { // 可以是不用登录就存在的Act
                 } else {
                     LogUtil.println("onActivityResumed checkCopyText activity", activity.getClass().getSimpleName());
 

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

@@ -432,12 +432,10 @@ public class TitleBarUtils {
                     actionBar.hide();
                 }
             } else {
-                activity.getWindow().getDecorView().findViewById(R.id.layout_navigationBar)
-                        .setVisibility(isShow ? View.VISIBLE : View.GONE);
+                ViewUtil.setVisibility(activity.getWindow().getDecorView().findViewById(R.id.layout_navigationBar), isShow);
             }
         } else {
-            activity.getWindow().getDecorView().findViewById(R.id.layout_navigationBar)
-                    .setVisibility(isShow ? View.VISIBLE : View.GONE);
+                ViewUtil.setVisibility(activity.getWindow().getDecorView().findViewById(R.id.layout_navigationBar), isShow);
         }
         return this;
     }

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

@@ -119,22 +119,4 @@
         android:layout_above="@+id/tab_container"
         android:background="#AAe2e2e2" />
 
-    <com.kfzs.duanduan.view.DragRelativeLayout
-        android:id="@+id/home_new_spring_activitys_drl"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="70dp"
-        android:gravity="end"
-        android:paddingTop="@dimen/content_padding_10"
-        android:paddingBottom="@dimen/content_padding_10">
-
-        <ImageView
-            android:layout_width="65dp"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:scaleType="fitXY"
-            android:src="@mipmap/ic_act_new_year" />
-    </com.kfzs.duanduan.view.DragRelativeLayout>
 </RelativeLayout>