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
79e1b92e
Commit
79e1b92e
authored
Jan 30, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改Activity;
parent
f644bd13
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
25 deletions
+13
-25
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
...va/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
+0
-2
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsActivity.java
.../java/com/xingdata/zzdpos/ui/marketing/ms/MsActivity.java
+0
-3
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
...in/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
+0
-2
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
...main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
+0
-3
app/src/main/res/layout/activity_statistics_detail.xml
app/src/main/res/layout/activity_statistics_detail.xml
+13
-15
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
View file @
79e1b92e
...
@@ -12,7 +12,6 @@ import com.xingdata.zzdpos.model.Cor;
...
@@ -12,7 +12,6 @@ import com.xingdata.zzdpos.model.Cor;
import
com.xingdata.zzdpos.model.Pager
;
import
com.xingdata.zzdpos.model.Pager
;
import
com.xingdata.zzdpos.model.Sskugrp
;
import
com.xingdata.zzdpos.model.Sskugrp
;
import
com.xingdata.zzdpos.model.Sssku
;
import
com.xingdata.zzdpos.model.Sssku
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
import
com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentActivity
;
import
com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentActivity
;
import
com.xingdata.zzdpos.ui.manage.sssku.fragment.AddFragment
;
import
com.xingdata.zzdpos.ui.manage.sssku.fragment.AddFragment
;
import
com.xingdata.zzdpos.ui.manage.sssku.fragment.DetailFragment
;
import
com.xingdata.zzdpos.ui.manage.sssku.fragment.DetailFragment
;
...
@@ -40,7 +39,6 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
...
@@ -40,7 +39,6 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
private
PriceFragment
mPriceFragment
=
new
PriceFragment
();
private
PriceFragment
mPriceFragment
=
new
PriceFragment
();
private
VipFragment
mVipFragment
=
new
VipFragment
();
private
VipFragment
mVipFragment
=
new
VipFragment
();
private
LoadingDialog
mLoadingDialog
=
new
LoadingDialog
();
private
ScanFragment
mScanFragment
=
new
ScanFragment
();
private
ScanFragment
mScanFragment
=
new
ScanFragment
();
@Override
@Override
...
...
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsActivity.java
View file @
79e1b92e
...
@@ -11,7 +11,6 @@ import com.xingdata.zzdpos.base.BaseSku;
...
@@ -11,7 +11,6 @@ import com.xingdata.zzdpos.base.BaseSku;
import
com.xingdata.zzdpos.databinding.ActivityMsBinding
;
import
com.xingdata.zzdpos.databinding.ActivityMsBinding
;
import
com.xingdata.zzdpos.model.Ms
;
import
com.xingdata.zzdpos.model.Ms
;
import
com.xingdata.zzdpos.model.Pager
;
import
com.xingdata.zzdpos.model.Pager
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
import
com.xingdata.zzdpos.ui.marketing.ms.fragment.AddFragment
;
import
com.xingdata.zzdpos.ui.marketing.ms.fragment.AddFragment
;
import
com.xingdata.zzdpos.ui.marketing.ms.fragment.EditorFragment
;
import
com.xingdata.zzdpos.ui.marketing.ms.fragment.EditorFragment
;
import
com.xingdata.zzdpos.ui.marketing.ms.fragment.ManagerFragment
;
import
com.xingdata.zzdpos.ui.marketing.ms.fragment.ManagerFragment
;
...
@@ -34,8 +33,6 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
...
@@ -34,8 +33,6 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
private
SearchFragment
<
Sku
>
mSearchFragment
=
new
SearchFragment
<>();
private
SearchFragment
<
Sku
>
mSearchFragment
=
new
SearchFragment
<>();
private
ScanFragment
mScanFragment
=
new
ScanFragment
<>();
private
ScanFragment
mScanFragment
=
new
ScanFragment
<>();
private
LoadingDialog
mLoadingDialog
=
new
LoadingDialog
();
@Override
@Override
public
int
getLayoutId
()
{
public
int
getLayoutId
()
{
return
R
.
layout
.
activity_ms
;
return
R
.
layout
.
activity_ms
;
...
...
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
View file @
79e1b92e
...
@@ -13,7 +13,6 @@ import com.xingdata.zzdpos.model.Saledetail;
...
@@ -13,7 +13,6 @@ import com.xingdata.zzdpos.model.Saledetail;
import
com.xingdata.zzdpos.model.Saleorder
;
import
com.xingdata.zzdpos.model.Saleorder
;
import
com.xingdata.zzdpos.model.Ticket
;
import
com.xingdata.zzdpos.model.Ticket
;
import
com.xingdata.zzdpos.model.Vip
;
import
com.xingdata.zzdpos.model.Vip
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
import
com.xingdata.zzdpos.ui.main.MainActivity
;
import
com.xingdata.zzdpos.ui.main.MainActivity
;
import
com.xingdata.zzdpos.ui.payment.PaymentActivity
;
import
com.xingdata.zzdpos.ui.payment.PaymentActivity
;
import
com.xingdata.zzdpos.ui.scan.ScanFragment
;
import
com.xingdata.zzdpos.ui.scan.ScanFragment
;
...
@@ -41,7 +40,6 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
...
@@ -41,7 +40,6 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
private
PasswordDialog
mPasswordDialog
=
new
PasswordDialog
();
private
PasswordDialog
mPasswordDialog
=
new
PasswordDialog
();
private
PayResultFragment
mPayResultFragment
=
new
PayResultFragment
();
private
PayResultFragment
mPayResultFragment
=
new
PayResultFragment
();
private
LoadingDialog
mLoadingDialog
=
new
LoadingDialog
();
private
PayingDialog
mPayingDialog
=
new
PayingDialog
();
private
PayingDialog
mPayingDialog
=
new
PayingDialog
();
private
ScanFragment
mScanFragment
=
new
ScanFragment
();
private
ScanFragment
mScanFragment
=
new
ScanFragment
();
...
...
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
View file @
79e1b92e
...
@@ -22,7 +22,6 @@ import com.xingdata.zzdpos.model.Pager;
...
@@ -22,7 +22,6 @@ import com.xingdata.zzdpos.model.Pager;
import
com.xingdata.zzdpos.model.Saledetail
;
import
com.xingdata.zzdpos.model.Saledetail
;
import
com.xingdata.zzdpos.model.Saleorder
;
import
com.xingdata.zzdpos.model.Saleorder
;
import
com.xingdata.zzdpos.model.Sskugrp
;
import
com.xingdata.zzdpos.model.Sskugrp
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
import
com.xingdata.zzdpos.ui.scan.ScanFragment
;
import
com.xingdata.zzdpos.ui.scan.ScanFragment
;
import
com.xingdata.zzdpos.ui.settle.SettleActivity
;
import
com.xingdata.zzdpos.ui.settle.SettleActivity
;
import
com.xingdata.zzdpos.ui.store.dialog.CartDialog
;
import
com.xingdata.zzdpos.ui.store.dialog.CartDialog
;
...
@@ -44,8 +43,6 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
...
@@ -44,8 +43,6 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
private
CartDialog
mCartDialog
=
new
CartDialog
();
private
CartDialog
mCartDialog
=
new
CartDialog
();
private
MsDialog
mMsDialog
=
new
MsDialog
();
private
MsDialog
mMsDialog
=
new
MsDialog
();
private
LoadingDialog
mLoadingDialog
=
new
LoadingDialog
();
@Override
@Override
public
int
getLayoutId
()
{
public
int
getLayoutId
()
{
return
R
.
layout
.
activity_store
;
return
R
.
layout
.
activity_store
;
...
...
app/src/main/res/layout/activity_statistics_detail.xml
View file @
79e1b92e
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:app=
"http://schemas.android.com/apk/res-auto"
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
>
xmlns:tools=
"http://schemas.android.com/tools"
>
<android.support.constraint.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/gray_zhouyu"
android:background=
"@color/gray_zhouyu"
>
>
<include
<include
android:id=
"@+id/ic_title"
android:id=
"@+id/ic_title"
...
@@ -16,7 +15,6 @@
...
@@ -16,7 +15,6 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
<FrameLayout
<FrameLayout
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"0dp"
android:layout_height=
"0dp"
...
@@ -29,25 +27,25 @@
...
@@ -29,25 +27,25 @@
android:id=
"@+id/view_order_detail"
android:id=
"@+id/view_order_detail"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout=
"@layout/view_order_detail"
/>
android:layout=
"@layout/view_order_detail"
/>
<ViewStub
<ViewStub
android:id=
"@+id/view_vip_recharge"
android:id=
"@+id/view_vip_recharge"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout=
"@layout/view_vip_recharge"
/>
android:layout=
"@layout/view_vip_recharge"
/>
<ViewStub
<ViewStub
android:id=
"@+id/view_ticket"
android:id=
"@+id/view_ticket"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout=
"@layout/view_ticket"
/>
android:layout=
"@layout/view_ticket"
/>
<ViewStub
<ViewStub
android:id=
"@+id/view_cs"
android:id=
"@+id/view_cs"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout=
"@layout/view_inventory_detail"
/>
android:layout=
"@layout/view_inventory_detail"
/>
</FrameLayout>
</FrameLayout>
<android.support.constraint.ConstraintLayout
<android.support.constraint.ConstraintLayout
...
@@ -74,7 +72,7 @@
...
@@ -74,7 +72,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toLeftOf=
"@id/btn_return"
app:layout_constraintRight_toLeftOf=
"@id/btn_return"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
tools:targetApi=
"lollipop"
/>
tools:targetApi=
"lollipop"
/>
<Button
<Button
android:id=
"@+id/btn_return"
android:id=
"@+id/btn_return"
...
@@ -90,13 +88,13 @@
...
@@ -90,13 +88,13 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_goneMarginStart=
"@dimen/all_margin_big_big"
app:layout_goneMarginStart=
"@dimen/all_margin_big_big"
tools:targetApi=
"lollipop"
/>
tools:targetApi=
"lollipop"
/>
<View
<View
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/view_line_L050"
android:layout_height=
"@dimen/view_line_L050"
android:background=
"@color/gray_huanggai"
android:background=
"@color/gray_huanggai"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>
</layout>
</layout>
\ No newline at end of file
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