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
1e4088a1
Commit
1e4088a1
authored
Jan 15, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加调整会员信息;
parent
1321c246
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
371 additions
and
18 deletions
+371
-18
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
...va/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
+14
-10
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuContract.java
...va/com/xingdata/zzdpos/ui/manage/sssku/SsskuContract.java
+8
-1
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java
...a/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java
+1
-1
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/VipFragment.java
...xingdata/zzdpos/ui/manage/sssku/fragment/VipFragment.java
+93
-0
app/src/main/res/layout/dialog_sssku_menu.xml
app/src/main/res/layout/dialog_sssku_menu.xml
+2
-4
app/src/main/res/layout/fragment_sssku_price.xml
app/src/main/res/layout/fragment_sssku_price.xml
+6
-2
app/src/main/res/layout/fragment_sssku_vip.xml
app/src/main/res/layout/fragment_sssku_vip.xml
+247
-0
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
View file @
1e4088a1
...
@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.manage.sssku.fragment.ManagerFragment;
...
@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.manage.sssku.fragment.ManagerFragment;
import
com.xingdata.zzdpos.ui.manage.sssku.fragment.PriceFragment
;
import
com.xingdata.zzdpos.ui.manage.sssku.fragment.PriceFragment
;
import
com.xingdata.zzdpos.ui.manage.sssku.fragment.SearchFragment
;
import
com.xingdata.zzdpos.ui.manage.sssku.fragment.SearchFragment
;
import
com.xingdata.zzdpos.ui.manage.sssku.fragment.SkugrpFragment
;
import
com.xingdata.zzdpos.ui.manage.sssku.fragment.SkugrpFragment
;
import
com.xingdata.zzdpos.ui.manage.sssku.fragment.VipFragment
;
import
java.util.List
;
import
java.util.List
;
...
@@ -32,9 +33,11 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
...
@@ -32,9 +33,11 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
private
SkugrpFragment
mSkugrpFragment
=
new
SkugrpFragment
();
private
SkugrpFragment
mSkugrpFragment
=
new
SkugrpFragment
();
private
AddFragment
mAddFragment
=
new
AddFragment
();
private
AddFragment
mAddFragment
=
new
AddFragment
();
private
EditorFragment
mEditorFragment
=
new
EditorFragment
();
private
DetailFragment
mDetailFragment
=
new
DetailFragment
();
private
DetailFragment
mDetailFragment
=
new
DetailFragment
();
private
EditorFragment
mEditorFragment
=
new
EditorFragment
();
private
PriceFragment
mPriceFragment
=
new
PriceFragment
();
private
PriceFragment
mPriceFragment
=
new
PriceFragment
();
private
VipFragment
mVipFragment
=
new
VipFragment
();
private
LoadingDialog
mLoadingDialog
=
new
LoadingDialog
();
private
LoadingDialog
mLoadingDialog
=
new
LoadingDialog
();
...
@@ -48,9 +51,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
...
@@ -48,9 +51,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
this
.
showTitleBarByTitleMode
(
C
.
TITLE_MODE
.
SKU
);
this
.
showTitleBarByTitleMode
(
C
.
TITLE_MODE
.
SKU
);
this
.
loadRootFragment
(
R
.
id
.
f_sssku
,
mManagerFragment
);
this
.
loadRootFragment
(
R
.
id
.
f_sssku
,
mManagerFragment
);
mViewBinding
.
btnBack
.
setOnClickListener
(
view
->
{
mViewBinding
.
btnBack
.
setOnClickListener
(
view
->
getTopFragment
().
onBackPressedSupport
());
getTopFragment
().
onBackPressedSupport
();
});
mViewBinding
.
etSearch
.
setOnEditorActionListener
((
textView
,
i
,
keyEvent
)
->
{
mViewBinding
.
etSearch
.
setOnEditorActionListener
((
textView
,
i
,
keyEvent
)
->
{
if
(
i
==
EditorInfo
.
IME_ACTION_SEARCH
&&
!
StringUtils
.
isEmpty
(
textView
.
getText
()))
{
if
(
i
==
EditorInfo
.
IME_ACTION_SEARCH
&&
!
StringUtils
.
isEmpty
(
textView
.
getText
()))
{
KeyboardUtils
.
hideSoftInput
(
textView
);
KeyboardUtils
.
hideSoftInput
(
textView
);
...
@@ -58,12 +59,8 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
...
@@ -58,12 +59,8 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
}
}
return
false
;
return
false
;
});
});
mViewBinding
.
etSearch
.
setOnFocusChangeListener
((
view
,
b
)
->
{
mViewBinding
.
etSearch
.
setOnFocusChangeListener
((
view
,
b
)
->
mPresenter
.
searchBarFocusChanged
(
b
,
C
.
TITLE_MODE
.
SKU
));
mPresenter
.
searchBarFocusChanged
(
b
,
C
.
TITLE_MODE
.
SKU
);
mViewBinding
.
btnMenu
.
setOnClickListener
(
view
->
mPresenter
.
clickSkuMenu
());
});
mViewBinding
.
btnMenu
.
setOnClickListener
(
view
->
{
mPresenter
.
clickSkuMenu
();
});
}
}
@Override
@Override
...
@@ -165,6 +162,13 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
...
@@ -165,6 +162,13 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
this
.
start
(
mPriceFragment
.
setSssku
(
sku
));
this
.
start
(
mPriceFragment
.
setSssku
(
sku
));
}
}
@Override
public
void
showVipFragment
(
Sssku
sku
)
{
this
.
showTitleBarByTitleMode
(
C
.
TITLE_MODE
.
TEXT
);
mViewBinding
.
tvTitle
.
setText
(
R
.
string
.
sku_subtitle_vip
);
this
.
start
(
mVipFragment
.
setSssku
(
sku
));
}
@Override
@Override
public
void
showDetailFragment
(
Sssku
sku
)
{
public
void
showDetailFragment
(
Sssku
sku
)
{
...
...
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuContract.java
View file @
1e4088a1
...
@@ -102,12 +102,19 @@ public interface SsskuContract {
...
@@ -102,12 +102,19 @@ public interface SsskuContract {
void
showEditorFragment
(
Sssku
sku
,
int
editMode
);
void
showEditorFragment
(
Sssku
sku
,
int
editMode
);
/**
/**
* 显示价格页面
* 显示价格
编辑
页面
*
*
* @param sku 要编辑的商品
* @param sku 要编辑的商品
*/
*/
void
showPriceFragment
(
Sssku
sku
);
void
showPriceFragment
(
Sssku
sku
);
/**
* 显示会员编辑页面
*
* @param sku 要编辑的商品
*/
void
showVipFragment
(
Sssku
sku
);
/**
/**
* 显示详情页面
* 显示详情页面
*
*
...
...
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java
View file @
1e4088a1
...
@@ -142,7 +142,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
...
@@ -142,7 +142,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
@Override
@Override
public
void
clickEditVipSku
(
Sssku
sssku
)
{
public
void
clickEditVipSku
(
Sssku
sssku
)
{
//TODO
mView
.
showVipFragment
(
sssku
);
}
}
@Override
@Override
...
...
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/VipFragment.java
0 → 100644
View file @
1e4088a1
package
com
.
xingdata
.
zzdpos
.
ui
.
manage
.
sssku
.
fragment
;
import
android.view.View
;
import
android.widget.EditText
;
import
com.xingdata.zzdpos.C
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseFragment
;
import
com.xingdata.zzdpos.databinding.FragmentSsskuVipBinding
;
import
com.xingdata.zzdpos.model.Sssku
;
import
com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity
;
import
com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter
;
import
com.xingdata.zzdpos.util.ConvertUtil
;
import
com.xingdata.zzdpos.util.InputFilters
;
public
class
VipFragment
extends
BaseFragment
<
SsskuPresenter
,
FragmentSsskuVipBinding
>
{
private
Sssku
mSssku
;
@Override
public
int
getLayoutId
()
{
return
R
.
layout
.
fragment_sssku_vip
;
}
@Override
public
void
initView
()
{
mViewBinding
.
ivPic
.
setImageURI
(
mSssku
.
getSpuImg
());
mViewBinding
.
setSku
(
mSssku
);
this
.
initVipView
();
this
.
setVipViewBySssku
();
mViewBinding
.
btnConfirm
.
setOnClickListener
(
view
->
{
this
.
processSssku
();
mPresenter
.
clickConfirm
(
mSssku
,
C
.
SKU_EDITOR_MODE
.
UPDATE
);
});
}
/**
* 设置商品
*
* @param sssku 商品信息
*/
public
VipFragment
setSssku
(
Sssku
sssku
)
{
this
.
mSssku
=
sssku
;
return
this
;
}
/**
* 初始化价格
*/
private
void
initVipView
()
{
View
.
OnFocusChangeListener
mOnFocusChangeListener
=
(
view
,
b
)
->
{
if
(
view
instanceof
EditText
)
{
EditText
editText
=
(
EditText
)
view
;
if
(
b
&&
editText
.
getText
().
toString
().
equals
(
"0.0"
))
{
editText
.
setText
(
""
);
}
else
if
(!
b
&&
editText
.
getText
().
length
()
==
0
)
{
editText
.
setText
(
"0.0"
);
}
}
};
mViewBinding
.
etPoint
.
setFilters
(
InputFilters
.
getMoneyFilter
(
6
));
mViewBinding
.
etPoint
.
setOnFocusChangeListener
(
mOnFocusChangeListener
);
}
/**
* 根据商品设置价格页面
*/
private
void
setVipViewBySssku
()
{
mViewBinding
.
rgDis
.
check
(
mSssku
.
getSkuOffFlag
()
==
null
||
mSssku
.
getSkuOffFlag
()
==
1
?
R
.
id
.
rb_dis_on
:
R
.
id
.
rb_dis_off
);
if
(
mSssku
.
getSkuBoundAmt
()
==
null
)
mSssku
.
setSkuBoundAmt
(
100L
);
mViewBinding
.
etPoint
.
setText
(
ConvertUtil
.
fenToYuan
(
mSssku
.
getSkuBoundAmt
()));
}
/**
* 处理商品
*/
private
void
processSssku
()
{
mSssku
.
setSkuOffFlag
((
byte
)
(
mViewBinding
.
rbDisOff
.
isChecked
()
?
0
:
1
));
mSssku
.
setSkuBoundAmt
(
ConvertUtil
.
yuanToFen
(
mViewBinding
.
etPoint
.
getText
().
toString
()));
mSssku
.
setCreateTime
(
null
);
mSssku
.
setUpdateTime
(
null
);
}
@Override
public
boolean
onBackPressedSupport
()
{
((
SsskuActivity
)
getActivity
()).
backToDetailFragment
();
return
super
.
onBackPressedSupport
();
}
}
app/src/main/res/layout/dialog_sssku_menu.xml
View file @
1e4088a1
...
@@ -48,8 +48,7 @@
...
@@ -48,8 +48,7 @@
android:layout_height=
"@dimen/all_line_width"
android:layout_height=
"@dimen/all_line_width"
android:layout_marginEnd=
"@dimen/all_margin"
android:layout_marginEnd=
"@dimen/all_margin"
android:layout_marginStart=
"@dimen/all_margin"
android:layout_marginStart=
"@dimen/all_margin"
android:background=
"@color/gray_kongming"
android:background=
"@color/gray_kongming"
/>
android:visibility=
"gone"
/>
<TextView
<TextView
android:id=
"@+id/tv_update_vip"
android:id=
"@+id/tv_update_vip"
...
@@ -59,8 +58,7 @@
...
@@ -59,8 +58,7 @@
android:gravity=
"center"
android:gravity=
"center"
android:text=
"@string/sku_update_vip"
android:text=
"@string/sku_update_vip"
android:textColor=
"@color/blue_mawu"
android:textColor=
"@color/blue_mawu"
android:textSize=
"@dimen/all_text_size"
android:textSize=
"@dimen/all_text_size"
/>
android:visibility=
"gone"
/>
</LinearLayout>
</LinearLayout>
<TextView
<TextView
...
...
app/src/main/res/layout/fragment_sssku_price.xml
View file @
1e4088a1
...
@@ -109,9 +109,8 @@
...
@@ -109,9 +109,8 @@
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"
0dp
"
android:layout_height=
"
wrap_content
"
android:layout_marginTop=
"@dimen/all_spacing"
android:layout_marginTop=
"@dimen/all_spacing"
android:layout_weight=
"1"
android:background=
"@color/white_caocao"
android:background=
"@color/white_caocao"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
...
@@ -192,6 +191,11 @@
...
@@ -192,6 +191,11 @@
android:background=
"@color/gray_huanggai"
/>
android:background=
"@color/gray_huanggai"
/>
</LinearLayout>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
/>
<Button
<Button
android:id=
"@+id/btn_confirm"
android:id=
"@+id/btn_confirm"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
app/src/main/res/layout/fragment_sssku_vip.xml
0 → 100644
View file @
1e4088a1
This diff is collapsed.
Click to expand it.
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