|
@@ -50,6 +50,7 @@ import com.cooleshow.base.constanst.Constants;
|
|
import com.cooleshow.base.data.net.RetrofitClientNoToken;
|
|
import com.cooleshow.base.data.net.RetrofitClientNoToken;
|
|
import com.cooleshow.base.router.RouterPath;
|
|
import com.cooleshow.base.router.RouterPath;
|
|
import com.cooleshow.base.ui.activity.BaseActivity;
|
|
import com.cooleshow.base.ui.activity.BaseActivity;
|
|
|
|
+import com.cooleshow.base.utils.AppUtils;
|
|
import com.cooleshow.base.utils.PermissionUtils;
|
|
import com.cooleshow.base.utils.PermissionUtils;
|
|
import com.cooleshow.base.utils.ToastUtils;
|
|
import com.cooleshow.base.utils.ToastUtils;
|
|
import com.cooleshow.base.utils.UriUtils;
|
|
import com.cooleshow.base.utils.UriUtils;
|
|
@@ -112,8 +113,7 @@ import okhttp3.ResponseBody;
|
|
/**
|
|
/**
|
|
* 创建日期:2022/6/8 18:25
|
|
* 创建日期:2022/6/8 18:25
|
|
*
|
|
*
|
|
- * @author
|
|
|
|
- * 类说明:
|
|
|
|
|
|
+ * @author 类说明:
|
|
*/
|
|
*/
|
|
@Route(path = RouterPath.WebCenter.ACTIVITY_HORIZONTAL_SCREEN_HTML)
|
|
@Route(path = RouterPath.WebCenter.ACTIVITY_HORIZONTAL_SCREEN_HTML)
|
|
public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Binding> implements JsInterfaceUtils.onGetMethodsListener {
|
|
public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Binding> implements JsInterfaceUtils.onGetMethodsListener {
|
|
@@ -545,6 +545,10 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
|
|
@Override
|
|
@Override
|
|
public void paymentOrder(String orderNo, String payChannel, String payInfo) {
|
|
public void paymentOrder(String orderNo, String payChannel, String payInfo) {
|
|
if (payChannel.equals("ali_app")) {
|
|
if (payChannel.equals("ali_app")) {
|
|
|
|
+ if (!AppUtils.checkAliPayInstalled(this)) {
|
|
|
|
+ sendPayResult(Constants.PAY_ERROR_BY_NOT_INSTALL);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
String orderInfo = payInfo;
|
|
String orderInfo = payInfo;
|
|
final Runnable payRunnable = new Runnable() {
|
|
final Runnable payRunnable = new Runnable() {
|
|
@Override
|
|
@Override
|
|
@@ -565,6 +569,10 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
|
|
payThread.start();
|
|
payThread.start();
|
|
} else {
|
|
} else {
|
|
//微信
|
|
//微信
|
|
|
|
+ if (!api.isWXAppInstalled()) {
|
|
|
|
+ sendPayResult(Constants.PAY_ERROR_BY_NOT_INSTALL);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
Gson gson = new Gson();
|
|
Gson gson = new Gson();
|
|
WeixinPayInfo weixinPayInfo = gson.fromJson(payInfo, WeixinPayInfo.class);
|
|
WeixinPayInfo weixinPayInfo = gson.fromJson(payInfo, WeixinPayInfo.class);
|
|
PayReq req = new PayReq();
|
|
PayReq req = new PayReq();
|
|
@@ -585,7 +593,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public void savePicture(String base64,String uuid) {
|
|
|
|
|
|
+ public void savePicture(String base64, String uuid) {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1203,7 +1211,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
|
|
public void onResult(SHARE_MEDIA platform) {
|
|
public void onResult(SHARE_MEDIA platform) {
|
|
|
|
|
|
if (platform.name().equals("WEIXIN_FAVORITE")) {
|
|
if (platform.name().equals("WEIXIN_FAVORITE")) {
|
|
- ToastUtils.showShort( "收藏成功啦");
|
|
|
|
|
|
+ ToastUtils.showShort("收藏成功啦");
|
|
} else {
|
|
} else {
|
|
if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
|
|
if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
|
|
&& platform != SHARE_MEDIA.EMAIL
|
|
&& platform != SHARE_MEDIA.EMAIL
|
|
@@ -1217,7 +1225,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
|
|
&& platform != SHARE_MEDIA.GOOGLEPLUS
|
|
&& platform != SHARE_MEDIA.GOOGLEPLUS
|
|
&& platform != SHARE_MEDIA.YNOTE
|
|
&& platform != SHARE_MEDIA.YNOTE
|
|
&& platform != SHARE_MEDIA.EVERNOTE) {
|
|
&& platform != SHARE_MEDIA.EVERNOTE) {
|
|
- ToastUtils.showShort( "分享成功啦");
|
|
|
|
|
|
+ ToastUtils.showShort("分享成功啦");
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@@ -1237,7 +1245,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
|
|
&& platform != SHARE_MEDIA.GOOGLEPLUS
|
|
&& platform != SHARE_MEDIA.GOOGLEPLUS
|
|
&& platform != SHARE_MEDIA.YNOTE
|
|
&& platform != SHARE_MEDIA.YNOTE
|
|
&& platform != SHARE_MEDIA.EVERNOTE) {
|
|
&& platform != SHARE_MEDIA.EVERNOTE) {
|
|
- ToastUtils.showShort( "分享失败啦");
|
|
|
|
|
|
+ ToastUtils.showShort("分享失败啦");
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1245,7 +1253,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void onCancel(SHARE_MEDIA platform) {
|
|
public void onCancel(SHARE_MEDIA platform) {
|
|
- ToastUtils.showShort( "分享取消了");
|
|
|
|
|
|
+ ToastUtils.showShort("分享取消了");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1263,24 +1271,30 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
|
|
* @param payResult
|
|
* @param payResult
|
|
*/
|
|
*/
|
|
private void sendPayResult(int payResult) {
|
|
private void sendPayResult(int payResult) {
|
|
- //支付成功
|
|
|
|
- if (payResult == Constants.PAY_SUCCESS) {
|
|
|
|
- onSendMessage("'paymentOperation',result:success");
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- //支付失败
|
|
|
|
- if (payResult == Constants.PAY_ERROR) {
|
|
|
|
- onSendMessage("'paymentOperation',result:error");
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- //支付未安装
|
|
|
|
- if (payResult == Constants.PAY_ERROR_BY_NOT_INSTALL) {
|
|
|
|
- onSendMessage("'paymentOperation',result:fail");
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- //支付取消
|
|
|
|
- if (payResult == Constants.PAY_CANCEL) {
|
|
|
|
- onSendMessage("'paymentOperation',result:cancel");
|
|
|
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
|
+ JSONObject contentJson = new JSONObject();
|
|
|
|
+ try {
|
|
|
|
+ jsonObject.put("api", "paymentOperation");
|
|
|
|
+ //支付成功
|
|
|
|
+ if (payResult == Constants.PAY_SUCCESS) {
|
|
|
|
+ contentJson.put("status", "success");
|
|
|
|
+ }
|
|
|
|
+ //支付失败
|
|
|
|
+ if (payResult == Constants.PAY_ERROR) {
|
|
|
|
+ contentJson.put("status", "error");
|
|
|
|
+ }
|
|
|
|
+ //支付未安装
|
|
|
|
+ if (payResult == Constants.PAY_ERROR_BY_NOT_INSTALL) {
|
|
|
|
+ contentJson.put("status", "fail");
|
|
|
|
+ }
|
|
|
|
+ //支付取消
|
|
|
|
+ if (payResult == Constants.PAY_CANCEL) {
|
|
|
|
+ contentJson.put("status", "cancel");
|
|
|
|
+ }
|
|
|
|
+ jsonObject.put("content", contentJson);
|
|
|
|
+ onSendMessage(jsonObject.toString());
|
|
|
|
+ } catch (JSONException e) {
|
|
|
|
+ e.printStackTrace();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|