Commit c1797cfb authored by pborate's avatar pborate

Updated account acitivity dao.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@180079 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 985bc1d7
......@@ -824,7 +824,6 @@ public class AccountActivityDao
public JSONObject getOsName(JSONObject activityData,List<String> loginUserList,String today) throws JSONException
{
JSONObject osName=new JSONObject();
try
{
String userList = getEnclosedString(loginUserList);
......@@ -856,7 +855,7 @@ public class AccountActivityDao
if("ANDROID".equalsIgnoreCase(osname)){
jsonObject.put( "ANDROID",osNameCount);
}
else if("IOS".equalsIgnoreCase(osname))
else if("IOS".equalsIgnoreCase(osname) || osname.startsWith("Mac"))
{
jsonObject.put( "IOS",osNameCount);
}
......@@ -868,8 +867,6 @@ public class AccountActivityDao
}
jsonObject.put("TOTAL", total);
activityData.put("MOBILE", jsonObject);
System.out.println("getOsName result:::::::"+osName);
session.close();
}
catch (HibernateException e)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment