1、oppo联调完成。封装完毕

2、代码优化

app/build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion 26
     defaultConfig {
-        applicationId "com.funcheer.channel.sdk"
+        applicationId "com.xinsglsbw.net.nearme.gamecenter"
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
@@ -16,20 +16,20 @@ android {
     }
 
     signingConfigs {
-//        release {
-//            storeFile file("./fqgamesdkkeystore.jks")
-//            storePassword '201868'
-//            keyPassword '201868'
-//            keyAlias 'fqgamesdkkeystore.jks'
+        release {
+            storeFile file("./fqgamesdkkeystore.jks")
+            storePassword '201868'
+            keyPassword '201868'
+            keyAlias 'fqgamesdkkeystore.jks'
 //            v2SigningEnabled false
-//        }
-//        debug{
-//            storeFile file("./fqgamesdkkeystore.jks")
-//            storePassword '201868'
-//            keyPassword '201868'
-//            keyAlias 'fqgamesdkkeystore.jks'
+        }
+        debug{
+            storeFile file("./fqgamesdkkeystore.jks")
+            storePassword '201868'
+            keyPassword '201868'
+            keyAlias 'fqgamesdkkeystore.jks'
 //            v2SigningEnabled false
-//        }
+        }
     }
 
     buildTypes {

app/src/main/java/com/funcheer/channel/sdk/MainActivity.java

@@ -6,7 +6,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.EditText;
@@ -16,19 +15,11 @@ import com.example.fqchannelsdk.R;
 import com.fq.channel.sdk.api.FqGame;
 import com.fq.channel.sdk.api.IExit;
 import com.fq.channel.sdk.api.IResult;
-import com.fq.channel.sdk.api.bean.LoginInfo;
-import com.fq.channel.sdk.api.bean.PaymentInfo;
+import com.fq.channel.sdk.base.bean.LoginInfo;
+import com.fq.channel.sdk.base.bean.PaymentInfo;
 import com.fq.channel.sdk.base.constants.ConstSet;
-import com.fq.channel.sdk.base.net.HttpManager;
-import com.fq.channel.sdk.base.net.callback.BaseCallback;
-import com.fq.channel.sdk.base.exception.BaseException;
 import com.fq.channel.sdk.base.utils.FqLog;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-
 /**
  * @Description: 描述
  * @Author: FLuty
@@ -190,11 +181,12 @@ public class MainActivity extends Activity implements View.OnClickListener {
         }
 
         FqLog.i(TAG,"price : "+priceString);
+        priceString = "0.01";
         PaymentInfo paymentInfo = new PaymentInfo();
         //订单金额
         paymentInfo.setPrice(priceString);
         //CP订单号
-        paymentInfo.setCpOrderId("cpOrder002");
+        paymentInfo.setCpOrderId("cp"+System.currentTimeMillis());
         //区服ID String的形式带入，值为int类型字符串
         paymentInfo.setServerId("1");
         //拓展信息

fq_channel_oppo/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
 
     <application>
         <!-- nearme game sdk config goes here -->
-        <meta-data android:name="debug_mode" android:value="true" />    <!-- 日志开关，发布时候设置为false -->
+        <meta-data android:name="debug_mode" android:value="false" />    <!-- 日志开关，发布时候设置为false -->
         <meta-data android:name="is_offline_game" android:value="false" />  <!-- true:单机游戏   false:网游 -->
         <meta-data android:name="app_key" android:value="71880d6376c347de88674f485f6ea446" />  <!--appKey，游戏上线时请务必替换成游戏自身的appkey-->
 

fq_channel_oppo/src/main/java/com/fq/channel/sdk/SdkPluginOppo.java

@@ -12,7 +12,7 @@ import android.util.Log;
 import android.widget.Toast;
 
 import com.fq.channel.sdk.base.constants.ConstSet;
-import com.fq.channel.sdk.base.constants.FqConfig;
+import com.fq.channel.sdk.base.config.FqConfig;
 import com.fq.channel.sdk.base.interfaces.FQPluginApi;
 import com.fq.channel.sdk.base.interfaces.PluginResult;
 import com.fq.channel.sdk.base.interfaces.PluginResultHandler;
@@ -26,8 +26,6 @@ import com.nearme.game.sdk.common.model.biz.PayInfo;
 import com.nearme.game.sdk.common.model.biz.ReportUserGameInfoParam;
 import com.nearme.platform.opensdk.pay.PayResponse;
 
-import org.json.JSONException;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -103,10 +101,15 @@ public class SdkPluginOppo extends FQPluginApi {
         String productName = String.valueOf(map.get(ConstSet.PAY_PRODUCT_NAME));
         String productDes = String.valueOf(map.get(ConstSet.PAY_PRODUCT_DES));
         String notifyUrl = String.valueOf(map.get(ConstSet.PAY_NOTIFY_URl));
-
+        int amount = 0;
+        try {
+            amount = (int) (price* 100); // 支付金额，单位分
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        }
         final PayInfo payInfo = new PayInfo(
                 orderId + "",
-                "oppo支付", 1); //分为单位，转换成为元
+                "oppo支付", amount);
         payInfo.setProductDesc(productDes);
         payInfo.setProductName(productName);
         payInfo.setCallbackUrl(notifyUrl);

fq_plugin_api/src/main/java/com/fq/channel/sdk/api/FqGame.java

@@ -5,8 +5,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 
-import com.fq.channel.sdk.api.bean.LoginInfo;
-import com.fq.channel.sdk.api.bean.PaymentInfo;
+import com.fq.channel.sdk.base.bean.LoginInfo;
+import com.fq.channel.sdk.base.bean.PaymentInfo;
 import com.fq.channel.sdk.base.utils.FqLog;
 import com.fq.channel.sdk.core.JointManager;
 import com.fq.channel.sdk.core.invoke.ApiPlugin;

fq_plugin_api/src/main/java/com/fq/channel/sdk/api/FqGameHander.java

@@ -2,18 +2,15 @@ package com.fq.channel.sdk.api;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
-import android.text.TextUtils;
 
-import com.fq.channel.sdk.api.bean.LoginInfo;
-import com.fq.channel.sdk.api.bean.PaymentInfo;
-import com.fq.channel.sdk.base.constants.AppConfig;
-import com.fq.channel.sdk.base.constants.FqConfig;
+import com.fq.channel.sdk.base.bean.LoginInfo;
+import com.fq.channel.sdk.base.bean.PaymentInfo;
+import com.fq.channel.sdk.base.config.FqConfig;
 import com.fq.channel.sdk.base.interfaces.IPermissionRequestCallback;
 import com.fq.channel.sdk.base.interfaces.PluginResult;
 import com.fq.channel.sdk.base.interfaces.PluginResultHandler;
 import com.fq.channel.sdk.base.net.HttpManager;
 import com.fq.channel.sdk.base.permission.PermissionManager;
-import com.fq.channel.sdk.base.utils.DeviceUtils;
 import com.fq.channel.sdk.base.utils.FqLog;
 import com.fq.channel.sdk.base.utils.Utils;
 import com.fq.channel.sdk.core.JointManager;
@@ -41,9 +38,6 @@ public class FqGameHander {
         PermissionManager.getInstance().applyPermission(activity, new IPermissionRequestCallback() {
             @Override
             public void onDone() {
-                //处理获取到读取IMEI权限的
-                String imei = DeviceUtils.getIMEI();
-                AppConfig.sImei = TextUtils.isEmpty(imei) ? "" : imei;
                 initSDKNet();
             }
         });

fq_plugin_api/src/main/java/com/fq/channel/sdk/api/bean/PayInfo.java

@@ -1,42 +0,0 @@
-package com.fq.channel.sdk.api.bean;
-
-/**
- * Created by Ethan on 2017/7/11.
- * <p>
- * 返回用户唯一标识uid和token给CP
- */
-
-public class PayInfo {
-
-    private String orderId;
-    private String notifyUrl;
-
-    public PayInfo(String orderId, String notifyUrl) {
-        this.orderId = orderId;
-        this.notifyUrl = notifyUrl;
-    }
-
-    public String getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(String orderId) {
-        this.orderId = orderId;
-    }
-
-    public String getNotifyUrl() {
-        return notifyUrl;
-    }
-
-    public void setNotifyUrl(String notifyUrl) {
-        this.notifyUrl = notifyUrl;
-    }
-
-    @Override
-    public String toString() {
-        return "PayInfo{" +
-                "orderId='" + orderId + '\'' +
-                ", notifyUrl='" + notifyUrl + '\'' +
-                '}';
-    }
-}

fq_plugin_api/src/main/java/com/fq/channel/sdk/api/bean/LoginInfo.java

@@ -1,4 +1,4 @@
-package com.fq.channel.sdk.api.bean;
+package com.fq.channel.sdk.base.bean;
 
 /**
  * Created by Ethan on 2017/7/11.

fq_plugin_api/src/main/java/com/fq/channel/sdk/api/bean/PaymentInfo.java

@@ -1,9 +1,4 @@
-package com.fq.channel.sdk.api.bean;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import com.fq.channel.sdk.base.utils.Utils;
+package com.fq.channel.sdk.base.bean;
 
 /**
  * Created by Ethan on 2017/8/17.

fq_plugin_api/src/main/java/com/fq/channel/sdk/api/bean/RoleInfo.java

@@ -1,4 +1,4 @@
-package com.fq.channel.sdk.api.bean;
+package com.fq.channel.sdk.base.bean;
 
 /**
  * Created by Ethan on 2017/8/19.

fq_plugin_base/src/main/java/com/fq/channel/sdk/base/constants/FqConfig.java

@@ -1,4 +1,4 @@
-package com.fq.channel.sdk.base.constants;
+package com.fq.channel.sdk.base.config;
 
 import android.app.Activity;
 import android.content.Context;

fq_plugin_base/src/main/java/com/fq/channel/sdk/base/constants/ResourceCfg.java

@@ -1,4 +1,4 @@
-package com.fq.channel.sdk.base.constants;
+package com.fq.channel.sdk.base.config;
 
 import android.content.Context;
 

fq_plugin_base/src/main/java/com/fq/channel/sdk/base/constants/AppConfig.java

@@ -1,118 +0,0 @@
-package com.fq.channel.sdk.base.constants;
-
-
-import com.fq.channel.sdk.base.utils.AppInfoUtils;
-
-import java.util.List;
-
-/**
- * Created by Ethan on 2017/8/4.
- * 配置类
- */
-
-public class AppConfig {
-
-
-    /**
-     * AppId
-     */
-    public static final String APP_ID = AppInfoUtils.getInstance().getAppId();
-
-
-
-    /**
-     * 渠道ID
-     */
-    public static final String CHANNEL_ID = AppInfoUtils.getInstance().getChannelId();
-
-    /**
-     * adId
-     */
-    public static final String AD_ID = AppInfoUtils.getInstance().getAdId();
-
-    /**
-     * adFlag
-     */
-    public static final String AD_FLAG = AppInfoUtils.getInstance().getAdFlag();
-
-    /**
-     * 凤起SDK的版本号
-     */
-    public static final String FQ_GAME_SDK_VERSION_CODE = AppInfoUtils.getInstance().getFqGameSdkVersionCode();
-
-    /**
-     * 游戏的版本信息
-     */
-    public static final String GAME_VERSION = AppInfoUtils.getInstance().getVersionCode() + "_" + AppInfoUtils.getInstance().getVersionName();
-
-
-    /**
-     * IMEI
-     */
-    public static String sImei;
-
-    /**
-     * 当前的uid
-     */
-    public static String sCurrentUid;
-
-    /**
-     * 当前token
-     */
-    public static String sCurrentToken;
-
-    /**
-     * 当前的凤起账号
-     */
-    public static String sCurrentAccount;
-
-    /**
-     * 客服电话号码
-     */
-    public static String sCustomerServerPhone = "";
-
-    /**
-     * 客服QQ
-     */
-    public static String sCustomerServerQq = "";
-
-    /**
-     * 是否禁用小球
-     */
-    public static boolean sIsFloatDisable = false;
-
-    /**
-     * 当前设备之前登录过的凤起账号
-     */
-    public static List<String> sLoggedinFqAccounts = null;
-
-    /**
-     * H5游戏的链接
-     */
-    public static String sH5GameUrl = "";
-
-    /**
-     * Td_AD_AppId
-     */
-    public static String sTdADAppId = "";
-
-    /**
-     * Td_GA_AppId
-     */
-    public static String sTdGAAppId = "";
-
-    /**
-     * Td_AD_Tdid
-     */
-    public static String sTdADTdid = FqConfig.get().getAdId();
-
-    /**
-     * Mac
-     */
-    public static final String Mac = AppInfoUtils.getInstance().tryGetWifiMac();
-
-    /**
-     * AndroidId
-     */
-    public static final String AndroidId = "";
-}

fq_plugin_base/src/main/java/com/fq/channel/sdk/base/constants/FqCache.java

@@ -1,9 +0,0 @@
-package com.fq.channel.sdk.base.constants;
-
-/**
- * @Description: 描述
- * @Author: FLuty
- * @CreateDate: 2020/4/3 14:44
- */
-public class FqCache {
-}

fq_plugin_base/src/main/java/com/fq/channel/sdk/base/net/FqNetRequest.java

@@ -1,14 +1,12 @@
 package com.fq.channel.sdk.base.net;
 
-import com.fq.channel.sdk.base.constants.FqConfig;
+import com.fq.channel.sdk.base.config.FqConfig;
 import com.fq.channel.sdk.base.net.callback.BaseCallback;
 import com.fq.channel.sdk.base.net.req.ParamsUtils;
 import com.fq.channel.sdk.base.net.req.RepOrderBody;
 import com.fq.channel.sdk.base.utils.FqLog;
 import com.fq.channel.sdk.base.utils.Utils;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.util.HashMap;
 
 /**

fq_plugin_base/src/main/java/com/fq/channel/sdk/base/net/req/ParamsUtils.java

@@ -1,7 +1,6 @@
 package com.fq.channel.sdk.base.net.req;
 
-import com.fq.channel.sdk.base.constants.AppConfig;
-import com.fq.channel.sdk.base.constants.FqConfig;
+import com.fq.channel.sdk.base.config.FqConfig;
 import com.fq.channel.sdk.base.exception.NullStringToEmptyAdapterFactory;
 import com.fq.channel.sdk.base.utils.DES;
 import com.fq.channel.sdk.base.utils.DeviceUtils;
@@ -12,17 +11,14 @@ import com.fq.threelib.gson.Gson;
 import com.fq.threelib.gson.GsonBuilder;
 import com.fq.threelib.gson.JsonObject;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.TreeMap;
 
-import static com.fq.channel.sdk.base.constants.FqConfig.KEY_CHANNEL_TYPE;
-import static com.fq.channel.sdk.base.constants.FqConfig.KEY_TOKEN;
+import static com.fq.channel.sdk.base.config.FqConfig.KEY_CHANNEL_TYPE;
+import static com.fq.channel.sdk.base.config.FqConfig.KEY_TOKEN;
 
 /**
  * Created by Ethan on 2017/7/5.
@@ -59,7 +55,7 @@ public class ParamsUtils {
 
         ReqContent<ReqInitBody> reqContent = new ReqContent<>();
         //生成init操作的boby
-        ReqInitBody body = new ReqInitBody(AppConfig.AD_ID);
+        ReqInitBody body = new ReqInitBody(FqConfig.get().getAdId());
         //生成init操作的head
         ReqHeader head = generateReqHeader(body);
 
@@ -136,19 +132,19 @@ public class ParamsUtils {
         reqHeader.setNetworkType(Utils.isWifi() ?"1" : "2"); //网络类型 1 wifi   2 其他
 
         reqHeader.setRequestIp(Utils.getIPAddress(true)); //请求ip
-        reqHeader.setImei(AppConfig.sImei); //Android 手机唯一识别码
+        reqHeader.setImei(DeviceUtils.getIMEI()); //Android 手机唯一识别码
         reqHeader.setIdfa(""); //ios唯一标识 没有传空字符传
         reqHeader.setOsType("1"); //系统类型 1 安卓 2 IOS 3 web 4 其他
 
-        reqHeader.setAppId(AppConfig.APP_ID); //appId
-        reqHeader.setChannelId(AppConfig.CHANNEL_ID); //渠道号
-        reqHeader.setAdId(AppConfig.AD_ID); //广告编号
-        reqHeader.setAdFlag(AppConfig.AD_FLAG); //广告名
-        reqHeader.setSdkVersion(AppConfig.FQ_GAME_SDK_VERSION_CODE);//凤起SDK版本
-        reqHeader.setGameVersion(AppConfig.GAME_VERSION);//游戏版本
+        reqHeader.setAppId(FqConfig.get().getAppId()); //appId
+        reqHeader.setChannelId(FqConfig.get().getChannelId()); //渠道号
+        reqHeader.setAdId(FqConfig.get().getAdId()); //广告编号
+        reqHeader.setAdFlag(FqConfig.get().getAdFlag()); //广告名
+        reqHeader.setSdkVersion(Utils.FQSDK_VERSION);//凤起SDK版本
+        reqHeader.setGameVersion(Utils.getVersionCode() + "_" + Utils.getVersionName());//游戏版本
         reqHeader.setToken(FqConfig.get().getString(KEY_TOKEN)); //token
 
-        reqHeader.setTdid(AppConfig.sTdADTdid);//Tdid
+        reqHeader.setTdid(FqConfig.get().getAdId());//Tdid
 
         String timestamp = System.currentTimeMillis() + "";//时间戳
         reqHeader.setTimestamp(timestamp);

fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/AppInfoUtils.java

@@ -1,126 +0,0 @@
-package com.fq.channel.sdk.base.utils;
-
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-
-import com.fq.channel.sdk.base.constants.FqConfig;
-
-/**
- * Created by Ethan on 2017/9/2.
- * 读取配置在AndroidManifest中的配置信息
- *
- * @author Ethan
- */
-
-public class AppInfoUtils {
-
-    /**
-     * 声明成volatile
-     */
-    private volatile static AppInfoUtils sInstance;
-
-    private AppInfoUtils() {
-    }
-
-    public static AppInfoUtils getInstance() {
-
-        if (sInstance == null) {
-            synchronized (AppInfoUtils.class) {
-                if (sInstance == null) {
-                    sInstance = new AppInfoUtils();
-                }
-            }
-        }
-        return sInstance;
-    }
-
-
-    /**
-     * 获取AppId
-     */
-    public String getAppId() {
-
-        return FqConfig.get().getAppId();
-    }
-
-    /**
-     * 获取配置写在strings.xml中的版本号信息
-     */
-    public String getFqGameSdkVersionCode() {
-        return Utils.FQSDK_VERSION;
-    }
-
-
-    /**
-     * 获取渠道号 ChannelId
-     * 如果获取不到 则使用默认的channelId
-     */
-    public String getChannelId() {
-        return FqConfig.get().getChannelId();
-    }
-
-    /**
-     * 获取adId
-     * 如果获取不到 则使用默认的adId
-     */
-    public String getAdId() {
-        return FqConfig.get().getAdId();
-    }
-
-    /**
-     * 获取adFlag
-     *
-     * @return
-     */
-    public String getAdFlag() {
-        return FqConfig.get().getAdFlag();
-    }
-
-    /**
-     * 获取VersionCode
-     *
-     * @return
-     */
-    public String getVersionCode() {
-
-        String versionCode = "";
-        try {
-            PackageManager pm = Utils.getContext().getPackageManager();
-            PackageInfo pi = pm.getPackageInfo(Utils.getContext().getPackageName(), 0);
-            versionCode = pi.versionCode + "";
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        return versionCode;
-    }
-
-    /**
-     * 获取VersionName
-     *
-     * @return
-     */
-    public String getVersionName() {
-
-        String versionName = "";
-        try {
-            PackageManager pm = Utils.getContext().getPackageManager();
-            PackageInfo pi = pm.getPackageInfo(Utils.getContext().getPackageName(), 0);
-            versionName = pi.versionName;
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        return versionName;
-    }
-
-    /**
-     * 通过WiFiManager获取mac地址
-     *
-     * @return
-     */
-    public String tryGetWifiMac() {
-        return DeviceUtils.tryGetWifiMac();
-    }
-
-}

fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/FqLog.java

@@ -2,7 +2,7 @@ package com.fq.channel.sdk.base.utils;
 
 import android.util.Log;
 
-import com.fq.channel.sdk.base.constants.FqConfig;
+import com.fq.channel.sdk.base.config.FqConfig;
 
 /**
  * @Description: 日志工具类

fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/Utils.java

@@ -5,6 +5,8 @@ import android.app.ActivityManager;
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
@@ -417,4 +419,43 @@ public class Utils {
         }
         return sb.toString();
     }
+
+    /**
+     * 获取VersionCode
+     *
+     * @return
+     */
+    public static String getVersionCode() {
+
+        String versionCode = "";
+        try {
+            PackageManager pm = Utils.getContext().getPackageManager();
+            PackageInfo pi = pm.getPackageInfo(Utils.getContext().getPackageName(), 0);
+            versionCode = pi.versionCode + "";
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        return versionCode;
+    }
+
+    /**
+     * 获取VersionName
+     *
+     * @return
+     */
+    public static String getVersionName() {
+
+        String versionName = "";
+        try {
+            PackageManager pm = Utils.getContext().getPackageManager();
+            PackageInfo pi = pm.getPackageInfo(Utils.getContext().getPackageName(), 0);
+            versionName = pi.versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        return versionName;
+    }
+
 }

fq_plugin_core/src/main/java/com/fq/channel/sdk/core/JointManager.java

@@ -4,8 +4,8 @@ import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import com.fq.channel.sdk.base.constants.FqConfig;
-import com.fq.channel.sdk.base.constants.ResourceCfg;
+import com.fq.channel.sdk.base.config.FqConfig;
+import com.fq.channel.sdk.base.config.ResourceCfg;
 import com.fq.channel.sdk.base.exception.BaseException;
 import com.fq.channel.sdk.base.interfaces.PluginResult;
 import com.fq.channel.sdk.base.interfaces.PluginResult.Status;