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
5e52b950
Commit
5e52b950
authored
Jan 30, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修改;
parent
5d3d04dc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
18 deletions
+15
-18
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
...va/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
+2
-4
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
...main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
+12
-13
app/src/main/res/layout/fragment_settle.xml
app/src/main/res/layout/fragment_settle.xml
+1
-1
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
View file @
5e52b950
...
@@ -26,8 +26,7 @@ import com.xingdata.zzdpos.util.Global;
...
@@ -26,8 +26,7 @@ import com.xingdata.zzdpos.util.Global;
import
java.util.List
;
import
java.util.List
;
public
class
SsskuActivity
extends
BaseActivity
<
SsskuPresenter
,
ActivitySsskuBinding
>
implements
public
class
SsskuActivity
extends
BaseActivity
<
SsskuPresenter
,
ActivitySsskuBinding
>
implements
SsskuContract
.
View
{
SsskuContract
.
View
{
private
ManagerFragment
mManagerFragment
=
new
ManagerFragment
();
private
ManagerFragment
mManagerFragment
=
new
ManagerFragment
();
private
SearchFragment
mSearchFragment
=
new
SearchFragment
();
private
SearchFragment
mSearchFragment
=
new
SearchFragment
();
...
@@ -52,8 +51,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
...
@@ -52,8 +51,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
this
.
showTitleBarByTitleMode
(
C
.
TITLE_MODE
.
SKU_MANAGER
);
this
.
showTitleBarByTitleMode
(
C
.
TITLE_MODE
.
SKU_MANAGER
);
this
.
loadRootFragment
(
R
.
id
.
f_sssku
,
mManagerFragment
);
this
.
loadRootFragment
(
R
.
id
.
f_sssku
,
mManagerFragment
);
mViewBinding
.
btnBack
.
setOnClickListener
(
view
->
getTopFragment
().
onBackPressedSupport
());
mViewBinding
.
btnBack
.
setOnClickListener
(
view
->
getTopFragment
().
onBackPressedSupport
());
mViewBinding
.
btnScan
.
setOnClickListener
(
view
->
mPresenter
.
clickScan
(
mViewBinding
mViewBinding
.
btnScan
.
setOnClickListener
(
view
->
mPresenter
.
clickScan
(
mViewBinding
.
getTitleMode
()));
.
getTitleMode
()));
mViewBinding
.
btnMenu
.
setOnClickListener
(
view
->
mPresenter
.
clickSkuMenu
());
mViewBinding
.
btnMenu
.
setOnClickListener
(
view
->
mPresenter
.
clickSkuMenu
());
mViewBinding
.
vSearch
.
setOnSearchListener
(
keyword
->
mPresenter
.
searchSku
(
keyword
));
mViewBinding
.
vSearch
.
setOnSearchListener
(
keyword
->
mPresenter
.
searchSku
(
keyword
));
}
}
...
...
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
View file @
5e52b950
...
@@ -57,19 +57,18 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
...
@@ -57,19 +57,18 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
mViewBinding
.
vSearch
.
setOnSearchListener
(
keyword
->
mPresenter
.
searchSku
(
keyword
));
mViewBinding
.
vSearch
.
setOnSearchListener
(
keyword
->
mPresenter
.
searchSku
(
keyword
));
mViewBinding
.
btnScan
.
setOnClickListener
(
view
->
mViewBinding
.
btnScan
.
setOnClickListener
(
view
->
PermissionUtils
.
permission
(
PermissionConstants
.
CAMERA
)
PermissionUtils
.
permission
(
PermissionConstants
.
CAMERA
)
.
callback
(
new
PermissionUtils
.
FullCallback
()
{
.
callback
(
new
PermissionUtils
.
FullCallback
()
{
@Override
@Override
public
void
onGranted
(
List
<
String
>
permissionsGranted
)
{
public
void
onGranted
(
List
<
String
>
permissionsGranted
)
{
mPresenter
.
clickScan
();
mPresenter
.
clickScan
();
}
}
@Override
@Override
public
void
onDenied
(
List
<
String
>
permissionsDeniedForever
,
List
<
String
>
permissionsDenied
)
{
public
void
onDenied
(
List
<
String
>
permissionsDeniedForever
,
List
<
String
>
permissionsDenied
)
{
}
}
})
})
.
request
()
.
request
()
);
);
mScanFragment
.
setOnScanCompletedListener
(
barcode
->
mPresenter
.
scanComplete
(
barcode
));
mScanFragment
.
setOnScanCompletedListener
(
barcode
->
mPresenter
.
scanComplete
(
barcode
));
}
}
...
...
app/src/main/res/layout/fragment_settle.xml
View file @
5e52b950
...
@@ -437,7 +437,7 @@
...
@@ -437,7 +437,7 @@
android:id=
"@+id/ll_point"
android:id=
"@+id/ll_point"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_height"
android:layout_height=
"@dimen/title_height"
android:clickable=
"@{
!defualtVip
}"
android:clickable=
"@{
avlPoints>0
}"
android:foreground=
"?android:attr/selectableItemBackground"
android:foreground=
"?android:attr/selectableItemBackground"
android:gravity=
"center"
android:gravity=
"center"
android:paddingEnd=
"@dimen/all_margin"
android:paddingEnd=
"@dimen/all_margin"
...
...
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