接口联调2

app/src/main/java/com/shuwei/intelligent/shelves/App.kt

@@ -8,10 +8,12 @@ import android.app.Application
  */
 class App : Application() {
 
-    //暂时固定，后续从接口获取
-    var accessToken: String = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjYW50ZWVuSWQiOiIiLCJ0eXBlIjoiNiIsInVzZXJJZCI6IjE2NzgyMjY1NTI5MzE1NDkxODYifQ.CQmbELpqT6QzvVCgCeirwvSvPp8Mhft_h6b1Af574Co"
+    //从接口获取
+    var accessToken: String = ""
+        //"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjYW50ZWVuSWQiOiIiLCJ0eXBlIjoiNiIsInVzZXJJZCI6IjE2NzgyMjY1NTI5MzE1NDkxODYifQ.CQmbELpqT6QzvVCgCeirwvSvPp8Mhft_h6b1Af574Co"
 
-    var androidId:String = ""
+    var deviceId:String = ""
+    var canteenId:String = ""
 
     override fun onCreate() {
         super.onCreate()
@@ -21,7 +23,7 @@ class App : Application() {
     companion object {
         private lateinit var app: App
 
-        fun get(): App {
+        fun getInstance(): App {
             return app
         }
     }