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
1a1592bb
Commit
1a1592bb
authored
Jan 17, 2018
by
王海
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 N多UI
parent
b960f2c5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
24 deletions
+7
-24
app/src/main/java/com/xingdata/zzdpos/App.java
app/src/main/java/com/xingdata/zzdpos/App.java
+2
-2
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
...main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
+4
-8
app/src/main/res/layout/dialog_integral_exchange_setting.xml
app/src/main/res/layout/dialog_integral_exchange_setting.xml
+1
-1
app/src/main/res/layout/dialog_integral_get_setting.xml
app/src/main/res/layout/dialog_integral_get_setting.xml
+0
-13
No files found.
app/src/main/java/com/xingdata/zzdpos/App.java
View file @
1a1592bb
...
@@ -70,7 +70,7 @@ public class App extends Application {
...
@@ -70,7 +70,7 @@ public class App extends Application {
.
start
();
.
start
();
// 初始化异常处理
// 初始化异常处理
//
initEx();
initEx
();
//初始化Fragment框架
//初始化Fragment框架
initFragment
();
initFragment
();
...
@@ -118,7 +118,7 @@ public class App extends Application {
...
@@ -118,7 +118,7 @@ public class App extends Application {
*/
*/
private
void
initFragment
()
{
private
void
initFragment
()
{
Fragmentation
.
builder
().
stackViewMode
(
Fragmentation
.
BUBBLE
)
.
debug
(
BuildConfig
.
DEBUG
)
Fragmentation
.
builder
().
stackViewMode
(
Fragmentation
.
BUBBLE
)
.
handleException
(
e
->
{
.
handleException
(
e
->
{
}).
install
();
}).
install
();
}
}
...
...
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
View file @
1a1592bb
...
@@ -8,11 +8,6 @@ import com.blankj.utilcode.util.KeyboardUtils;
...
@@ -8,11 +8,6 @@ import com.blankj.utilcode.util.KeyboardUtils;
import
com.blankj.utilcode.util.LogUtils
;
import
com.blankj.utilcode.util.LogUtils
;
import
com.blankj.utilcode.util.SPUtils
;
import
com.blankj.utilcode.util.SPUtils
;
import
com.blankj.utilcode.util.ToastUtils
;
import
com.blankj.utilcode.util.ToastUtils
;
import
java.util.ArrayList
;
import
java.util.List
;
import
com.xingdata.zzdpos.ui.main.MainActivity
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseActivity
;
import
com.xingdata.zzdpos.base.BaseActivity
;
import
com.xingdata.zzdpos.databinding.ActivityLoginBinding
;
import
com.xingdata.zzdpos.databinding.ActivityLoginBinding
;
...
@@ -22,12 +17,13 @@ import com.xingdata.zzdpos.ui.login.fragment.SignInFragment;
...
@@ -22,12 +17,13 @@ import com.xingdata.zzdpos.ui.login.fragment.SignInFragment;
import
com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean
;
import
com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean
;
import
com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean
;
import
com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean
;
import
com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean
;
import
com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean
;
import
com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity
;
import
com.xingdata.zzdpos.ui.main.MainActivity
;
import
com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity
;
import
com.xingdata.zzdpos.ui.payment.PaymentActivity
;
import
com.xingdata.zzdpos.ui.splash.SplashActivity
;
import
com.xingdata.zzdpos.ui.splash.SplashActivity
;
import
com.xingdata.zzdpos.view.PopupWindowDownList
;
import
com.xingdata.zzdpos.view.PopupWindowDownList
;
import
java.util.ArrayList
;
import
java.util.List
;
public
class
LoginActivity
extends
BaseActivity
<
LoginPresenter
,
ActivityLoginBinding
>
implements
public
class
LoginActivity
extends
BaseActivity
<
LoginPresenter
,
ActivityLoginBinding
>
implements
LoginContract
.
View
{
LoginContract
.
View
{
private
long
mExitTime
;
private
long
mExitTime
;
...
...
app/src/main/res/layout/dialog_integral_exchange_setting.xml
View file @
1a1592bb
...
@@ -146,7 +146,7 @@
...
@@ -146,7 +146,7 @@
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"2"
android:layout_weight=
"2"
android:text=
" 个积分
等于
1元"
android:text=
" 个积分
=
1元"
android:textColor=
"@color/black_baozheng"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/et_textsize"
/>
android:textSize=
"@dimen/et_textsize"
/>
</LinearLayout>
</LinearLayout>
...
...
app/src/main/res/layout/dialog_integral_get_setting.xml
View file @
1a1592bb
...
@@ -235,13 +235,6 @@
...
@@ -235,13 +235,6 @@
</LinearLayout>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding"
android:background=
"@color/gray1"
android:visibility=
"gone"
></View>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -327,12 +320,6 @@
...
@@ -327,12 +320,6 @@
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
</LinearLayout>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding"
android:background=
"@color/gray1"
></View>
<LinearLayout
<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