Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im

RvClient/build.gradle

@@ -12,6 +12,7 @@ android {
         versionName "1.5.2"
         multiDexEnabled true
 
+
         ndk {
             abiFilters "armeabi", "armeabi-v7a", "x86", "mips", 'arm64-v8a'
         }

RvWrapper/src/main/res/values/dimens.xml

@@ -53,6 +53,7 @@
     <dimen name="size_245">245dp</dimen>
     <dimen name="size_250">250dp</dimen>
     <dimen name="size_420">420dp</dimen>
+    <dimen name="size_440">440dp</dimen>
     <dimen name="size_500">500dp</dimen>
     <dimen name="size_535">535dp</dimen>
     <dimen name="size_550">550dp</dimen>

module_home/src/main/res/layout/fragment_home.xml

@@ -560,7 +560,7 @@
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/recyclerView_home_content"
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/size_420"
+                        android:layout_height="@dimen/size_440"
                         android:layout_marginTop="@dimen/size_10"
                         android:paddingLeft="@dimen/size_10"
                         android:paddingRight="@dimen/size_10" />

module_mine/src/pro/res/layout/activity_mine.xml

@@ -268,8 +268,7 @@
                                 android:layout_weight="1"
                                 android:clickable="false"
                                 android:gravity="center"
-                                android:orientation="vertical"
-                                android:visibility="gone">
+                                android:orientation="vertical">
 
                                 <ImageView
                                     android:layout_width="@dimen/size_25"

plugin_calendar/src/main/java/com/rv/plugin/calendar/CalendarActivity.java

@@ -308,7 +308,7 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
                 day.setCurDay(true);
                 day.setDefTextColor(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) {
                 //如果是今天以前
                 day.setDefTextColor(context.getResources().getColor(R.color.ri_lhui));

plugin_imcamera/src/main/java/com/xxfc/imcamera/photopicker/PhotoPickerActivity.java

@@ -27,6 +27,8 @@ import android.widget.GridView;
 import android.widget.Toast;
 
 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.photopicker.intent.PhotoPreviewIntent;
 
@@ -316,10 +318,16 @@ public class PhotoPickerActivity extends AppCompatActivity {
         btnPreview.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                PhotoPreviewIntent intent = new PhotoPreviewIntent(mCxt);
-                intent.setCurrentItem(0);
-                intent.setPhotoPaths(resultList);
-                startActivityForResult(intent, PhotoPreviewActivity.REQUEST_PREVIEW);
+//                PhotoPreviewIntent intent = new PhotoPreviewIntent(mCxt);
+//                intent.setCurrentItem(0);
+//                intent.setPhotoPaths(resultList);
+//                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);
             }
         });