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

rk

8 小时以前 99b89dc0ae4fbe90c6d629a223ad730986ffd8f3

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java

@@ -14,7 +14,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.serialport.SerialPortFinder;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextUtils;
@@ -75,6 +74,7 @@
import com.doumee.keyCabinet.ui.keyCabinet.ChangeUrlActivity;
import com.doumee.keyCabinet.ui.keyCabinet.KeyCabinetActivity;
import com.doumee.keyCabinet.ui.keyCabinet.ManageLoginActivity;
import com.doumee.keyCabinet.ui.keyCabinet.ZWListActivity;
import com.doumee.keyCabinet.ui.service.FaceUpdateService;
import com.doumee.keyCabinet.ui.service.HeartbeatService;
import com.doumee.keyCabinet.ui.face.AddFaceActivity;