diff --git a/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomVPAdapter.java b/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomVPAdapter.java index daf1288b1..f3ab647bb 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomVPAdapter.java +++ b/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomVPAdapter.java @@ -19,6 +19,11 @@ public class RoomVPAdapter extends FragmentPagerAdapter { this.fragmentList = fragmentList; } + public RoomVPAdapter(FragmentManager fm, List fragmentList,int behavior) { + super(fm,behavior); + this.fragmentList = fragmentList; + } + public RoomVPAdapter(FragmentManager fm) { super(fm,FragmentPagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT); } diff --git a/app/src/main/res/layout/fragment_newbie_list.xml b/app/src/main/res/layout/fragment_newbie_list.xml index a6cabb407..7bcb630c1 100644 --- a/app/src/main/res/layout/fragment_newbie_list.xml +++ b/app/src/main/res/layout/fragment_newbie_list.xml @@ -1,8 +1,7 @@ + android:layout_height="match_parent"> miniWorldChooseInfoList; public static void start(DialogManager manager, long worldId) { if (beforeStart(manager)) { @@ -143,7 +144,7 @@ public class PublishActivity extends BaseMvpActivity BindPhoneActivity.start(manager.getContext())); + () -> BindPhoneActivity.start(manager.getContext())); return true; } else { @@ -191,7 +192,7 @@ public class PublishActivity extends BaseMvpActivity { - CaptureStrategy captureStrategy = new CaptureStrategy(true, context.getPackageName()+".fileprovider", + CaptureStrategy captureStrategy = new CaptureStrategy(true, context.getPackageName() + ".fileprovider", BasicConfig.INSTANCE.getImageDir().getAbsolutePath()); int maxCanSelect = 9 - uploadList.size(); Matisse.from(PublishActivity.this) @@ -264,9 +265,6 @@ public class PublishActivity extends BaseMvpActivity 0); + boolean isEnabled = uploadList.size() > 0; + tvPublish.setEnabled(isEnabled); + tvPublish.setTextColor(isEnabled ? getResources().getColor(R.color.color_7154EE) : getResources().getColor(R.color.color_999999)); } private void initOtherView() { @@ -476,8 +476,6 @@ public class PublishActivity extends BaseMvpActivity miniWorldChooseInfoList; - private void addMiniWorldList(List list) { miniWorldChooseInfoList = list; flGroup.removeAllViews(); diff --git a/app/src/module_community/res/layout/activity_publish.xml b/app/src/module_community/res/layout/activity_publish.xml index 05f8d2c08..c6b36deb4 100644 --- a/app/src/module_community/res/layout/activity_publish.xml +++ b/app/src/module_community/res/layout/activity_publish.xml @@ -10,7 +10,7 @@ android:id="@+id/title_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="25dp" + android:layout_marginTop="35dp" app:layout_constraintTop_toTopOf="parent" />