Commit 3f1608b2 authored by jiangjiantao's avatar jiangjiantao

dev

parent 73dc7111
......@@ -7,22 +7,21 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application
android:allowBackup="true"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.MiYaFastCashier">
<activity
android:name=".ui.login.ui.login.LoginActivity">
android:name=".ui.login.LoginActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".MainActivity">
</activity>
<activity android:name=".MainActivity"/>
</application>
</manifest>
\ No newline at end of file
......@@ -27,7 +27,7 @@ interface LoginService {
HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BASIC }
val client = OkHttpClient.Builder()
.addInterceptor(httpLoggingInterceptor)
// .addInterceptor(httpLoggingInterceptor)
.build()
val retrofit = Retrofit.Builder()
......
package com.miya.fastcashier.ui.login.ui.login
package com.miya.fastcashier.ui.login
import android.app.Activity
import androidx.lifecycle.Observer
......@@ -13,6 +13,7 @@ import android.view.View
import android.view.inputmethod.EditorInfo
import android.widget.EditText
import android.widget.Toast
import com.alibaba.fastjson.JSON
import com.miya.fastcashier.R
import com.miya.fastcashier.databinding.ActivityLoginBinding
import com.miya.fastcashier.viewmodel.LoginViewModel
......@@ -40,7 +41,7 @@ class LoginActivity : AppCompatActivity() {
Log.e("######","失败")
return@observe
}
Log.e("######","成功")
Log.e("######",JSON.toJSONString(selfCashierAccountInfo))
}
binding.login.setOnClickListener{
......
......@@ -9,7 +9,7 @@
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context=".ui.login.ui.login.LoginActivity">
tools:context=".ui.login.LoginActivity">
<EditText
android:id="@+id/username"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment