Merge branch 'C58寸' into C58寸专用

孙向锦
2 parents f2896faa 19e4f834
Showing 3 changed files with 29 additions and 14 deletions
C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
C5/app/src/main/java/com/sunvote/xpadapp/widget/StatusBarView.java
C5/app/src/main/res/layout/status_icon_view.xml
@@ -286,6 +286,7 @@ public class MainActivity extends BaseActivity implements ComListener {
             statusBarView.setStatusSignal(0);
             statusBarView.setStatusBarBaseId(0);
             //statusBarView.setStatusCH(0);
+            statusBarView.setStatusWifi(0);
             statusBarView.setStatusKeyId(0);
         }
@@ -307,7 +308,8 @@ public class MainActivity extends BaseActivity implements ComListener {
                 runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        statusBarView.setStatusSignal(netWork_receiver.getRssiLevel());
+                        //statusBarView.setStatusSignal(netWork_receiver.getRssiLevel());
+                        statusBarView.setStatusWifi(netWork_receiver.getRssiLevel());
                     }
                 });
             }
@@ -15,8 +15,8 @@ import com.sunvote.xpadapp.R;
 public class StatusBarView extends LinearLayout {
     Context mContext;
-    //信号图标,基站编号,CH,终端ID,电池电量图标,系统时间
-    BarItem barSignal,barBasestation,barCh,barTerminalId,barBattery,barSystemtime;
+    //信号图标,基站编号,CH,终端ID,电池电量图标,系统时间,wifi
+    BarItem barSignal,barBasestation,barCh,barTerminalId,barBattery,barSystemtime,barWifi;
     public StatusBarView(Context context) {
         this(context, null);
@@ -46,6 +46,7 @@ public class StatusBarView extends LinearLayout {
         barTerminalId =  (BarItem) view.findViewById(R.id.bar_terminalId);
         barBattery =  (BarItem) view.findViewById(R.id.bar_battery);
         barSystemtime =  (BarItem) view.findViewById(R.id.bar_systemtime);
+        barWifi=  (BarItem) view.findViewById(R.id.bar_wifi);
         addView(view);
     }
@@ -57,7 +58,7 @@ public class StatusBarView extends LinearLayout {
      * @param rssi
      */
     public void setStatusSignal(int rssi){
-       /* barSignal.setIcon(R.mipmap.signal);
+        barSignal.setIcon(R.mipmap.signal);
         if (rssi < 95){
             barSignal.setIcon(R.mipmap.signal_1);
         }
@@ -72,16 +73,19 @@ public class StatusBarView extends LinearLayout {
         }
         if (rssi < 55) {
             barSignal.setIcon(R.mipmap.signal_5);
-        }*/
-
-       if(rssi > -100) {
-           barSignal.setVisibility(VISIBLE);
-           barSignal.setIcon(R.mipmap.wifi);
-       }else {
-           barSignal.setVisibility(INVISIBLE);
-       }
+        }
     }
+    public void setStatusWifi(int wifi){
+        if(wifi > -100) {
+            barWifi.setVisibility(VISIBLE);
+            barWifi.setIcon(R.mipmap.wifi);
+        }else {
+            barWifi.setVisibility(GONE);
+        }
+    }
+
+
     /**
      * 设置基站编号
      * @param value
@@ -17,6 +17,7 @@
             android:layout_height="match_parent"
             android:gravity="left|center_vertical"
             android:layout_weight="1"
+            android:visibility="invisible"
             android:text=""
             android:textColor="@android:color/white"/>
         <com.sunvote.statusbar.view.BarItem
@@ -43,7 +44,7 @@
             android:layout_height="match_parent"
             android:gravity="center"
             android:text=""
-            android:layout_weight="8"
+            android:layout_weight="7"
             android:textColor="@android:color/white"/>
         <com.sunvote.statusbar.view.BarItem
             android:id="@+id/bar_systemtime"
@@ -51,7 +52,15 @@
             android:layout_height="match_parent"
             android:gravity="right|center"
             android:text=""
-            android:layout_weight="2"
+            android:layout_weight="1"
+            android:textColor="@android:color/white"/>
+        <com.sunvote.statusbar.view.BarItem
+            android:id="@+id/bar_wifi"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="right|center_vertical"
+            android:layout_weight="0.1"
+            android:text=""
             android:textColor="@android:color/white"/>
         <com.sunvote.statusbar.view.BarItem
             android:id="@+id/bar_battery"