wu98hay 1 anno fa
parent
commit
7fddf4581b

+ 1 - 1
app/build.gradle

@@ -10,7 +10,7 @@ android {
         minSdk 27
         targetSdk 31
         versionCode 9
-        versionName "1.1.9"
+        versionName "1.2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

+ 1 - 0
app/src/main/java/com/qy/agv/activity/RobotInfoActivity.java

@@ -71,6 +71,7 @@ public class RobotInfoActivity extends BaseActivity {
         binding.exit.setOnClickListener(view->{
             myLogout();
         });
+        binding.tvIp.setText(Constant.server_ip);
     }
 
     private void updateApp(){

+ 1 - 1
app/src/main/java/com/qy/agv/util/Constant.java

@@ -32,7 +32,7 @@ public class Constant {
 
 //  修改 string.xml APP 名称 “宇光同行” 内网
 //    public static String PROJECT_NAME = "qyzl";
-//    public static String server_ip = "192.168.1.100";
+//    public static String server_ip = "192.168.110.100";
 //    public static String HTTP_URL = "http://"+server_ip+":8084/api";
 //    public static String UPDATE_URL = "http://"+server_ip+":8084/app";
 

+ 28 - 1
app/src/main/res/layout/qy_robot_info.xml

@@ -64,8 +64,35 @@
                         android:layout_height="wrap_content"
                         android:gravity="left"
                         android:paddingLeft="10dp"
-                        android:id="@+id/tv_work_station"
                         android:text="工位"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/tv_work_station"
+                        android:layout_weight="1"
+                        android:text=""/>
+                </LinearLayout>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_marginLeft="10dp"
+                    android:background="@color/dc_line"
+                    />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:layout_width="100dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="left"
+                        android:paddingLeft="10dp"
+                        android:id="@+id/tv_server_ip"
+                        android:text="IP"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">拨云智联</string>
+    <string name="app_name">宇光同行</string>
     <string name="sure">确定</string>
     <string name="restart_success_">重启成功!</string>
     <string name="cancel">取消</string>