Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
machine
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
hooloo
android
machine
Commits
3bf27115
Commit
3bf27115
authored
Sep 05, 2022
by
wjg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add update
parent
cb3908f0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
app/src/main/java/com/ihaoin/hooloo/device/component/IntroViewPager.java
+3
-0
app/src/main/java/com/ihaoin/hooloo/device/kds/view/KdsPresentation.java
+0
-6
No files found.
app/src/main/java/com/ihaoin/hooloo/device/component/IntroViewPager.java
View file @
3bf27115
...
...
@@ -11,6 +11,7 @@ import androidx.viewpager.widget.PagerAdapter;
import
androidx.viewpager.widget.ViewPager
;
import
com.ihaoin.hooloo.device.util.CollectionUtils
;
import
com.ihaoin.hooloo.device.util.Utils
;
import
java.util.List
;
...
...
@@ -77,6 +78,7 @@ public class IntroViewPager extends ViewPager {
public
void
destroyItem
(
@NonNull
ViewGroup
container
,
int
position
,
@NonNull
Object
object
)
{
View
view
=
getView
(
position
);
container
.
removeView
(
view
);
Utils
.
i
(
"destroyItem: "
+
position
);
}
@NonNull
...
...
@@ -85,6 +87,7 @@ public class IntroViewPager extends ViewPager {
if
(
CollectionUtils
.
isEmpty
(
introViews
))
{
return
null
;
}
Utils
.
i
(
"instantiateItem: "
+
position
);
View
view
=
getView
(
position
);
container
.
addView
(
view
);
return
view
;
...
...
app/src/main/java/com/ihaoin/hooloo/device/kds/view/KdsPresentation.java
View file @
3bf27115
...
...
@@ -139,16 +139,10 @@ public class KdsPresentation extends Presentation {
private
void
showImages
()
{
MainData
mainData
=
HLApplication
.
getMainData
();
// TODO TEST
// List<String> imgs = Arrays.asList("https://hooloo-saas-test.oss-cn-beijing.aliyuncs.com/hooloo/2022/07/04/%E7%82%B9%E5%8D%95%E5%B1%8F%E5%86%85%E5%AE%B9%E5%9B%BE3.png", "https://hooloo-saas-test.oss-cn-beijing.aliyuncs.com/hooloo/2022/07/04/%E7%82%B9%E5%8D%95%E5%B1%8F%E5%86%85%E5%AE%B9%E5%9B%BE3.png", "https://hooloo-saas-test.oss-cn-beijing.aliyuncs.com/hooloo/2022/07/04/%E7%82%B9%E5%8D%95%E5%B1%8F%E5%86%85%E5%AE%B9%E5%9B%BE3.png");
// Images img = new Images();
// img.setLeft(imgs);
// mainData.setImages(img);
if
(
mainData
==
null
||
mainData
.
getImages
()
==
null
)
{
return
;
}
imagePager
.
removeAllViews
();
// List<String> lefts = Arrays.asList("https://hooloo-saas-test.oss-cn-beijing.aliyuncs.com/hooloo/2022/07/08/点单屏内容图-拿铁.png", "https://hooloo-saas-test.oss-cn-beijing.aliyuncs.com/hooloo/2022/07/08/点单屏内容图-拿铁.png");
if
(
CollectionUtils
.
isEmpty
(
mainData
.
getImages
().
getLeft
()))
{
return
;
}
...
...
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