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
20d929c3
Commit
20d929c3
authored
Jan 26, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
营销计划空页面;
parent
dbc7d680
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
7 deletions
+22
-7
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/ManagerFragment.java
...data/zzdpos/ui/marketing/ms/fragment/ManagerFragment.java
+9
-0
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
...n/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
+2
-6
app/src/main/res/layout/view_type_gift.xml
app/src/main/res/layout/view_type_gift.xml
+9
-0
app/src/main/res/values/strings.xml
app/src/main/res/values/strings.xml
+2
-1
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/ManagerFragment.java
View file @
20d929c3
package
com
.
xingdata
.
zzdpos
.
ui
.
marketing
.
ms
.
fragment
;
package
com
.
xingdata
.
zzdpos
.
ui
.
marketing
.
ms
.
fragment
;
import
android.annotation.SuppressLint
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.view.View
;
import
android.widget.TextView
;
import
com.xingdata.zzdpos.C
;
import
com.xingdata.zzdpos.C
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.R
;
...
@@ -40,6 +43,12 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
...
@@ -40,6 +43,12 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
// set other
// set other
mViewBinding
.
llAdd
.
setOnClickListener
(
view
->
mPresenter
.
clickAdd
());
mViewBinding
.
llAdd
.
setOnClickListener
(
view
->
mPresenter
.
clickAdd
());
// set empty
@SuppressLint
(
"InflateParams"
)
View
emptyView
=
getLayoutInflater
().
inflate
(
R
.
layout
.
view_empty
,
null
);
((
TextView
)
emptyView
.
findViewById
(
R
.
id
.
tv_empty
)).
setText
(
R
.
string
.
ms_empty_hint
);
mMsAdapter
.
setEmptyView
(
emptyView
);
mMsAdapter
.
isUseEmpty
(
false
);
// init data
// init data
refreshMs
();
refreshMs
();
}
}
...
...
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @
20d929c3
...
@@ -155,9 +155,7 @@ public class SettlePresenter extends SettleContract.Presenter {
...
@@ -155,9 +155,7 @@ public class SettlePresenter extends SettleContract.Presenter {
vips
.
add
(
vip
);
vips
.
add
(
vip
);
mView
.
loadVips
(
vips
);
mView
.
loadVips
(
vips
);
},
},
throwable
->
{
throwable
->
mView
.
loadVips
(
new
ArrayList
<>()));
mView
.
loadVips
(
new
ArrayList
<>());
});
}
}
@Override
@Override
...
@@ -319,9 +317,7 @@ public class SettlePresenter extends SettleContract.Presenter {
...
@@ -319,9 +317,7 @@ public class SettlePresenter extends SettleContract.Presenter {
break
;
break
;
}
}
},
},
throwable
->
{
throwable
->
mView
.
showPayFailFragment
(
throwable
,
mSaleorder
));
mView
.
showPayFailFragment
(
throwable
,
mSaleorder
);
});
}
}
@Override
@Override
...
...
app/src/main/res/layout/view_type_gift.xml
View file @
20d929c3
...
@@ -122,12 +122,21 @@
...
@@ -122,12 +122,21 @@
android:layout_marginStart=
"@dimen/all_margin"
android:layout_marginStart=
"@dimen/all_margin"
android:layout_marginTop=
"@dimen/all_margin"
>
android:layout_marginTop=
"@dimen/all_margin"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:text=
"@string/ms_editor_type_gift_text5"
android:textColor=
"@color/black"
android:textSize=
"@dimen/big_text_size"
/>
<EditText
<EditText
android:id=
"@+id/et_search"
android:id=
"@+id/et_search"
style=
"@style/searchBarEditor"
style=
"@style/searchBarEditor"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginEnd=
"@dimen/all_spacing"
android:layout_marginEnd=
"@dimen/all_spacing"
android:layout_marginStart=
"@dimen/all_spacing"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:hint=
"@string/ms_editor_type_gift_search_hint"
android:hint=
"@string/ms_editor_type_gift_search_hint"
android:inputType=
"text"
android:inputType=
"text"
...
...
app/src/main/res/values/strings.xml
View file @
20d929c3
...
@@ -329,7 +329,7 @@
...
@@ -329,7 +329,7 @@
<string
name=
"ms_user_hint"
>
营销计划功能限时免费使用 1 个月
</string>
<string
name=
"ms_user_hint"
>
营销计划功能限时免费使用 1 个月
</string>
<string
name=
"ms_count"
>
共%s个营销计划
</string>
<string
name=
"ms_count"
>
共%s个营销计划
</string>
<string
name=
"ms_search_hint"
>
请输入活动名称
</string>
<string
name=
"ms_search_hint"
>
请输入活动名称
</string>
<string
name=
"ms_empty_hint"
>
没有
搜到此计划\n请重新搜索,或点击添加按钮进行添加
~
</string>
<string
name=
"ms_empty_hint"
>
没有
找到营销计划
~
</string>
<string
name=
"ms_editor_title"
>
管理-营销计划
</string>
<string
name=
"ms_editor_title"
>
管理-营销计划
</string>
<string
name=
"ms_editor_setting"
>
设置营销计划
</string>
<string
name=
"ms_editor_setting"
>
设置营销计划
</string>
<string
name=
"ms_editor_subtitle_info"
>
基本信息
</string>
<string
name=
"ms_editor_subtitle_info"
>
基本信息
</string>
...
@@ -369,6 +369,7 @@
...
@@ -369,6 +369,7 @@
<string
name=
"ms_editor_type_gift_text2"
>
元
</string>
<string
name=
"ms_editor_type_gift_text2"
>
元
</string>
<string
name=
"ms_editor_type_gift_text3"
>
加
</string>
<string
name=
"ms_editor_type_gift_text3"
>
加
</string>
<string
name=
"ms_editor_type_gift_text4"
>
1件
</string>
<string
name=
"ms_editor_type_gift_text4"
>
1件
</string>
<string
name=
"ms_editor_type_gift_text5"
>
换购
</string>
<string
name=
"ms_editor_type_gift_hint"
>
条码:请扫码或输入条码
</string>
<string
name=
"ms_editor_type_gift_hint"
>
条码:请扫码或输入条码
</string>
<string
name=
"ms_editor_type_gift_name"
>
品名:
</string>
<string
name=
"ms_editor_type_gift_name"
>
品名:
</string>
<string
name=
"ms_editor_type_gift_price"
>
售价:
</string>
<string
name=
"ms_editor_type_gift_price"
>
售价:
</string>
...
...
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