Commit 8c5f423f authored by linfeng's avatar linfeng

bug修改

parent ed485f81
...@@ -268,8 +268,7 @@ ...@@ -268,8 +268,7 @@
android:layout_weight="1" android:layout_weight="1"
android:clickable="false" android:clickable="false"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical">
android:visibility="gone">
<ImageView <ImageView
android:layout_width="@dimen/size_25" android:layout_width="@dimen/size_25"
......
...@@ -308,7 +308,7 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> { ...@@ -308,7 +308,7 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
day.setCurDay(true); day.setCurDay(true);
day.setDefTextColor(context.getResources().getColor(R.color.gray_FFB74B)); day.setDefTextColor(context.getResources().getColor(R.color.gray_FFB74B));
day.setDefNongTextColor(context.getResources().getColor(R.color.gray_FFB74B)); day.setDefNongTextColor(context.getResources().getColor(R.color.gray_FFB74B));
day.setCanBeChoose(true); day.setCanBeChoose(false);
} else if (CalendarDateUtil.compareDateDay(CalendarDateUtil.getCurDate(), curDay) > 0 || spanIndex >= MAX_SPAN) { } else if (CalendarDateUtil.compareDateDay(CalendarDateUtil.getCurDate(), curDay) > 0 || spanIndex >= MAX_SPAN) {
//如果是今天以前 //如果是今天以前
day.setDefTextColor(context.getResources().getColor(R.color.ri_lhui)); day.setDefTextColor(context.getResources().getColor(R.color.ri_lhui));
......
...@@ -27,6 +27,8 @@ import android.widget.GridView; ...@@ -27,6 +27,8 @@ import android.widget.GridView;
import android.widget.Toast; import android.widget.Toast;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.base.utils.tools.android.IntentUtil;
import com.ruiwenliu.wrapper.browse.ActivityImageBrowseUrl;
import com.xxfc.imcamera.R; import com.xxfc.imcamera.R;
import com.xxfc.imcamera.photopicker.intent.PhotoPreviewIntent; import com.xxfc.imcamera.photopicker.intent.PhotoPreviewIntent;
...@@ -316,10 +318,16 @@ public class PhotoPickerActivity extends AppCompatActivity { ...@@ -316,10 +318,16 @@ public class PhotoPickerActivity extends AppCompatActivity {
btnPreview.setOnClickListener(new View.OnClickListener() { btnPreview.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
PhotoPreviewIntent intent = new PhotoPreviewIntent(mCxt); // PhotoPreviewIntent intent = new PhotoPreviewIntent(mCxt);
intent.setCurrentItem(0); // intent.setCurrentItem(0);
intent.setPhotoPaths(resultList); // intent.setPhotoPaths(resultList);
startActivityForResult(intent, PhotoPreviewActivity.REQUEST_PREVIEW); // startActivityForResult(intent, PhotoPreviewActivity.REQUEST_PREVIEW);
Bundle bundle = new Bundle();
bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
bundle.putInt(ActivityImageBrowseUrl.KEY_SELECTPOSITION, 0);
bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) resultList);
IntentUtil.startActivity(mCxt, 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