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
4c68ac55
Commit
4c68ac55
authored
Jan 08, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码;
parent
57fab647
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
19 deletions
+16
-19
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/GroupSkuView.java
...om/xingdata/zzdpos/ui/marketing/ms/view/GroupSkuView.java
+6
-6
app/src/main/res/layout/fragment_ms_editor.xml
app/src/main/res/layout/fragment_ms_editor.xml
+4
-2
app/src/main/res/layout/view_group_all.xml
app/src/main/res/layout/view_group_all.xml
+1
-1
app/src/main/res/layout/view_group_cate.xml
app/src/main/res/layout/view_group_cate.xml
+4
-10
app/src/main/res/layout/view_group_sku.xml
app/src/main/res/layout/view_group_sku.xml
+1
-0
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/GroupSkuView.java
View file @
4c68ac55
...
...
@@ -26,11 +26,11 @@ public class GroupSkuView extends BaseGroupView<ViewGroupSkuBinding> {
@Override
public
void
initView
()
{
super
.
initView
();
mViewBinding
.
btnSearch
.
setOnClickListener
(
view
->
{
//
TODO
//
mViewBinding.btnSearch.setOnClickListener(view -> {
//
TODO
// mPresenter.clickGroupSkuSearchButton(mViewBinding.etKeyword.getText().toString());
});
mViewBinding
.
etKeyword
.
requestFocus
();
//
});
//
mViewBinding.etKeyword.requestFocus();
}
@SuppressLint
(
"SetTextI18n"
)
...
...
@@ -38,7 +38,7 @@ public class GroupSkuView extends BaseGroupView<ViewGroupSkuBinding> {
protected
void
setViewByMs
()
{
if
(
mMs
.
getMsTouchTag2
()
==
null
||
mMs
.
getMsTouchTag2
()
!=
C
.
MS_GROUP
.
SKU
)
return
;
mViewBinding
.
llProduct
.
setVisibility
(
View
.
VISIBLE
);
mViewBinding
.
etKeyword
.
setText
(
ConvertUtil
.
longToString
(
mMs
.
getSkuBarCode
()));
//
mViewBinding.etKeyword.setText(ConvertUtil.longToString(mMs.getSkuBarCode()));
mViewBinding
.
tvProductName
.
setText
(
getString
(
R
.
string
.
ms_editor_group_sku_name
)
+
mMs
.
getSkuName
());
mViewBinding
.
tvProductPrice
.
setText
(
getString
(
R
.
string
.
ms_editor_group_sku_price
)
+
ConvertUtil
.
fenToYuan
(
mMs
.
getSkuPrice1
(),
true
));
}
...
...
@@ -55,7 +55,7 @@ public class GroupSkuView extends BaseGroupView<ViewGroupSkuBinding> {
public
void
loadSssku
(
Sssku
sssku
)
{
this
.
mSssku
=
sssku
;
if
(
sssku
!=
null
)
{
mViewBinding
.
etKeyword
.
setText
(
ConvertUtil
.
longToString
(
sssku
.
getSpuBarcode
()));
//
mViewBinding.etKeyword.setText(ConvertUtil.longToString(sssku.getSpuBarcode()));
mViewBinding
.
tvProductName
.
setText
(
getString
(
R
.
string
.
ms_editor_group_sku_name
)
+
sssku
.
getSpuName
());
mViewBinding
.
tvProductPrice
.
setText
(
getString
(
R
.
string
.
ms_editor_group_sku_price
)
+
ConvertUtil
.
fenToYuan
(
sssku
.
getSkuRetailPrice1
(),
true
));
mViewBinding
.
llProduct
.
setVisibility
(
View
.
VISIBLE
);
...
...
app/src/main/res/layout/fragment_ms_editor.xml
View file @
4c68ac55
...
...
@@ -288,13 +288,15 @@
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
android:layout_height=
"wrap_content"
android:background=
"@color/white_caocao"
>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/rl_group"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
/>
android:layout_weight=
"1"
android:background=
"@color/gray_zhouyu"
/>
<FrameLayout
android:id=
"@+id/f_group"
...
...
app/src/main/res/layout/view_group_all.xml
View file @
4c68ac55
...
...
@@ -5,7 +5,7 @@
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/
transparent
"
>
android:background=
"@color/
white_caocao
"
>
<TextView
android:layout_width=
"wrap_content"
...
...
app/src/main/res/layout/view_group_cate.xml
View file @
4c68ac55
...
...
@@ -5,7 +5,7 @@
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/
transparent
"
android:background=
"@color/
white_caocao
"
android:orientation=
"horizontal"
>
<TextView
...
...
@@ -18,31 +18,25 @@
<org.angmarch.views.NiceSpinner
android:id=
"@+id/ns_type_1"
style=
"@style/editor_edit"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/all_spacing"
android:minWidth=
"@dimen/et_min_width_short"
app:backgroundSelector=
"@drawable/selector_white_background_stroke_2"
/>
android:minWidth=
"@dimen/et_min_width_short"
/>
<org.angmarch.views.NiceSpinner
android:id=
"@+id/ns_type_2"
style=
"@style/editor_edit"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/all_spacing"
android:minWidth=
"@dimen/et_min_width_short"
app:backgroundSelector=
"@drawable/selector_white_background_stroke_2"
/>
android:minWidth=
"@dimen/et_min_width_short"
/>
<org.angmarch.views.NiceSpinner
android:id=
"@+id/ns_type_3"
style=
"@style/editor_edit"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/all_spacing"
android:minWidth=
"@dimen/et_min_width_short"
android:visibility=
"gone"
app:backgroundSelector=
"@drawable/selector_white_background_stroke_2"
/>
android:visibility=
"gone"
/>
<TextView
android:layout_width=
"wrap_content"
...
...
app/src/main/res/layout/view_group_sku.xml
View file @
4c68ac55
...
...
@@ -5,6 +5,7 @@
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/white_caocao"
android:orientation=
"vertical"
>
<LinearLayout
...
...
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