diff --git a/common/src/main/java/com/yunbao/common/bean/NewPeopleTaskModel.java b/common/src/main/java/com/yunbao/common/bean/NewPeopleTaskModel.java index 6d45fc3e2..de0dd109c 100644 --- a/common/src/main/java/com/yunbao/common/bean/NewPeopleTaskModel.java +++ b/common/src/main/java/com/yunbao/common/bean/NewPeopleTaskModel.java @@ -12,6 +12,16 @@ public class NewPeopleTaskModel extends BaseModel { private RewardAllModel rewardAll = new RewardAllModel(); @SerializedName("reward_one") private RewardAllModel rewardOne = new RewardAllModel(); + @SerializedName("is_free_gift") + private String is_free_gift; + + public String getIs_free_gift() { + return is_free_gift; + } + + public void setIs_free_gift(String is_free_gift) { + this.is_free_gift = is_free_gift; + } public TaskModel getTask() { return task; diff --git a/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java b/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java index ebac97c3e..26ca87c44 100644 --- a/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java +++ b/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java @@ -291,7 +291,7 @@ public class LiveHttpUtil { * 获取被举报人的名字 */ public static void getReportName(int report_id, HttpCallback callback) { - HttpClient.getInstance().get("Live.getReportInfo", LiveHttpConsts.GETREPORTINFO) + HttpClient.getInstance().get("genjuyonghuidhuoqujubaorennicheng", LiveHttpConsts.GETREPORTINFO) .params("report_id", report_id) .execute(callback); } @@ -622,10 +622,15 @@ public class LiveHttpUtil { * 完成新手任務 */ public static void setFrontTask(String type, String liveuid, HttpCallback callback) { + HttpClient.getInstance().get("sendFreeGift", "sendFreeGift") + .params("liveuid", liveuid) + .execute(callback); +/* HttpClient.getInstance().get("shezhixinshouyindaozhuangtai", "shezhixinshouyindaozhuangtai") .params("type", type) .params("liveuid", liveuid) .execute(callback); +*/ } /** diff --git a/live/src/main/java/com/yunbao/live/activity/ReportSecondActivity.java b/live/src/main/java/com/yunbao/live/activity/ReportSecondActivity.java index 156055e55..53803a875 100644 --- a/live/src/main/java/com/yunbao/live/activity/ReportSecondActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/ReportSecondActivity.java @@ -142,7 +142,9 @@ If you have any supplementary information or proof, you can click to enter the d startIndex = stringBuilder.toString().length(); stringBuilder.append(userName); endIndex = stringBuilder.toString().length(); - stringBuilder .append("】,我們已對其進行重點觀察,並進一步判定,若發現違規將立刻處理,感謝您的監督~\n如您有任何信息證明補充,可點擊進入詳情,再次進行提交,感謝您對淨化平台環境做出的貢獻!"); + stringBuilder .append("】,我們已對其進行重點觀察,並進一步判定,若發現違規將立刻處理,感謝您的監督~ ") + .append("\n") + .append("如您有任何信息證明補充,可點擊進入詳情,再次進行提交,感謝您對淨化平台環境做出的貢獻!"); } else { stringBuilder.append("The user 【"); startIndex = stringBuilder.toString().length(); diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java index 1f1bbdd1d..a0f6ec331 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java @@ -905,7 +905,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On public void sendGift() { if (mLiveGiftBean.getTag() != null) { if (mCount.equals("1")) { - LiveHttpUtil.setFrontTask("sendgift", mLiveUid, new HttpCallback() { + LiveHttpUtil.setFrontTask("sendFreeGift", mLiveUid, new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { EventBus.getDefault().post("stop_svga_new_user_gif"); diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java index 2ce0b6398..e5eb407b9 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java @@ -727,7 +727,7 @@ public class LiveGiftPopup extends AbsDialogFragment { } if (liveGiftModel.getTag() != null) { if (mCount.equals("1")) { - LiveHttpUtil.setFrontTask("sendgift", mLiveUid, new HttpCallback() { + LiveHttpUtil.setFrontTask("sendFreeGift", mLiveUid, new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { EventBus.getDefault().post("stop_svga_new_user_gif"); diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index da942fd1f..652854388 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -895,7 +895,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveRoomViewHolder.firstLookLiveNotify(); } //判断是否有免费礼物 - if("0".equals(data.getNewPeopleTask().getTask().getSendgift())){ + if("0".equals(data.getNewPeopleTask().getIs_free_gift())){ Log.i("xinrenguanbo", "有免费礼物: "); mLiveRoomViewHolder.firstLook5MinLiveNotify(); diff --git a/live/src/main/res/layout/activity_report_second.xml b/live/src/main/res/layout/activity_report_second.xml index 38dfc49f0..a16cca941 100644 --- a/live/src/main/res/layout/activity_report_second.xml +++ b/live/src/main/res/layout/activity_report_second.xml @@ -89,7 +89,6 @@ android:layout_marginEnd="10dp" android:layout_marginTop="10dp" android:layout_marginBottom="10dp" - android:text="您舉報的用戶【用戶暱稱】,我們已對其進行重點觀察,並進一步判定,若發現違規將立刻處理,感謝您的監督~" android:textColor="#ff777777" android:textSize="11sp" />