Merge remote-tracking branch 'origin/master'

This commit is contained in:
hch
2024-04-07 10:05:51 +08:00
11 changed files with 87 additions and 16 deletions

View File

@@ -33,6 +33,7 @@ import com.yunbao.common.Constants;
import com.yunbao.common.bean.CoolConfig;
import com.yunbao.common.bean.NativeCallbackModel;
import com.yunbao.common.dialog.CinemaTicketPopupWindow;
import com.yunbao.common.dialog.SkitCheckInWasSuccessfulPopup;
import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.fragment.BaseFragment;
import com.yunbao.common.http.HttpCallback;
@@ -226,6 +227,15 @@ public class MainHomeCommunityVideoFragment extends BaseFragment {
System.out.println("code = " + code + ", msg = " + msg + ", info = " + Arrays.toString(info));
if (code == 0) {
mWebView.loadUrl(JSONObject.parseObject(info[0]).getString("url"));
String sign_ok = JSONObject.parseObject(info[0]).getString("sign_ok");
if (TextUtils.equals(sign_ok,"1")){
new XPopup.Builder(mContext)
.asCustom(new SkitCheckInWasSuccessfulPopup(mContext))
.show();
}
// new XPopup.Builder(mContext)
// .asCustom(new SkitCheckInWasSuccessfulPopup(mContext))
// .show();
}
}
});

View File

@@ -51,6 +51,7 @@ public class MainHttpUtil {
.params("pushid", "")
.params("lastlogindevice", "Android")
.params("uuid_Device", uuid)
.params("langue", WordUtil.isNewZh()?"chinese":"english")
.execute(callback);
}

View File

@@ -8,8 +8,10 @@ import android.widget.HorizontalScrollView;
import android.widget.ImageView;
import android.widget.TextView;
import com.lxj.xpopup.XPopup;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.dialog.SkitCheckInWasSuccessfulPopup;
import com.yunbao.common.event.FloatWarOrderEvent;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.RouteUtil;
@@ -59,7 +61,9 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
// img_trophy.setOnLongClickListener(new View.OnLongClickListener() {
// @Override
// public boolean onLongClick(View view) {
//
// new XPopup.Builder(mContext)
// .asCustom(new SkitCheckInWasSuccessfulPopup(mContext))
// .show();
// return true;
// }
// });