"另外开分支，使用设计稿的UI显示，定制组名信息"

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "com.srthinker.statinfo"
         minSdk 24
         targetSdk 32
-        versionCode 1
-        versionName "1.0.4"
+        versionCode 2
+        versionName "2.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/AndroidManifest.xml

@@ -33,19 +33,19 @@
                 android:value="" />
         </activity>
         <activity
-            android:name=".uis.MainActivity"
-            android:exported="true" >
-            <intent-filter>
+            android:name=".uis.MainActivity1"
+            android:exported="false" >
+            <!--<intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
 
-                <!--
+                &lt;!&ndash;
                 <category android:name="android.intent.category.HOME" />
                 <category android:name="android.intent.category.DEFAULT" />
-                -->
+                &ndash;&gt;
 
-            </intent-filter>
+            </intent-filter>-->
 
             <meta-data
                 android:name="android.app.lib_name"
@@ -80,10 +80,21 @@
         </provider>
 
         <activity
-            android:name=".uis.MainOldActivity"
+            android:name=".uis.MainActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:exported="false"
+            android:exported="true"
             android:windowSoftInputMode="adjustPan" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+
+                <!--
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
+                -->
+
+            </intent-filter>
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />

app/src/main/java/com/srthinker/statinfo/constant/GroupConst.java

@@ -19,16 +19,18 @@ public class GroupConst {
    public static final int NO_GROUP = 100;
    public static final int GROUPED = 200;
 
-   //钢筋班组，木工班组，泥工班组，水电班组，防水班组，外架班组，项目部，监理单位
+   //钢筋班组，木工班组，外架班组，防水班组，瓦工班组，安全文明施工，防水班组，众安管理人员，中交六公司管理人员，特种作业人员
    public static ArrayList<Group2Bean> group2BeansConst = new ArrayList<>();
    static {
-      group2BeansConst.add(new Group2Bean(5, "钢筋班组",0));
-      group2BeansConst.add(new Group2Bean(6, "木工班组",0));
-      group2BeansConst.add(new Group2Bean(7, "泥工班组",0));
-      group2BeansConst.add(new Group2Bean(8, "水电班组",0));
-      group2BeansConst.add(new Group2Bean(1, "防水班组",0));
-      group2BeansConst.add(new Group2Bean(2, "外架班组",0));
-      group2BeansConst.add(new Group2Bean(3, "项目部",0));
-      group2BeansConst.add(new Group2Bean(4, "监理单位",0));
+      group2BeansConst.add(new Group2Bean(1, "钢筋班组",0));
+      group2BeansConst.add(new Group2Bean(2, "木工班组",0));
+      group2BeansConst.add(new Group2Bean(3, "外架班组",0));
+      group2BeansConst.add(new Group2Bean(4, "防水班组",0));
+      group2BeansConst.add(new Group2Bean(5, "瓦工班组",0));
+      group2BeansConst.add(new Group2Bean(6, "安全文明施工",0));
+      group2BeansConst.add(new Group2Bean(7, "防水班组",0));
+      group2BeansConst.add(new Group2Bean(8, "众安管理人员",0));
+      group2BeansConst.add(new Group2Bean(9, "中交六公司管理人员",0));
+      group2BeansConst.add(new Group2Bean(10, "特种作业人员",0));
    }
 }

app/src/main/res/layout/activity_main.xml

@@ -8,7 +8,7 @@
     android:focusableInTouchMode="true"
     android:orientation="vertical"
     android:background="@color/bg_070A2E"
-    tools:context=".uis.MainOldActivity">
+    tools:context=".uis.MainActivity">
 
     <RelativeLayout
         android:layout_width="939.59dp"
@@ -109,8 +109,9 @@
                     android:id="@+id/rv_group"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="32dp"
-                    android:layout_marginLeft="10dp"/>
+                    android:layout_gravity="center"
+                    android:layout_marginTop="15dp"
+                    />
             </LinearLayout>
             <LinearLayout
                 android:layout_width="653dp"
@@ -195,7 +196,7 @@
                     android:textSize="@dimen/text_10"
                     android:layout_toRightOf="@+id/tv_enter_text"
                     android:layout_alignBottom="@+id/tv_enter_text"
-                    android:visibility="visible"
+                    android:visibility="invisible"
                     android:layout_marginLeft="5dp"/>
                 <TextView
                     android:id="@+id/tv_leave_text"
@@ -216,7 +217,7 @@
                     android:textSize="@dimen/text_10"
                     android:layout_toLeftOf="@+id/tv_leave_text"
                     android:layout_alignBottom="@+id/tv_leave_text"
-                    android:visibility="visible"
+                    android:visibility="invisible"
                     android:layout_marginRight="5dp"/>
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -245,5 +246,6 @@
         android:layout_height="wrap_content"
         android:gravity="left|center"
         android:textColor="@color/white"
+        android:layout_marginLeft="15dp"
         android:textSize="@dimen/text_10"/>
 </LinearLayout>
\ No newline at end of file

app/src/main/res/layout/activity_new_main.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black"
-    tools:context=".uis.MainActivity">
+    tools:context=".uis.MainActivity1">
     <TextView
         android:id="@+id/tv_setting"
         android:layout_width="wrap_content"

app/src/main/res/layout/dialog_select.xml

@@ -7,7 +7,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="42dp"
-        android:layout_marginBottom="32dp"
+        android:layout_marginBottom="22dp"
         android:background="@color/color_2D52E3">
         <TextView
             android:id="@+id/tv_title"
@@ -66,6 +66,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:padding="10dp"
         android:gravity="center">
     </androidx.recyclerview.widget.RecyclerView>
     <LinearLayout

app/src/main/res/values/dimens.xml

@@ -11,5 +11,7 @@
     <dimen name="text_15">15sp</dimen>
     <dimen name="text_11">11sp</dimen>
     <dimen name="dlg_margin">10dp</dimen>
-    <dimen name="display_text">77sp</dimen>  //一列：95sp
+    <dimen name="display_text">77sp</dimen>
+    <dimen name="text_30">30sp</dimen>
+    //一列：95sp
 </resources>
\ No newline at end of file