* �ָ���¼�汾
Merge branch 'genertecPad' of https://github.com/finalljx/viewhome into genertecPad
Merge branch 'genertecPad' of https://github.com/finalljx/viewhome into genertecPad
Merge branch 'genertecPad' of https://github.com/finalljx/viewhome into genertecPad
* ������ӻ�ȡ���ָ��״̬��ִ����ݲ�������ͷ��񷽷�
* �����¼��Ӳ�������ͷ������
* �޸��û����ύʱת��ΪСд
Merge branch 'genertecPad' of https://github.com/finalljx/viewhome into genertecPad
Merge branch 'genertecPad' of https://github.com/finalljx/viewhome into genertecPad
Merge branch 'genertecPad' of https://github.com/finalljx/viewhome into genertecPad
Merge branch 'genertecPad' of https://github.com/finalljx/viewhome into genertecPad
Merge branch 'genertecPad' of https://github.com/finalljx/viewhome into genertecPad
* �޸�startPushServiceֻ��android����µ���
* �޸�iPad������ťչʾ������ios8