Merge branch 'dev_2.7.0' into dev_optimization

# Conflicts:
#	VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/utils/VenvyDeviceUtil.java

Author: lucas

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/utils/VenvyDeviceUtil.java

@@ -116,10 +116,15 @@ public static String getIMEI(Context context) {
      * @return
      */
     public static String getIMSI(Context context) {
-//        TelephonyManager tm = (TelephonyManager) context
-//                .getSystemService(Context.TELEPHONY_SERVICE);//
-//        return tm.getSubscriberId();
-        return "";
+        String imsi = "";
+        try {
+            TelephonyManager tm = (TelephonyManager) context
+                    .getSystemService(Context.TELEPHONY_SERVICE);//
+            imsi = tm.getSubscriberId();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return imsi;
     }
 
     /**