添加build.gradle 配置。

demo/release/output-metadata.json

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

demo/src/main/AndroidManifest.xml

@@ -19,8 +19,7 @@
 
 
     <application
-        android:debuggable="true"
-        android:requestLegacyExternalStorage="true"        android:name="cn.yyxx.commsdk.base.YYXXApplication"
+        android:name="cn.yyxx.commsdk.base.YYXXApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

library_base/build.gradle

@@ -63,5 +63,4 @@ android.libraryVariants.all { variant ->
 
 
 
-apply from: 'buildJar.gradle'
 apply from: 'publish.gradle'

library_base/buildJar.gradle

@@ -14,8 +14,9 @@ task deleteBaseBuild(type: Delete) {
 
 task makeJar(type: Jar) {
     from zipTree(zipFile)
-    setBaseName(SDK_BASENAME + SEPARATOR + SDK_VERSION)
-    setDestinationDir(file(sdkDestinationPath))
+
+    baseName(PUBLISH_ARTIFACT_ID + "-" + PUBLISH_VERSION)
+    destinationDir(file(sdkDestinationPath))
 
 }
 

library_base/publish.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 ext {
     PUBLISH_GROUP_ID = 'io.github.yyxxgame.sdk'
     PUBLISH_ARTIFACT_ID = 'yyxx-comm-base'
-    PUBLISH_VERSION = '3.0.304'
+    PUBLISH_VERSION = '3.0.306'
 }
 
 
@@ -121,3 +121,4 @@ signing {
 }
 
 publishReleasePublicationToMavencentralRepository.dependsOn(assemble)
+apply from: 'buildJar.gradle'

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

@@ -3,6 +3,10 @@ package cn.yyxx.commsdk.base;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -100,17 +104,25 @@ public class YYXXWelcomeActivity extends Activity {
 
 
     private void setView() {
-        int id = 0;
 
-        id = ResUtils.getResId(this, "yyxx_comm_welcome", "drawable");
+        Bitmap bit = null;
 
-        if (id == 0) {
+        try {
+            bit = BitmapFactory.decodeStream(getAssets().open("yyxx_comm_welcome.jpg"));
+        } catch (Exception e) {
+            // TODO: handle exception
+            Logger.i("Not Configured  Splash yyxx_comm_welcome");
 
+        }
+
+        if (bit == null){
             return;
         }
 
         layout = new LinearLayout(this);
-        layout.setBackgroundResource(id);
+        Drawable drawable = new BitmapDrawable(getResources(), bit);
+
+        layout.setBackground(drawable);
         setContentView(layout);
     }
 

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

@@ -1,5 +1,7 @@
 package cn.yyxx.commsdk.base.entity;
 
+import java.util.Arrays;
+
 /**
  * @author #Suyghur.
  * Created on 2021/12/25
@@ -207,4 +209,31 @@ public class SdkChargeInfo {
         this.party_id = party_id;
     }
 
+    @Override
+    public String toString() {
+        return "SdkChargeInfo{" +
+                "game_no='" + game_no + '\'' +
+                ", pay_money='" + pay_money + '\'' +
+                ", server_id='" + server_id + '\'' +
+                ", server_name='" + server_name + '\'' +
+                ", role_id='" + role_id + '\'' +
+                ", role_level='" + role_level + '\'' +
+                ", role_name='" + role_name + '\'' +
+                ", ext='" + ext + '\'' +
+                ", order_desc='" + order_desc + '\'' +
+                ", sdk_params='" + sdk_params + '\'' +
+                ", order_split=" + Arrays.toString(order_split) +
+                ", roleCreateTime='" + roleCreateTime + '\'' +
+                ", order_name='" + order_name + '\'' +
+                ", product_name='" + product_name + '\'' +
+                ", product_id='" + product_id + '\'' +
+                ", vip_level='" + vip_level + '\'' +
+                ", party_name='" + party_name + '\'' +
+                ", count='" + count + '\'' +
+                ", radio='" + radio + '\'' +
+                ", reincarnationCount='" + reincarnationCount + '\'' +
+                ", hasGold='" + hasGold + '\'' +
+                ", party_id='" + party_id + '\'' +
+                '}';
+    }
 }

library_channel/build.gradle

@@ -59,5 +59,4 @@ dependencies {
 
 }
 
-apply from: 'buildJar.gradle'
 apply from: 'publish.gradle'

library_channel/buildJar.gradle

@@ -1,6 +1,4 @@
-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')
 
@@ -14,9 +12,12 @@ task deleteBaseBuild(type: Delete) {
 
 task makeJar(type: Jar) {
     from zipTree(zipFile)
-    setBaseName(SDK_BASENAME + SEPARATOR + SDK_VERSION)
-    setDestinationDir(file(sdkDestinationPath))
+
+    baseName(PUBLISH_ARTIFACT_ID + "-" + PUBLISH_VERSION)
+    destinationDir(file(sdkDestinationPath))
 
 }
 
+
+
 makeJar.dependsOn(deleteBaseBuild, build)

library_channel/publish.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 ext {
     PUBLISH_GROUP_ID = 'io.github.yyxxgame.sdk'
     PUBLISH_ARTIFACT_ID = 'yyxx-comm-channel'
-    PUBLISH_VERSION = '3.0.304'
+    PUBLISH_VERSION = '3.0.305'
 }
 
 
@@ -121,3 +121,4 @@ signing {
 }
 
 publishReleasePublicationToMavencentralRepository.dependsOn(assemble)
+apply from: 'buildJar.gradle'

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

@@ -182,13 +182,13 @@ public class LoginViewModel {
 
     public void verifyChannelInfo(Activity activity, String channelInfo){
 
-        LoadingDialogUtils.getInstance().show(activity);
+
 
         SdkRequest.getInstance().verfifyChannelLoginInfo(activity, channelInfo, new IRequestCallback() {
             @Override
             public void onResponse(ResultInfo resultInfo) {
                 {
-                    LoadingDialogUtils.getInstance().hide();
+
                     if (resultInfo.code == ResultInfo.CODE_SUCCESS && !TextUtils.isEmpty(resultInfo.data)){
 
                         SdkLoginInfo.getInstance().initLoginInfo(resultInfo.data);

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

@@ -79,10 +79,8 @@ 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;
 
-/**
- * @author #Suyghur.
- * Created on 2021/12/25
- */
+
+
 public class ChannelBridgeImpl implements IFeature, ILifeCycle, IApplication, IOrder {
 
 

library_core/build.gradle

@@ -73,6 +73,5 @@ android.libraryVariants.all { variant ->
 
 
 
-apply from: 'buildJar.gradle'
 
 apply from: 'publish.gradle'

library_core/buildJar.gradle

@@ -1,6 +1,4 @@
-def SDK_BASENAME = "yyxx_comm_core"
-def SDK_VERSION = "1.0.0"
-def SEPARATOR = "_"
+
 def sdkDestinationPath = "build/jar/"
 def zipFile = file('build/intermediates/aar_main_jar/release/classes.jar')
 
@@ -14,8 +12,8 @@ task deleteBaseBuild(type: Delete) {
 
 task makeJar(type: Jar) {
     from zipTree(zipFile)
-    baseName = SDK_BASENAME + SEPARATOR + SDK_VERSION
-    destinationDir = file(sdkDestinationPath)
+    baseName(PUBLISH_ARTIFACT_ID + "-" + PUBLISH_VERSION)
+    destinationDir(file(sdkDestinationPath))
 }
 
 makeJar.dependsOn(deleteBaseBuild, build)

library_core/publish.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 ext {
     PUBLISH_GROUP_ID = 'io.github.yyxxgame.sdk'
     PUBLISH_ARTIFACT_ID = 'yyxx-comm-core'
-    PUBLISH_VERSION = '3.0.304'
+    PUBLISH_VERSION = '3.0.305'
 }
 
 
@@ -121,3 +121,4 @@ signing {
 }
 
 publishReleasePublicationToMavencentralRepository.dependsOn(assemble)
+apply from: 'buildJar.gradle'

library_core/src/main/java/cn/yyxx/commsdk/core/common/CommonOperationManager.java

@@ -481,8 +481,8 @@ public class CommonOperationManager {
                 || TextUtils.isEmpty(roleInfo.getRolePower())
                 || TextUtils.isEmpty(roleInfo.getReincarnationCount())) {
 
-            Logger.i("上报参数有空值，请检查: "+ roleInfo.toString());
-
+            Logger.i("上报参数有空值，请检查: "+ roleInfo);
+            return;
         }
         
         
@@ -536,7 +536,8 @@ public class CommonOperationManager {
                 || TextUtils.isEmpty(chargeInfo.getOrder_desc())
                 || TextUtils.isEmpty(chargeInfo.getProduct_id())) {
 
-            Logger.i("下单参数有空值，请检查: "+ chargeInfo);
+            Logger.i("下单参数有空值，请检查: "+ chargeInfo.toString());
+            return;
         }
 
         SdkRequest.getInstance().charge(activity, chargeInfo, new IRequestCallback() {

library_core/src/main/java/cn/yyxx/commsdk/core/network/SdkRequest.java

@@ -9,6 +9,7 @@ import android.text.TextUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+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;
@@ -312,6 +313,10 @@ public class SdkRequest {
 
     public void verfifyChannelLoginInfo(Context context,String channelLoginInfo, IRequestCallback callback){
 
+
+
+        LoadingDialogUtils.getInstance().show(context);
+
         JSONObject json = new JSONObject();
 
         try {
@@ -326,7 +331,13 @@ public class SdkRequest {
 
         String paramText = SdkDrive.getInstance().invokeJob(json.toString());
 
-        VolleyRequest.postWithText(context, HOST, paramText, callback);
+        VolleyRequest.postWithText(context, HOST, paramText, new IRequestCallback() {
+            @Override
+            public void onResponse(ResultInfo resultInfo) {
+                callback.onResponse(resultInfo);
+                LoadingDialogUtils.getInstance().hide();
+            }
+        });
 
 
     }

library_core/src/main/java/cn/yyxx/commsdk/core/network/VolleyRequest.java

@@ -67,7 +67,7 @@ public class VolleyRequest {
                     resultInfo.data = s;
 
                     Logger.logHandler("返回内容 : " + resultInfo);
-
+                    Logger.d("onResponse : " + resultInfo.toString());
                     if (callback != null) {
                         callback.onResponse(resultInfo);
                     }
@@ -151,7 +151,8 @@ public class VolleyRequest {
                         resultInfo.data = "";
                     }
                     Logger.logHandler("返回内容 : " + resultInfo);
-                     if (callback != null) {
+                    Logger.d("onResponse : " + resultInfo.toString());
+                    if (callback != null) {
                         callback.onResponse(resultInfo);
                     }
                 }

library_platform/build.gradle

@@ -26,6 +26,17 @@ android {
         abortOnError false
     }
 
+    dexOptions {
+        preDexLibraries false
+    }
+    buildFeatures {
+        buildConfig false
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
     dexOptions {
         preDexLibraries false
     }

library_platform/hnqj/build.gradle

@@ -74,5 +74,4 @@ dependencies {
 
 }
 
-apply from: 'buildJar.gradle'
-apply from: 'publish.gradle'
+ apply from: 'publish.gradle'

library_platform/hnqj/buildJar.gradle

@@ -1,6 +1,4 @@
-def SDK_BASENAME = "hnqj"
-def SDK_VERSION = "1.0.0"
-def SEPARATOR = "_"
+
 def sdkDestinationPath = "build/jar/"
 def zipFile = file('build/intermediates/aar_main_jar/release/classes.jar')
 
@@ -14,8 +12,8 @@ task deleteBaseBuild(type: Delete) {
 
 task makeJar(type: Jar) {
     from zipTree(zipFile)
-    baseName = SDK_BASENAME + SEPARATOR + SDK_VERSION
-    destinationDir = file(sdkDestinationPath)
+    baseName(PUBLISH_ARTIFACT_ID + "-" + PUBLISH_VERSION)
+    destinationDir(file(sdkDestinationPath))
 }
 
 makeJar.dependsOn(deleteBaseBuild, build)

library_platform/hnqj/publish.gradle

@@ -121,3 +121,4 @@ signing {
 }
 
 publishReleasePublicationToMavencentralRepository.dependsOn(assemble)
+apply from: 'buildJar.gradle'

library_platform/hnqj/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnqj/dialog/CustomExitGameDialog.java

@@ -81,7 +81,7 @@ public class CustomExitGameDialog extends Dialog {
 					});
 				}
 				issure_exit = dialog.findViewById(ResourceUtil.getId(context,
-						"qj_issure_exit"));
+						"issure_exit"));
 				return dialog;
 			}
 		}

library_platform/hnqj/src/main/res/layout/qj_exit_game_dialog.xml

@@ -24,7 +24,7 @@
             android:textSize="18sp"
             />
         <TextView
-            android:id="@+id/qj_issure_exit"
+            android:id="@+id/issure_exit"
             android:layout_width="match_parent"
             android:layout_height="45dp"
             android:gravity="center_horizontal"

library_platform/hnyy/build.gradle

@@ -24,10 +24,17 @@ android {
             proguardFiles 'proguard-rules.pro'
         }
     }
-
     buildFeatures {
         buildConfig false
     }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    dexOptions {
+        preDexLibraries false
+    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -111,5 +118,4 @@ dependencies {
 
 }
 
-apply from: 'buildJar.gradle'
 apply from: 'publish.gradle'

library_platform/hnyy/buildJar.gradle

@@ -1,6 +1,3 @@
-def SDK_BASENAME = "hnyy"
-def SDK_VERSION = "1.0.0"
-def SEPARATOR = "_"
 def sdkDestinationPath = "build/jar/"
 def zipFile = file('build/intermediates/aar_main_jar/release/classes.jar')
 
@@ -14,8 +11,8 @@ task deleteBaseBuild(type: Delete) {
 
 task makeJar(type: Jar) {
     from zipTree(zipFile)
-    baseName = SDK_BASENAME + SEPARATOR + SDK_VERSION
-    destinationDir = file(sdkDestinationPath)
+    baseName(PUBLISH_ARTIFACT_ID + "-" + PUBLISH_VERSION)
+    destinationDir(file(sdkDestinationPath))
 }
 
 makeJar.dependsOn(deleteBaseBuild, build)

library_platform/hnyy/publish.gradle

@@ -121,3 +121,4 @@ signing {
 }
 
 publishReleasePublicationToMavencentralRepository.dependsOn(assemble)
+apply from: 'buildJar.gradle'

library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/dialog/CustomExitGameDialog.java

@@ -19,7 +19,7 @@ public class CustomExitGameDialog extends Dialog {
 
 	private	static Button bt_exit_game;
 	private static Button bt_goon_game;
-	private static TextView hnyy_issure_exit;
+	private static TextView issure_exit;
 	private static CustomExitGameDialog dialog;
 
 	public CustomExitGameDialog(Context context, int theme) {
@@ -40,7 +40,7 @@ public class CustomExitGameDialog extends Dialog {
 			return this;
 		}
 		public void setTitle(String title){
-			hnyy_issure_exit.setText(title);
+			issure_exit.setText(title);
 		}
 		public void  dialogDismiss(){dialog.dismiss();}
 		public CustomExitGameDialog Create(){
@@ -80,8 +80,8 @@ public class CustomExitGameDialog extends Dialog {
 						}
 					});
 				}
-				hnyy_issure_exit = dialog.findViewById(ResourceUtil.getId(context,
-						"hnyy_issure_exit"));
+				issure_exit = dialog.findViewById(ResourceUtil.getId(context,
+						"issure_exit"));
 				return dialog;
 			}
 		}

library_platform/hnyy/src/main/res/layout/hnyy_exit_game_dialog.xml

@@ -25,7 +25,7 @@
             android:textStyle="bold"
             />
         <TextView
-            android:id="@+id/hnyy_issure_exit"
+            android:id="@+id/issure_exit"
             android:layout_width="190dp"
             android:layout_height="45dp"
             android:gravity="center_horizontal"

library_platform/shxy/build.gradle

@@ -25,6 +25,18 @@ android {
         }
     }
 
+
+    buildFeatures {
+        buildConfig false
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    dexOptions {
+        preDexLibraries false
+    }
     buildFeatures {
         buildConfig false
     }
@@ -78,5 +90,4 @@ dependencies {
 
 }
 
-apply from: 'buildJar.gradle'
 apply from: 'publish.gradle'

library_platform/shxy/buildJar.gradle

@@ -1,6 +1,3 @@
-def SDK_BASENAME = "hnqj"
-def SDK_VERSION = "1.0.0"
-def SEPARATOR = "_"
 def sdkDestinationPath = "build/jar/"
 def zipFile = file('build/intermediates/aar_main_jar/release/classes.jar')
 
@@ -14,8 +11,8 @@ task deleteBaseBuild(type: Delete) {
 
 task makeJar(type: Jar) {
     from zipTree(zipFile)
-    baseName = SDK_BASENAME + SEPARATOR + SDK_VERSION
-    destinationDir = file(sdkDestinationPath)
+    baseName(PUBLISH_ARTIFACT_ID + "-" + PUBLISH_VERSION)
+    destinationDir(file(sdkDestinationPath))
 }
 
 makeJar.dependsOn(deleteBaseBuild, build)

library_platform/shxy/publish.gradle

@@ -121,3 +121,4 @@ signing {
 }
 
 publishReleasePublicationToMavencentralRepository.dependsOn(assemble)
+apply from: 'buildJar.gradle'

library_platform/xinrui/build.gradle

@@ -28,6 +28,17 @@ android {
     buildFeatures {
         buildConfig false
     }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    dexOptions {
+        preDexLibraries false
+    }
+
+
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -76,5 +87,4 @@ dependencies {
 
 }
 
-apply from: 'buildJar.gradle'
 apply from: 'publish.gradle'

library_platform/xinrui/buildJar.gradle

@@ -1,6 +1,4 @@
-def SDK_BASENAME = "hnqj"
-def SDK_VERSION = "1.0.0"
-def SEPARATOR = "_"
+
 def sdkDestinationPath = "build/jar/"
 def zipFile = file('build/intermediates/aar_main_jar/release/classes.jar')
 
@@ -14,8 +12,8 @@ task deleteBaseBuild(type: Delete) {
 
 task makeJar(type: Jar) {
     from zipTree(zipFile)
-    baseName = SDK_BASENAME + SEPARATOR + SDK_VERSION
-    destinationDir = file(sdkDestinationPath)
+    baseName(PUBLISH_ARTIFACT_ID + "-" + PUBLISH_VERSION)
+    destinationDir(file(sdkDestinationPath))
 }
 
 makeJar.dependsOn(deleteBaseBuild, build)

library_platform/xinrui/publish.gradle

@@ -121,3 +121,4 @@ signing {
 }
 
 publishReleasePublicationToMavencentralRepository.dependsOn(assemble)
+apply from: 'buildJar.gradle'