Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MiYaFastCashier
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jiangjiantao
MiYaFastCashier
Commits
3f1608b2
Commit
3f1608b2
authored
Jan 12, 2022
by
jiangjiantao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dev
parent
73dc7111
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
mobile-pay-1.72.jar
app/libs/mobile-pay-1.72.jar
+0
-0
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+4
-5
LoginService.kt
...rc/main/java/com/miya/fastcashier/service/LoginService.kt
+1
-1
LoginActivity.kt
.../main/java/com/miya/fastcashier/ui/login/LoginActivity.kt
+3
-2
activity_login.xml
app/src/main/res/layout/activity_login.xml
+1
-1
No files found.
app/libs/mobile-pay-1.72.jar
deleted
100644 → 0
View file @
73dc7111
File deleted
app/src/main/AndroidManifest.xml
View file @
3f1608b2
...
@@ -7,22 +7,21 @@
...
@@ -7,22 +7,21 @@
<uses-permission
android:name=
"android.permission.READ_EXTERNAL_STORAGE"
/>
<uses-permission
android:name=
"android.permission.READ_EXTERNAL_STORAGE"
/>
<application
<application
android:allowBackup=
"
tru
e"
android:allowBackup=
"
fals
e"
android:icon=
"@mipmap/ic_launcher"
android:icon=
"@mipmap/ic_launcher"
android:label=
"@string/app_name"
android:label=
"@string/app_name"
android:roundIcon=
"@mipmap/ic_launcher_round"
android:roundIcon=
"@mipmap/ic_launcher_round"
android:supportsRtl=
"true"
android:supportsRtl=
"true"
android:theme=
"@style/Theme.MiYaFastCashier"
>
android:theme=
"@style/Theme.MiYaFastCashier"
>
<activity
<activity
android:name=
".ui.login.ui.login.LoginActivity"
>
android:name=
".ui.login.LoginActivity"
android:exported=
"true"
>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
</intent-filter>
</intent-filter>
</activity>
</activity>
<activity
android:name=
".MainActivity"
>
<activity
android:name=
".MainActivity"
/>
</activity>
</application>
</application>
</manifest>
</manifest>
\ No newline at end of file
app/src/main/java/com/miya/fastcashier/service/LoginService.kt
View file @
3f1608b2
...
@@ -27,7 +27,7 @@ interface LoginService {
...
@@ -27,7 +27,7 @@ interface LoginService {
HttpLoggingInterceptor
().
apply
{
level
=
HttpLoggingInterceptor
.
Level
.
BASIC
}
HttpLoggingInterceptor
().
apply
{
level
=
HttpLoggingInterceptor
.
Level
.
BASIC
}
val
client
=
OkHttpClient
.
Builder
()
val
client
=
OkHttpClient
.
Builder
()
.
addInterceptor
(
httpLoggingInterceptor
)
//
.addInterceptor(httpLoggingInterceptor)
.
build
()
.
build
()
val
retrofit
=
Retrofit
.
Builder
()
val
retrofit
=
Retrofit
.
Builder
()
...
...
app/src/main/java/com/miya/fastcashier/ui/login/LoginActivity.kt
View file @
3f1608b2
package
com.miya.fastcashier.ui.login
.ui.login
package
com.miya.fastcashier.ui.login
import
android.app.Activity
import
android.app.Activity
import
androidx.lifecycle.Observer
import
androidx.lifecycle.Observer
...
@@ -13,6 +13,7 @@ import android.view.View
...
@@ -13,6 +13,7 @@ import android.view.View
import
android.view.inputmethod.EditorInfo
import
android.view.inputmethod.EditorInfo
import
android.widget.EditText
import
android.widget.EditText
import
android.widget.Toast
import
android.widget.Toast
import
com.alibaba.fastjson.JSON
import
com.miya.fastcashier.R
import
com.miya.fastcashier.R
import
com.miya.fastcashier.databinding.ActivityLoginBinding
import
com.miya.fastcashier.databinding.ActivityLoginBinding
import
com.miya.fastcashier.viewmodel.LoginViewModel
import
com.miya.fastcashier.viewmodel.LoginViewModel
...
@@ -40,7 +41,7 @@ class LoginActivity : AppCompatActivity() {
...
@@ -40,7 +41,7 @@ class LoginActivity : AppCompatActivity() {
Log
.
e
(
"######"
,
"失败"
)
Log
.
e
(
"######"
,
"失败"
)
return
@observe
return
@observe
}
}
Log
.
e
(
"######"
,
"成功"
)
Log
.
e
(
"######"
,
JSON
.
toJSONString
(
selfCashierAccountInfo
)
)
}
}
binding
.
login
.
setOnClickListener
{
binding
.
login
.
setOnClickListener
{
...
...
app/src/main/res/layout/activity_login.xml
View file @
3f1608b2
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
android:paddingTop=
"@dimen/activity_vertical_margin"
android:paddingTop=
"@dimen/activity_vertical_margin"
android:paddingRight=
"@dimen/activity_horizontal_margin"
android:paddingRight=
"@dimen/activity_horizontal_margin"
android:paddingBottom=
"@dimen/activity_vertical_margin"
android:paddingBottom=
"@dimen/activity_vertical_margin"
tools:context=
".ui.login.
ui.login.
LoginActivity"
>
tools:context=
".ui.login.LoginActivity"
>
<EditText
<EditText
android:id=
"@+id/username"
android:id=
"@+id/username"
...
...
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