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

rk

8 小时以前 99b89dc0ae4fbe90c6d629a223ad730986ffd8f3

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

@@ -87,10 +87,11 @@
                getDB().clProgress.setVisibility(View.GONE);
                tipDownCount = 60;
                isShowTip = true;
                getDB().tvTip1.setText(data.getData().get("obj").toString());
                getDB().clTip.setVisibility(View.VISIBLE);
                break;
            case 5:
                startActivity(ManageCabinetActivity.class);
                startActivity(ChoseFunActivity.class);
                finish();
                break;
            case 6: