Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
android-koreadc-client-aar
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
郑鹏
android-koreadc-client-aar
Commits
eb2094f5
Commit
eb2094f5
authored
Apr 09, 2020
by
郑鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix fragment bug
parent
3c7180f7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
MerchantDetailsActivity.java
...ankal/client/ui/home/details/MerchantDetailsActivity.java
+10
-10
No files found.
app/src/main/java/cn/dankal/client/ui/home/details/MerchantDetailsActivity.java
View file @
eb2094f5
...
...
@@ -154,6 +154,7 @@ public class MerchantDetailsActivity extends BaseActivity {
requestStoreDetail
();
break
;
case
"1"
:
//不存在
case
"3"
:
//已隐藏
tvTabNumber
.
setVisibility
(
View
.
GONE
);
tableUUID
=
null
;
startActivity
(
new
Intent
(
MerchantDetailsActivity
.
this
,
ScanResultActivity
.
class
));
...
...
@@ -163,11 +164,6 @@ public class MerchantDetailsActivity extends BaseActivity {
tableUUID
=
null
;
showDialogStateTow
(
getString
(
R
.
string
.
the_table_number_is_in_use
));
break
;
case
"3"
:
//已隐藏
tvTabNumber
.
setVisibility
(
View
.
GONE
);
tableUUID
=
null
;
startActivity
(
new
Intent
(
MerchantDetailsActivity
.
this
,
ScanResultActivity
.
class
));
break
;
}
}
});
...
...
@@ -204,7 +200,7 @@ public class MerchantDetailsActivity extends BaseActivity {
}
private
void
initData
(
Intent
intent
)
{
detailsShopFragmentOne
=
new
DetailsShopFragment
();
storeUUId
=
intent
.
getStringExtra
(
MerchantDetailsActivity
.
HOTELUUID
);
tableUUID
=
intent
.
getStringExtra
(
MerchantDetailsActivity
.
TABLE_UUID
);
tableName
=
intent
.
getStringExtra
(
MerchantDetailsActivity
.
TABLE_NUMBER
);
...
...
@@ -259,6 +255,10 @@ public class MerchantDetailsActivity extends BaseActivity {
@Override
public
void
onNext
(
RestaurantDetailEntity
entity
)
{
if
(
detailsShopFragmentOne
!=
null
)
{
detailsShopFragmentOne
=
null
;
}
detailsShopFragmentOne
=
new
DetailsShopFragment
();
if
(
entity
.
getIs_call
()
==
0
)
{
//是否开启排队,0没开启
showState
=
2
;
}
else
{
...
...
@@ -310,14 +310,14 @@ public class MerchantDetailsActivity extends BaseActivity {
bundle
.
putInt
(
SHOW_STATE
,
showState
);
bundle
.
putInt
(
USER_STAMP_COUNT
,
userStampNumber
);
bundle
.
putBoolean
(
MerchantDetailsActivity
.
USER_COUPON
,
isUserCoupon
);
bundle
.
putBoolean
(
"isAgain"
,
isAgain
);
bundle
.
putBoolean
(
"isAgain"
,
isAgain
);
bundle
.
putSerializable
(
DetailsShopFragment
.
TYPEDATA
,
(
Serializable
)
entity
.
getGoods_type_list
());
//fragmen是否激活判断
if
(
detailsShopFragmentOne
.
isRemoving
())
{
detailsShopFragmentOne
.
getArguments
().
putAll
(
bundle
);
}
else
{
try
{
detailsShopFragmentOne
.
setArguments
(
bundle
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
dataList
.
add
(
detailsShopFragmentOne
);
...
...
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