get correct device id

app/src/main/java/com/sheep/gamegroup/view/activity/ActXianWanWeb.java

@@ -12,6 +12,8 @@ import com.sheep.gamegroup.model.entity.XianWanEntity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DeviceIDUtil;
+import com.sheep.gamegroup.util.DeviceUtil;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.WebViewJs;
 import com.sheep.jiuyan.samllsheep.R;
@@ -188,7 +190,7 @@ public class ActXianWanWeb extends BaseActivity {
     private String assemblyData(){
         String baseUrl = xianWanEntity.getUrl();
         int pType = 2;
-        String deviceId = DeviceIDUtil.getimei(activity);
+        String deviceId = DeviceUtil.getDeviceId(activity);
         String appId =  xianWanEntity.getAndroid().getAppid();
         String userId = DataUtil.getInstance().getUserId();
         String msaoaid = "";
@@ -203,7 +205,7 @@ public class ActXianWanWeb extends BaseActivity {
                 userId,
                 appSecret);
         String keyCode = CommonUtil.getInstance().encrypt2Md5(keyCodeBefore);
-
+        LogUtil.logI("Get xianwan params: " + keyCodeBefore);
         return String.format(Locale.CHINA, "%s?ptype=%d&deviceid=%s&appid=%s&appsign=%s&keycode=%s&androidosv=%d&msaoaid=%s",
                 baseUrl,
                 pType,