Commit f387f5e0 authored by linfeng's avatar linfeng

bug修复

parent 11c8560c
...@@ -36,6 +36,7 @@ import java.util.List; ...@@ -36,6 +36,7 @@ import java.util.List;
public class ActivityImageBrowseInt extends BaseActivity { public class ActivityImageBrowseInt extends BaseActivity {
final public static String KEY_IMAGE = "image"; final public static String KEY_IMAGE = "image";
final public static String KEY_BACKGROUND = "background"; final public static String KEY_BACKGROUND = "background";
final public static String KEY_SELECTPOSITION = "select";
FrameLayout root; FrameLayout root;
ViewPager viewPager; ViewPager viewPager;
...@@ -58,6 +59,9 @@ public class ActivityImageBrowseInt extends BaseActivity { ...@@ -58,6 +59,9 @@ public class ActivityImageBrowseInt extends BaseActivity {
@Override @Override
public void onData() { public void onData() {
fragmentImageBrowseList = new ArrayList<>(); fragmentImageBrowseList = new ArrayList<>();
int select = getIntent().getIntExtra(ActivityImageBrowseInt.KEY_SELECTPOSITION, 0);
int background = getIntent().getIntExtra(ActivityImageBrowseInt.KEY_BACKGROUND, 0); int background = getIntent().getIntExtra(ActivityImageBrowseInt.KEY_BACKGROUND, 0);
if (background != 0) { if (background != 0) {
root.setBackgroundColor(ContextCompat.getColor(baseContext, background)); root.setBackgroundColor(ContextCompat.getColor(baseContext, background));
...@@ -87,7 +91,7 @@ public class ActivityImageBrowseInt extends BaseActivity { ...@@ -87,7 +91,7 @@ public class ActivityImageBrowseInt extends BaseActivity {
} }
}); });
viewPager.setCurrentItem(0);
if (fragmentImageBrowseList.size() >= 2) { if (fragmentImageBrowseList.size() >= 2) {
recyclerView.setVisibility(View.VISIBLE); recyclerView.setVisibility(View.VISIBLE);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext); LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
...@@ -96,6 +100,8 @@ public class ActivityImageBrowseInt extends BaseActivity { ...@@ -96,6 +100,8 @@ public class ActivityImageBrowseInt extends BaseActivity {
adapterRecyclerViewIndicator = new AdapterRecyclerViewIndicator(); adapterRecyclerViewIndicator = new AdapterRecyclerViewIndicator();
recyclerView.setAdapter(adapterRecyclerViewIndicator); recyclerView.setAdapter(adapterRecyclerViewIndicator);
} }
viewPager.setCurrentItem(select);
} }
@Override @Override
......
...@@ -37,6 +37,7 @@ import java.util.List; ...@@ -37,6 +37,7 @@ import java.util.List;
public class ActivityImageBrowseUrl extends BaseActivity { public class ActivityImageBrowseUrl extends BaseActivity {
final public static String KEY_IMAGE = "image"; final public static String KEY_IMAGE = "image";
final public static String KEY_BACKGROUND = "background"; final public static String KEY_BACKGROUND = "background";
final public static String KEY_SELECTPOSITION = "select";
FrameLayout root; FrameLayout root;
ViewPager viewPager; ViewPager viewPager;
...@@ -60,6 +61,8 @@ public class ActivityImageBrowseUrl extends BaseActivity { ...@@ -60,6 +61,8 @@ public class ActivityImageBrowseUrl extends BaseActivity {
public void onData() { public void onData() {
fragmentImageBrowseList = new ArrayList<>(); fragmentImageBrowseList = new ArrayList<>();
int select = getIntent().getIntExtra(ActivityImageBrowseInt.KEY_SELECTPOSITION, 0);
int background = getIntent().getIntExtra(ActivityImageBrowseInt.KEY_BACKGROUND, 0); int background = getIntent().getIntExtra(ActivityImageBrowseInt.KEY_BACKGROUND, 0);
if (background != 0) { if (background != 0) {
root.setBackgroundColor(ContextCompat.getColor(baseContext, background)); root.setBackgroundColor(ContextCompat.getColor(baseContext, background));
...@@ -89,7 +92,7 @@ public class ActivityImageBrowseUrl extends BaseActivity { ...@@ -89,7 +92,7 @@ public class ActivityImageBrowseUrl extends BaseActivity {
} }
}); });
viewPager.setCurrentItem(0);
if (fragmentImageBrowseList.size() >= 2) { if (fragmentImageBrowseList.size() >= 2) {
recyclerView.setVisibility(View.VISIBLE); recyclerView.setVisibility(View.VISIBLE);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext); LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
...@@ -98,6 +101,8 @@ public class ActivityImageBrowseUrl extends BaseActivity { ...@@ -98,6 +101,8 @@ public class ActivityImageBrowseUrl extends BaseActivity {
adapterRecyclerViewIndicator = new AdapterRecyclerViewIndicator(); adapterRecyclerViewIndicator = new AdapterRecyclerViewIndicator();
recyclerView.setAdapter(adapterRecyclerViewIndicator); recyclerView.setAdapter(adapterRecyclerViewIndicator);
} }
viewPager.setCurrentItem(select);
} }
@Override @Override
......
...@@ -260,13 +260,14 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> { ...@@ -260,13 +260,14 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
} }
@JavascriptInterface @JavascriptInterface
public void showImage(String imageJson) { public void showImage(int selectPosition,String imageJson) {
if (!TextUtil.isEmpty(imageJson)) { if (!TextUtil.isEmpty(imageJson)) {
List<String> imagesList = new Gson().fromJson(imageJson, List<String> imagesList = new Gson().fromJson(imageJson,
new TypeToken<List<String>>() { new TypeToken<List<String>>() {
}.getType()); }.getType());
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary); bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
bundle.putInt(ActivityImageBrowseUrl.KEY_SELECTPOSITION,selectPosition);
bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) imagesList); bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) imagesList);
IntentUtil.startActivity(mActivity, ActivityImageBrowseUrl.class, bundle); IntentUtil.startActivity(mActivity, ActivityImageBrowseUrl.class, bundle);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment