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 c072935..5be35fb 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
@@ -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());
}
});
}
diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/widget/StatusBarView.java b/C5/app/src/main/java/com/sunvote/xpadapp/widget/StatusBarView.java
index f5ccced..f3b31d7 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/widget/StatusBarView.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/widget/StatusBarView.java
@@ -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
diff --git a/C5/app/src/main/res/layout/status_icon_view.xml b/C5/app/src/main/res/layout/status_icon_view.xml
index 3866dd1..bc2a189 100644
--- a/C5/app/src/main/res/layout/status_icon_view.xml
+++ b/C5/app/src/main/res/layout/status_icon_view.xml
@@ -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"/>
+