Browse Source

Add Reconnect button

connman
Aditya Kulkarni 5 years ago
parent
commit
dc99d1b007
  1. 18
      app/src/main/java/com/adityapk/zcash/zqwandroid/MainActivity.kt
  2. 18
      app/src/main/res/layout/content_main.xml

18
app/src/main/java/com/adityapk/zcash/zqwandroid/MainActivity.kt

@ -7,6 +7,7 @@ import android.net.Uri
import android.os.Bundle
import android.os.Handler
import android.support.constraint.ConstraintLayout
import android.support.design.widget.Snackbar
import android.support.v7.app.AppCompatActivity
import android.util.Log
import android.view.Menu
@ -19,6 +20,7 @@ import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.content_main.*
import okhttp3.*
import okio.ByteString
import java.net.ConnectException
import java.text.DecimalFormat
@ -46,7 +48,15 @@ class MainActivity : AppCompatActivity(), TransactionItemFragment.OnFragmentInte
startActivityForResult(intent, QrReaderActivity.REQUEST_CONNDATA)
}
btnReconnect.setOnClickListener {
makeConnection()
DataModel.makeAPICalls()
}
swiperefresh.setOnRefreshListener {
if (connStatus == ConnectionStatus.DISCONNECTED) {
makeConnection()
}
makeAPICalls()
}
@ -286,12 +296,11 @@ class MainActivity : AppCompatActivity(), TransactionItemFragment.OnFragmentInte
private fun disconnected() {
Log.i(TAG, "Disconnected")
connStatus = ConnectionStatus.DISCONNECTED
DataModel.clear()
updateUI(true)
}
private inner class EchoWebSocketListener : WebSocketListener() {
override fun onOpen(webSocket: WebSocket, response: Response) {
@ -311,12 +320,17 @@ class MainActivity : AppCompatActivity(), TransactionItemFragment.OnFragmentInte
override fun onClosing(webSocket: WebSocket, code: Int, reason: String?) {
webSocket.close(1000, null)
connStatus = ConnectionStatus.DISCONNECTED
Log.i(TAG,"Closing : $code / $reason")
disconnected()
}
override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
Log.e(TAG,"Failed $t")
connStatus = ConnectionStatus.DISCONNECTED
if (t is ConnectException) {
Snackbar.make(layoutConnect, t.localizedMessage, Snackbar.LENGTH_SHORT).show()
}
disconnected()
}
}

18
app/src/main/res/layout/content_main.xml

@ -103,7 +103,7 @@
android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="0.35000002"/>
app:layout_constraintVertical_bias="0.22000003"/>
<Button
android:text="Scan QR Code"
android:layout_width="wrap_content"
@ -113,6 +113,22 @@
android:layout_marginEnd="8dp"
android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/imageView5"/>
<TextView
android:text="OR"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/textView3" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/btnConnect" app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="8dp" android:textAlignment="center"/>
<Button
android:text="Reconnect"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btnReconnect" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/textView3" app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="8dp"/>
</android.support.constraint.ConstraintLayout>
<android.support.design.widget.BottomNavigationView
android:layout_width="match_parent"

Loading…
Cancel
Save