Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8
This commit is contained in:
@@ -288,24 +288,31 @@ public class CommunitySendActivity extends AbsActivity {
|
||||
}
|
||||
}
|
||||
|
||||
TimePickerView timePickerView;
|
||||
|
||||
public void showTimeChooseDialog() {
|
||||
Calendar startCalendar = Calendar.getInstance();
|
||||
startCalendar.set(1990, 1, 1);
|
||||
Calendar endCalendar = Calendar.getInstance();
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
int year = calendar.get(Calendar.YEAR);
|
||||
int month = calendar.get(Calendar.MONTH) + 1; // Calendar.MONTH 从0开始计数
|
||||
int month = calendar.get(Calendar.MONTH); // Calendar.MONTH 从0开始计数
|
||||
int day = calendar.get(Calendar.DAY_OF_MONTH);
|
||||
int hour = calendar.get(Calendar.HOUR); // 使用24小时制
|
||||
int hour = calendar.get(Calendar.HOUR_OF_DAY); // 使用24小时制
|
||||
int minute = calendar.get(Calendar.MINUTE);
|
||||
int second = calendar.get(Calendar.SECOND);
|
||||
endCalendar.set(year, month, day, hour, minute, second);
|
||||
|
||||
TimePickerView timePickerView = new TimePickerBuilder(CommunitySendActivity.this, new OnTimeSelectListener() {
|
||||
timePickerView = new TimePickerBuilder(CommunitySendActivity.this, new OnTimeSelectListener() {
|
||||
@SuppressLint("SetTextI18n")
|
||||
@Override
|
||||
public void onTimeSelect(Date date, View v) {
|
||||
chooseTime.setText(DateFormatUtil.getTimeStrings(date.getTime()));
|
||||
if (date.getTime() > new Date().getTime()) {
|
||||
ToastUtil.show(getResources().getString(com.yunbao.main.R.string.time_cannot_be_greater_than_the_current_time));
|
||||
timePickerView.show();
|
||||
} else {
|
||||
chooseTime.setText(DateFormatUtil.getTimeStrings(date.getTime()));
|
||||
}
|
||||
}
|
||||
}).setType(new boolean[]{true, true, true, true, true, false})// 默认全部显示
|
||||
.setCancelText(getResources().getString(R.string.cancel))//取消按钮文字
|
||||
@@ -318,12 +325,6 @@ public class CommunitySendActivity extends AbsActivity {
|
||||
.isCenterLabel(false) //是否只显示中间选中项的label文字，false则每项item全部都带有label。
|
||||
.build();
|
||||
timePickerView.show();
|
||||
timePickerView.setOnDismissListener(new OnDismissListener() {
|
||||
@Override
|
||||
public void onDismiss(Object o) {
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void openImageChooserActivity() {
|
||||
|
||||
@@ -14,10 +14,6 @@ import android.webkit.WebView;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
|
||||
import com.samsung.android.sdk.iap.lib2.listener.OnPaymentListener;
|
||||
import com.samsung.android.sdk.iap.lib2.vo.ErrorVo;
|
||||
import com.samsung.android.sdk.iap.lib2.vo.PurchaseVo;
|
||||
import com.yunbao.common.pay.samsung.SamsungUtil;
|
||||
import com.yunbao.common.utils.StringUtil;
|
||||
import com.yunbao.common.utils.ToastUtil;
|
||||
@@ -99,15 +95,13 @@ public class SamsungFragment extends Fragment {
|
||||
mProductId = ProductId;
|
||||
mOrderid = OrderNumber;
|
||||
MoneyUsds = MoneyUsd;
|
||||
|
||||
SamsungUtil.newInstance(getActivity()).buy(mProductId, new OnPaymentListener() {
|
||||
SamsungUtil.newInstance(getActivity()).buy(mProductId, new SamsungUtil.OnPaymentListener() {
|
||||
@Override
|
||||
public void onPayment(ErrorVo _errorVO, PurchaseVo _purchaseVO) {
|
||||
if (_purchaseVO != null) {
|
||||
SamsungUtil.newInstance(getActivity()).consume(_purchaseVO.getPurchaseId());
|
||||
payHandler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
public void onPaymentSuccess(String purchaseVo) {
|
||||
SamsungUtil.newInstance(getActivity()).consume(purchaseVo);
|
||||
payHandler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
// CommonHttpUtil.notifySamsung(_purchaseVO.getPurchaseId(), mOrderid, new HttpCallback() {
|
||||
// @Override
|
||||
// public void onSuccess(int code, String msg, String[] info) {
|
||||
@@ -117,23 +111,22 @@ public class SamsungFragment extends Fragment {
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
}
|
||||
});
|
||||
} else {
|
||||
payHandler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (_errorVO.getErrorCode() == HelperDefine.IAP_PAYMENT_IS_CANCELED) {
|
||||
ToastUtil.show(getString(R.string.pay_cancel));
|
||||
} else {
|
||||
ToastUtil.show(_errorVO.getErrorString());
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPaymentFailed(String errorVo) {
|
||||
payHandler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
ToastUtil.show(errorVo);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
lastClickTime = currentTime;
|
||||
|
||||
Log.e(TAG, "ProductId" + ProductId + "OrderNumber" + OrderNumber + "MoneyUsd" + MoneyUsd);
|
||||
@@ -149,6 +142,7 @@ public class SamsungFragment extends Fragment {
|
||||
public void androidGoBack() {
|
||||
getActivity().onBackPressed();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -5,12 +5,10 @@ import android.annotation.SuppressLint;
|
||||
import android.app.Dialog;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.database.Cursor;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.Outline;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.provider.MediaStore;
|
||||
import android.util.SparseArray;
|
||||
import android.view.View;
|
||||
import android.view.ViewOutlineProvider;
|
||||
@@ -271,7 +269,7 @@ public class UserHomeActivity extends AbsActivity {
|
||||
tagList.add(userInfo.getUserHomeTopInfo().getAge() + (WordUtil.isNewZh() ? "歲" : "years old"));
|
||||
}
|
||||
if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getHeight())) {
|
||||
tagList.add(userInfo.getUserHomeTopInfo().getHeight());
|
||||
tagList.add(userInfo.getUserHomeTopInfo().getHeight() + "cm");
|
||||
}
|
||||
if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getCareer())) {
|
||||
tagList.add(userInfo.getUserHomeTopInfo().getCareer());
|
||||
@@ -354,6 +352,9 @@ public class UserHomeActivity extends AbsActivity {
|
||||
public void onConfirmClick(Dialog dialog, String content) {
|
||||
bannerImgList.remove(position);
|
||||
uploadImg(false);
|
||||
if (bannerImgList.isEmpty()) {
|
||||
bannerImgList.add(userInfo.getUserHomeTopInfo().getUser_avatar());
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -761,6 +762,12 @@ public class UserHomeActivity extends AbsActivity {
|
||||
}
|
||||
|
||||
private void uploadImg(boolean isUp) {
|
||||
for (int i = 0; i < bannerImgList.size(); i++) {
|
||||
if (bannerImgList.get(i).equals(userInfo.getUserHomeTopInfo().getUser_avatar())) {
|
||||
bannerImgList.remove(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
CommonHttpUtil.uploadUserInfoImg(new Gson().toJson(bannerImgList), new com.yunbao.common.http.HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
|
||||
Reference in New Issue
Block a user