Merge remote-tracking branch 'origin/FaceScenic_V2' into FaceScenic_V2

app/src/main/java/com/hanghui/senic/activity/MainActivity.java

@@ -22,7 +22,6 @@ import com.hanghui.senic.R;
 import com.hanghui.senic.activity.view.ClickButtonFloatView;
 import com.hanghui.senic.common.AppHandler;
 import com.hanghui.senic.common.BroadcastManager;
-import com.hanghui.senic.common.CommonUtil;
 import com.hanghui.senic.common.Constants;
 import com.hanghui.senic.common.DevelopUtil;
 import com.hanghui.senic.common.DeviceInitManager;
@@ -194,7 +193,7 @@ public class MainActivity extends BaseActivity {
                 case Constants.Code_NetNetworkCallback_NetworkNormal:
                     updateNetworkStateView();
                     break;
-                case Constants.Code_NetNetworkCallback_NetworkAnomaly:
+                case Constants.Code_NetNetworkCallback_NetworkAbnomal:
                     iv_internetStatus.setImageResource(R.mipmap.no_network);
                     LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) iv_networkType.getLayoutParams();
                     layoutParams.width = (int) getResources().getDimension(R.dimen.dp_72);

app/src/main/java/com/hanghui/senic/common/Constants.java

@@ -56,7 +56,7 @@ public class Constants {
     public static final int Code_USBroadcastCallback_USBAllInOneIDCardSucceed = 4;//东信多合一USB连接成功
     public static final int Code_USBroadcastCallback_USBAllInOneIDCardFail = 5;//东信多合一USB连接断开
     public static final int Code_NetNetworkCallback_NetworkNormal = 0;//网络正常
-    public static final int Code_NetNetworkCallback_NetworkAnomaly = 1;//网络异常
+    public static final int Code_NetNetworkCallback_NetworkAbnomal = 1;//网络异常
 
     public static final int Code_DeviceInitCallback_HardwareIDCard = 1;//身份证
     public static final int Code_DeviceInitCallback_HardwareQRCode = 2;//二维码

app/src/main/java/com/hanghui/senic/network/HttpRequest.java

@@ -218,13 +218,13 @@ public class HttpRequest {
                 }
             });
 
-            //timeRange < 0 表示已经过期
-            if (timeRange < 0) {
-                DeviceExpireManager.getInstance().setDeviceExpire(true);
-            } else {
-                DeviceExpireManager.getInstance().setDeviceExpire(false);
-            }
+        }
 
+        //timeRange < 0 表示已经过期
+        if (timeRange < 0) {
+            DeviceExpireManager.getInstance().setDeviceExpire(true);
+        } else {
+            DeviceExpireManager.getInstance().setDeviceExpire(false);
         }
 
     }