Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TangKuPos
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
王海
TangKuPos
Commits
46051130
Commit
46051130
authored
Jan 02, 2018
by
陈前
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
755e3123
e47ac4b7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
7 deletions
+3
-7
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralIndexFragment.java
...ui/marketing/integral/fragment/IntegralIndexFragment.java
+1
-1
app/src/main/res/layout/fragment_integral_main.xml
app/src/main/res/layout/fragment_integral_main.xml
+2
-6
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralIndexFragment.java
View file @
46051130
...
@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralAdapter;
...
@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralAdapter;
import
com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralExchangeAdapter
;
import
com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralExchangeAdapter
;
import
com.xingdata.zzdpos.util.OnClickListener
;
import
com.xingdata.zzdpos.util.OnClickListener
;
import
java.lang.ref.WeakReference
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -61,7 +62,6 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
...
@@ -61,7 +62,6 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
linearLayoutManager
.
setOrientation
(
LinearLayoutManager
.
VERTICAL
);
linearLayoutManager
.
setOrientation
(
LinearLayoutManager
.
VERTICAL
);
mViewBinding
.
rvMessage
.
setLayoutManager
(
linearLayoutManager
);
mViewBinding
.
rvMessage
.
setLayoutManager
(
linearLayoutManager
);
mViewBinding
.
rvMessage
.
setAdapter
(
integralAdapter
);
mViewBinding
.
rvMessage
.
setAdapter
(
integralAdapter
);
List
<
Ubound
>
list
=
new
ArrayList
<>();
List
<
Ubound
>
list
=
new
ArrayList
<>();
Ubound
ubound
=
new
Ubound
();
Ubound
ubound
=
new
Ubound
();
ubound
.
setBoundValAmt
(
1000
l
);
ubound
.
setBoundValAmt
(
1000
l
);
...
...
app/src/main/res/layout/fragment_integral_main.xml
View file @
46051130
...
@@ -70,9 +70,7 @@
...
@@ -70,9 +70,7 @@
<RadioButton
<RadioButton
android:id=
"@+id/rb_get"
android:id=
"@+id/rb_get"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_marginLeft=
"@dimen/all_margin"
android:layout_marginRight=
"@dimen/all_margin"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:background=
"@drawable/radio_select"
android:background=
"@drawable/radio_select"
android:button=
"@null"
android:button=
"@null"
...
@@ -87,9 +85,7 @@
...
@@ -87,9 +85,7 @@
<RadioButton
<RadioButton
android:id=
"@+id/rb_exchange"
android:id=
"@+id/rb_exchange"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_marginLeft=
"@dimen/all_margin"
android:layout_marginRight=
"@dimen/all_margin"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:background=
"@drawable/radio_select"
android:background=
"@drawable/radio_select"
android:button=
"@null"
android:button=
"@null"
...
...
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