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
1688455d
Commit
1688455d
authored
Jan 22, 2018
by
陈前
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
升级
parent
0d38de7d
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
61 additions
and
1372 deletions
+61
-1372
app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
...c/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
+25
-16
app/src/main/java/com/xingdata/zzdpos/ui/main/MainContract.java
...c/main/java/com/xingdata/zzdpos/ui/main/MainContract.java
+10
-505
app/src/main/java/com/xingdata/zzdpos/ui/main/MainPresenter.java
.../main/java/com/xingdata/zzdpos/ui/main/MainPresenter.java
+25
-850
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/MyselfFragment.java
.../com/xingdata/zzdpos/ui/main/fragment/MyselfFragment.java
+1
-1
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
View file @
1688455d
...
@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.main.dialog.HandoverDialog;
...
@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.main.dialog.HandoverDialog;
import
com.xingdata.zzdpos.ui.main.fragment.CasherFragment
;
import
com.xingdata.zzdpos.ui.main.fragment.CasherFragment
;
import
com.xingdata.zzdpos.ui.main.fragment.MyselfFragment
;
import
com.xingdata.zzdpos.ui.main.fragment.MyselfFragment
;
import
com.xingdata.zzdpos.ui.main.fragment.ServiceFragment
;
import
com.xingdata.zzdpos.ui.main.fragment.ServiceFragment
;
import
com.xingdata.zzdpos.ui.splash.dialog.UpgradeDialog
;
import
com.xingdata.zzdpos.util.Global
;
import
com.xingdata.zzdpos.util.Global
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
@@ -39,6 +40,7 @@ import io.reactivex.schedulers.Schedulers;
...
@@ -39,6 +40,7 @@ import io.reactivex.schedulers.Schedulers;
public
class
MainActivity
extends
BaseActivity
<
MainPresenter
,
ActivityMainBinding
>
implements
public
class
MainActivity
extends
BaseActivity
<
MainPresenter
,
ActivityMainBinding
>
implements
MainContract
.
View
{
MainContract
.
View
{
public
static
MainActivity
mainActivity
;
public
static
MainActivity
mainActivity
;
UpgradeDialog
upgradeDialog
=
new
UpgradeDialog
();
private
long
mExitTime
;
private
long
mExitTime
;
private
int
[]
titleInts
=
{
R
.
string
.
menu_cashier
,
R
.
string
.
menu_service
,
R
.
string
.
menu_myself
};
private
int
[]
titleInts
=
{
R
.
string
.
menu_cashier
,
R
.
string
.
menu_service
,
R
.
string
.
menu_myself
};
private
int
[]
iconList
=
{
R
.
mipmap
.
icon_menu_cashier_1
,
R
.
mipmap
.
icon_menu_service_0
,
R
private
int
[]
iconList
=
{
R
.
mipmap
.
icon_menu_cashier_1
,
R
.
mipmap
.
icon_menu_service_0
,
R
...
@@ -83,26 +85,26 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
...
@@ -83,26 +85,26 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
}
}).
subscribeOn
(
Schedulers
.
newThread
()).
observeOn
(
AndroidSchedulers
.
mainThread
())
}).
subscribeOn
(
Schedulers
.
newThread
()).
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
(
new
Consumer
<
View
>()
{
.
subscribe
(
new
Consumer
<
View
>()
{
int
i
=
0
;
int
i
=
0
;
@Override
@Override
public
void
accept
(
View
view
)
throws
Exception
{
public
void
accept
(
View
view
)
throws
Exception
{
ItemMenuBottomBinding
itemMenuBottomBinding
=
DataBindingUtil
.
bind
(
view
);
ItemMenuBottomBinding
itemMenuBottomBinding
=
DataBindingUtil
.
bind
(
view
);
itemMenuBottomBinding
.
text
.
setText
(
titleInts
[
i
]);
itemMenuBottomBinding
.
text
.
setText
(
titleInts
[
i
]);
if
(
i
==
0
)
{
if
(
i
==
0
)
{
itemMenuBottomBinding
.
text
.
setTextColor
(
getResources
().
getColor
(
R
.
color
itemMenuBottomBinding
.
text
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
red_guanyu
));
.
red_guanyu
));
}
}
itemMenuBottomBinding
.
img
.
setImageResource
(
iconList
[
i
]);
itemMenuBottomBinding
.
img
.
setImageResource
(
iconList
[
i
]);
itemMenuBottomBindings
.
add
(
itemMenuBottomBinding
);
itemMenuBottomBindings
.
add
(
itemMenuBottomBinding
);
itemMenuBottomBinding
.
getRoot
().
setMinimumHeight
(
200
);
itemMenuBottomBinding
.
getRoot
().
setMinimumHeight
(
200
);
mViewBinding
.
tabLayout
.
getTabAt
(
i
).
setCustomView
(
view
);
mViewBinding
.
tabLayout
.
getTabAt
(
i
).
setCustomView
(
view
);
i
++;
i
++;
}
}
});
});
mViewBinding
.
tabLayout
.
addOnTabSelectedListener
(
new
TabLayout
.
OnTabSelectedListener
()
{
mViewBinding
.
tabLayout
.
addOnTabSelectedListener
(
new
TabLayout
.
OnTabSelectedListener
()
{
...
@@ -200,4 +202,11 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
...
@@ -200,4 +202,11 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
return
super
.
dispatchTouchEvent
(
ev
);
return
super
.
dispatchTouchEvent
(
ev
);
}
}
@Override
public
void
showUptateDialog
(
String
updateUrl
,
String
version
)
{
upgradeDialog
.
setupdateData
(
updateUrl
,
version
);
upgradeDialog
.
show
(
this
);
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/MainContract.java
View file @
1688455d
This diff is collapsed.
Click to expand it.
app/src/main/java/com/xingdata/zzdpos/ui/main/MainPresenter.java
View file @
1688455d
This diff is collapsed.
Click to expand it.
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/MyselfFragment.java
View file @
1688455d
...
@@ -61,7 +61,7 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
...
@@ -61,7 +61,7 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
ActivityUtils
.
startActivity
(
getActivity
(),
FeedBackActivity
.
class
);
ActivityUtils
.
startActivity
(
getActivity
(),
FeedBackActivity
.
class
);
break
;
break
;
case
C
.
MENU
.
MENU_UPDATE
:
//升级
case
C
.
MENU
.
MENU_UPDATE
:
//升级
ToastUtils
.
showShort
(
"已经是最新版本"
);
mPresenter
.
checkUpdate
(
);
break
;
break
;
case
C
.
MENU
.
MENU_HELP
:
//帮助
case
C
.
MENU
.
MENU_HELP
:
//帮助
...
...
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