瀏覽代碼

添加初始化操作。

kaiweicai 3 年之前
父節點
當前提交
7408549984

+ 0 - 1
library_channel/src/main/java/cn/yyxx/commsdk/impl/channel/msa/MsaDeviceIdsHandler.java

@@ -11,7 +11,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import cn.yyxx.support.hawkeye.LogUtils;
-import cn.yyxx.support.msa.IMsaDeviceIdsCallback;
 
 /**
  * @author #Suyghur.

+ 1 - 0
library_core/build.gradle

@@ -52,4 +52,5 @@ android {
 dependencies {
 
     api project(':library_base')
+    api project(':library_channel')
 }

+ 17 - 0
library_core/src/main/assets/supplierconfig.json

@@ -0,0 +1,17 @@
+{
+  "supplier":{
+    "vivo":{
+      "appid":"100215079"
+    },
+    "xiaomi":{
+
+    },
+    "huawei":{
+
+    },
+    "oppo":{
+
+    }
+  }
+
+}

+ 22 - 8
library_core/src/main/java/cn/yyxx/commsdk/core/common/CommonOperationManager.java

@@ -30,9 +30,10 @@ import cn.yyxx.commsdk.core.utils.ManifestUtils;
 import cn.yyxx.commsdk.core.utils.ParamsUtils;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
 import cn.yyxx.commsdk.core.utils.SharedPreferencesUtils;
+import cn.yyxx.commsdk.impl.channel.msa.IMsaDeviceIdsCallback;
+import cn.yyxx.commsdk.impl.channel.msa.MsaDeviceIdsHandler;
 import cn.yyxx.support.JsonUtils;
-import cn.yyxx.support.msa.IMsaDeviceIdsCallback;
-import cn.yyxx.support.msa.MsaDeviceIdsHandler;
+
 import cn.yyxx.support.permission.IPermissionCallback;
 import cn.yyxx.support.permission.Permission;
 import cn.yyxx.support.permission.PermissionKit;
@@ -140,19 +141,20 @@ public class CommonOperationManager {
     public void initMsaDeviceIds(Application application,Context context){
         MsaDeviceIdsHandler.initMsaDeviceIds(application, new IMsaDeviceIdsCallback() {
             @Override
-            public void onIdsRead(int code, String msg, Map<String, String> map) {
-                Logger.d("msa sdk attach , code : " + code + " , msg : " + msg);
-                hasIdsRead = true;
+            public void onIdsRead(int code, String msg, Map<String, String> ids) {
+
             }
         });
     }
     @SuppressLint("MissingPermission")
-    public String getIfa(Context context){
+    public JSONObject getIfa(Context context){
         String ifa = "";
+        String ifa_type= "";
+
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P){
 
                 ifa = MsaDeviceIdsHandler.oaid;
-
+                ifa_type =  "2";
         }else{
             if (PermissionKit.isGranted(context,Permission.READ_PHONE_STATE)){
                 @SuppressLint("ServiceCast") TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELECOM_SERVICE);
@@ -162,16 +164,27 @@ public class CommonOperationManager {
                     ifa = telephonyManager.getDeviceId();
                 }
             }
+            ifa_type = "1";
         }
 
         if (ifa.isEmpty()){
             ifa = Settings.Secure.getString(context.getApplicationContext().getContentResolver(), Settings.Secure.ANDROID_ID);
+            ifa_type = "3";
             if (ifa.isEmpty()){
                 ifa = userSimulateImei(context);
+                ifa_type = "0";
             }
         }
 
-        return ifa;
+        JSONObject json = new JSONObject();
+        try {
+            json.put("ifa",ifa);
+            json.put("ifa_type",ifa_type);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        return json;
     }
 
 
@@ -298,6 +311,7 @@ public class CommonOperationManager {
     }
 
 
+
     public enum Result{
         /**
          * 授权

+ 7 - 3
library_core/src/main/java/cn/yyxx/commsdk/core/impl/SdkBridgeImpl.java

@@ -6,17 +6,19 @@ import android.content.Context;
 import android.content.Intent;
 
 import java.util.List;
+import java.util.Map;
 
 import cn.yyxx.commsdk.base.entity.SdkChargeInfo;
 import cn.yyxx.commsdk.base.entity.SdkRoleInfo;
 import cn.yyxx.commsdk.base.internal.ICallback;
-import cn.yyxx.commsdk.base.internal.IInitialize;
+
 import cn.yyxx.commsdk.base.utils.Logger;
-import cn.yyxx.commsdk.core.SdkDrive;
+
 import cn.yyxx.commsdk.core.common.CommonOperationManager;
-import cn.yyxx.commsdk.core.network.SdkRequest;
+
 import cn.yyxx.commsdk.core.utils.MMKVUtils;
 
+
 /**
  * @author #Suyghur.
  * Created on 2021/12/25
@@ -34,6 +36,7 @@ public final class SdkBridgeImpl {
         // 初始化Zap日志框架
         Logger.initZap(application);
 
+        CommonOperationManager.getInstance().initMsaDeviceIds(application,context);
 
 
     }
@@ -41,6 +44,7 @@ public final class SdkBridgeImpl {
     public void initApplication(Application application) {
         Logger.i("initApplication ...");
         MMKVUtils.getInstance().init(application);
+
     }
 
     public void initAgreement(Activity activity,ICallback callback) {

+ 3 - 8
library_core/src/main/java/cn/yyxx/commsdk/core/network/SdkRequest.java

@@ -46,20 +46,15 @@ public class SdkRequest {
     }
     public void  initSdk(Context context, IRequestCallback callback){
 
-        String ifa = CommonOperationManager.getInstance().getIfa(context);
-        String ifa_type = "1";
+        JSONObject ifa_info = CommonOperationManager.getInstance().getIfa(context);
 
-
-        JSONObject json = new JSONObject();
         try {
-            json.put("ifa",ifa);
-            json.put("ifa_type",ifa_type);
-            json.put("route_path",Hosts.BASIC_URL_INIT_SDK);
+            ifa_info.put("route_path",Hosts.BASIC_URL_INIT_SDK);
         } catch (JSONException e) {
             e.printStackTrace();
         }
 
-        String paramText = SdkDrive.getInstance().invokeJob(json.toString());
+        String paramText = SdkDrive.getInstance().invokeJob(ifa_info.toString());
         VolleyRequest.post(context,HOST,paramText,callback);
     }
 }