Selaa lähdekoodia

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

zengjiebin 7 vuotta sitten
vanhempi
commit
3bbb9d3988

+ 17 - 11
app/src/main/java/com/sheep/gamegroup/view/activity/ActInvitation.java

@@ -91,7 +91,7 @@ public class ActInvitation extends BaseUMActivity {
     @BindView(R.id.main_layout)
     ConstraintLayout main_layout;
 
-    int forMission=0;
+    int forMission = 0;
     String picParamUrl;
 
     @Override
@@ -379,26 +379,32 @@ public class ActInvitation extends BaseUMActivity {
     private SparseArray<View> viewList = new SparseArray<>();
 
     private void init(final String url, final String description) {
-        gridLayoutManager = new GridLayoutManager(this, 5);
+        if (forMission == 0) {
+            gridLayoutManager = new GridLayoutManager(this, 5);
+        } else {
+            gridLayoutManager = new GridLayoutManager(this, 3);
+        }
         ask_share_list.setLayoutManager(gridLayoutManager);
         final List<String> list = ListUtil.emptyList();
-        list.add(ShareLinkConfig.FACE_TO_FACE);
+        final List<String> imgList = ListUtil.emptyList();
+        final List<String> nameList = ListUtil.emptyList();
         list.add(ShareLinkConfig.WX);
         list.add(ShareLinkConfig.QQ);
         list.add(ShareLinkConfig.WEIXIN_CIRCLE);
-        list.add(ShareLinkConfig.COPY_SHARE_LINK);
-        final List<String> imgList = ListUtil.emptyList();
-        imgList.add("share_face_to_face");
         imgList.add("share_wx");
         imgList.add("share_qq");
         imgList.add("share_weixin_circle");
-        imgList.add("share_copy_share_link");
-        final List<String> nameList = ListUtil.emptyList();
-        nameList.add("面对面");
         nameList.add("微信");
         nameList.add("QQ好友");
         nameList.add("朋友圈");
-        nameList.add("复制链接");
+        if (forMission == 0) {
+            list.add(0, ShareLinkConfig.FACE_TO_FACE);
+            list.add(ShareLinkConfig.COPY_SHARE_LINK);
+            imgList.add(0, "share_face_to_face");
+            imgList.add("share_copy_share_link");
+            nameList.add(0, "面对面");
+            nameList.add("复制链接");
+        }
         AdbCommonRecycler<String> adapter = new AdbCommonRecycler<String>(this, list) {
             @Override
             public int getViewIdByType(int type) {
@@ -454,7 +460,7 @@ public class ActInvitation extends BaseUMActivity {
                                         if (TextUtils.isEmpty(picParamUrl)) {
                                             callMissionExecute(2);
                                         } else {
-                                            if (forMission>0) {
+                                            if (forMission > 0) {
                                                 callMissionExecute(forMission);
                                             }
                                         }