From 428a50574029a912992ee4bb982c61641e393c27 Mon Sep 17 00:00:00 2001
From: Zhengyu Peng <rookiepeng@users.noreply.github.com>
Date: Mon, 14 Feb 2022 19:58:41 -0500
Subject: [PATCH] update

---
 .../android/app/src/main/AndroidManifest.xml  |  2 +-
 .../com/rookiedev/hexapod/ControlActivity.kt  | 28 ++++++++-----------
 .../com/rookiedev/hexapod/MainActivity.kt     |  4 ++-
 .../app/src/main/res/layout/activity_main.xml |  6 ++--
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/software/android/app/src/main/AndroidManifest.xml b/software/android/app/src/main/AndroidManifest.xml
index 4d3cdfc..f0af214 100644
--- a/software/android/app/src/main/AndroidManifest.xml
+++ b/software/android/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
             android:name=".ControlActivity"
             android:exported="false"
             android:theme="@style/Theme.HexapodFullScreen"
-            android:screenOrientation="landscape"
+            android:screenOrientation="sensorLandscape"
             android:configChanges="orientation|keyboardHidden"/>
         <activity
             android:name=".MainActivity"
diff --git a/software/android/app/src/main/java/com/rookiedev/hexapod/ControlActivity.kt b/software/android/app/src/main/java/com/rookiedev/hexapod/ControlActivity.kt
index 647894a..7b09286 100644
--- a/software/android/app/src/main/java/com/rookiedev/hexapod/ControlActivity.kt
+++ b/software/android/app/src/main/java/com/rookiedev/hexapod/ControlActivity.kt
@@ -1,20 +1,18 @@
 package com.rookiedev.hexapod
 
 import android.annotation.SuppressLint
-import android.content.res.Resources
 import android.os.Bundle
-import android.util.TypedValue
 import android.view.*
 import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import com.rookiedev.hexapod.network.TCPClient
 import com.rookiedev.hexapod.network.TCPClient.OnConnectEstablished
 import com.rookiedev.hexapod.network.TCPClient.OnMessageReceived
+import kotlinx.coroutines.*
 import kotlin.math.PI
 import kotlin.math.atan2
 import kotlin.math.pow
 import kotlin.math.sqrt
-import kotlinx.coroutines.*
 
 
 /**
@@ -71,32 +69,28 @@ class ControlActivity : AppCompatActivity() {
     private var radius = 0f
 
     private var tcpClient: TCPClient? = null
+    private var ip:String = ""
+    private var port = 0
 
     private val scope = CoroutineScope(Job() + Dispatchers.IO)
 
     private var currentState: String = "standby"
 
-//    private val lock = ReentrantLock()
-//    private val waitLock = lock.newCondition()
-
 
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_control)
 
+        val myIntent = intent // gets the previously created intent
+
+        ip = myIntent.getStringExtra("ip").toString()
+        port = myIntent.getStringExtra("port").toString().toInt()
+
         controlWindowInsets(true)
 
         val controlCircle = findViewById<ImageView>(R.id.control_image)
 
-        val dip = 32f
-        val r: Resources = resources
-        this.pxMargin = TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            dip,
-            r.displayMetrics
-        )
-
         val vto: ViewTreeObserver = controlCircle.viewTreeObserver
         vto.addOnPreDrawListener(object : ViewTreeObserver.OnPreDrawListener {
             override fun onPreDraw(): Boolean {
@@ -132,7 +126,7 @@ class ControlActivity : AppCompatActivity() {
                             currentState = "standby"
                         }
                     } else if (length >= radius / 3 && length < 2 * radius / 3) {
-                        var angle = atan2(coorY, coorX)
+                        val angle = atan2(coorY, coorX)
                         if (angle > -PI / 4 && angle <= PI / 4) {
                             if (currentState != "shiftright") {
                                 println("Move right")
@@ -159,7 +153,7 @@ class ControlActivity : AppCompatActivity() {
                             }
                         }
                     } else if (length >= 2 * radius / 3 && length < radius) {
-                        var angle = atan2(coorY, coorX)
+                        val angle = atan2(coorY, coorX)
                         if (angle > -PI / 4 && angle <= PI / 4) {
                             if (currentState != "rightturn") {
                                 println("Turn right")
@@ -190,7 +184,7 @@ class ControlActivity : AppCompatActivity() {
                 }
             }
         )
-        this.tcpClient = TCPClient(this, "192.168.1.202", 1234, object : OnMessageReceived {
+        this.tcpClient = TCPClient(this, ip, port, object : OnMessageReceived {
             override fun messageReceived(message: String?) {
                 if (message == null) {
 //                    alertDialog(DISCONNECTED)
diff --git a/software/android/app/src/main/java/com/rookiedev/hexapod/MainActivity.kt b/software/android/app/src/main/java/com/rookiedev/hexapod/MainActivity.kt
index 6d5a74e..15b2356 100644
--- a/software/android/app/src/main/java/com/rookiedev/hexapod/MainActivity.kt
+++ b/software/android/app/src/main/java/com/rookiedev/hexapod/MainActivity.kt
@@ -24,8 +24,10 @@ class MainActivity : AppCompatActivity() {
         buttonConnect.setOnClickListener {
             // your code to perform when the user clicks on the button
 
-            Toast.makeText(this@MainActivity, "You clicked me.", Toast.LENGTH_SHORT).show()
+//            Toast.makeText(this@MainActivity, "You clicked me.", Toast.LENGTH_SHORT).show()
             val intent = Intent(this, ControlActivity::class.java).apply {
+                putExtra("ip", ipInput.text.toString())
+                putExtra("port", portInput.text.toString())
             }
             startActivity(intent)
         }
diff --git a/software/android/app/src/main/res/layout/activity_main.xml b/software/android/app/src/main/res/layout/activity_main.xml
index a4337e4..257163f 100644
--- a/software/android/app/src/main/res/layout/activity_main.xml
+++ b/software/android/app/src/main/res/layout/activity_main.xml
@@ -40,7 +40,8 @@
                 android:layout_height="wrap_content"
                 android:digits="0123456789."
                 android:hint="IP"
-                android:inputType="number|numberDecimal" />
+                android:inputType="number|numberDecimal"
+                android:text="192.168.1.202" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
@@ -58,7 +59,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="Port"
-                android:inputType="number" />
+                android:inputType="number"
+                android:text="1234" />
 
         </com.google.android.material.textfield.TextInputLayout>