Pārlūkot izejas kodu

1、代码优化

fluty 4 gadi atpakaļ
vecāks
revīzija
1324b425fa

+ 11 - 1
fq_channel_ysdk/src/main/java/com/fq/channel/sdk/ReqYsdkPayBody.java

@@ -16,8 +16,9 @@ public class ReqYsdkPayBody {
     private String thirdAmt;
     private String appId;
     private String platform;
+    private String channelType;
 
-    public ReqYsdkPayBody(String openId, String accessToken, String payToken, String pf, String pfKey, String zoneId, String fqBillNo, String thirdAmt, String appId, String platform) {
+    public ReqYsdkPayBody(String openId, String accessToken, String payToken, String pf, String pfKey, String zoneId, String fqBillNo, String thirdAmt, String appId, String platform, String channelType) {
         this.openId = openId;
         this.accessToken = accessToken;
         this.payToken = payToken;
@@ -28,6 +29,15 @@ public class ReqYsdkPayBody {
         this.thirdAmt = thirdAmt;
         this.appId = appId;
         this.platform = platform;
+        this.channelType = channelType;
+    }
+
+    public String getChannelType() {
+        return channelType;
+    }
+
+    public void setChannelType(String channelType) {
+        this.channelType = channelType;
     }
 
     public String getOpenId() {

+ 5 - 4
fq_channel_ysdk/src/main/java/com/fq/channel/sdk/SdkPluginYsdk.java

@@ -153,7 +153,7 @@ public class SdkPluginYsdk extends FQPluginApi implements UserListener, BuglyLis
                         // 支付成功
                         case PayRet.PAYSTATE_PAYSUCC:
 //                            扣款回调
-                            ReqYsdkPayBody payBody = new ReqYsdkPayBody( openId,  accessToken,  payToken,  pf,  pfKey,  zoneId,  fqBillNo,  thirdAmt,  mAppid,  platform);
+                            ReqYsdkPayBody payBody = new ReqYsdkPayBody( openId,  accessToken,  payToken,  pf,  pfKey,  zoneId,  fqBillNo,  thirdAmt,  mAppid,  platform,"ysdk");
                             ysdkPayNotify(payBody);
                             break;
                         // 取消支付
@@ -555,9 +555,10 @@ public class SdkPluginYsdk extends FQPluginApi implements UserListener, BuglyLis
 
     private void ysdkPayNotify(ReqYsdkPayBody payBody){
         String request = ParamsUtils.getInstance().generateParams(payBody);
-        FqLog.i(TAG, "ysdkPayNotify:" + request);
-//        FqConfig.get().getBaseUrl()+
-        HttpManager.getInstance().post("https://app.funcheergame.com/api/sdk/ysdk/v1/notify ", Utils.decodeText(request), new BaseCallback() {
+        FqLog.i(TAG, "ysdkPayNotify:" +request);
+        FqLog.i(TAG, "ysdkPayNotify:" + FqConfig.get().getBaseUrl()+"/api/sdk/channel/v1/pay");
+//        FqConfig.get().getBaseUrl()+ https://app.funcheergame.com/api/sdk/ysdk/v1/notify
+        HttpManager.getInstance().post(FqConfig.get().getBaseUrl()+"/api/sdk/channel/v1/pay", Utils.decodeText(request), new BaseCallback() {
             @Override
             public void onFailure(BaseException msg) {
                 FqLog.e(TAG, "ysdkPayNotify: onFailure" + msg.getMsg());

+ 0 - 3
fq_plugin_api/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">fq_plugin_api</string>
-</resources>

+ 1 - 2
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/net/FqNetRequest.java

@@ -37,7 +37,6 @@ public class FqNetRequest {
     public static void login(HashMap<String, String> channelInfo, BaseCallback callback) {
         String request = ParamsUtils.getInstance().generateLoginParams(channelInfo);
         FqLog.i(TAG, "login:" + request);
-//        TODO  Utils.decodeText(request)
         HttpManager.getInstance().post(FqConfig.KEY_URL_LOGIN, request, callback);
     }
 
@@ -48,7 +47,7 @@ public class FqNetRequest {
      */
     public static void createOrder(RepOrderBody payInfo, BaseCallback callback) {
         String request = ParamsUtils.getInstance().generateOrderParams(payInfo);
-        FqLog.i(TAG, "login:" + request);
+        FqLog.i(TAG, "createOrder:" + request);
         HttpManager.getInstance().post(FqConfig.KEY_URL_CREATE_ORDER, Utils.decodeText(request), callback);
     }
 

+ 0 - 3
fq_plugin_base/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">fq_plugin_base</string>
-</resources>

+ 0 - 3
fq_plugin_core/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">fq_plugin_core</string>
-</resources>