修复bug -- 选举

孙向锦
1 parent 18faef8d
Showing 12 changed files with 33 additions and 23 deletions
C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/presenter/XPadPresenter.java
C5/app/src/main/java/com/sunvote/xpadcomm/XPadApi.java
C5/app/src/main/res/layout/list_multi_vote_result_item.xml
C5/app/src/main/res/layout/status_icon_view.xml
C5/app/src/main/res/mipmap-hdpi/signal_1.png
C5/app/src/main/res/mipmap-hdpi/signal_2.png
C5/app/src/main/res/mipmap-hdpi/signal_3.png
C5/app/src/main/res/mipmap-hdpi/signal_4.png
C5/app/src/main/res/mipmap-hdpi/signal_5.png
@@ -293,7 +293,7 @@ public class MainActivity extends BaseActivity implements ComListener {
         if(statusBarView!=null){
             statusBarView.setStatusSignal(0);
             statusBarView.setStatusBarBaseId(0);
-            //statusBarView.setStatusCH(0);
+            statusBarView.setStatusCH(0);
             statusBarView.setStatusWifi(0);
             statusBarView.setStatusKeyId(0);
         }
@@ -1377,6 +1377,9 @@ public class MainActivity extends BaseActivity implements ComListener {
                 @Override
                 public void run() {
                     service.setVisibility(View.GONE);
+                    if(servicePresent != null){
+                        servicePresent.dismiss();
+                    }
                 }
             });
         }
@@ -1651,9 +1654,16 @@ public class MainActivity extends BaseActivity implements ComListener {
     }
     @Override
-    public void onKeyPadEvent(KeypadInfo info) {
+    public void onKeyPadEvent(final KeypadInfo info) {
         LogUtil.i(TAG, "onKeyPadEvent");
         mKeypadInfo = info;
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                statusBarView.setStatusKeyId(info.keyId);
+                statusBarView.setStatusCH(info.chan);
+            }
+        });
         XPadSystem.setStatusBarPadID(this, info.keyId);
         XPadSystem.setStatusBarChannel(this, info.chan);
         if (info.cmd1 == 8 || info.cmd1 == 9) {
@@ -1666,7 +1676,7 @@ public class MainActivity extends BaseActivity implements ComListener {
     }
     @Override
-    public void onOnLineEvent(OnLineInfo info) {
+    public void onOnLineEvent(final OnLineInfo info) {
         if (info.comError == 1) {
             if (info.comError != mOnlineInfo.comError) {
@@ -1707,7 +1717,10 @@ public class MainActivity extends BaseActivity implements ComListener {
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                if(mOnlineInfo != null){
+                if(mOnlineInfo != null) {
+                    statusBarView.setStatusBarBaseId(mOnlineInfo.baseId);
+                    statusBarView.setStatusCH(mOnlineInfo.chan);
+                    statusBarView.setStatusSignal(mOnlineInfo.rssi);
                     setTerminalId(mOnlineInfo.keyId);
                 }
             }
@@ -1717,7 +1730,6 @@ public class MainActivity extends BaseActivity implements ComListener {
         XPadSystem.setStatusBarBaseId(this, getString(R.string.base_id) + ":" + info.baseId);
         XPadSystem.setStatusBarSingal(this, info.rssi);
-
     }
@@ -397,15 +397,16 @@ public class ElectionCustomFragment extends BaseFragment {
 			convertView.setBackgroundColor(position % 2 == 0 ? Color.WHITE : Color.parseColor("#E5E5E5"));
 			holder.tvNum.setText(String.valueOf(it.No));
 			holder.tvName.setText(String.valueOf(it.title));
-			if (it.result == 4) {
-				holder.RG.clearCheck();
-			} else if (it.result == 1) {
+			if (it.result == 1) {
 				holder.RG.check(R.id.list_election_item_oo);
-			} else if (it.result == 2) {
-				holder.RG.check(R.id.list_election_item_xx);
-			}else if (it.result == 3) {
-				holder.RG.check(R.id.list_election_item_abstain);
+			} else {
+				holder.RG.clearCheck();
 			}
+//			else if (it.result == 2) {
+//				holder.RG.check(R.id.list_election_item_xx);
+//			}else if (it.result == 3) {
+//				holder.RG.check(R.id.list_election_item_abstain);
+//			}
 			if(it.modifyModel){
 				holder.btnO.setEnabled(false);
@@ -417,11 +418,11 @@ public class ElectionCustomFragment extends BaseFragment {
 				holder.btnAbstain.setEnabled(true);
 			}
-			if(it.result == 1){
+			/*if(it.result == 1){
 				holder.btnO.setChecked(true);
 			}else {
 				holder.btnO.setChecked(false);
-			}
+			}*/
 			holder.btnO.setOnClickListener(new OnClickListener() {
 				@Override
@@ -306,7 +306,7 @@ public class ElectionFragment extends BaseFragment {
 				listview.setVisibility(View.VISIBLE);
 				hideConfirm();
 				hideResult();
-				showVote();
+//				showVote();
 			}
 		});
@@ -236,7 +236,7 @@ public class XPadPresenter implements ComListener {
 	@Override
 	public void onServiceSubmitSuccess() {
-
+		cl.onServiceSubmitSuccess();
 	}
 	private IntentFilter batteryLevelFilter;
@@ -1523,9 +1523,9 @@ public class XPadApi implements XPadApiInterface {
         info.dataPos = dt[4] & 0xff;
         info.mode = dt[5] & 0xff;
         info.mode1_msgType = dt[6] & 0xff;
-        if (info.mode != VoteType_Stop) {
-            serialNumber = 0;
-        }
+//        if (info.mode != VoteType_Stop) {
+//            serialNumber = 0;
+//        }
         if (info.mode == VoteType_Stop) { // 停止
             if (info.mode1_msgType == 2) { // 有结果
@@ -29,7 +29,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="10dp"
             android:layout_weight="1"
-            android:gravity="center"
+            android:gravity="left|center_vertical"
             android:text="表决标题表决标题表决标题表决标题表决标题表决标题表决标题表决标题"
             android:textColor="@color/white"
             android:textSize="@dimen/px40dp" />
@@ -17,7 +17,6 @@
             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
@@ -25,7 +24,6 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="left"
-            android:visibility="invisible"
             android:text=""
             android:layout_weight="0.1"
             android:textColor="@android:color/white"/>
@@ -35,7 +33,6 @@
             android:layout_height="match_parent"
             android:gravity="right"
             android:text=""
-            android:visibility="invisible"
             android:layout_weight="1"
             android:textColor="@android:color/white"/>
         <com.sunvote.statusbar.view.BarItem