添加混淆内容。

config.gradle

@@ -10,6 +10,6 @@ ext {
             compileSdk: 31,
             buildToolsVersion: '31.0.0',
             minSdk    : 21,
-            targetSdk : 31,
+            targetSdk : 26,
     ]
 }

demo/build.gradle

@@ -72,9 +72,9 @@ android {
 dependencies {
     implementation project(path: ':library_core')
     implementation project(path: ':library_channel')
-//    implementation project(path: ':library_platform:platform_hnyy')
+    implementation project(path: ':library_platform:hnyy')
 
-    implementation project(path: ':library_channel_repository:oppo')
+//    implementation project(path: ':library_channel_repository:oppo')
 
 
 }

demo/release/output-metadata.json

@@ -1,20 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.yyxx.commsdk.demo",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 1,
-      "versionName": "0.0.1",
-      "outputFile": "demo-release.apk"
-    }
-  ],
-  "elementType": "File"
-}

demo/src/main/java/com/yyxx/commsdk/demo/DemoActivity.kt

@@ -10,6 +10,7 @@ import android.os.Handler
 import android.os.Looper
 import android.os.Message
 import android.text.InputType
+import android.util.Log
 import android.view.KeyEvent
 
 import android.view.View
@@ -20,10 +21,12 @@ import cn.yyxx.commsdk.base.entity.ResultInfo
 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.utils.Logger
 
 
 import cn.yyxx.support.hawkeye.ToastUtils
 import cn.yyxx.support.permission.Permission
+
 import org.json.JSONObject
 
 
@@ -43,6 +46,8 @@ class DemoActivity : Activity(), View.OnClickListener {
         Item(6, "06 定额充值"),
         Item(7, "07 权限申请测试"),
         Item(8, "08 上报游戏事件"),
+        Item(9, "09 获取oaid"),
+
     )
 
     private lateinit var layout: LinearLayout
@@ -69,8 +74,7 @@ class DemoActivity : Activity(), View.OnClickListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         initView()
-
-        YYXXCommSdk.getInstance().initialize(this,object: ICallback{
+         YYXXCommSdk.getInstance().initialize(this,object: ICallback{
             override fun onResult(code: Int, result: String?) {
 
                 ToastUtils.toastInfo(this@DemoActivity,"code:$code   msg:$result")
@@ -88,6 +92,7 @@ class DemoActivity : Activity(), View.OnClickListener {
 
         YYXXCommSdk.getInstance().onCreate(this,savedInstanceState)
 
+
     }
 
 
@@ -184,6 +189,9 @@ class DemoActivity : Activity(), View.OnClickListener {
                 8 ->{
                     YYXXCommSdk.getInstance().reportGameEvent("主线任务1", getGameEvent());
                 }
+                9 ->{
+                    YYXXCommSdk.getInstance().getOaid();
+                }
 
             }
         }

gradlew

@@ -0,0 +1,183 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,100 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

library_base/build.gradle

@@ -32,12 +32,40 @@ android {
 }
 
 dependencies {
+
+
     api files('../libs/mmkv-static-1.2.8.jar')
     api files('../libs/dolin_zap_1.0.0.jar')
     api files('../libs/yyxx_support_1.0.2.jar')
-//    api files('../libs/ali_authsdk_2.12.1.jar')
     api files('../libs/android-support-v4.jar')
 
+
 }
 
-//apply from: 'buildJar.gradle'
+
+android.libraryVariants.all { variant ->
+    if (variant.buildType.name == 'release'){
+        variant.outputs.all {
+
+            outputFileName = "$PUBLISH_ARTIFACT_ID$PUBLISH_VERSION" + ".aar"
+        }
+    }else{
+        variant.outputs.all {
+            outputFileName = "$PUBLISH_ARTIFACT_ID" + "_"+ variant.buildType.name + "$PUBLISH_VERSION" + ".aar"
+        }
+    }
+
+}
+
+
+ext {
+
+    PUBLISH_ARTIFACT_ID = 'yyxx_comm_base'
+    PUBLISH_VERSION = ':1.0.100'
+}
+
+
+
+
+
+apply from: 'buildJar.gradle'

library_base/buildJar.gradle

@@ -0,0 +1,22 @@
+def SDK_BASENAME = "yyxx_comm_base"
+def SDK_VERSION = "1.0.0"
+def SEPARATOR = "_"
+def sdkDestinationPath = "build/jar/"
+def zipFile = file('build/intermediates/aar_main_jar/release/classes.jar')
+
+static def buildTime() {
+    return new Date().format("yyyyMMddHHmm", TimeZone.getDefault())
+}
+
+task deleteBaseBuild(type: Delete) {
+    delete sdkDestinationPath
+}
+
+task makeJar(type: Jar) {
+    from zipTree(zipFile)
+    setBaseName(SDK_BASENAME + SEPARATOR + SDK_VERSION)
+    setDestinationDir(file(sdkDestinationPath))
+
+}
+
+makeJar.dependsOn(deleteBaseBuild, build)

library_base/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

library_base/src/main/assets/supplierconfig.json

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

library_base/src/main/java/cn/yyxx/commsdk/Version.java

@@ -5,5 +5,5 @@ package cn.yyxx.commsdk;
  * Created on 2021/12/25
  */
 public class Version {
-    public static final String VERSION_NAME = "3.0.0";
+    public static final String VERSION_NAME = "1.0.0";
 }

library_base/src/main/java/cn/yyxx/commsdk/base/YYXXCommSdk.java

@@ -20,7 +20,6 @@ import cn.yyxx.commsdk.base.entity.ResultInfo;
 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.support.AppUtils;
 
@@ -318,6 +317,21 @@ public final class YYXXCommSdk {
 
 
     }
+
+    public String getOaid(){
+
+        if (checkSdkBridgeNull(Function.GET_OAID, null)) {
+            return "";
+        }
+
+        if (checkSdkNonInit(Function.GET_OAID, null)) {
+            return "";
+        }
+
+        return (String) SdkBridgeManager.callback(Function.GET_OAID, new Class[]{}, new Object[]{});
+
+    }
+
     /**
      * 同步游戏Activity的onStart
      */

library_base/src/main/java/cn/yyxx/commsdk/base/constants/Constants.java

@@ -7,12 +7,6 @@ public class Constants {
     public static final String UPLOAD_TYPE_LEVEL_UPGRADE = "roleUpgrade";
 
 
-    public static final String LOGIN = "LOGIN";
-
-    public static final String LOGOUT = "LOGOUT";
-
-
-
 
     public static final long CLICK_INTERVAL = 2000L;
 

library_base/src/main/java/cn/yyxx/commsdk/base/entity/Function.java

@@ -21,7 +21,8 @@ public @interface Function {
     String START_PAY = "startPay";
     String GET_CHANNEL_ORDER_EXT = "getChannelOrderExt";
     String UPLOAD_ROLE_INFO = "uploadRoleInfo";
-
+    String INIT_MSA_DEVICE_IDS = "initMsaDeviceIds";
+    String GET_OAID ="getOaid";
     String HAS_EXIT_VIEW = "hasExitView";
     String OPEN_EXIT_VIEW = "openExitView";
     String REPORT_GAME_EVENT = "reportGameEvent";

library_base/src/main/java/cn/yyxx/commsdk/base/entity/SdkChargeInfo.java

@@ -17,6 +17,8 @@ public class SdkChargeInfo {
     String order_desc;
     String sdk_params;
 
+    int[] order_split;
+
     public String getSdk_params() {
         return this.sdk_params;
     }

library_base/src/main/java/cn/yyxx/commsdk/base/entity/bean/InitBean.java

@@ -56,7 +56,7 @@ public class InitBean {
 
 
             initBean.reg_tabs = jsonObject.optJSONArray("reg_tabs");
-            initBean.sdk_login = jsonObject.optInt("sdk_login", 100);
+            initBean.sdk_login = jsonObject.optInt("sdk_login", 1);
 
             initBean.bswitch = jsonObject.optInt("bswitch");
 

library_base/src/main/java/cn/yyxx/commsdk/base/internal/IInitialize.java

@@ -1,10 +0,0 @@
-package cn.yyxx.commsdk.base.internal;
-
-/**
- * @author #Suyghur.
- * Created on 2021/10/22
- */
-public interface IInitialize {
-
-    void onResult(int code, String result);
-}

library_base/src/main/java/cn/yyxx/commsdk/base/internal/feature/IFeature.java

@@ -1,6 +1,7 @@
 package cn.yyxx.commsdk.base.internal.feature;
 
 import android.app.Activity;
+import android.content.Context;
 
 import org.json.JSONObject;
 
@@ -8,6 +9,7 @@ import cn.yyxx.commsdk.base.entity.SdkChargeInfo;
 import cn.yyxx.commsdk.base.entity.SdkRoleInfo;
 import cn.yyxx.commsdk.base.entity.bean.InitBean;
 import cn.yyxx.commsdk.base.internal.ICallback;
+import cn.yyxx.commsdk.base.internal.IMsaDeviceCallback;
 
 /**
  * @author #Suyghur.
@@ -17,7 +19,7 @@ public interface IFeature {
 
     void initialize(Activity activity, ICallback callback);
 
-    void initializeSuccess();
+    void initializeSuccess(Activity activity, int loginStatus);
 
     void setLogoutListener(Activity activity,ICallback callback);
 
@@ -25,8 +27,6 @@ public interface IFeature {
 
     void logout();
 
-
-
     boolean hasExitView(Activity activity);
 
     void openExitView(Activity activity, ICallback callback);
@@ -35,4 +35,6 @@ public interface IFeature {
 
     void reportGameEvent(String event, JSONObject message);
 
+    void initMsaDeviceIds(Context context, final IMsaDeviceCallback iMsaDeviceCallback);
+
 }

library_base/src/main/java/cn/yyxx/commsdk/base/internal/feature/ILifeCycle.java

@@ -15,7 +15,7 @@ public interface ILifeCycle {
 
     void onResume(Activity activity);
 
-    void onReStart(Activity activity);
+    void onRestart(Activity activity);
 
     void onPause(Activity activity);
 

library_channel/build.gradle

@@ -31,6 +31,29 @@ android {
     }
 }
 
+
+android.libraryVariants.all { variant ->
+    if (variant.buildType.name == 'release'){
+        variant.outputs.all {
+
+            outputFileName = "$PUBLISH_ARTIFACT_ID$PUBLISH_VERSION" + ".aar"
+        }
+    }else{
+        variant.outputs.all {
+            outputFileName = "$PUBLISH_ARTIFACT_ID" + "_"+ variant.buildType.name + "$PUBLISH_VERSION" + ".aar"
+        }
+    }
+
+}
+
+
+ext {
+
+    PUBLISH_ARTIFACT_ID = 'yyxx_comm_channel'
+    PUBLISH_VERSION = ':1.0.100'
+}
+
+
 dependencies {
     compileOnly project(':library_base')
 
@@ -39,4 +62,4 @@ dependencies {
 
 }
 
-//apply from: 'buildJar.gradle'
+apply from: 'buildJar.gradle'

library_channel/buildJar.gradle

@@ -0,0 +1,22 @@
+def SDK_BASENAME = "yyxx_comm_channel"
+def SDK_VERSION = "1.0.0"
+def SEPARATOR = "_"
+def sdkDestinationPath = "build/jar/"
+def zipFile = file('build/intermediates/aar_main_jar/release/classes.jar')
+
+static def buildTime() {
+    return new Date().format("yyyyMMddHHmm", TimeZone.getDefault())
+}
+
+task deleteBaseBuild(type: Delete) {
+    delete sdkDestinationPath
+}
+
+task makeJar(type: Jar) {
+    from zipTree(zipFile)
+    setBaseName(SDK_BASENAME + SEPARATOR + SDK_VERSION)
+    setDestinationDir(file(sdkDestinationPath))
+
+}
+
+makeJar.dependsOn(deleteBaseBuild, build)

library_channel/proguard-rules.pro

@@ -18,4 +18,167 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+# 代码混淆压缩比，在0~7之间，默认为5，一般不做修改
+-optimizationpasses 5
+# 混合时不使用大小写混合，混合后的类名为小写
+-dontusemixedcaseclassnames
+# 指定不去忽略非公共库的类
+-dontskipnonpubliclibraryclasses
+-dontoptimize
+# 这句话能够使我们的项目混淆后产生映射文件
+# 包含有类名->混淆后类名的映射关系
+-verbose
+-ignorewarnings
+# 指定不去忽略非公共库的类成员
+-dontskipnonpubliclibraryclassmembers
+# 指定混淆是采用的算法，后面的参数是一个过滤器
+# 这个过滤器是谷歌推荐的算法，一般不做更改
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+# 保留java与js交互注解
+-keepattributes *Annotation*
+-keepattributes *JavascriptInterface*
+#保留JavascriptInterface中的方法
+-keepclassmembers class * {
+    @android.webkit.JavascriptInterface <methods>;
+}
+
+# 保留内部类
+-keepattributes Exceptions,InnerClasses
+
+# 保留泛型
+-keepattributes Signature
+
+-keep class kotlin.** { *; }
+-keep class kotlin.Metadata { *; }
+
+-dontwarn kotlin.**
+
+-keepclassmembers class **$WhenMappings {
+    <fields>;
+}
+-keepclassmembers class kotlin.Metadata {
+    public <methods>;
+}
+
+-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
+    static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
+}
+
+-keepnames class * implements java.io.Serializable
+-keepclassmembers class * implements java.io.Serializable {
+   static final long serialVersionUID;
+   private static final java.io.ObjectStreamField[] serialPersistentFields;
+   !static !transient <fields>;
+   private void writeObject(java.io.ObjectOutputStream);
+   private void readObject(java.io.ObjectInputStream);
+   java.lang.Object writeReplace();
+   java.lang.Object readResolve();
+}
+
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+-keep class **.R$* {
+ *;
+}
+
+-keep public class * extends android.app.Activity{
+	public <fields>;
+	public <methods>;
+}
+-keep public class * extends android.app.Application{
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+
+-keep public class * extends androidx.core.app.CoreComponentFactory
+
+
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keepclasseswithmembers class * {
+	public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+	public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclasseswithmembernames class *{
+	native <methods>;
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
+
+-keepclasseswithmembers class * {
+    ... *JNI*(...);
+}
+
+-keepclasseswithmembernames class * {
+	... *JRI*(...);
+}
+
+-keep class **JNI* {*;}
+
+-keep class cn.yyxx.commsdk.impl.ChannelSdkImpl{public <fields>; public<methods>;}
+
+-keep class cn.yyxx.commsdk.impl.ChannelSdkGenerator{public <fields>; public<methods>;}
+
+
+
+-keep class cn.yyxx.commsdk.impl.merge.user.**{public <fields>; public <methods>;}
+
+
+-keep class cn.yyxx.commsdk.impl.merge.LoginViewModel{*;}
+
+
+
+
+-dontshrink
+
+
+# support sdk
+-keep class cn.yyxx.support.**{*;}
+
+# base sdk
+-keep class cn.qingshi.gamesdk.base.**{*;}
+
+# msa sdk
+-keep class XI.**{*;}
+-keep class com.asus.**{*;}
+-keep class com.bun.**{*;}
+-keep class com.huawei.hms.ads.identifier.**{*;}
+-keep class com.samsung.android.deviceidservice.**{*;}
+-keep class com.netease.nis.sdkwrapper.** {*;}
+-keep class com.zui.**{*;}
+-keep class org.json.**{*;}
+
+# authsdk
+-keep class com.alibaba.**{*;}
+-keep class com.cmic.**{*;}
+-keep class com.mobile.**{*;}
+-keep class com.nirvana.**{*;}
+
+# mmkv
+-keep class com.tencent.mmkv.**{*;}
+
+# zap
+-keep class com.dolin.zap.**{*;}
+
+# v4-support
+-keep class android.support.**{*;}

library_channel/src/main/java/cn/yyxx/commsdk/impl/ChannelSdkGenerator.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import cn.yyxx.commsdk.base.internal.feature.IFeature;
 import cn.yyxx.commsdk.impl.merge.channel.ChannelSdk;
 import cn.yyxx.commsdk.impl.merge.platform.PlatformSdk;
-import cn.yyxx.commsdk.impl.entity.ChannelId;
+
 
 /**
  * @author #Suyghur.
@@ -16,10 +16,9 @@ public class ChannelSdkGenerator {
     public static IFeature getChannelInstance(Context context, boolean isThird) {
         IFeature instance = null;
         if (isThird){
-            instance = new PlatformSdk(context);
-        }else{
             instance = new ChannelSdk(context);
-
+        }else{
+            instance = new PlatformSdk(context);
         }
         return instance;
     }

library_channel/src/main/java/cn/yyxx/commsdk/impl/ChannelSdkImpl.java

@@ -15,6 +15,7 @@ import cn.yyxx.commsdk.base.entity.SdkOrderInfo;
 import cn.yyxx.commsdk.base.entity.SdkRoleInfo;
 import cn.yyxx.commsdk.base.entity.bean.InitBean;
 import cn.yyxx.commsdk.base.internal.ICallback;
+import cn.yyxx.commsdk.base.internal.IMsaDeviceCallback;
 import cn.yyxx.commsdk.base.internal.feature.IApplication;
 import cn.yyxx.commsdk.base.internal.feature.IFeature;
 import cn.yyxx.commsdk.base.internal.feature.ILifeCycle;
@@ -29,12 +30,12 @@ import cn.yyxx.commsdk.core.utils.ParamsUtils;
 public class ChannelSdkImpl {
 
     private IFeature impl;
-    private int channelId = 1;
+
 
     private String [] platforms = new String[]{"HNYY","SHXY","HNQJ","HNXR"};
 
     public ChannelSdkImpl(Context context) {
-        //TODO 从配置文件读取channelId
+        //TODO 从配置文件读取channelName(YYXX_PLATFORM),判断是否自有sdk
         String channelName = ParamsUtils.getChannelName(context);
         boolean isThird = true;
 
@@ -47,6 +48,10 @@ public class ChannelSdkImpl {
         impl = ChannelSdkGenerator.getChannelInstance(context, isThird);
     }
 
+    public void initMsaDeviceIds(Context context, final IMsaDeviceCallback iMsaDeviceCallback){
+        impl.initMsaDeviceIds(context,iMsaDeviceCallback);
+    }
+
     public void attachBaseContext(Application application, Context context) {
         if (impl instanceof IApplication) {
             ((IApplication) impl).attachBaseContext(application, context);
@@ -59,12 +64,16 @@ public class ChannelSdkImpl {
         }
     }
 
+
     public void initialize(Activity activity, ICallback callback) {
         impl.initialize(activity, callback);
     }
 
-    public void initializeSuccess(){
-        impl.initializeSuccess();
+    public void initializeSuccess(Activity activity,int loginStatus){
+        if (loginStatus != 1){
+            impl  = ChannelSdkGenerator.getChannelInstance(activity, false);
+        }
+        impl.initializeSuccess(activity,loginStatus);
     }
     public void setLogoutListener(Activity activity,ICallback callback){
         impl.setLogoutListener(activity,callback);
@@ -118,7 +127,7 @@ public class ChannelSdkImpl {
 
     public void onRestart(Activity activity) {
         if (impl instanceof ILifeCycle) {
-            ((ILifeCycle) impl).onReStart(activity);
+            ((ILifeCycle) impl).onRestart(activity);
         }
     }
 

library_channel/src/main/java/cn/yyxx/commsdk/impl/entity/ChannelId.java

@@ -1,11 +0,0 @@
-package cn.yyxx.commsdk.impl.entity;
-
-/**
- * @author #Suyghur.
- * Created on 2021/12/26
- */
-public class ChannelId {
-
-    public static final int YYXX = 0;
-    public static final int OPPO = 1;
-}

library_channel/src/main/java/cn/yyxx/commsdk/impl/merge/LoginViewModel.java

@@ -197,5 +197,13 @@ public class LoginViewModel {
         });
     }
 
+    public void requestChannelExtInfo(Activity activity,String host,JSONObject info,ICallback callback){
+        SdkRequest.getInstance().requestChannelExtInfo(activity,host,info, new IRequestCallback() {
+            @Override
+            public void onResponse(ResultInfo resultInfo) {
+
+            }
+        });
+    }
 
 }

library_channel/src/main/java/cn/yyxx/commsdk/impl/merge/channel/ChannelSdk.java

@@ -14,12 +14,14 @@ import cn.yyxx.commsdk.base.entity.SdkOrderInfo;
 import cn.yyxx.commsdk.base.entity.SdkRoleInfo;
 import cn.yyxx.commsdk.base.entity.bean.InitBean;
 import cn.yyxx.commsdk.base.internal.ICallback;
+import cn.yyxx.commsdk.base.internal.IMsaDeviceCallback;
 import cn.yyxx.commsdk.base.internal.feature.IApplication;
 import cn.yyxx.commsdk.base.internal.feature.IFeature;
 import cn.yyxx.commsdk.base.internal.feature.ILifeCycle;
 import cn.yyxx.commsdk.base.internal.feature.IOrder;
 
 
+
 /**
  * @author #Suyghur.
  * Created on 2021/12/25
@@ -68,12 +70,13 @@ public class ChannelSdk implements IFeature,ILifeCycle, IApplication,IOrder {
     }
 
     @Override
-    public void initializeSuccess() {
+    public void initializeSuccess(Activity activity, int loginStatus) {
         checkSdkBridgeNull();
-        SdkProxyChannelManager.call(Function.INITIALIZE_SUCCESS,  new Class[]{}, new Object[]{});
+        SdkProxyChannelManager.call(Function.INITIALIZE_SUCCESS,  new Class[]{Activity.class,int.class}, new Object[]{activity,loginStatus});
 
     }
 
+
     @Override
     public void setLogoutListener(Activity activity, ICallback callback) {
         checkSdkBridgeNull();
@@ -122,6 +125,13 @@ public class ChannelSdk implements IFeature,ILifeCycle, IApplication,IOrder {
 
     }
 
+    @Override
+    public void initMsaDeviceIds(Context context, IMsaDeviceCallback iMsaDeviceCallback) {
+        checkSdkBridgeNull();
+        SdkProxyChannelManager.call(Function.INIT_MSA_DEVICE_IDS, new Class[]{Context.class, IMsaDeviceCallback.class}, new Object[]{context,iMsaDeviceCallback});
+
+    }
+
 
     @Override
     public void attachBaseContext(Application application, Context context) {
@@ -152,7 +162,7 @@ public class ChannelSdk implements IFeature,ILifeCycle, IApplication,IOrder {
     }
 
     @Override
-    public void onReStart(Activity activity) {
+    public void onRestart(Activity activity) {
         checkSdkBridgeNull();
         SdkProxyChannelManager.call(Function.ON_RESTART, new Class[]{Activity.class}, new Object[]{activity});
 

library_channel/src/main/java/cn/yyxx/commsdk/impl/merge/platform/PlatformSdk.java

@@ -17,6 +17,7 @@ import cn.yyxx.commsdk.base.entity.SdkOrderInfo;
 import cn.yyxx.commsdk.base.entity.SdkRoleInfo;
 import cn.yyxx.commsdk.base.internal.ICallback;
 import cn.yyxx.commsdk.base.entity.bean.InitBean;
+import cn.yyxx.commsdk.base.internal.IMsaDeviceCallback;
 import cn.yyxx.commsdk.base.internal.feature.IApplication;
 import cn.yyxx.commsdk.base.internal.feature.IFeature;
 import cn.yyxx.commsdk.base.internal.feature.ILifeCycle;
@@ -71,9 +72,9 @@ public class PlatformSdk implements IFeature,ILifeCycle, IApplication,IOrder {
     }
 
     @Override
-    public void initializeSuccess() {
+    public void initializeSuccess(Activity activity, int loginStatus) {
         checkSdkBridgeNull();
-        SdkProxyPlatformManager.call(Function.INITIALIZE_SUCCESS,  new Class[]{}, new Object[]{});
+        SdkProxyPlatformManager.call(Function.INITIALIZE_SUCCESS,  new Class[]{Activity.class,int.class}, new Object[]{activity,loginStatus});
 
     }
 
@@ -125,6 +126,13 @@ public class PlatformSdk implements IFeature,ILifeCycle, IApplication,IOrder {
 
     }
 
+    @Override
+    public void initMsaDeviceIds(Context context, IMsaDeviceCallback iMsaDeviceCallback) {
+        checkSdkBridgeNull();
+        SdkProxyPlatformManager.call(Function.INIT_MSA_DEVICE_IDS, new Class[]{Context.class, IMsaDeviceCallback.class}, new Object[]{context,iMsaDeviceCallback});
+
+    }
+
 
     @Override
     public void attachBaseContext(Application application, Context context) {
@@ -155,7 +163,7 @@ public class PlatformSdk implements IFeature,ILifeCycle, IApplication,IOrder {
     }
 
     @Override
-    public void onReStart(Activity activity) {
+    public void onRestart(Activity activity) {
         checkSdkBridgeNull();
         SdkProxyPlatformManager.call(Function.ON_RESTART, new Class[]{Activity.class}, new Object[]{activity});
 

library_channel_repository/oppo/build.gradle

@@ -28,14 +28,14 @@ dependencies {
 
 
 
-    api files('../oppo/libs/core-1.1.0.aar')
+    compileOnly files('../oppo/libs/core-1.1.0.aar')
 
-    api files('../oppo/libs/gamesdk-20220310.aar')
+    compileOnly files('../oppo/libs/gamesdk-20220310.aar')
 
-    api files('../oppo/libs/gamesdk-common-20220310.aar')
+    compileOnly files('../oppo/libs/gamesdk-common-20220310.aar')
 
 
-    api files('../oppo/libs/oaid_sdk_1.0.25.aar')
+    compileOnly files('../oppo/libs/oaid_sdk_1.0.25.aar')
 
 
 

library_channel_repository/oppo/src/main/java/cn/yyxx/commsdk/impl/merge/channel/ChannelBridge.java

@@ -13,6 +13,7 @@ import cn.yyxx.commsdk.base.entity.SdkOrderInfo;
 import cn.yyxx.commsdk.base.entity.SdkRoleInfo;
 import cn.yyxx.commsdk.base.entity.bean.InitBean;
 import cn.yyxx.commsdk.base.internal.ICallback;
+import cn.yyxx.commsdk.base.internal.IMsaDeviceCallback;
 import cn.yyxx.commsdk.base.internal.feature.IApplication;
 import cn.yyxx.commsdk.base.internal.feature.IFeature;
 import cn.yyxx.commsdk.base.internal.feature.ILifeCycle;
@@ -49,8 +50,8 @@ public class ChannelBridge implements IFeature, ILifeCycle, IApplication, IOrder
     }
 
     @Override
-    public void initializeSuccess() {
-        impl.initializeSuccess();
+    public void initializeSuccess(Activity activity, int loginStatus) {
+        impl.initializeSuccess(activity,loginStatus);
     }
 
     @Override
@@ -90,6 +91,11 @@ public class ChannelBridge implements IFeature, ILifeCycle, IApplication, IOrder
         impl.reportGameEvent(event,message);
     }
 
+    @Override
+    public void initMsaDeviceIds(Context context, IMsaDeviceCallback iMsaDeviceCallback) {
+        impl.initMsaDeviceIds(context,iMsaDeviceCallback);
+    }
+
 
     @Override
     public void onStart(Activity activity) {
@@ -102,8 +108,8 @@ public class ChannelBridge implements IFeature, ILifeCycle, IApplication, IOrder
     }
 
     @Override
-    public void onReStart(Activity activity) {
-        impl.onResume(activity);
+    public void onRestart(Activity activity) {
+        impl.onRestart(activity);
     }
 
     @Override

library_channel_repository/oppo/src/main/java/cn/yyxx/commsdk/impl/merge/channel/msa/MsaDeviceHandler.java

@@ -11,7 +11,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import cn.yyxx.commsdk.base.internal.IMsaDeviceCallback;
-import cn.yyxx.support.hawkeye.LogUtils;
+import cn.yyxx.commsdk.base.utils.Logger;
+
 
 
 /**
@@ -27,7 +28,7 @@ public class MsaDeviceHandler {
     public static String aaid = "";
 
     public static void initMsaDeviceIds(Context context, final IMsaDeviceCallback callback) {
-        LogUtils.i("attach msa sdk , version : " + VERSION);
+        Logger.i("attach msa sdk , version : " + VERSION);
         int code = MdidSdkHelper.InitSdk(context, true, new IIdentifierListener() {
             @Override
             public void OnSupport(boolean isSupport, IdSupplier idSupplier) {
@@ -57,7 +58,7 @@ public class MsaDeviceHandler {
                 callback.onIdsRead(-1, "不支持的设备厂商", null);
                 break;
             case ErrorCode.INIT_ERROR_RESULT_DELAY:
-                LogUtils.e("initMsaDeviceIds : 获取接口是异步的，结果会在回调中返回，回调执行的回调可能在工作线程");
+                Logger.e("initMsaDeviceIds : 获取接口是异步的，结果会在回调中返回，回调执行的回调可能在工作线程");
                 break;
             case ErrorCode.INIT_HELPER_CALL_ERROR:
                 callback.onIdsRead(-1, "反射调用出错", null);

library_channel_repository/oppo/src/main/java/cn/yyxx/commsdk/impl/merge/channel/oppo/ChannelBridgeImpl.java

@@ -26,11 +26,13 @@ import cn.yyxx.commsdk.base.entity.SdkOrderInfo;
 import cn.yyxx.commsdk.base.entity.SdkRoleInfo;
 import cn.yyxx.commsdk.base.entity.bean.InitBean;
 import cn.yyxx.commsdk.base.internal.ICallback;
+import cn.yyxx.commsdk.base.internal.IMsaDeviceCallback;
 import cn.yyxx.commsdk.base.internal.feature.IApplication;
 import cn.yyxx.commsdk.base.internal.feature.IFeature;
 import cn.yyxx.commsdk.base.internal.feature.ILifeCycle;
 import cn.yyxx.commsdk.base.internal.feature.IOrder;
 import cn.yyxx.commsdk.impl.merge.LoginViewModel;
+import cn.yyxx.commsdk.impl.merge.channel.msa.MsaDeviceHandler;
 import cn.yyxx.commsdk.impl.merge.channel.utils.ParamsUtils;
 
 /**
@@ -72,7 +74,7 @@ public class ChannelBridgeImpl implements IFeature, ILifeCycle, IApplication, IO
     }
 
     @Override
-    public void initializeSuccess() {
+    public void initializeSuccess(Activity activity, int loginStatus) {
 
     }
 
@@ -228,6 +230,11 @@ public class ChannelBridgeImpl implements IFeature, ILifeCycle, IApplication, IO
 
     }
 
+    @Override
+    public void initMsaDeviceIds(Context context, IMsaDeviceCallback iMsaDeviceCallback) {
+        MsaDeviceHandler.initMsaDeviceIds(context,iMsaDeviceCallback);
+    }
+
     @Override
     public void onStart(Activity activity) {
 
@@ -239,7 +246,7 @@ public class ChannelBridgeImpl implements IFeature, ILifeCycle, IApplication, IO
     }
 
     @Override
-    public void onReStart(Activity activity) {
+    public void onRestart(Activity activity) {
 
     }