Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
RvApp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lify
RvApp
Commits
8c5f423f
Commit
8c5f423f
authored
Sep 25, 2019
by
linfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修改
parent
ed485f81
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
7 deletions
+14
-7
activity_mine.xml
module_mine/src/pro/res/layout/activity_mine.xml
+1
-2
CalendarActivity.java
...rc/main/java/com/rv/plugin/calendar/CalendarActivity.java
+1
-1
PhotoPickerActivity.java
...va/com/xxfc/imcamera/photopicker/PhotoPickerActivity.java
+12
-4
No files found.
module_mine/src/pro/res/layout/activity_mine.xml
View file @
8c5f423f
...
@@ -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"
...
...
plugin_calendar/src/main/java/com/rv/plugin/calendar/CalendarActivity.java
View file @
8c5f423f
...
@@ -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
(
tru
e
);
day
.
setCanBeChoose
(
fals
e
);
}
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
));
...
...
plugin_imcamera/src/main/java/com/xxfc/imcamera/photopicker/PhotoPickerActivity.java
View file @
8c5f423f
...
@@ -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
);
}
}
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment