From 3e1796db50fe8d76286caf2c34bcaf283fa6e643 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Sun, 24 Feb 2019 18:11:34 +0800
Subject: [PATCH] 管理员界面修改

---
 C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java            |   4 ++++
 C5/app/src/main/java/com/sunvote/xpadapp/fragments/AdminFragment.java |   2 +-
 C5/app/src/main/res/layout/activity_main.xml                          |   1 +
 C5/app/src/main/res/layout/fragment_admin.xml                         | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
 C5/app/src/main/res/layout/fragment_no_file.xml                       |   4 ++--
 5 files changed, 64 insertions(+), 47 deletions(-)

diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java b/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
index c816e1f..af98bf8 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
@@ -300,6 +300,10 @@ public class MainActivity extends BaseActivity implements ComListener {
         super.onResume();
     }
 
+    public void setBackgroundColor(int color){
+        findViewById(R.id.root).setBackgroundColor(color);
+    }
+
     @Override
     protected void onPause() {
         LogUtil.i(TAG, "onPause");
diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/AdminFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/AdminFragment.java
index bcdc303..75f14e7 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/AdminFragment.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/AdminFragment.java
@@ -41,7 +41,7 @@ public class AdminFragment extends BaseFragment {
         btnConfig =  view.findViewById(R.id.admin_config_mode);
         btnPowerOff =  view.findViewById(R.id.admin_btnShutdown);
 
-        tvModalInfo.setText(getString(R.string.app_version) + getVersionName() + getString(R.string.server_ip) + Config.getInstance().serverIP);
+        tvModalInfo.setText(getString(R.string.app_version) + getVersionName() + "     "+ getString(R.string.server_ip) + Config.getInstance().serverIP);
         btnBack.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/C5/app/src/main/res/layout/activity_main.xml b/C5/app/src/main/res/layout/activity_main.xml
index 3c2606d..6f11de3 100644
--- a/C5/app/src/main/res/layout/activity_main.xml
+++ b/C5/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.sunvote.xpadapp.MainActivity"
diff --git a/C5/app/src/main/res/layout/fragment_admin.xml b/C5/app/src/main/res/layout/fragment_admin.xml
index 439288c..56b293a 100644
--- a/C5/app/src/main/res/layout/fragment_admin.xml
+++ b/C5/app/src/main/res/layout/fragment_admin.xml
@@ -2,25 +2,77 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#ffa9a9a9">
+    android:background="@drawable/bgpic_2">
+
+
+    <LinearLayout
+        android:id="@+id/middle_line"
+        android:layout_width="720dp"
+        android:layout_height="60dp"
+        android:layout_centerInParent="true"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/admin_config_mode"
+            android:layout_width="0dp"
+            android:layout_height="60dp"
+            android:layout_marginRight="80dp"
+            android:layout_weight="1"
+            android:background="@color/blue"
+            android:gravity="center"
+            android:text="@string/modifi_idsn"
+            android:textColor="@color/white"
+            android:textSize="@dimen/big_text_p5"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/admin_btnComTest"
+            android:layout_width="0dp"
+            android:layout_height="60dp"
+            android:layout_weight="1"
+            android:background="@color/blue"
+            android:gravity="center"
+            android:text="重定向服务器"
+            android:textColor="@color/white"
+            android:textSize="@dimen/big_text_p5"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/admin_btnShutdown"
+            android:layout_width="0dp"
+            android:layout_height="60dp"
+            android:layout_marginLeft="80dp"
+            android:layout_weight="1"
+            android:background="@drawable/oppos_selector"
+            android:gravity="center"
+            android:text="@string/shutdown"
+            android:textColor="@color/white"
+            android:textSize="@dimen/big_text_p5"
+            android:textStyle="bold"/>
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/admin_modal_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="48dp"
+        android:layout_above="@id/middle_line"
+        android:layout_marginBottom="48dp"
         android:text="@string/admin_setting"
         android:textSize="@dimen/big_text_p2"
+        android:textColor="@color/white"
         android:textStyle="bold" />
 
     <TextView
         android:id="@+id/admin_modal_info"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/admin_modal_title"
+        android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="30dp"
+        android:layout_marginBottom="50dp"
+        android:text="APP版本：1.1.2.6 基站IP：192.168.0.136"
+        android:textColor="@color/white"
         android:textSize="@dimen/big_text_p4" />
 
     <ImageButton
@@ -31,46 +83,6 @@
         android:layout_marginTop="20dp"
         android:background="@drawable/back_selector" />
 
-    <Button
-        android:id="@+id/admin_config_mode"
-        android:layout_width="200dp"
-        android:layout_height="60dp"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="120dp"
-        android:background="@drawable/agree_selector"
-        android:gravity="center"
-        android:text="@string/modifi_idsn"
-        android:textColor="@color/white"
-        android:textSize="@dimen/big_text_p5"
-        android:textStyle="bold" />
 
-    <Button
-        android:id="@+id/admin_btnComTest"
-        android:layout_width="200dp"
-        android:layout_height="60dp"
-        android:layout_below="@id/admin_config_mode"
-        android:layout_marginLeft="120dp"
-        android:layout_marginTop="40dp"
-        android:background="@drawable/agree_selector"
-        android:gravity="center"
-        android:text="重定向服务器"
-        android:textColor="@color/white"
-        android:textSize="@dimen/big_text_p5"
-        android:textStyle="bold" />
-
-    <Button
-        android:id="@+id/admin_btnShutdown"
-        android:layout_width="200dp"
-        android:layout_height="60dp"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="120dp"
-        android:background="@drawable/oppos_selector"
-        android:gravity="center"
-        android:text="@string/shutdown"
-        android:textColor="@color/white"
-        android:textSize="@dimen/big_text_p5"
-        android:textStyle="bold"/>
 
 </RelativeLayout>
diff --git a/C5/app/src/main/res/layout/fragment_no_file.xml b/C5/app/src/main/res/layout/fragment_no_file.xml
index 3b44165..b056e0c 100644
--- a/C5/app/src/main/res/layout/fragment_no_file.xml
+++ b/C5/app/src/main/res/layout/fragment_no_file.xml
@@ -31,7 +31,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
-            android:textColor="#ff1111"
+            android:textColor="@color/white"
             android:textStyle="bold"
             android:text="会议1的资料不存在！"
             android:textSize="@dimen/big_text_p1" />
@@ -43,7 +43,7 @@
             android:layout_below="@id/fragment_no_file_title"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="30dp"
-            android:textColor="#ff1111"
+            android:textColor="@color/white"
             android:textStyle="bold"
             android:textSize="@dimen/big_text_p1" />
     </RelativeLayout>
--
libgit2 0.21.4