🎉 4.1.6，小完善版本

Hny0305Lin · Jun 22, 2022 · 5674c27 · 5674c27
1 parent 4b1489b
commit 5674c27
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 442 deletions.
diff --git a/HaohanyhHAMOSProjectX Software/app/build.gradle b/HaohanyhHAMOSProjectX Software/app/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdk 21
         targetSdk 26
         versionCode 1
-        versionName "4.0.1.2022.0519.Haohanyh.Basin"
+        versionName "4.1.6.2022.0622.Haohanyh.Basin"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/...jectX Software/app/src/main/java/com/haohanyh/hamos/projectx/LianDong/ExceedActivity.java b/...jectX Software/app/src/main/java/com/haohanyh/hamos/projectx/LianDong/ExceedActivity.java
@@ -281,6 +281,11 @@ public void OFFLiandongCheck(View view) {
         boolon = 0;
     }
 
+    public void LiandongOver(View view) {
+        Intent intent = new Intent(ExceedActivity.this, MainNewActivity.class);
+        startActivity(intent);
+    }
+
     private boolean ExceedCheck() {
 
         num = txtnum.getText().toString();

diff --git a/HaohanyhHAMOSProjectX Software/app/src/main/res/drawable-nodpi/hamosv4.png b/HaohanyhHAMOSProjectX Software/app/src/main/res/drawable-nodpi/hamosv4.png
diff --git a/HaohanyhHAMOSProjectX Software/app/src/main/res/drawable-nodpi/smarthomereg.png b/HaohanyhHAMOSProjectX Software/app/src/main/res/drawable-nodpi/smarthomereg.png
diff --git a/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_first.xml b/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_first.xml
diff --git a/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_fourth.xml b/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_fourth.xml
diff --git a/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_fourth_new.xml b/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_fourth_new.xml
@@ -52,6 +52,10 @@
             android:orientation="vertical"
             android:background="@drawable/xiamen1">
 
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="20dp" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />

diff --git a/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_liandong_main.xml b/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_liandong_main.xml
@@ -33,6 +33,10 @@
             android:layout_height="280dp"
             android:orientation="horizontal">
 
+            <Space
+                android:layout_width="30dp"
+                android:layout_height="match_parent" />
+
             <RadioGroup
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content">
@@ -135,7 +139,7 @@
 
                 <EditText
                     android:id="@+id/editText1"
-                    android:layout_width="wrap_content"
+                    android:layout_width="160dp"
                     android:layout_height="50dp"
                     android:ems="10"
                     android:hint="点击我填写数值"
@@ -145,7 +149,7 @@
 
                 <EditText
                     android:id="@+id/editText2"
-                    android:layout_width="wrap_content"
+                    android:layout_width="160dp"
                     android:layout_height="50dp"
                     android:ems="10"
                     android:hint="点击我填写0和1"
@@ -166,6 +170,10 @@
             android:layout_height="231dp"
             android:orientation="horizontal">
 
+            <Space
+                android:layout_width="30dp"
+                android:layout_height="match_parent" />
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -243,7 +251,34 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical"/>
+                android:orientation="vertical">
+
+                <Space
+                    android:layout_width="match_parent"
+                    android:layout_height="20dp" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
+
+                    <Space
+                        android:layout_width="15dp"
+                        android:layout_height="match_parent" />
+
+                    <Button
+                        android:id="@+id/exitliandong"
+                        android:layout_width="130dp"
+                        android:layout_height="48dp"
+                        android:background="@drawable/button_nihao345345"
+                        android:text="@string/exitliandong"
+                        android:textColor="@color/white"
+                        android:textSize="15sp"
+                        android:onClick="LiandongOver"/>
+
+                </LinearLayout>
+
+            </LinearLayout>
 
         </LinearLayout>
 

diff --git a/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_login.xml b/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_login.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="115dp"
+        android:layout_marginBottom="200dp"
         android:orientation="vertical"
         android:paddingLeft="32dp"
         android:paddingRight="32dp">
@@ -55,6 +55,7 @@
                 android:maxLines="1"
                 android:textColor="@color/black"
                 android:textSize="16sp" />
+
         </com.google.android.material.textfield.TextInputLayout>
 
         <LinearLayout

diff --git a/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_main_thirdnew.xml b/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_main_thirdnew.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/minecraft365"
+    android:background="@drawable/hamosv4"
     android:orientation="vertical">
 
     <LinearLayout
@@ -12,13 +12,13 @@
         android:orientation="horizontal"
         android:background="@color/white">
 
-        <ImageButton
+        <!--ImageButton
             android:id="@+id/imageButtonClickToOld"
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_weight="1"
             android:background="@drawable/exit_new_icon"
-            android:onClick="ClickToOld"/>
+            android:onClick="ClickToOld"/-->
 
         <TextView
             android:id="@+id/textView"

diff --git a/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_reg.xml b/HaohanyhHAMOSProjectX Software/app/src/main/res/layout/activity_reg.xml
@@ -90,7 +90,7 @@
         android:inputType="textPersonName"
         android:maxLines="1"
         android:text=""
-        android:textColor="@color/black"
+        android:textColor="@color/white"
         android:theme="@style/haohanyh"
         app:layout_constraintBaseline_toBaselineOf="@+id/textView3"
         app:layout_constraintEnd_toEndOf="@+id/editTextTextPasswordPassword"
@@ -106,7 +106,7 @@
         android:inputType="textPassword"
         android:maxLines="1"
         android:text=""
-        android:textColor="@color/black"
+        android:textColor="@color/white"
         android:theme="@style/haohanyh"
         app:layout_constraintBaseline_toBaselineOf="@+id/textView4"
         app:layout_constraintEnd_toEndOf="parent"