Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
huangzhicong
/
SmartCanteen
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
68c483f5
authored
Aug 03, 2019
by
patpat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改QRCodeEvent位置
parent
b88d7729
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
+3
-6
app/src/main/java/com/bgycc/smartcanteen/activity/MainActivity.kt
+1
-2
app/src/main/java/com/bgycc/smartcanteen/event/QRCodeEvent.java
+1
-1
app/src/main/java/com/bgycc/smartcanteen/task/QRCodeTask.java
+1
-3
No files found.
app/src/main/java/com/bgycc/smartcanteen/activity/MainActivity.kt
View file @
68c483f5
...
...
@@ -10,7 +10,7 @@ import android.view.animation.Animation
import
android.view.animation.RotateAnimation
import
com.bgycc.smartcanteen.App
import
com.bgycc.smartcanteen.AppConfig
import
com.bgycc.smartcanteen.QRCodeEvent
import
com.bgycc.smartcanteen.
event.
QRCodeEvent
import
com.bgycc.smartcanteen.R
import
com.bgycc.smartcanteen.event.LogEvent
import
com.bgycc.smartcanteen.event.PayStateEvent
...
...
@@ -30,7 +30,6 @@ import java.text.SimpleDateFormat
import
java.util.*
import
kotlinx.android.synthetic.main.activity_main.*
import
java.lang.Exception
import
java.text.DateFormat
import
java.util.concurrent.Executors
import
java.util.concurrent.ScheduledExecutorService
import
java.util.concurrent.TimeUnit
...
...
app/src/main/java/com/bgycc/smartcanteen/QRCodeEvent.java
→
app/src/main/java/com/bgycc/smartcanteen/
event/
QRCodeEvent.java
View file @
68c483f5
package
com
.
bgycc
.
smartcanteen
;
package
com
.
bgycc
.
smartcanteen
.
event
;
public
class
QRCodeEvent
{
public
byte
[]
data
;
...
...
app/src/main/java/com/bgycc/smartcanteen/task/QRCodeTask.java
View file @
68c483f5
package
com
.
bgycc
.
smartcanteen
.
task
;
import
android.util.Log
;
import
com.bgycc.smartcanteen.QRCodeEvent
;
import
com.bgycc.smartcanteen.event.QRCodeEvent
;
import
com.bgycc.smartcanteen.action.*
;
import
com.bgycc.smartcanteen.event.LogEvent
;
import
com.bgycc.smartcanteen.helper.TimerHelper
;
import
com.bgycc.smartcanteen.server.websocket.MainWebSocket
;
import
com.szxb.jni.libszxb
;
import
kotlin.jvm.functions.Function1
;
import
kotlin.jvm.functions.Function2
;
import
org.greenrobot.eventbus.EventBus
;
import
org.json.JSONObject
;
...
...
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