添加系统状态条，修改选举根据主控值发生改变

wutaian
1 parent 430dc15d
Showing 6 changed files with 77 additions and 12 deletions
C5/app/build.gradle
C5/app/src/main/AndroidManifest.xml
C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java
C5/app/src/main/res/layout/activity_main.xml
C5/app/src/main/res/layout/fragment_election.xml
@@ -82,14 +82,17 @@ repositories {
  
  
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:support-v4:23.4.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    implementation 'com.android.support:appcompat-v7:26.+'
     compile files('libs/ant.jar')
     compile project(':udpmodule')
-    compile project(':xpadprotocal')
     compile(name: 'ycanfilereadfunc-release', ext: 'aar')
     compile(name: 'ycanreaderfileshow-release', ext: 'aar')
     compile(name: 'ycan-release', ext: 'aar')
+    compile project(':statusBar')
     compile 'com.bm.photoview:library:1.4.1'
     compile 'com.github.barteksc:android-pdf-viewer:2.7.0'
     compile 'cn.yipianfengye.android:zxing-library:2.2'
@@ -70,6 +70,15 @@
         <!-- android:label="testActivity1" -->
         <!-- android:screenOrientation="landscape" > -->
         <!-- </activity> -->
+        <receiver
+            android:name=".server.BatteryReceiver"
+            android:enabled="true"
+            android:permission="android.permission.RECEIVE_BOOT_COMPLETED" >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
  
         <receiver
             android:name=".BootBroadcastReceiver"
@@ -9,6 +9,7 @@ import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.net.Uri;
@@ -72,9 +73,12 @@ import com.sunvote.xpadapp.fragments.SinginResultFragment;
 import com.sunvote.xpadapp.fragments.SingleTitleFragment;
 import com.sunvote.xpadapp.presenter.ServicePresent;
 import com.sunvote.xpadapp.presenter.XPadPresenter;
+import com.sunvote.xpadapp.server.BatteryReceiver;
 import com.sunvote.xpadapp.server.MoniService;
 import com.sunvote.xpadapp.utils.FileUtil;
 import com.sunvote.xpadapp.utils.SharedPreferencesUtil;
+import com.sunvote.xpadapp.widget.StatusBarView;
+import com.sunvote.xpadapp.widget.TimeThread;
 import com.sunvote.xpadcomm.ComListener;
 import com.sunvote.xpadcomm.FileRecver;
 import com.sunvote.xpadcomm.ScreenUtil;
@@ -212,11 +216,13 @@ public class MainActivity extends BaseActivity implements ComListener {
     private TextView terminalId;
     private ImageView service;
  
+    BatteryReceiver m_receiver;
+    StatusBarView statusBarView;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        terminalId = findViewById(R.id.terminal_id);
+       // terminalId = findViewById(R.id.terminal_id);
         service = findViewById(R.id.service);
         lockscreen = findViewById(R.id.lockscreen);
         if (service != null) {
@@ -245,6 +251,11 @@ public class MainActivity extends BaseActivity implements ComListener {
         screenTimer = new Timer(true);
         screenTimer.schedule(screenTask, 1000, 1000); // 延时1000ms后执行，1000ms执行一次
  
+        IntentFilter intentFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+        m_receiver = new BatteryReceiver();
+        registerReceiver(m_receiver, intentFilter);
+        setTiltleStatus();
+
         clearApkFile();
         FirmUpdateFragment.clearUpdateFile();
  
@@ -254,7 +265,37 @@ public class MainActivity extends BaseActivity implements ComListener {
     }
  
     public void setTerminalId(int id) {
-       terminalId.setText(getString(R.string.terminal_id) + id);
+       //terminalId.setText(getString(R.string.terminal_id) + id);
+        statusBarView.setStatusKeyId(id);
+    }
+
+    /**
+     * 设置标题状态栏
+     */
+    private void setTiltleStatus(){
+        statusBarView =(StatusBarView)findViewById(R.id.title_status);
+        if(statusBarView!=null){
+            statusBarView.setStatusSignal(0);
+            statusBarView.setStatusBarBaseId(0);
+            //statusBarView.setStatusCH(0);
+            statusBarView.setStatusKeyId(0);
+        }
+
+        m_receiver.setOnReceiveResultData(new BatteryReceiver.IReceiveData() {
+            @Override
+            public void onReceiveData() {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        statusBarView.setStatusBattery(m_receiver.getCurrentLevel(),m_receiver.getBatteryPercent());
+                    }
+                });
+            }
+        });
+
+        //显示时间的控件
+        TimeThread timeThread = new TimeThread(statusBarView.getTimeCtl());
+        timeThread.start();//启动线程
     }
  
     @Override
@@ -304,7 +345,8 @@ public class MainActivity extends BaseActivity implements ComListener {
     }
  
     public void setBackgroundColor(int color){
-        findViewById(R.id.root).setBackgroundColor(color);
+       //findViewById(R.id.root).setBackgroundColor(color);
+        statusBarView.setBackgroundColor(color);
     }
  
     @Override
@@ -861,10 +861,12 @@ public class ElectionFragment extends BaseFragment {
 		listview.invalidate();
  
 		if((aryContent.size()-  voteInfo.select)<checkOpposeVoted()){
-			//list_election_item_add_btn.setVisibility(View.VISIBLE);
-			list_election_item_add_btn.setEnabled(true);
+			if(voteInfo.other>0){//允许另选他人
+				list_election_item_add_btn.setEnabled(true);
+			}else{
+				list_election_item_add_btn.setEnabled(false);
+			}
 		}else{
-			//list_election_item_add_btn.setVisibility(View.GONE);
 			list_election_item_add_btn.setEnabled(false);
 		}
 	}
@@ -6,7 +6,7 @@
     tools:context="com.sunvote.xpadapp.MainActivity"
     android:background="#720600">
  
-    <TextView
+   <TextView
         android:id="@+id/terminal_id"
         android:layout_width="wrap_content"
         android:layout_height="20dp"
@@ -14,13 +14,21 @@
         android:layout_centerHorizontal="true"
         android:gravity="center_horizontal"
         android:textColor="@color/white"
+        android:visibility="gone"
         android:text="Default" />
  
+    <com.sunvote.xpadapp.widget.StatusBarView
+        android:id="@+id/title_status"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_width="match_parent"
+        android:layout_height="22dp"/>
+
     <FrameLayout
         android:id="@+id/frame_content"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:layout_below="@id/terminal_id"/>
+        android:layout_below="@id/title_status"/>
  
     <ImageView
         android:id="@+id/service"
@@ -269,7 +269,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/line_panel"
-        android:background="#E5E5E5">
+        android:background="#E5E5E5"
+        android:visibility="gone">
  
         <LinearLayout
             android:id="@+id/name_layout"