Merge remote-tracking branch 'origin/develop' into yinyou_dating

core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java

@@ -366,6 +366,7 @@ public class PaymentActivity extends Activity
                         }
                     }
                 })
+                .compose(RxHelper.handleSchedulers())
                 .subscribe((stringStringMap, throwable) -> {
                     if (throwable == null) {
                         AliPayResult aliPayResult = new AliPayResult(stringStringMap);

core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/alipay/AliPayModel.java

@@ -55,8 +55,7 @@ public class AliPayModel extends BaseModel implements IAliPayModel {
                 chargeProdId,
                 Constants.CHARGE_ALIPAY,
                 NetworkUtils.getIPAddress(context),
-                AuthModel.get().getTicket())
-                .compose(RxHelper.handleSchedulers());
+                AuthModel.get().getTicket());
 
     }