v1.0.0开发：增加正式环境域名

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         // ndk版本
         NDK_VERSION = '21.4.7075529'
         // kotlin版本
-        KOTLIN_VERSION = '1.5.21'
+        KOTLIN_VERSION = '1.4.20'
         // compileSdkVersion
         COMPILE_SDK_VERSION = 30
         // buildToolsVersion
@@ -41,7 +41,7 @@ allprojects {
         google()
         mavenCentral()
         jcenter()
-        maven { url 'https://jitpack.io' }
+//        maven { url 'https://jitpack.io' }
     }
 }
 

demo/build.gradle

@@ -12,7 +12,7 @@ android {
     buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        applicationId "com.shzd.eyuangame"
+        applicationId 'com.shzd.eyuangame'
         minSdkVersion MIN_SDK_VERSION
         targetSdkVersion TARGET_SDK_VERSION
         versionCode 1
@@ -75,7 +75,7 @@ dependencies {
 
     if (PUBLISH_ENABLE) {
         if (REMOTE_LIBRARY) {
-            implementation 'io.github.yyxxgame.sdk:eyuangame-sdk-ktx:1.0.0-alpha3'
+            implementation 'io.github.yyxxgame.sdk:eyuangame-sdk-ktx:1.0.0-alpha8'
         } else {
             api(name: 'library_core-release', ext: 'aar')
 
@@ -100,11 +100,8 @@ dependencies {
             implementation "com.android.billingclient:billing-ktx:3.0.3"
             implementation 'com.google.firebase:firebase-analytics-ktx:19.0.0'
             implementation 'com.google.firebase:firebase-crashlytics-ktx:18.1.0'
-            implementation 'com.google.firebase:firebase-crashlytics-ndk:18.1.0'
-
             //facebook
-            implementation 'com.facebook.android:facebook-login:9.0.0'
-            implementation 'com.facebook.android:facebook-android-sdk:8.2.0'
+            implementation 'com.facebook.android:facebook-android-sdk:11.2.0'
 
             //adjust
             implementation 'com.adjust.sdk:adjust-android:4.28.2'

demo/src/main/assets/yyxx_game/sdk_log.json

@@ -7,7 +7,5 @@
   "login_success_google": "tk971u",
   "login_success_account": "wp73dt",
   "ecommerce_purchase": "qum6x5",
-  "first_purchase": "r1mt2x",
-  "create_player": "apjl7l",
-  "enter_game": "qfd1ul"
+  "first_purchase": "r1mt2x"
 }

demo/src/main/assets/yyxx_game/yyxx_cfg.properties

@@ -9,6 +9,6 @@ YYXX_GOOGLE_APP_ID=70429070957
 # Google Server Client Id
 YYXX_GOOGLE_CLIENT_ID=70429070957-7clr9u565jrjgbgg474ksg8q2esq2okj.apps.googleusercontent.com
 # Facebook AppId
-YYXX_FACEBOOK_ID=1047370039003298
+YYXX_FACEBOOK_ID=229604925839347
 #debug模式（cp出正式包请关闭）
 YYXX_OWN_DEBUG=true

demo/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
-    <string name="facebook_app_id" translatable="false">1047370039003298</string>
-    <string name="fb_login_protocol_scheme" translatable="false">fb1047370039003298</string>
+    <string name="facebook_app_id" translatable="false">229604925839347</string>
+    <string name="fb_login_protocol_scheme" translatable="false">fb229604925839347</string>
     <string name="app_name" translatable="false">EYuanGameSdk-KTX</string>
     <!-- project_number -->
     <string name="gcm_defaultSenderId" translatable="false">70429070957</string>

library_base/src/main/java/cn/yyxx/eyuangame/Version.kt

@@ -5,7 +5,7 @@ package cn.yyxx.eyuangame
  * Created on 2021/06/09
  */
 object Version {
-    const val VERSION_NAME = "1.0.0-alpha2"
+    const val VERSION_NAME = "1.0.0-alpha9"
     const val VERSION_CODE = 100
     const val SERVER_VERSION = "1.0.0"
 }

library_base/src/main/java/cn/yyxx/eyuangame/base/EYuanGame.kt

@@ -430,13 +430,13 @@ class EYuanGame private constructor() {
         @JvmStatic
         @Keep
         fun getInstance(): EYuanGame {
-            return ColumbusHolder.INSTANCE
+            return EYuanGameHolder.INSTANCE
         }
 
         private const val CLICK_INTERVAL: Int = 1500
 
         @Keep
-        private object ColumbusHolder {
+        private object EYuanGameHolder {
             val INSTANCE: EYuanGame = EYuanGame()
         }
 
@@ -445,7 +445,7 @@ class EYuanGame private constructor() {
          */
         @Keep
         private fun readResolve(): Any {
-            return ColumbusHolder.INSTANCE
+            return EYuanGameHolder.INSTANCE
         }
     }
 }

library_core/build.gradle

@@ -65,8 +65,8 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
+//    implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
+//    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
 
     //mmkv
     implementation 'com.tencent:mmkv-static:1.2.10'
@@ -76,7 +76,7 @@ dependencies {
 
     implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
 
@@ -85,13 +85,13 @@ dependencies {
     implementation 'com.google.android.gms:play-services-auth:19.2.0'
     //4.0.0的billing库消耗商品会回调两次，后续在排查，先用3.0.3
     implementation "com.android.billingclient:billing-ktx:3.0.3"
-    implementation 'com.google.firebase:firebase-analytics-ktx:19.0.0'
-    implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.0'
-//    implementation 'com.google.firebase:firebase-crashlytics-ndk:18.2.0'
+    implementation 'com.google.firebase:firebase-analytics-ktx:19.0.1'
+    implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.1'
+    implementation 'com.google.firebase:firebase-crashlytics-ndk:18.2.1'
 
     //facebook
-    implementation 'com.facebook.android:facebook-login:9.0.0'
-    implementation 'com.facebook.android:facebook-android-sdk:8.2.0'
+//    implementation 'com.facebook.android:facebook-login:11.2.0'
+    implementation 'com.facebook.android:facebook-android-sdk:11.2.0'
 
     //adjust
     implementation 'com.adjust.sdk:adjust-android:4.28.2'

library_core/publish.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 ext {
     PUBLISH_GROUP_ID = 'io.github.yyxxgame.sdk'
     PUBLISH_ARTIFACT_ID = 'eyuangame-sdk-ktx'
-    PUBLISH_VERSION = '1.0.0-alpha4'
+    PUBLISH_VERSION = '1.0.0-alpha9'
 }
 
 Properties properties = new Properties()
@@ -69,12 +69,14 @@ publishing {
                 // that your library builds upon
                 withXml {
                     def dependenciesNode = asNode().appendNode('dependencies')
-
-                    project.configurations.implementation.allDependencies.each {
+                    for (def node : project.configurations.implementation.allDependencies) {
+                        if (node.group == "null" || node.name == "unspecified" || node.version == "null") {
+                            break
+                        }
                         def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', it.group)
-                        dependencyNode.appendNode('artifactId', it.name)
-                        dependencyNode.appendNode('version', it.version)
+                        dependencyNode.appendNode('groupId', node.group)
+                        dependencyNode.appendNode('artifactId', node.name)
+                        dependencyNode.appendNode('version', node.version)
                     }
                 }
             }

library_core/publish_old.gradle

@@ -3,7 +3,7 @@ apply plugin: 'signing'
 
 def PUBLISH_GROUP_ID = "io.github.yyxxgame.sdk"
 def PUBLISH_ARTIFACT_ID = "eyuangame-sdk-ktx"
-def PUBLISH_VERSION = "1.0.0-alpha4"
+def PUBLISH_VERSION = "1.0.0-alpha7"
 
 Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())

library_core/src/main/cpp/toolkit.cpp

@@ -154,7 +154,7 @@ int ToolKit::GetNetworkType(JNIEnv *env, jobject context) {
         Logger::E(env, "DeviceInfoUtils clz is null");
         return 0;
     }
-    const char *method_name = "getNetworkClass";
+    const char *method_name = "getNetworkType";
     const char *sig = "(Landroid/content/Context;)Ljava/lang/String;";
     jmethodID mid = env->GetStaticMethodID(clz, method_name, sig);
     auto result = (jstring) env->CallStaticObjectMethod(clz, mid, context);

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/SdkBridgeImpl.kt

@@ -99,14 +99,12 @@ class SdkBridgeImpl(context: Context) {
                 SdkDrive.instance.setParam("aid", id)
                 MMKVUtils.instance.eventKV.encode("adjust_id", id)
             }
-
         })
     }
 
     fun initialize(activity: Activity, isLandscape: Boolean, callback: ICallback, initCallback: IInitialize) {
         Logger.i("EYuanGameSdk initialize ...")
         isLand = isLandscape
-
         if (TextUtils.isEmpty(ParamsUtils.getGcpCode(activity))) {
             Logger.e("初始化失败，参数异常，请检查yyxx_cfg.properties中YYXX_GCP_CODE的值")
             initCallback.onResult(-1, "初始化失败，参数异常，请检查yyxx_cfg.properties中YYXX_GAME_CODE的值")
@@ -328,15 +326,12 @@ class SdkBridgeImpl(context: Context) {
 
     fun roleCreate(activity: Activity, roleInfo: SdkRoleInfo) {
         Logger.i("EYuanGameSdk roleCreate ...")
-        Linking.instance.roleCreate(activity)
         isSubmitRoleData = true
     }
 
     fun roleLauncher(activity: Activity, roleInfo: SdkRoleInfo) {
         Logger.i("EYuanGameSdk roleLauncher ...")
-        Linking.instance.roleLauncher(activity)
         isSubmitRoleData = true
-
     }
 
     fun roleLevelUp(activity: Activity, roleInfo: SdkRoleInfo) {

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/center/HybridActivity.kt

@@ -1,22 +1,22 @@
 package cn.yyxx.eyuangame.core.impl.center
 
 import android.app.Activity
+import android.content.Context
 import android.content.Intent
+import android.graphics.Color
 import android.net.Uri
 import android.net.http.SslError
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.View
 import android.view.WindowManager
 import android.webkit.*
 import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.TextView
 import cn.yyxx.eyuangame.core.entity.ClickType
 import cn.yyxx.eyuangame.core.impl.SdkBridgeImpl
 import cn.yyxx.eyuangame.core.impl.SdkDrive
 import cn.yyxx.eyuangame.core.impl.SdkJsImpl
 import cn.yyxx.eyuangame.core.internal.IJsCallback
+import cn.yyxx.eyuangame.core.ui.dialog.ScaleLoadingDialog
 import cn.yyxx.support.AndroidBug5497Workaround
 import cn.yyxx.support.ResUtils
 import cn.yyxx.support.device.DeviceInfoUtils
@@ -28,9 +28,11 @@ import cn.yyxx.support.hawkeye.ToastUtils
  */
 class HybridActivity : Activity(), View.OnClickListener {
 
-    private lateinit var ivReturn: ImageView
-    private lateinit var tvTitle: TextView
+    //    private lateinit var ivReturn: ImageView
+//    private lateinit var tvTitle: TextView
     private lateinit var webView: WebView
+    private var loadingDialog: ScaleLoadingDialog? = null
+
 
     private val callback = object : IJsCallback {
 
@@ -64,12 +66,14 @@ class HybridActivity : Activity(), View.OnClickListener {
             AndroidBug5497Workaround.assistActivity(this)
         }
 
-        tvTitle = findViewById(ResUtils.getResId(this, "yyxx_tv_title", "id"))
-        ivReturn = findViewById(ResUtils.getResId(this, "yyxx_iv_return", "id"))
-        ivReturn.apply {
-            tag = ClickType.ACTION_RETURN
-            setOnClickListener(this@HybridActivity)
-        }
+//        tvTitle = findViewById(ResUtils.getResId(this, "yyxx_tv_title", "id"))
+//        ivReturn = findViewById(ResUtils.getResId(this, "yyxx_iv_return", "id"))
+//        ivReturn.apply {
+//            tag = ClickType.ACTION_RETURN
+//            setOnClickListener(this@HybridActivity)
+//        }
+
+        showDialog(this)
     }
 
 
@@ -78,6 +82,8 @@ class HybridActivity : Activity(), View.OnClickListener {
         webView.isVerticalScrollBarEnabled = true
         webView.scrollBarStyle = View.SCROLLBARS_INSIDE_OVERLAY
         webView.addJavascriptInterface(SdkJsImpl(callback), "eyuangame")
+        webView.setBackgroundColor(Color.TRANSPARENT)
+//        webView.alpha = 0F
         val container = findViewById<FrameLayout>(ResUtils.getResId(this, "yyxx_webview_container", "id"))
         container.addView(webView)
 
@@ -156,10 +162,10 @@ class HybridActivity : Activity(), View.OnClickListener {
             override fun onProgressChanged(view: WebView, newProgress: Int) {
                 super.onProgressChanged(view, newProgress)
                 //progressWebView.setProgressBarProgress(newProgress);
-//                if (newProgress == 100 && loadingDialog != null && loadingDialog!!.isShowing) {
-//                    //加载完成,关闭loading
-//                    loadingDialog!!.dismiss()
-//                }
+                if (newProgress == 100 && loadingDialog != null && loadingDialog!!.isShowing) {
+                    //加载完成,关闭loading
+                    dismissDialog()
+                }
             }
 
             //For Android > 5.0
@@ -170,18 +176,18 @@ class HybridActivity : Activity(), View.OnClickListener {
 
             override fun onReceivedTitle(view: WebView, title: String) {
                 super.onReceivedTitle(view, title)
-                if (!DeviceInfoUtils.isNetworkConnected(view.context)) {
-                    tvTitle.text = "网络异常"
-                    return
-                }
-                if (!TextUtils.isEmpty(view.title)) {
-                    var viewtitle = view.title
-                    if (viewtitle!!.length > 10) {
-                        viewtitle = viewtitle.substring(0, 10)
-                        viewtitle = "$viewtitle..."
-                    }
-                    tvTitle.text = viewtitle
-                }
+//                if (!DeviceInfoUtils.isNetworkConnected(view.context)) {
+//                    tvTitle.text = "网络异常"
+//                    return
+//                }
+//                if (!TextUtils.isEmpty(view.title)) {
+//                    var viewtitle = view.title
+//                    if (viewtitle!!.length > 10) {
+//                        viewtitle = viewtitle.substring(0, 10)
+//                        viewtitle = "$viewtitle..."
+//                    }
+//                    tvTitle.text = viewtitle
+//                }
             }
         }
     }
@@ -194,6 +200,23 @@ class HybridActivity : Activity(), View.OnClickListener {
         super.onDestroy()
     }
 
+    private fun showDialog(context: Context) {
+        loadingDialog?.apply {
+            dismiss()
+            loadingDialog = null
+        }
+
+        loadingDialog = ScaleLoadingDialog(context, "")
+        loadingDialog?.show()
+    }
+
+    private fun dismissDialog() {
+        loadingDialog?.apply {
+            dismiss()
+            loadingDialog = null
+        }
+    }
+
 
     override fun onClick(v: View?) {
         v?.apply {
@@ -211,8 +234,6 @@ class HybridActivity : Activity(), View.OnClickListener {
             Companion.url = url
             activity.startActivity(Intent(activity, HybridActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
         }
-
-
     }
 
 }

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/iab/ChargeImpl.kt

@@ -15,7 +15,6 @@ import cn.yyxx.support.hawkeye.ToastUtils
 import com.android.billingclient.api.*
 import org.json.JSONException
 import org.json.JSONObject
-import java.util.concurrent.atomic.AtomicInteger
 
 /**
  * @author #Suyghur.
@@ -38,8 +37,6 @@ class ChargeImpl : InAppBilling() {
         this.implCallback = callback
         this.chargeInfo = chargeInfo
         showDialog(activity)
-
-//        checkLocalNotifyFailedOrder(activity)
         getOrderId(activity)
     }
 

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/login/UserSignInImpl.kt

@@ -67,8 +67,8 @@ class UserSignInImpl constructor(val activity: LoginActivity, private val callba
                     try {
                         val jsonObject = JSONObject()
                         jsonObject.put("login_type", LoginType.TYPE_FACEBOOK_LOGIN)
-                        jsonObject.put("third_plat_id", AccessToken.getCurrentAccessToken().userId)
-                        jsonObject.put("third_plat_token", AccessToken.getCurrentAccessToken().token)
+                        jsonObject.put("third_plat_id", AccessToken.getCurrentAccessToken()?.userId)
+                        jsonObject.put("third_plat_token", AccessToken.getCurrentAccessToken()?.token)
                         userLoginVerify(activity, jsonObject)
                     } catch (e: JSONException) {
                         e.printStackTrace()

library_core/src/main/java/cn/yyxx/eyuangame/core/internal/IEventObserver.kt

@@ -19,9 +19,9 @@ interface IEventObserver {
 
     fun onCharge(context: Context, amount: Int)
 
-    fun onRoleCreate(context: Context)
+//    fun onRoleCreate(context: Context)
 
-    fun onRoleLauncher(context: Context)
+//    fun onRoleLauncher(context: Context)
 
     fun onCreate(activity: Activity)
 

library_core/src/main/java/cn/yyxx/eyuangame/core/linking/Linking.kt

@@ -58,18 +58,6 @@ class Linking private constructor() {
         }
     }
 
-    fun roleCreate(context: Context) {
-        for (ob in observers) {
-            ob.onRoleCreate(context)
-        }
-    }
-
-    fun roleLauncher(context: Context) {
-        for (ob in observers) {
-            ob.onRoleLauncher(context)
-        }
-    }
-
     fun create(activity: Activity) {
         for (ob in observers) {
             ob.onCreate(activity)

library_core/src/main/java/cn/yyxx/eyuangame/core/linking/channel/LinkingAdjustImpl.kt

@@ -166,44 +166,6 @@ class LinkingAdjustImpl(val callback: OnAdjustIdRead) : IEventObserver {
         }
     }
 
-    override fun onRoleCreate(context: Context) {
-        if (!isInitSuccess) {
-            Logger.e("adjust log failed , component initialize failed")
-            return
-        }
-
-        if (TextUtils.isEmpty(SdkBackLoginInfo.instance.userId)) {
-            Logger.e("adjust log failed , user is null")
-            return
-        }
-
-        sdkConfig?.apply {
-            if (JsonUtils.hasJsonKey(this, "create_player")) {
-                Adjust.trackEvent(AdjustEvent(this.getString("create_player")))
-                Logger.d("adjust log create player success")
-            }
-        }
-    }
-
-    override fun onRoleLauncher(context: Context) {
-        if (!isInitSuccess) {
-            Logger.e("adjust log failed , component initialize failed")
-            return
-        }
-
-        if (TextUtils.isEmpty(SdkBackLoginInfo.instance.userId)) {
-            Logger.e("adjust log failed , user is null")
-            return
-        }
-
-        sdkConfig?.apply {
-            if (JsonUtils.hasJsonKey(this, "enter_game")) {
-                Adjust.trackEvent(AdjustEvent(this.getString("enter_game")))
-                Logger.d("adjust log enter game success")
-            }
-        }
-    }
-
     override fun onCreate(activity: Activity) {
     }
 

library_core/src/main/java/cn/yyxx/eyuangame/core/linking/channel/LinkingFacebookImpl.kt

@@ -37,7 +37,8 @@ class LinkingFacebookImpl : IEventObserver {
             isInitSuccess = true
             return
         }
-        fbLogger.logEvent("open_app")
+        //open_app
+        fbLogger.logEvent(AppEventsConstants.EVENT_NAME_ADDED_PAYMENT_INFO)
         Logger.d("facebook log open app success")
         MMKVUtils.instance.eventKV.encode("facebook_activities", true)
         isInitSuccess = true
@@ -110,34 +111,6 @@ class LinkingFacebookImpl : IEventObserver {
         Logger.d("facebook log charge success")
     }
 
-    override fun onRoleCreate(context: Context) {
-        if (!isInitSuccess) {
-            Logger.e("facebook log failed , component initialize failed")
-            return
-        }
-
-        if (TextUtils.isEmpty(SdkBackLoginInfo.instance.userId)) {
-            Logger.e("facebook log failed , user is null")
-            return
-        }
-        fbLogger.logEvent("create_player")
-        Logger.d("facebook log create player success")
-    }
-
-    override fun onRoleLauncher(context: Context) {
-        if (!isInitSuccess) {
-            Logger.e("facebook log failed , component initialize failed")
-            return
-        }
-
-        if (TextUtils.isEmpty(SdkBackLoginInfo.instance.userId)) {
-            Logger.e("facebook log failed , user is null")
-            return
-        }
-        fbLogger.logEvent("enter_game")
-        Logger.d("facebook log enter player success")
-    }
-
     override fun onCreate(activity: Activity) {
         if (!isInitSuccess) {
             Logger.e("facebook log failed , component initialize failed")
@@ -171,7 +144,6 @@ class LinkingFacebookImpl : IEventObserver {
                 "fb_mobile_tutorial_completion" -> AppEventsConstants.EVENT_NAME_COMPLETED_TUTORIAL
                 "fb_mobile_level_achieved" -> AppEventsConstants.EVENT_NAME_ACHIEVED_LEVEL
                 "fb_mobile_spent_credits" -> AppEventsConstants.EVENT_NAME_SPENT_CREDITS
-                "fb_mobile_add_payment_info" -> AppEventsConstants.EVENT_NAME_ADDED_PAYMENT_INFO
                 "fb_mobile_initiated_checkout" -> AppEventsConstants.EVENT_NAME_INITIATED_CHECKOUT
                 "fb_mobile_add_to_cart" -> AppEventsConstants.EVENT_NAME_ADDED_TO_CART
                 "fb_mobile_add_to_wishlist" -> AppEventsConstants.EVENT_NAME_ADDED_TO_WISHLIST

library_core/src/main/java/cn/yyxx/eyuangame/core/linking/channel/LinkingFirebaseImpl.kt

@@ -106,34 +106,6 @@ class LinkingFirebaseImpl : IEventObserver {
 
     }
 
-    override fun onRoleCreate(context: Context) {
-        if (!isInitSuccess) {
-            Logger.e("firebase log failed , component initialize failed")
-            return
-        }
-
-        if (TextUtils.isEmpty(SdkBackLoginInfo.instance.userId)) {
-            Logger.e("firebase log failed , user is null")
-            return
-        }
-        Firebase.analytics.logEvent("create_player", null)
-        Logger.d("firebase log create player success")
-    }
-
-    override fun onRoleLauncher(context: Context) {
-        if (!isInitSuccess) {
-            Logger.e("firebase log failed , component initialize failed")
-            return
-        }
-
-        if (TextUtils.isEmpty(SdkBackLoginInfo.instance.userId)) {
-            Logger.e("firebase log failed , user is null")
-            return
-        }
-        Firebase.analytics.logEvent("enter_game", null)
-        Logger.d("firebase log enter game success")
-    }
-
     override fun onCreate(activity: Activity) {
     }
 

library_core/src/main/java/cn/yyxx/eyuangame/core/network/Host.kt

@@ -9,7 +9,7 @@ import cn.yyxx.support.HostModelUtils
  */
 object Host {
 
-    private const val DEFAULT_ONLINE_HOST = "http://testsdkapi.eyuangame.com"
+    private const val DEFAULT_ONLINE_HOST = "https://sdkapi.eyuangame.com"
     private const val DEFAULT_TEST_HOST = "http://testsdkapi.eyuangame.com"
 
     var HOST = ""

library_core/src/main/res/layout-land/yyxx_hybrid.xml

@@ -3,73 +3,18 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="center">
+    android:layout_gravity="center"
+    android:background="@color/yyxx_transparent">
 
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <FrameLayout
+        android:id="@+id/yyxx_webview_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="300dp"
         android:layout_margin="50dp"
+        android:background="@color/yyxx_transparent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/yyxx_title_container"
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:background="@drawable/yyxx_green_blue_panel_title"
-            app:layout_constraintBottom_toTopOf="@id/yyxx_content_container"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/yyxx_iv_return"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="10dp"
-                android:background="@drawable/yyxx_back_img"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/yyxx_tv_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/yyxx_color_white"
-                android:textSize="18sp"
-                android:textStyle="bold"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/yyxx_content_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/yyxx_white_panel_content_bg"
-            android:padding="10dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/yyxx_title_container">
-
-            <FrameLayout
-                android:id="@+id/yyxx_webview_container"
-                android:layout_width="match_parent"
-                android:layout_height="260dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

library_core/src/main/res/layout/yyxx_account_list_item.xml

@@ -10,6 +10,7 @@
         android:layout_width="14dp"
         android:layout_height="14dp"
         android:layout_marginStart="15dp"
+        android:layout_marginLeft="15dp"
         android:background="@drawable/yyxx_account_img" />
 
     <TextView
@@ -17,6 +18,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_weight="1"
         android:gravity="center"
         android:text="账号"

library_core/src/main/res/layout/yyxx_hybrid.xml

@@ -3,73 +3,18 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="center">
+    android:layout_gravity="center"
+    android:background="@color/yyxx_transparent">
 
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <FrameLayout
+        android:id="@+id/yyxx_webview_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="320dp"
         android:layout_margin="20dp"
+        android:background="@color/yyxx_transparent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/yyxx_title_container"
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:background="@drawable/yyxx_green_blue_panel_title"
-            app:layout_constraintBottom_toTopOf="@id/yyxx_content_container"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/yyxx_iv_return"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="10dp"
-                android:background="@drawable/yyxx_back_img"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/yyxx_tv_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/yyxx_color_white"
-                android:textSize="18sp"
-                android:textStyle="bold"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/yyxx_content_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/yyxx_white_panel_content_bg"
-            android:padding="10dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/yyxx_title_container">
-
-            <FrameLayout
-                android:id="@+id/yyxx_webview_container"
-                android:layout_width="match_parent"
-                android:layout_height="320dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>