From 7e9322c283c53f6aad20a64deb9f4eeaeb797389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?=
 =?UTF-8?q?=D0=B8=D0=BC?= <kashin20031984@mail.ru>
Date: Tue, 26 Dec 2023 11:39:24 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D1=81=20=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=83=D1=82=D0=B0,=20=D0=B7=D0=B0=D0=BF=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B0=D0=B5=D0=BC=20ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                               | 4 ++++
 app/build.gradle.kts                                         | 2 ++
 .../java/com/example/myapplication/api/MyServerService.kt    | 5 ++++-
 app/src/main/res/xml/network_security_config.xml             | 5 ++++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index ac801d8..ceb7afd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index add4282..96251d9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -96,4 +96,6 @@ dependencies {
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
+
+    //
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/myapplication/api/MyServerService.kt b/app/src/main/java/com/example/myapplication/api/MyServerService.kt
index 1088826..a0ffd01 100644
--- a/app/src/main/java/com/example/myapplication/api/MyServerService.kt
+++ b/app/src/main/java/com/example/myapplication/api/MyServerService.kt
@@ -146,7 +146,10 @@ interface MyServerService {
     ): RentRemote
 
     companion object {
-        private const val BASE_URL = "http://192.168.0.104:8079/"
+        //Раздача с тлф
+        private const val BASE_URL = "http://192.168.138.47:8079/"
+        //Пк дома
+        /*private const val BASE_URL = "http://192.168.0.104:8079/"*/
         //private const val BASE_URL = "http://10.0.2.2:8079/"
 
         @Volatile
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index 3e00a4c..da25c08 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
     <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">192.168.0.104</domain>
+        <!--Раздача с тлф-->
+        <domain includeSubdomains="true">192.168.138.47</domain>
+        <!--Дома пк-->
+<!--        <domain includeSubdomains="true">192.168.0.104</domain>-->
 <!--        <domain includeSubdomains="true">10.0.2.2</domain>-->
     </domain-config>
 </network-security-config>
\ No newline at end of file