From 864ed172b57a5853e322206e73a1e46c7b98c772 Mon Sep 17 00:00:00 2001 From: kl Date: Thu, 8 Jun 2023 13:17:12 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=B7=D0=BD=D0=B0=D1=87=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetDropDown.xml | 22 ++++++++- app/src/main/java/com/example/game/Knb.kt | 15 +++--- app/src/main/java/com/example/game/Quiz.kt | 17 ++++--- .../java/com/example/game/QuizQuestion.kt | 2 + .../main/java/com/example/game/TicTacToe.kt | 4 +- app/src/main/res/layout/activity_ttt.xml | 10 ++-- app/src/main/res/layout/buttons_ttt.xml | 41 ++++++++-------- app/src/main/res/layout/quiz_button.xml | 32 ++++++------- .../main/java/com/example/server/Server.kt | 48 +++++++++---------- 9 files changed, 111 insertions(+), 80 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index f1dcef9..8f6733c 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -12,8 +12,28 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/example/game/Knb.kt b/app/src/main/java/com/example/game/Knb.kt index 2553ffb..f3d1598 100644 --- a/app/src/main/java/com/example/game/Knb.kt +++ b/app/src/main/java/com/example/game/Knb.kt @@ -81,6 +81,10 @@ class Knb : ComponentActivity() { buttons[i].setOnClickListener {view -> onButtonClicked(view, i) } } + buttonCls.setOnClickListener { + exitToMenu(); + } + disableAllButtons() // TODO: загрузка сервера - фронтенд @a1sarpi GlobalScope.launch(Dispatchers.IO) { @@ -109,9 +113,6 @@ class Knb : ComponentActivity() { // Обновляем UI в основном потоке launch(Dispatchers.Main) { // TODO: конец ожидания сервера (фронтенд) @a1sarpi - buttonCls.setOnClickListener { - exitToMenu(); - } currentPlayer = 1 tv = findViewById(R.id.currentPlayerTV) tv.text = "Противник ${enemyEmail.removeSuffix("@whatever.ru")}" @@ -352,9 +353,11 @@ class Knb : ComponentActivity() { private fun exitToMenu() { val intent = Intent(this, MenuActivity::class.java) startActivity(intent) - clientSocket.close() - writer.close() - reader.close() + if (clientSocket.isConnected) { + clientSocket.close() + writer.close() + reader.close() + } finish() // Закрываем меню после запуска игры } diff --git a/app/src/main/java/com/example/game/Quiz.kt b/app/src/main/java/com/example/game/Quiz.kt index d4e782f..c9c39ab 100644 --- a/app/src/main/java/com/example/game/Quiz.kt +++ b/app/src/main/java/com/example/game/Quiz.kt @@ -6,6 +6,7 @@ import android.app.Activity import android.content.Intent import android.os.Bundle import android.util.Log +import android.view.Window import android.widget.Button import android.widget.GridLayout import android.widget.TextView @@ -62,6 +63,7 @@ class Quiz : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + requestWindowFeature(Window.FEATURE_NO_TITLE); Log.d("Debug", "Вошли в класс Quiz!") setContentView(R.layout.activity_quiz) @@ -82,6 +84,10 @@ class Quiz : AppCompatActivity() { onButtonClick(Pair(MAX_ROW, 1)) } + buttonCls.setOnClickListener { + exitToMenu(); + } + // Настройка обработчиков нажатия для кнопок в сетке val gridLayout = findViewById(R.id.gridLayout) for (row in 0 until gridLayout.rowCount) { @@ -142,9 +148,6 @@ class Quiz : AppCompatActivity() { // Обновляем UI в основном потоке launch(Dispatchers.Main) { // TODO: конец ожидания сервера (фронтенд) @a1sarpi - buttonCls.setOnClickListener { - exitToMenu(); - } currentPlayer = 1 tv = findViewById(R.id.currentPlayerTV) @@ -472,9 +475,11 @@ class Quiz : AppCompatActivity() { private fun exitToMenu() { val intent = Intent(this, MenuActivity::class.java) startActivity(intent) - clientSocket.close() - writer.close() - reader.close() + if (clientSocket.isConnected) { + clientSocket.close() + writer.close() + reader.close() + } finish() // Закрываем меню после запуска игры } diff --git a/app/src/main/java/com/example/game/QuizQuestion.kt b/app/src/main/java/com/example/game/QuizQuestion.kt index 018acf0..2bd9231 100644 --- a/app/src/main/java/com/example/game/QuizQuestion.kt +++ b/app/src/main/java/com/example/game/QuizQuestion.kt @@ -4,6 +4,7 @@ import android.app.Activity import android.content.Intent import android.os.Bundle import android.util.Log +import android.view.Window import android.widget.Button import android.widget.TextView import androidx.activity.ComponentActivity @@ -31,6 +32,7 @@ class QuizQuestion : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.activity_quiz_question) Log.d("Debug", "Запущен класс QuizQuestion") diff --git a/app/src/main/java/com/example/game/TicTacToe.kt b/app/src/main/java/com/example/game/TicTacToe.kt index 36c06f2..ce26f3d 100644 --- a/app/src/main/java/com/example/game/TicTacToe.kt +++ b/app/src/main/java/com/example/game/TicTacToe.kt @@ -197,8 +197,8 @@ class TicTacToe : ComponentActivity() { } buttons[number.first*3 + number.second].background = w //buttons[number.first*3 + number.second].setImageResource(R.drawable.cross_blue) - val iv: ImageView = findViewById(R.id.imageView) - iv.setImageResource(R.drawable.cross_blue) +// val iv: ImageView = findViewById(R.id.imageView) +// iv.setImageResource(R.drawable.cross_blue) enableAllButtons() // Смена текущего игрока currentPlayer = if (currentPlayer == 1) 2 else 1 diff --git a/app/src/main/res/layout/activity_ttt.xml b/app/src/main/res/layout/activity_ttt.xml index 5d30557..5a3afcc 100644 --- a/app/src/main/res/layout/activity_ttt.xml +++ b/app/src/main/res/layout/activity_ttt.xml @@ -99,11 +99,11 @@ + android:layout_marginTop="30dp" /> diff --git a/app/src/main/res/layout/buttons_ttt.xml b/app/src/main/res/layout/buttons_ttt.xml index 6cdd75c..648ef88 100644 --- a/app/src/main/res/layout/buttons_ttt.xml +++ b/app/src/main/res/layout/buttons_ttt.xml @@ -1,71 +1,72 @@ diff --git a/app/src/main/res/layout/quiz_button.xml b/app/src/main/res/layout/quiz_button.xml index 14ce8f4..1453130 100644 --- a/app/src/main/res/layout/quiz_button.xml +++ b/app/src/main/res/layout/quiz_button.xml @@ -9,8 +9,8 @@ android:orientation="vertical"> @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0-1" - android:layout_margin="10dp" + android:layout_margin="5dp" android:backgroundTint="#FFE45E" android:fontFamily="@font/zerocool" android:textSize="20sp" @@ -61,7 +61,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0-2" - android:layout_margin="10dp" + android:layout_margin="5dp" android:backgroundTint="#FFE45E" android:fontFamily="@font/zerocool" android:textSize="20sp" @@ -71,7 +71,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="1-0" - android:layout_margin="10dp" + android:layout_margin="5dp" android:backgroundTint="#FFE45E" android:fontFamily="@font/zerocool" android:textSize="20sp" @@ -82,7 +82,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="1-1" - android:layout_margin="10dp" + android:layout_margin="5dp" android:backgroundTint="#FFE45E" android:fontFamily="@font/zerocool" android:textSize="20sp" @@ -92,7 +92,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="1-2" - android:layout_margin="10dp" + android:layout_margin="5dp" android:backgroundTint="#FFE45E" android:fontFamily="@font/zerocool" android:textSize="20sp" @@ -102,7 +102,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="2-0" - android:layout_margin="10dp" + android:layout_margin="5dp" android:backgroundTint="#FFE45E" android:fontFamily="@font/zerocool" android:textSize="20sp" @@ -112,7 +112,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="2-1" - android:layout_margin="10dp" + android:layout_margin="5dp" android:backgroundTint="#FFE45E" android:fontFamily="@font/zerocool" android:textSize="20sp" @@ -122,7 +122,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="2-2" - android:layout_margin="10dp" + android:layout_margin="5dp" android:backgroundTint="#FFE45E" android:fontFamily="@font/zerocool" android:textSize="20sp" @@ -132,7 +132,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="3-0" - android:layout_margin="10dp" + android:layout_margin="5dp" android:backgroundTint="#FFE45E" android:fontFamily="@font/zerocool" android:textSize="20sp" @@ -142,7 +142,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="3-1" - android:layout_margin="10dp" + android:layout_margin="5dp" android:backgroundTint="#FFE45E" android:fontFamily="@font/zerocool" android:textSize="20sp" @@ -152,7 +152,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="3-2" - android:layout_margin="10dp" + android:layout_margin="5dp" android:backgroundTint="#FFE45E" android:fontFamily="@font/zerocool" android:textSize="20sp" @@ -160,8 +160,8 @@