v1.0.0开发：迁移自有sdk

README.md

@@ -1,3 +1,612 @@
-# EYuanCommSdk-KTX
+[TOC]
 
-元游海外融合Sdk
+# 修订记录
+
+| 日期         | 版本    | 说明   | 作者  |
+|:----------:|:-----:|:---- |:---:|
+| 2022-02-28 | 1.0.0 | 文档建立 | 麦锦培 |
+
+# 1.接入前检查
+
+- 游戏资源文件名、布局名、布局id名等建议使用规范命名，避免和SDK资源冲突
+
+- Android Studio 3.0及以上，由于谷歌服务一系列SDK已不提供jar包形式，因此SDK不提供jar包形式以eclipse接入
+
+- Android Gradle Plugin Version : 7.0.2+
+
+- Gradle Version : 7.0.2+
+
+- Android Studio开启Android X支持，请在游戏项目根目录的**`gradle.properties`**中设置
+  
+  ```properties
+  android.useAndroidX=true
+  android.enableJetifier=true
+  ```
+
+- 请务必使用我们提供的keystore签名文件进行签名，否则SDK功能会异常
+
+- [服务端接口文档](http://yydocs.yyxxgame.com/web/#/147/892)
+
+- [客户端SDK接入Demo](http://gogs.yyxxgame.com/Client/EYuanCommSdkDemo)
+
+# 2.SDK资源接入说明
+
+- 1.接入中存在问题请参考SDK提供的Demo工程或联系技术解决
+
+- 2.拷贝对应渠道目录下**`assets`**至项目中
+
+- 3.拷贝对应渠道目录下**`res/values/strings.xml`**中的内容至项目中相应的文档中，如果没有strings.xml则新建一份即可，如果该目录没有则不需要处理
+
+- 4.在应用**`build.gradle`**中**`dependencies`**节点下添加SDK依赖，目前只提供远程依赖
+  
+  > 在项目级**`build.gradle`**文件下的**`allprojects`**节点下添加仓库的url
+  
+  ```groovy
+      allprojects {
+          repositories {
+              ...
+              mavenCentral()
+              // 华为sdk仓库
+              maven { url 'https://developer.huawei.com/repo' }
+              ...
+          }
+      }
+  ```
+  
+  > 在应用级**`build.gradle`**文件下的**`allprojects`**节点下添加仓库的url
+  
+  ```groovy
+    implementation 'io.github.yyxxgame.sdk:eyuancomm-sdk-ktx-comm:1.0.0-rc3'
+    implementation 'io.github.yyxxgame.sdk:eyuancomm-sdk-ktx-impl:1.0.0-rc3'
+    // 以下sdk依赖在生成对应包时按需引入，为了避免资源冲突请不要同时引入
+    implementation 'io.github.yyxxgame.sdk:eyuancomm-channel-lib-huawei:1.0.0-rc3'
+    implementation 'io.github.yyxxgame.sdk:eyuancomm-channel-lib-oppo:1.0.0-rc3'
+  ```
+
+# 3.接口说明
+
+> <font color=red size=5>**SDK的所有接口如无特殊说明，默认均为必接且请务必在游戏主线程调用**</font>
+
+## 1）同步Application中的生命周期
+
+- 若游戏无自定义Application则直接在清单文件AndroidManifest.xml的**``application``**节点中设置name属性为SDK提供的Application**``cn.yyxx.eyuangame.base.EYuanCommApplication``**
+
+```xml
+    <application android:name="cn.yyxx.eyuangame.base.EYuanCommApplication">
+        ···
+    </application>
+```
+
+- 若游戏有自定义Application，则需要继承SDK提供的Application
+
+```java
+    public class DemoApplication extends EYuanCommApplication {
+        @Override
+        protected void attachBaseContext(Context base) {
+            super.attachBaseContext(base);
+        }
+
+        @Override
+        public void onCreate() {
+            super.onCreate();
+        }
+    }
+```
+
+## 2）同步游戏Activity中各个生命周期至SDK
+
+- 同步onStart
+
+```java
+    @Override
+    protected void onStart() {
+        super.onStart();
+        EYuanCommSdk.getInstance().onStart(this);
+    }
+```
+
+- 同步onResume
+
+```java
+    @Override
+    protected void onResume() {
+        super.onResume();
+        EYuanCommSdk.getInstance().onResume(this);
+    }
+```
+
+- 同步onRestart
+
+```java
+    @Override
+    protected void onRestart() {
+        super.onRestart();
+        EYuanCommSdk.getInstance().onReStart(this);
+    }
+```
+
+- 同步onPause
+
+```java
+    @Override
+    protected void onPause() {
+        super.onPause();
+        EYuanCommSdk.getInstance().onPause(this);
+    }
+```
+
+- 同步onStop
+
+```java
+    @Override
+    protected void onStop() {
+        super.onStop();
+        EYuanCommSdk.getInstance().onStop(this);
+    }
+```
+
+- 同步onDestroy
+
+```java
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EYuanCommSdk.getInstance().onDestroy(this);
+    }
+```
+
+- 同步onActivityResult
+
+```java
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        EYuanCommSdk.getInstance().onActivityResult(this, requestCode, requestCode, data);
+    }
+```
+
+- 同步onNewIntent
+
+```java
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        EYuanGame.getInstance().onNewIntent(this, intent);
+    }
+```
+
+## 3）SDK通用回调接口ICallback说明
+
+```java
+    public interface ICallback {
+        void onResult(int code, String result);
+    }
+```
+
+| 参数     | 类型     | 说明            |
+|:------:|:------:|:-------------:|
+| code   | int    | 状态码（0成功，-1失败） |
+| result | string | 返回信息          |
+
+## 4）SDK初始化
+
+- 在游戏的主Activity的onCreate中调用
+
+```java
+    /**
+     * SDK初始化
+     *
+     * @param activity    Activity上下文
+     * @param isLandscape 是否横屏
+     * @param callback    SDK初始化回调
+     */
+    public void initialize(final Activity activity, final Boolean isLandscape, ICallback callback)
+```
+
+- 示例
+
+```java
+    @Override
+    protected void onCreate(Bundle savedInstanceState){
+        EYuanCommSdk.getInstance().initialize(this, false, new ICallback() {
+            @Override
+            public void onResult(int code, String result) {
+                if (code == 0) {
+                    //TODO SDK初始化成功
+                } else {
+                    //TODO SDK初始化失败，result是失败的debug信息
+                }
+            }
+        });
+    }
+```
+
+## 5）用户账号登录
+
+```java
+    /**
+     * SDK用户登录
+     *
+     * @param activity Activity上下文
+     * @param isAuto   是否自动登录
+     * @param callback 登录回调对象
+     */
+    public void login(Activity activity, Boolean isAuto, ICallback callback)
+```
+
+**登录回调返回的result信息**
+
+| 参数     | 类型     | 说明       |
+|:------:|:------:|:--------:|
+| userId | string | SDK的用户ID |
+| token  | string | 签名token  |
+
+- 示例
+
+```java
+    EYuanCommSdk.getInstance().login(DemoActivity.this, true, new ICallback(){
+        @Override
+        public void onResult(int code, String result) {
+            if (code == 0) {
+                //TODO 对SDK返回的用户信息进行验签
+                //result返回的是JSON字符串，可以得到uid和token等信息
+                //签名规则详见服务端接入文档
+            } else {
+                //TODO 登录失败，result是返回的debug信息
+            }
+        }
+    });
+```
+
+## 6）用户账号登出
+
+> 用户在游戏中触发登出，游戏回到选服界面重新拉起登录
+
+```java
+    /**
+     * SDK用户登出账号
+     *
+     * @param activity Activity上下文
+     * @param callback 登出回调对象
+     */
+    public void logout(Activity activity, ICallback callback)
+```
+
+- 示例
+
+```java
+    EYuanCommSdk.getInstance().logout(this, new ICallback() {
+        @Override
+        public void onResult(int code, String result) {
+            if (code == 0) {
+                //TODO 用户登出成功，登出成功后请返回游戏选服界面，然后拉起登录框，如果调用登录接口，请设置为非自动登录
+            } else {
+                //TODO 用户登出失败，result是返回的debug信息
+            }
+        }
+    }
+```
+
+## 7）角色信息上报
+
+> 请务必根据当前角色的触发的事件进行上报
+
+角色信息实体对象SdkRoleInfo，如无特别说明所有字段均不能为null或空串""
+
+| 参数            | 类型     | 说明                          |
+|:-------------:|:------:|:---------------------------:|
+| userId        | string | 当前用户ID                      |
+| serverId      | string | 当前角色所在的服务器ID                |
+| serverName    | string | 当前角色所在的服务器名                 |
+| roleId        | string | 当前角色ID                      |
+| roleName      | string | 当前角色名                       |
+| roleLevel     | string | 当前角色等级                      |
+| roleCTime     | long   | 当前角色创建的时间戳（10位），角色一旦创建则是固定值 |
+| vipLevel      | string | 当前Vip角色等级，若无传"none"         |
+| balance       | string | 当前角色游戏币余额，若无传"none"         |
+| totalPurchase | int    | 累计充值金额，若无传0）                |
+
+> 角色创建
+
+```java
+    /**
+     * SDK角色创建信息上报
+     *
+     * @param activity Activity上下文
+     * @param roleInfo 角色信息实体
+     */
+    public void roleCreate(Activity activity, SdkRoleInfo roleInfo)
+```
+
+> 角色进入服务器（角色登录）
+
+```java
+    /**
+     * SDK角色登录信息上报
+     *
+     * @param activity Activity上下文
+     * @param roleInfo 角色信息实体
+     */
+    public void roleLauncher(Activity activity, SdkRoleInfo roleInfo)
+```
+
+> 角色升级
+
+```java
+    /**
+     * SDK角色升级信息上报
+     *
+     * @param activity Activity上下文
+     * @param roleInfo 角色信息实体
+     */
+    public void roleUpgrade(Activity activity, SdkRoleInfo roleInfo)
+```
+
+- 示例
+
+```java
+    SdkRoleInfo gameRoleInfo = new SdkRoleInfo();
+    //用户ID
+    gameRoleInfo.setUserId(EYuanGame.getInstance().getCurrentUserId());
+    //角色ID
+    gameRoleInfo.setRoleId(roleId);
+    //角色名称
+    gameRoleInfo.setRoleName(roleName);
+    //角色等级
+    gameRoleInfo.setRoleLevel(roleLevel);
+    //创角时间戳（角色一旦创角则是固定值）
+    gameRoleInfo.setRoleCTime(System.currentTimeMillis()/1000)
+    //服务器ID
+    gameRoleInfo.setServerId(serverId);
+    //服务器名
+    gameRoleInfo.setServerName(serverName);
+    //用户VIP等级，无该字段则传空串""
+    gameRoleInfo.setVipLevel("1");
+    //当前角色游戏币余额
+    gameRoleInfo.setBalance("600");
+    //累计充值金额，若无传0）
+    gameRoleInfo.setTotalPurchase(0)
+
+    //角色创建
+    EYuanCommSdk.getInstance().roleCreate(this, gameRoleInfo);
+
+    //角色登录
+    EYuanCommSdk.getInstance().roleLauncher(this, gameRoleInfo;
+
+    //角色升级
+    EYuanCommSdk.getInstance().roleUpgrade(this, gameRoleInfo;
+```
+
+## 8）支付储值
+
+> 请务必保证调用角色信息上报中的角色登录上报后再调用
+> <font color=red size=5>**客户端SDK回调的只是支付流程的结果，实际支付结果将由服务端回调**</font>
+> 默认情况均为内购包即上架Google Play，具体情况请根据运营需求接入
+
+支付信息实体对象SdkChargeInfo，如无特别说明所有字段均不能为null或空串""
+
+| 参数          | 类型     | 说明                   |
+|:-----------:|:------:|:--------------------:|
+| userId      | string | 当前用户ID               |
+| serverCode  | string | 当前角色所在的服务器ID         |
+| serverName  | string | 当前角色所在的服务器名          |
+| roleId      | string | 当前角色ID               |
+| roleName    | string | 当前角色名                |
+| roleLevel   | string | 当前角色等级               |
+| amount      | int    | 金额，单位分，币种固定为币种美金     |
+| productId   | string | 商品ID                 |
+| productName | string | 商品名称                 |
+| productDesc | string | 商品描述                 |
+| cpOrderId   | string | 游戏订单号                |
+| cpExt       | string | 游戏透传信息，最终会元游返回，可为空   |
+| cpPayTime   | long   | 下单时间，10位Unix时间戳      |
+| cpPaySign   | string | 支付签名，具体签名规则详见服务端接口文档 |
+
+```java
+    /**
+     * SDK用户支付
+     *
+     * @param activity   Activity上下文
+     * @param chargeInfo 支付信息实体对象
+     * @param isIab             是否内购
+     * @param callback   支付回调对象
+     */
+    public void charge(Activity activity, SdkChargeInfo chargeInfo, boolean isIab , ICallback callback)
+```
+
+- 示例
+
+```java
+    long ts = System.currentTimeMillis();
+    SdkChargeInfo gameChargeInfo = new SdkChargeInfo();
+    //用户ID
+    gameChargeInfo.setUserId(EYuanGame.getInstance().getCurrentUserId());
+    //角色ID
+    gameChargeInfo.setRoleId(roleId);
+    //角色名称
+    gameChargeInfo.setRoleName(roleName);
+    //角色等级
+    gameChargeInfo.setRoleLevel(roleLevel);
+    //创角时间戳（角色一旦创建则是固定值）
+    gameChargeInfo.setRoleCTime(创角时间戳（角色一旦创建则是固定值）);
+    //服务器ID
+    gameChargeInfo.setServerId(serverId);
+    //服务器名
+    gameChargeInfo.setServerName(serverName);
+    //游戏的订单号
+    gameChargeInfo.setCpOrderId(orderId);
+    //透传字段，会在服务端回调中原样返回
+    gameChargeInfo.setCpExt("cp_callback_info||" + orderId);
+    //金额，单位分，币种美金
+    gameChargeInfo.setAmount(99);
+    //商品ID，计费点
+    gameChargeInfo.setProductId("com.shzd.1usd");
+    //商品名称
+    gameChargeInfo.setProductName("60元宝");
+    //商品描述
+    gameChargeInfo.setProductDesc("60元宝");
+    //下单时间
+    gameChargeInfo.setCpPayTime(payTs)
+    //支付签名
+    gameChargeInfo.setCpPaySign("支付签名，具体签名规则详见服务端接口文档")
+
+    //客户端SDK回调的只是支付流程的结果，实际支付结果将由服务端回调
+    EYuanCommSdk.getInstance().charge(this, gameChargeInfo, true , new ICallback() {
+        @Override
+            public void onResult(int code, String result) {
+                if (code == 0) {
+                    //TODO 支付流程完成
+                } else {
+                    //TODO 支付失败
+                }
+            }
+    });
+```
+
+## 9）显示SDK退出框
+
+> 用户（玩家）按下返回键时调用，接入方需要实现Activity的onKeyDown，并判断keyCode为KeyEvent.KEYCODE_BACK时调用该接口
+
+> 调用退出框前，请先调用hasExitView()判断是否有渠道退出框，如果返回false则显示游戏原生退出框即可
+
+```java
+    /**
+     * 显示退出框
+     *
+     * @param activity Activity上下文
+     * @param callback 退出回调对象
+     */
+    public boolean hasExitView(Activity activity)
+```
+
+```java
+    /**
+     * 显示退出框
+     *
+     * @param activity Activity上下文
+     * @param callback 退出回调对象
+     */
+    public void openExitView(Activity activity, ICallback callback)
+```
+
+- 示例
+
+```java
+    //重写Activity的onKeyDown并判断KeyDown事件
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            if (EYuanCommSdk.getInstance().hasExitView(this)) {
+                EYuanCommSdk.getInstance().openExitView(this, new ICallback() {
+                    @Override
+                    public void onResult(int code, String result) {
+                        if (code == 0) {
+                            // 结束当前Activity
+                            // 如果要杀进程需要在onDestroy中处理，不然会不执行SDK的onDestroy方法
+                            finish();
+                        }
+                    }
+                });
+            }else {
+                // 显示游戏原生退出框
+            }
+            return true;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EYuanCommSdk.getInstance().onDestroy(this);
+        //结束当前应用进程
+        System.exit(0);
+    }
+```
+
+## 10）设置SDK浮标切换用户监听
+
+> 在SDK初始化成功后设置浮标切换用户监听
+
+```java
+    /**
+     * 设置SDK浮标切换用户监听
+     *
+     * @param callback 切换用户回调对象
+     */
+    public void setOnFloatBallLogout(ICallback callback)
+```
+
+- 示例
+
+```java
+    EYuanCommSdk.getInstance().initialize(this, true, new ICallback() {
+        @Override
+        public void onResult(int code, @NonNull String result) {
+            if (code == 0) {
+                // SDK初始化成功设置浮标切换用户监听
+                EYuanCommSdk.getInstance().setOnFloatBallLogout(new ICallback() {
+                    @Override
+                    public void onResult(int code2, @NonNull String result2) {
+                        if (code2 == 0) {
+                            // 用户触发浮标切换账号，游戏需退回到登录选服页，并调用SDK的login()接口拉起登录
+                         } else {
+                            // 预留，暂时无需处理
+                        }
+                    }
+                });
+            }
+        }
+    });
+```
+
+## 11）获取SDK当前用户ID（选接）
+
+```java
+    /**
+     * 获取当前SDK版本
+     *
+     * @return
+     */
+    public String getCurrentUserId()
+```
+
+- 示例
+
+```java
+    EYuanCommSdk.getInstance().getCurrentUserId();
+```
+
+## 12）获取SDK当前版本（选接）
+
+```java
+    /**
+     * 获取当前SDK版本
+     *
+     * @return
+     */
+    public String getCurrentSdkVersion()
+```
+
+- 示例
+
+```java
+    EYuanCommSdk.getInstance().getCurrentSdkVersion();
+```
+
+## 13）SDK日志接口（选接）
+
+> 若游戏有需要持久化java、kotlin和C++(联系我方技术获取头文件)层的日志，可以使用SDK的日志接口。SDK的日志框架底层使用C++进行开发，使用了Linux系统的mmap内存拷贝技术
+> SDK会默认缓存3天的日志，过期则自动删除
+> 缓存的文件使用Facebook开源的压缩算法zlib进行压缩
+> 缓存路径为**手机内部存储目录/Android/data/包名/files/dolin/zap**，即应用的私有目录
+> 更多使用方法请联系我方技术
+
+```java
+    // debug日志
+    Logger.d(TAG,msg);
+    // info日志
+    Logger.i(TAG,msg);
+    // error日志
+    Logger.e(TAG,msg);
+```

build.gradle

@@ -27,7 +27,6 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.huawei.agconnect:agcp:1.6.0.300'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

channel_registry/channel_huawei/build.gradle

@@ -28,7 +28,7 @@ android {
     }
 
     compileOptions {
-        kotlinOptions.freeCompilerArgs += ['-module-name', "cn.yyxx.eyuangame.channel.huawei"]
+        kotlinOptions.freeCompilerArgs += ['-module-name', "cn.yyxx.eyuancomm.channel.huawei"]
     }
 
     compileOptions {
@@ -68,7 +68,16 @@ dependencies {
 //    api files('libs/facebook-core-12.3.0.jar')
 //    api files('libs/facebook-login-12.3.0.jar')
     implementation 'com.facebook.android:facebook-login:12.3.0'
+    implementation 'com.google.android.gms:play-services-auth:20.1.0'
 
-    implementation 'com.google.android.gms:play-services-auth:20.0.1'
-
+//    api project(':component:google-auth:play-services-auth')
+//    api project(':component:google-auth:play-services-auth-api-phone')
+//    api project(':component:google-auth:play-services-auth-base')
+//    api project(':component:google-auth:play-services-base')
+//    api project(':component:google-auth:play-services-basement')
+//    api project(':component:google-auth:play-services-tasks')
+//
+//    api project(':component:facebook-auth:facebook-comm')
+//    api project(':component:facebook-auth:facebook-core')
+//    api project(':component:facebook-auth:facebook-login')
 }

channel_registry/channel_huawei/src/main/AndroidManifest.xml

@@ -298,6 +298,7 @@
             android:label="@string/app_name"
             android:theme="@style/com_facebook_activity_theme" />
         <activity android:name="com.facebook.CustomTabMainActivity" />
+
         <activity
             android:name="com.facebook.CustomTabActivity"
             android:exported="true">
@@ -325,6 +326,7 @@
                 <action android:name="com.facebook.sdk.ACTION_CURRENT_ACCESS_TOKEN_CHANGED" />
             </intent-filter>
         </receiver>
+
         <receiver
             android:name="com.facebook.AuthenticationTokenManager$CurrentAuthenticationTokenChangedBroadcastReceiver"
             android:exported="false">

channel_registry/channel_huawei/src/main/res/values-zh-rCN/strings.xml

@@ -71,31 +71,5 @@
     <string name="hms_game_login_notice" priority="LT">"欢迎，华为用户 %1$s"</string>
     <!-- Hmssdk-game -->
 
-    <!-- facebook -->
-    <string gender="unknown" name="com_facebook_device_auth_instructions">访问&lt;b>facebook.com/device&lt;/b>并输入上方显示的验证码。</string>
-    <string gender="unknown" name="com_facebook_image_download_unknown_error">下载图片时出现意外错误。</string>
-    <string gender="unknown" name="com_facebook_internet_permission_error_message">WebView 登录需要访问网络</string>
-    <string gender="unknown" name="com_facebook_internet_permission_error_title">AndroidManifest 错误</string>
-    <string gender="unknown" name="com_facebook_like_button_liked">赞了</string>
-    <string gender="unknown" name="com_facebook_like_button_not_liked">赞</string>
-    <string gender="unknown" name="com_facebook_loading">正在加载…</string>
-    <string gender="unknown" name="com_facebook_loginview_cancel_action">取消</string>
-    <string gender="unknown" name="com_facebook_loginview_log_in_button">登录</string>
-    <string gender="unknown" name="com_facebook_loginview_log_in_button_continue">使用 Facebook 登录</string>
-    <string gender="unknown" name="com_facebook_loginview_log_in_button_long">使用 Facebook 登录</string>
-    <string gender="unknown" name="com_facebook_loginview_log_out_action">退出</string>
-    <string gender="unknown" name="com_facebook_loginview_log_out_button">退出</string>
-    <string gender="unknown" name="com_facebook_loginview_logged_in_as">登录身份：%1$s</string>
-    <string gender="unknown" name="com_facebook_loginview_logged_in_using_facebook">已通过 Facebook 登录</string>
-    <string gender="unknown" name="com_facebook_send_button_text">发送</string>
-    <string gender="unknown" name="com_facebook_share_button_text">分享</string>
-    <string gender="unknown" name="com_facebook_smart_device_instructions">要关联帐户，请在移动设备上打开 Facebook 应用并查看通知。</string>
-    <string gender="unknown" name="com_facebook_smart_device_instructions_or">- 或 -</string>
-    <string gender="unknown" name="com_facebook_smart_login_confirmation_cancel">不是你？</string>
-    <string gender="unknown" name="com_facebook_smart_login_confirmation_continue_as">以%1$s的身份继续</string>
-    <string gender="unknown" name="com_facebook_smart_login_confirmation_title">确认登录</string>
-    <string gender="unknown" name="com_facebook_tooltip_default">应用分享内容由你掌控。</string>
-    <!-- facebook -->
-
 
 </resources>

channel_registry/channel_huawei/src/main/res/values-zh-rHK/strings.xml

@@ -71,30 +71,4 @@
     <string name="hms_game_login_notice" priority="LT">"歡迎，華為用戶 %1$s"</string>
     <!-- Hmssdk-game -->
 
-    <!-- facebook -->
-    <string gender="unknown" name="com_facebook_device_auth_instructions">前往&lt;b> facebook.com/device &lt;/b>並輸入上方顯示的代碼。</string>
-    <string gender="unknown" name="com_facebook_image_download_unknown_error">下載圖像時發生沒有預期的錯誤。</string>
-    <string gender="unknown" name="com_facebook_internet_permission_error_message">WebView 登入需要網絡使用權限</string>
-    <string gender="unknown" name="com_facebook_internet_permission_error_title">AndroidManifest 錯誤</string>
-    <string gender="unknown" name="com_facebook_like_button_liked">已讚好</string>
-    <string gender="unknown" name="com_facebook_like_button_not_liked">讚好</string>
-    <string gender="unknown" name="com_facebook_loading">載入中......</string>
-    <string gender="unknown" name="com_facebook_loginview_cancel_action">取消</string>
-    <string gender="unknown" name="com_facebook_loginview_log_in_button">登入</string>
-    <string gender="unknown" name="com_facebook_loginview_log_in_button_continue">繼續使用 Facebook 帳戶</string>
-    <string gender="unknown" name="com_facebook_loginview_log_in_button_long">使用 Facebook 登入</string>
-    <string gender="unknown" name="com_facebook_loginview_log_out_action">登出</string>
-    <string gender="unknown" name="com_facebook_loginview_log_out_button">登出</string>
-    <string gender="unknown" name="com_facebook_loginview_logged_in_as">以%1$s身分登入</string>
-    <string gender="unknown" name="com_facebook_loginview_logged_in_using_facebook">已使用 Facebook 登入</string>
-    <string gender="unknown" name="com_facebook_send_button_text">送出</string>
-    <string gender="unknown" name="com_facebook_share_button_text">分享</string>
-    <string gender="unknown" name="com_facebook_smart_device_instructions">若要連結帳戶，請在流動裝置上開啟 Facebook 應用程式，然後查看通知。</string>
-    <string gender="unknown" name="com_facebook_smart_device_instructions_or">- 或 -</string>
-    <string gender="unknown" name="com_facebook_smart_login_confirmation_cancel">不是你嗎？</string>
-    <string gender="unknown" name="com_facebook_smart_login_confirmation_continue_as">以%1$s的身分繼續</string>
-    <string gender="unknown" name="com_facebook_smart_login_confirmation_title">確認登入</string>
-    <string gender="unknown" name="com_facebook_tooltip_default">一切由你掌握：自行選擇要分享給應用程式的資訊種類。</string>
-    <!-- facebook -->
-
 </resources>

channel_registry/channel_huawei/src/main/res/values-zh-rTW/strings.xml

@@ -70,31 +70,4 @@
     <string name="hms_game_check_update_success_content" priority="LT">"若要使用此服務，需安裝下列應用程式的最新版本：\n\n·應用程式助手 (%1$s MB)"</string>
     <string name="hms_game_login_notice" priority="LT">"歡迎，華為使用者 %1$s"</string>
     <!-- Hmssdk-game -->
-
-    <!-- facebook -->
-    <string name="com_facebook_device_auth_instructions" gender="unknown">前往&lt;b> facebook.com/device &lt;/b>並輸入上方顯示的代碼。</string>
-    <string name="com_facebook_image_download_unknown_error" gender="unknown">下載圖像時無預警發生錯誤。</string>
-    <string name="com_facebook_internet_permission_error_message" gender="unknown">WebView 登入需要網路使用權限</string>
-    <string name="com_facebook_internet_permission_error_title" gender="unknown">AndroidManifest 錯誤</string>
-    <string name="com_facebook_like_button_liked" gender="unknown">已說讚</string>
-    <string name="com_facebook_like_button_not_liked" gender="unknown">讚</string>
-    <string name="com_facebook_loading" gender="unknown">載入中......</string>
-    <string name="com_facebook_loginview_cancel_action" gender="unknown">取消</string>
-    <string name="com_facebook_loginview_log_in_button" gender="unknown">登入</string>
-    <string name="com_facebook_loginview_log_in_button_continue" gender="unknown">以 Facebook 帳號繼續</string>
-    <string name="com_facebook_loginview_log_in_button_long" gender="unknown">使用 Facebook 帳號登入</string>
-    <string name="com_facebook_loginview_log_out_action" gender="unknown">登出</string>
-    <string name="com_facebook_loginview_log_out_button" gender="unknown">登出</string>
-    <string name="com_facebook_loginview_logged_in_as" gender="unknown">已使用%1$s的身分登入</string>
-    <string name="com_facebook_loginview_logged_in_using_facebook" gender="unknown">已使用 Facebook 登入</string>
-    <string name="com_facebook_send_button_text" gender="unknown">送出</string>
-    <string name="com_facebook_share_button_text" gender="unknown">分享</string>
-    <string name="com_facebook_smart_device_instructions" gender="unknown">若要連結帳號，請在行動裝置上開啟 Facebook 應用程式，然後查看通知。</string>
-    <string name="com_facebook_smart_device_instructions_or" gender="unknown">- 或 -</string>
-    <string name="com_facebook_smart_login_confirmation_cancel" gender="unknown">不是你？</string>
-    <string name="com_facebook_smart_login_confirmation_continue_as" gender="unknown">以%1$s的身分繼續</string>
-    <string name="com_facebook_smart_login_confirmation_title" gender="unknown">確認登入</string>
-    <string name="com_facebook_tooltip_default" gender="unknown">一切操之在你：自行選擇要分享給應用程式的資訊種類。</string>
-    <!-- facebook -->
-
 </resources>

channel_registry/channel_huawei/src/main/res/values/colors.xml

@@ -5,19 +5,4 @@
     <color name="upsdk_color_gray_10">#191919</color>
     <color name="upsdk_color_gray_7">#808080</color>
     <!-- Update -->
-
-    <!-- facebook -->
-    <color name="com_facebook_blue">#1877F2</color>
-    <color name="com_facebook_button_background_color">@color/com_facebook_blue</color>
-    <color name="com_facebook_button_background_color_disabled">#EBEDF0</color>
-    <color name="com_facebook_button_background_color_pressed">#186BDA</color>
-    <color name="com_facebook_device_auth_text">#90949C</color>
-    <color name="com_facebook_likeboxcountview_border_color">#6a7180</color>
-    <color name="com_facebook_likeboxcountview_text_color">#6a7180</color>
-    <color name="com_facebook_likeview_text_color">#6a7180</color>
-    <color name="com_facebook_primary_button_disabled_text_color">#BCC3C9</color>
-    <color name="com_facebook_primary_button_pressed_text_color">#DADDE2</color>
-    <color name="com_facebook_primary_button_text_color">#FFFFFF</color>
-    <color name="com_smart_login_code">#3C6499</color>
-    <!-- facebook -->
 </resources>

channel_registry/channel_huawei/src/main/res/values/dimens.xml

@@ -7,23 +7,4 @@
     <dimen name="upsdk_master_body_2">13sp</dimen>
     <dimen name="upsdk_master_subtitle">15sp</dimen>
     <!-- Update -->
-
-    <!-- facebook -->
-    <dimen name="com_facebook_auth_dialog_corner_radius">2dp</dimen>
-    <dimen name="com_facebook_auth_dialog_corner_radius_oversized">4dp</dimen>
-    <dimen name="com_facebook_button_corner_radius">4dp</dimen>
-    <dimen name="com_facebook_likeboxcountview_border_radius">3dp</dimen>
-    <dimen name="com_facebook_likeboxcountview_border_width">1dp</dimen>
-    <dimen name="com_facebook_likeboxcountview_caret_height">3dp</dimen>
-    <dimen name="com_facebook_likeboxcountview_caret_width">6dp</dimen>
-    <dimen name="com_facebook_likeboxcountview_text_padding">6dp</dimen>
-    <dimen name="com_facebook_likeboxcountview_text_size">11.0sp</dimen>
-    <dimen name="com_facebook_likeview_edge_padding">2dp</dimen>
-    <dimen name="com_facebook_likeview_internal_padding">6dp</dimen>
-    <dimen name="com_facebook_likeview_text_size">11.0sp</dimen>
-    <dimen name="com_facebook_button_login_corner_radius">3dp</dimen>
-    <dimen name="com_facebook_profilepictureview_preset_size_large">180dp</dimen>
-    <dimen name="com_facebook_profilepictureview_preset_size_normal">100dp</dimen>
-    <dimen name="com_facebook_profilepictureview_preset_size_small">50dp</dimen>
-    <!-- facebook -->
 </resources>

channel_registry/channel_huawei/src/main/res/values/strings.xml

@@ -106,30 +106,4 @@ aNPPT4LEm5R7sV6vG1CjwbgvQrWCgc4nMb8ngdfnVF7Ydqjqi9SAqUzIk4+Uf0ZY
     <string name="push_cat_head" translatable="false">767499AE5B2DFC9D873AF46032E13B00</string>
     <!-- opendevice -->
 
-    <!-- facebook -->
-    <string name="com_facebook_internet_permission_error_title">AndroidManifest Error</string>
-    <string name="com_facebook_like_button_liked">Liked</string>
-    <string name="com_facebook_like_button_not_liked">Like</string>
-    <string name="com_facebook_loading">Loading…</string>
-    <string name="com_facebook_loginview_cancel_action">Cancel</string>
-    <string name="com_facebook_loginview_log_in_button">Log in</string>
-    <string name="com_facebook_loginview_log_in_button_continue">Continue with Facebook</string>
-    <string name="com_facebook_loginview_log_in_button_long">Log in with Facebook</string>
-    <string name="com_facebook_loginview_log_out_action">Log out</string>
-    <string name="com_facebook_loginview_log_out_button">Log out</string>
-    <string name="com_facebook_loginview_logged_in_as">Logged in as: <ns1:g id="user name">%1$s</ns1:g></string>
-    <string name="com_facebook_loginview_logged_in_using_facebook">Logged in using Facebook</string>
-    <string name="com_facebook_send_button_text">Send</string>
-    <string name="com_facebook_share_button_text">Share</string>
-    <string name="com_facebook_smart_device_instructions">To connect your account, open the Facebook app on your mobile device and check for notifications.</string>
-    <string name="com_facebook_smart_device_instructions_or">- OR -</string>
-    <string name="com_facebook_smart_login_confirmation_cancel">Not you?</string>
-    <string name="com_facebook_smart_login_confirmation_continue_as">Continue as <ns1:g id="user name">%1$s</ns1:g></string>
-    <string name="com_facebook_smart_login_confirmation_title">Confirm Login</string>
-    <string name="com_facebook_device_auth_instructions">Visit &lt;b>facebook.com/device&lt;/b> and enter the code shown above.</string>
-    <string name="com_facebook_image_download_unknown_error">Unexpected error while downloading an image.</string>
-    <string name="com_facebook_internet_permission_error_message">WebView login requires INTERNET permission</string>
-    <string name="com_facebook_tooltip_default">You\'re in control - choose what info you want to share with apps.</string>
-    <!-- facebook -->
-
 </resources>

channel_registry/channel_huawei/src/main/res/values/styles.xml

@@ -6,110 +6,4 @@
     </style>
     <!-- HMSSdkUI -->
 
-    <!-- facebook -->
-    <style name="com_facebook_activity_theme" parent="@style/Theme.AppCompat.NoActionBar">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
-    <style name="com_facebook_auth_dialog" parent="@style/Theme.AppCompat.Dialog">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-    </style>
-
-    <style name="com_facebook_auth_dialog_instructions_textview" ns2:targetApi="17">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:fontFamily">roboto</item>
-        <item name="android:gravity">center</item>
-        <item name="android:drawablePadding">12dp</item>
-        <item name="android:singleLine">false</item>
-        <item name="android:textColor">@color/com_facebook_device_auth_text</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:typeface">sans</item>
-    </style>
-
-    <style name="com_facebook_button" parent="@android:style/Widget.Button">
-        <item name="android:background">@drawable/com_facebook_button_background</item>
-        <item name="android:drawablePadding">4dp</item>
-        <item name="android:gravity">center</item>
-        <item name="android:paddingBottom">5dp</item>
-        <item name="android:paddingLeft">8dp</item>
-        <item name="android:paddingRight">8dp</item>
-        <item name="android:paddingTop">5dp</item>
-        <item name="android:textColor">@color/com_facebook_button_text_color</item>
-        <item name="android:textSize">14.0dp</item>
-    </style>
-
-    <style name="com_facebook_button_like" parent="com_facebook_button">
-        <item name="android:background">@drawable/com_facebook_button_like_background</item>
-    </style>
-
-    <declare-styleable name="com_facebook_like_view">
-        <attr name="com_facebook_foreground_color" format="color" />
-        <attr name="com_facebook_object_id" format="string" />
-        <attr name="com_facebook_object_type">
-            <!-- Keep in sync with Enums in Likeview -->
-            <enum name="unknown" value="0" />
-            <enum name="open_graph" value="1" />
-            <enum name="page" value="2" />
-        </attr>
-        <attr name="com_facebook_style">
-            <!-- Keep in sync with Enums in LikeView -->
-            <enum name="standard" value="0" />
-            <enum name="button" value="1" />
-            <enum name="box_count" value="2" />
-        </attr>
-        <attr name="com_facebook_auxiliary_view_position">
-            <!-- Keep in sync with Enums in LikeView -->
-            <enum name="bottom" value="0" />
-            <enum name="inline" value="1" />
-            <enum name="top" value="2" />
-        </attr>
-        <attr name="com_facebook_horizontal_alignment">
-            <!-- Keep in sync with Enums in LikeView -->
-            <enum name="center" value="0" />
-            <enum name="left" value="1" />
-            <enum name="right" value="2" />
-        </attr>
-    </declare-styleable>
-
-    <style name="com_facebook_loginview_default_style" parent="com_facebook_button" />
-
-    <style name="tooltip_bubble_text">
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:gravity">left</item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:shadowDy">-1</item>
-        <item name="android:shadowRadius">0.25</item>
-        <item name="android:shadowColor">#40000000</item>
-    </style>
-
-    <declare-styleable name="com_facebook_login_view">
-        <attr name="com_facebook_confirm_logout" format="boolean" />
-        <attr name="com_facebook_login_text" format="string" />
-        <attr name="com_facebook_logout_text" format="string" />
-        <attr name="com_facebook_tooltip_mode">
-            <!-- Keep in sync with Enums in LoginButton -->
-            <enum name="automatic" value="0" />
-            <enum name="display_always" value="1" />
-            <enum name="never_display" value="2" />
-        </attr>
-        <attr name="com_facebook_login_button_radius" format="dimension" />
-        <attr name="com_facebook_login_button_transparency" format="integer" />
-    </declare-styleable>
-    <declare-styleable name="com_facebook_profile_picture_view">
-        <attr name="com_facebook_preset_size">
-            <!-- Keep in sync with constants in ProfilePictureView -->
-            <enum name="small" value="-2" />
-            <enum name="normal" value="-3" />
-            <enum name="large" value="-4" />
-        </attr>
-        <attr name="com_facebook_is_cropped" format="boolean" />
-    </declare-styleable>
-    <!-- facebook -->
-
 </resources>

channel_registry/channel_huawei2/build.gradle

@@ -42,9 +42,19 @@ android {
 }
 
 dependencies {
-    api "com.huawei.agconnect:agconnect-auth:1.6.3.300"
-    api 'com.huawei.hms:hwid:6.3.0.301'
     api 'com.huawei.hms:iap:6.3.0.300'
-    api 'com.huawei.hms:game:6.1.0.301'
-    api "com.huawei.agconnect:agconnect-auth-huawei:1.6.3.300"
-}
+    api 'com.huawei.hms:game:6.2.0.300'
+    
+    api 'com.huawei.hms:hianalytics:6.4.0.300'
+    api 'com.huawei.agconnect:agconnect-crash:1.6.4.300'
+
+    api "com.huawei.agconnect:agconnect-auth:1.6.4.300"
+    api "com.huawei.agconnect:agconnect-auth-huawei:1.6.4.300"
+    api "com.huawei.agconnect:agconnect-auth-facebook:1.6.4.300"
+    api "com.huawei.agconnect:agconnect-auth-google:1.6.4.300"
+    api 'com.huawei.hms:hwid:6.4.0.300'
+    api 'com.facebook.android:facebook-login:12.3.0'
+    api 'com.google.android.gms:play-services-auth:20.1.0'
+}
+
+apply from: 'publish.gradle'

channel_registry/channel_huawei2/publish.gradle

@@ -0,0 +1,110 @@
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+ext {
+    PUBLISH_GROUP_ID = 'io.github.yyxxgame.sdk'
+    PUBLISH_ARTIFACT_ID = 'eyuancomm-channel-lib-huawei'
+    PUBLISH_VERSION = '1.0.0-rc3'
+}
+
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+def ossrhUsername = properties.getProperty("SonaType.user")
+def ossrhPassword = properties.getProperty("SonaType.pwd")
+
+task androidSourcesJar(type: Jar) {
+    archiveClassifier.set('source')
+    if (project.plugins.findPlugin('com.android.library')) {
+        from android.sourceSets.main.java.srcDirs
+    } else {
+        form sourceSets.main.java.srcDirs
+    }
+    exclude "**/R.class"
+    exclude "**/BuildConfig.class"
+}
+
+publishing {
+    publications {
+        release(MavenPublication) {
+            // The coordinates of the library, being set from variables that
+            // we'll set up in a moment
+            groupId PUBLISH_GROUP_ID
+            artifactId PUBLISH_ARTIFACT_ID
+            version PUBLISH_VERSION
+
+            // Two artifacts, the `aar` and the sources
+            artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
+            artifact androidSourcesJar
+
+            // Self-explanatory metadata for the most part
+            pom {
+                name = "${PUBLISH_GROUP_ID}:${PUBLISH_ARTIFACT_ID}"
+                description = 'game comm sdk of eyuan'
+                // If your project has a dedicated site, use its URL here
+                url = 'https://github.com/yyxxgame'
+                licenses {
+                    license {
+                        // 协议类型，一般默认Apache License2.0的话不用改：
+                        name = 'The Apache License, Version 2.0'
+                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'yyxxgame'
+                        name = 'yyxxgame'
+                        email = 'developcentre@yyxxgame.com'
+                    }
+                }
+                // Version control info, if you're using GitHub, follow the format as seen here
+                scm {
+                    //修改成你的Git地址：
+                    connection = 'scm:git:gogs.yyxxgame.com:3000/Client/EYuanGameSdk-KTX.git'
+                    developerConnection = 'scm:git:ssh://gogs.yyxxgame.com:3000/Client/EYuanGameSdk-KTX.git'
+                    //分支地址：
+                    url = 'http://gogs.yyxxgame.com/Client/EYuanGameSdk-KTX'
+                }
+                // A slightly hacky fix so that your POM will include any transitive dependencies
+                // that your library builds upon
+                withXml {
+                    def dependenciesNode = asNode().appendNode('dependencies')
+                    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', node.group)
+                        dependencyNode.appendNode('artifactId', node.name)
+                        dependencyNode.appendNode('version', node.version)
+                    }
+                }
+            }
+        }
+    }
+    repositories {
+        // The repository to publish to, Sonatype/MavenCentral
+        maven {
+            // This is an arbitrary name, you may also use "mavencentral" or
+            // any other name that's descriptive for you
+            name = "mavencentral"
+
+            def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+            def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+            // You only need this if you want to publish snapshots, otherwise just set the URL
+            // to the release repo directly
+            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+
+            // The username and password we've fetched earlier
+            credentials {
+                username ossrhUsername
+                password ossrhPassword
+            }
+        }
+    }
+}
+signing {
+    sign publishing.publications
+}
+
+publishReleasePublicationToMavencentralRepository.dependsOn(assemble)

channel_registry/channel_huawei2/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cn.yyxx.eyuangame.channel.huawei">
+    package="cn.yyxx.eyuancomm.channel.huawei">
 
     <!-- HMS-SDK引导升级HMS功能，访问OTA服务器需要网络权限 -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -16,6 +16,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
+    <!--    &lt;!&ndash;    <uses-sdk tools:overrideLibrary="com.huawei.agconnect.credential,com.huawei.agconnect.core,com.huawei.agconnect.https,com.huawei.agconnect.datastore" />&ndash;&gt;-->
+
     <queries>
         <intent>
             <action android:name="com.apptouch.intent.action.update_hms" />
@@ -35,200 +37,282 @@
     </queries>
 
     <application android:allowBackup="true">
-        <!-- agconnect core -->
-        <provider
-            android:name="com.huawei.agconnect.core.provider.AGConnectInitializeProvider"
-            android:authorities="${applicationId}.AGCInitializeProvider"
-            android:exported="false" />
+        <!--        &lt;!&ndash; agconnect core &ndash;&gt;-->
+        <!--        <provider-->
+        <!--            android:name="com.huawei.agconnect.core.provider.AGConnectInitializeProvider"-->
+        <!--            android:authorities="${applicationId}.AGCInitializeProvider"-->
+        <!--            android:exported="false" />-->
 
-        <service
-            android:name="com.huawei.agconnect.core.ServiceDiscovery"
-            android:exported="false" >
-            <meta-data
-                android:name="com.huawei.agconnect.api.ApiServiceRegistrar"
-                android:value="com.huawei.agconnect.core.ServiceRegistrar" />
-            <meta-data
-                android:name="com.huawei.agconnect.auth.AuthServiceRegistrar"
-                android:value="com.huawei.agconnect.core.ServiceRegistrar" />
-            <meta-data
-                android:name="com.huawei.agconnect.credential.CredentialServiceRegistrar:100"
-                android:value="com.huawei.agconnect.core.ServiceRegistrar" />
-        </service>
-        <!-- agconnect core -->
-
-        <!-- Componentverifysdk -->
-        <meta-data
-            android:name="componentverify_ag_cbg_root"
-            android:value="@string/ag_sdk_cbg_root" />
-        <!-- Componentverifysdk -->
+        <!--        <service-->
+        <!--            android:name="com.huawei.agconnect.core.ServiceDiscovery"-->
+        <!--            android:exported="false">-->
+        <!--            <meta-data-->
+        <!--                android:name="com.huawei.agconnect.api.ApiServiceRegistrar"-->
+        <!--                android:value="com.huawei.agconnect.core.ServiceRegistrar" />-->
+        <!--            <meta-data-->
+        <!--                android:name="com.huawei.agconnect.auth.AuthServiceRegistrar"-->
+        <!--                android:value="com.huawei.agconnect.core.ServiceRegistrar" />-->
+        <!--            <meta-data-->
+        <!--                android:name="com.huawei.agconnect.credential.CredentialServiceRegistrar:100"-->
+        <!--                android:value="com.huawei.agconnect.core.ServiceRegistrar" />-->
+        <!--            <meta-data-->
+        <!--                android:name="com.huawei.agconnect.crash.AGConnectCrashRegistrar"-->
+        <!--                android:value="com.huawei.agconnect.core.ServiceRegistrar" />-->
+        <!--        </service>-->
+        <!--        &lt;!&ndash; agconnect core &ndash;&gt;-->
 
-        <!-- HMSSdkAvailableUpdate -->
-        <meta-data
-            android:name="availableLoaded"
-            android:value="yes" />
+        <!--        &lt;!&ndash; Componentverifysdk &ndash;&gt;-->
+        <!--        <meta-data-->
+        <!--            android:name="componentverify_ag_cbg_root"-->
+        <!--            android:value="@string/ag_sdk_cbg_root" />-->
+        <!--        &lt;!&ndash; Componentverifysdk &ndash;&gt;-->
 
-        <provider
-            android:name="com.huawei.hms.update.provider.UpdateProvider"
-            android:authorities="${applicationId}.hms.update.provider"
-            android:exported="false"
-            android:grantUriPermissions="true" />
-        <!-- HMSSdkAvailableUpdate -->
+        <!--        &lt;!&ndash; HMSSdkAvailableUpdate &ndash;&gt;-->
+        <!--        <meta-data-->
+        <!--            android:name="availableLoaded"-->
+        <!--            android:value="yes" />-->
 
-        <!-- HMSSdkBase -->
-        <meta-data
-            android:name="com.huawei.hms.client.service.name:base"
-            android:value="base:6.3.0.303" />
+        <!--        <provider-->
+        <!--            android:name="com.huawei.hms.update.provider.UpdateProvider"-->
+        <!--            android:authorities="${applicationId}.hms.update.provider"-->
+        <!--            android:exported="false"-->
+        <!--            android:grantUriPermissions="true" />-->
+        <!--        &lt;!&ndash; HMSSdkAvailableUpdate &ndash;&gt;-->
 
-        <meta-data
-            android:name="com.huawei.hms.min_api_level:base:hmscore"
-            android:value="1" />
-        <!-- HMSSdkBase -->
-
-        <!-- HMSSdkDevice -->
-        <provider
-            android:name="com.huawei.hms.device.provider.CheckHmsProvider"
-            android:authorities="${applicationId}.hms.device.validate.spoofprovider"
-            android:exported="false"
-            android:grantUriPermissions="false" />
-        <!-- HMSSdkDevice -->
-
-        <!-- HMSSdkUI -->
-        <activity
-            android:name="com.huawei.hms.activity.BridgeActivity"
-            android:configChanges="orientation|locale|layoutDirection|fontScale|screenSize|smallestScreenSize|screenLayout|uiMode"
-            android:excludeFromRecents="true"
-            android:exported="false"
-            android:hardwareAccelerated="true"
-            android:screenOrientation="behind"
-            android:theme="@style/Base_Translucent">
-            <meta-data
-                android:name="hwc-theme"
-                android:value="androidhwext:style/Theme.Emui.Translucent" />
-        </activity>
-        <activity
-            android:name="com.huawei.hms.activity.EnableServiceActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout"
-            android:exported="false" />
-        <!-- HMSSdkUI -->
+        <!--        &lt;!&ndash; HMSSdkBase &ndash;&gt;-->
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.client.service.name:base"-->
+        <!--            android:value="base:6.3.0.303" />-->
 
-        <!-- Update -->
-        <activity
-            android:name="com.huawei.updatesdk.service.otaupdate.AppUpdateActivity"
-            android:configChanges="orientation|screenSize"
-            android:exported="false"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar">
-            <meta-data
-                android:name="hwc-theme"
-                android:value="androidhwext:style/Theme.Emui.Translucent.NoTitleBar" />
-            <meta-data
-                android:name="hnc-theme"
-                android:value="androidhnext:style/Theme.Magic.Translucent.NoTitleBar" />
-        </activity>
-        <activity
-            android:name="com.huawei.updatesdk.support.pm.PackageInstallerActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:exported="false"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar">
-            <meta-data
-                android:name="hwc-theme"
-                android:value="androidhwext:style/Theme.Emui.Translucent" />
-            <meta-data
-                android:name="hnc-theme"
-                android:value="androidhnext:style/Theme.Magic.Translucent" />
-        </activity>
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.min_api_level:base:hmscore"-->
+        <!--            android:value="1" />-->
+        <!--        &lt;!&ndash; HMSSdkBase &ndash;&gt;-->
 
-        <provider
-            android:name="com.huawei.updatesdk.fileprovider.UpdateSdkFileProvider"
-            android:authorities="${applicationId}.updateSdk.fileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true" />
-        <!-- Update -->
+        <!--        &lt;!&ndash; HMSSdkDevice &ndash;&gt;-->
+        <!--        <provider-->
+        <!--            android:name="com.huawei.hms.device.provider.CheckHmsProvider"-->
+        <!--            android:authorities="${applicationId}.hms.device.validate.spoofprovider"-->
+        <!--            android:exported="false"-->
+        <!--            android:grantUriPermissions="false" />-->
+        <!--        &lt;!&ndash; HMSSdkDevice &ndash;&gt;-->
 
-        <!-- Apptouch -->
-        <meta-data
-            android:name="com.huawei.hms.min_api_level:apptouch:apptouch"
-            android:value="1" />
-        <!-- Apptouch -->
+        <!--        &lt;!&ndash; HMSSdkUI &ndash;&gt;-->
+        <!--        <activity-->
+        <!--            android:name="com.huawei.hms.activity.BridgeActivity"-->
+        <!--            android:configChanges="orientation|locale|layoutDirection|fontScale|screenSize|smallestScreenSize|screenLayout|uiMode"-->
+        <!--            android:excludeFromRecents="true"-->
+        <!--            android:exported="false"-->
+        <!--            android:hardwareAccelerated="true"-->
+        <!--            android:screenOrientation="behind"-->
+        <!--            android:theme="@style/Base_Translucent">-->
+        <!--            <meta-data-->
+        <!--                android:name="hwc-theme"-->
+        <!--                android:value="androidhwext:style/Theme.Emui.Translucent" />-->
+        <!--        </activity>-->
+        <!--        <activity-->
+        <!--            android:name="com.huawei.hms.activity.EnableServiceActivity"-->
+        <!--            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout"-->
+        <!--            android:exported="false" />-->
+        <!--        &lt;!&ndash; HMSSdkUI &ndash;&gt;-->
 
-        <!-- Hmssdk-game -->
-        <meta-data
-            android:name="com.huawei.hms.client.service.name:game"
-            android:value="game:6.1.0.301" />
+        <!--        &lt;!&ndash; Update &ndash;&gt;-->
+        <!--        <activity-->
+        <!--            android:name="com.huawei.updatesdk.service.otaupdate.AppUpdateActivity"-->
+        <!--            android:configChanges="orientation|screenSize"-->
+        <!--            android:exported="false"-->
+        <!--            android:theme="@android:style/Theme.Translucent.NoTitleBar">-->
+        <!--            <meta-data-->
+        <!--                android:name="hwc-theme"-->
+        <!--                android:value="androidhwext:style/Theme.Emui.Translucent.NoTitleBar" />-->
+        <!--            <meta-data-->
+        <!--                android:name="hnc-theme"-->
+        <!--                android:value="androidhnext:style/Theme.Magic.Translucent.NoTitleBar" />-->
+        <!--        </activity>-->
+        <!--        <activity-->
+        <!--            android:name="com.huawei.updatesdk.support.pm.PackageInstallerActivity"-->
+        <!--            android:configChanges="orientation|keyboardHidden|screenSize"-->
+        <!--            android:exported="false"-->
+        <!--            android:theme="@android:style/Theme.Translucent.NoTitleBar">-->
+        <!--            <meta-data-->
+        <!--                android:name="hwc-theme"-->
+        <!--                android:value="androidhwext:style/Theme.Emui.Translucent" />-->
+        <!--            <meta-data-->
+        <!--                android:name="hnc-theme"-->
+        <!--                android:value="androidhnext:style/Theme.Magic.Translucent" />-->
+        <!--        </activity>-->
 
-        <service
-            android:name="com.huawei.hms.jos.games.service.GameService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.huawei.hms.games.service" />
-            </intent-filter>
-        </service>
+        <!--        <provider-->
+        <!--            android:name="com.huawei.updatesdk.fileprovider.UpdateSdkFileProvider"-->
+        <!--            android:authorities="${applicationId}.updateSdk.fileProvider"-->
+        <!--            android:exported="false"-->
+        <!--            android:grantUriPermissions="true" />-->
+        <!--        &lt;!&ndash; Update &ndash;&gt;-->
 
-        <provider
-            android:name="com.huawei.hms.jos.games.archive.ArchiveRemoteAccessProvider"
-            android:authorities="${applicationId}.hmssdk.jos.archive"
-            android:exported="true" />
+        <!--        &lt;!&ndash; Apptouch &ndash;&gt;-->
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.min_api_level:apptouch:apptouch"-->
+        <!--            android:value="1" />-->
+        <!--        &lt;!&ndash; Apptouch &ndash;&gt;-->
 
-        <activity
-            android:name="com.huawei.appmarket.component.buoycircle.impl.delegete.BuoyBridgeActivity"
-            android:configChanges="orientation|locale|screenSize|layoutDirection|fontScale"
-            android:excludeFromRecents="true"
-            android:exported="false"
-            android:hardwareAccelerated="true"
-            android:theme="@android:style/Theme.Translucent">
-            <meta-data
-                android:name="hwc-theme"
-                android:value="androidhwext:style/Theme.Emui.Translucent" />
-        </activity>
+        <!--        &lt;!&ndash; Hmssdk-game &ndash;&gt;-->
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.client.service.name:game"-->
+        <!--            android:value="game:6.1.0.301" />-->
 
-        <meta-data
-            android:name="com.huawei.hms.jos.versioncode"
-            android:value="60100301" />
-        <!-- Hmssdk-game -->
+        <!--        <service-->
+        <!--            android:name="com.huawei.hms.jos.games.service.GameService"-->
+        <!--            android:exported="true">-->
+        <!--            <intent-filter>-->
+        <!--                <action android:name="com.huawei.hms.games.service" />-->
+        <!--            </intent-filter>-->
+        <!--        </service>-->
 
-        <!-- iap -->
-        <meta-data
-            android:name="com.huawei.hms.client.service.name:iap"
-            android:value="iap:6.3.0.300" />
-        <!-- iap -->
+        <!--        <provider-->
+        <!--            android:name="com.huawei.hms.jos.games.archive.ArchiveRemoteAccessProvider"-->
+        <!--            android:authorities="${applicationId}.hmssdk.jos.archive"-->
+        <!--            android:exported="true" />-->
 
-        <activity
-            android:name="com.huawei.hms.hwid.internal.ui.activity.HwIdSignInHubActivity"
-            android:configChanges="fontScale|uiMode"
-            android:excludeFromRecents="true"
-            android:exported="false"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" >
-        </activity>
-        <activity
-            android:name="com.huawei.hms.account.internal.ui.activity.AccountSignInHubActivity"
-            android:excludeFromRecents="true"
-            android:exported="false"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" >
-        </activity>
+        <!--        <activity-->
+        <!--            android:name="com.huawei.appmarket.component.buoycircle.impl.delegete.BuoyBridgeActivity"-->
+        <!--            android:configChanges="orientation|locale|screenSize|layoutDirection|fontScale"-->
+        <!--            android:excludeFromRecents="true"-->
+        <!--            android:exported="false"-->
+        <!--            android:hardwareAccelerated="true"-->
+        <!--            android:theme="@android:style/Theme.Translucent">-->
+        <!--            <meta-data-->
+        <!--                android:name="hwc-theme"-->
+        <!--                android:value="androidhwext:style/Theme.Emui.Translucent" />-->
+        <!--        </activity>-->
 
-        <!-- 切记同步修改 HuaweiIdAuthInternalConstant.HMS_SDK_VERSION -->
-        <meta-data
-            android:name="com.huawei.hms.client.service.name:hwid"
-            android:value="hwid:6.3.0.300" />
-        <meta-data
-            android:name="com.huawei.hms.min_api_level:hwid:hwid"
-            android:value="1" />
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.jos.versioncode"-->
+        <!--            android:value="60100301" />-->
+        <!--        &lt;!&ndash; Hmssdk-game &ndash;&gt;-->
 
-        <!-- 5.3.0 独立授权依赖的api_level为11 -->
-        <!-- 5.3.0 setCarrierId依赖的api_level为13 -->
-        <meta-data
-            android:name="com.huawei.hms.min_api_level:hwid:account"
-            android:value="13" />
+        <!--        &lt;!&ndash; iap &ndash;&gt;-->
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.client.service.name:iap"-->
+        <!--            android:value="iap:6.3.0.300" />-->
+        <!--        &lt;!&ndash; iap &ndash;&gt;-->
+
+        <!--        <activity-->
+        <!--            android:name="com.huawei.hms.hwid.internal.ui.activity.HwIdSignInHubActivity"-->
+        <!--            android:configChanges="fontScale|uiMode"-->
+        <!--            android:excludeFromRecents="true"-->
+        <!--            android:exported="false"-->
+        <!--            android:theme="@android:style/Theme.Translucent.NoTitleBar" />-->
+        <!--        <activity-->
+        <!--            android:name="com.huawei.hms.account.internal.ui.activity.AccountSignInHubActivity"-->
+        <!--            android:excludeFromRecents="true"-->
+        <!--            android:exported="false"-->
+        <!--            android:theme="@android:style/Theme.Translucent.NoTitleBar" />-->
+
+        <!--        &lt;!&ndash; 切记同步修改 HuaweiIdAuthInternalConstant.HMS_SDK_VERSION &ndash;&gt;-->
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.client.service.name:hwid"-->
+        <!--            android:value="hwid:6.3.0.300" />-->
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.min_api_level:hwid:hwid"-->
+        <!--            android:value="1" />-->
+
+        <!--        &lt;!&ndash; 5.3.0 独立授权依赖的api_level为11 &ndash;&gt;-->
+        <!--        &lt;!&ndash; 5.3.0 setCarrierId依赖的api_level为13 &ndash;&gt;-->
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.min_api_level:hwid:account"-->
+        <!--            android:value="13" />-->
+
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.client.channel.androidMarket"-->
+        <!--            android:value="false" />-->
+
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.client.appid"-->
+        <!--            android:value="appid=105116483" />-->
+
+        <!--        <uses-library-->
+        <!--            android:name="org.apache.http.legacy"-->
+        <!--            android:required="false" />-->
+
+        <!--        &lt;!&ndash; auth huawei &ndash;&gt;-->
+        <!--        <service-->
+        <!--            android:name="com.huawei.agconnect.api.ApiDiscovery"-->
+        <!--            android:exported="false">-->
+        <!--            <meta-data-->
+        <!--                android:name="com.huawei.agconnect.auth.huawei.HuaweiAuthRegistrar"-->
+        <!--                android:value="com.huawei.agconnect.api.component.ComponentRegistrar" />-->
+        <!--            <meta-data-->
+        <!--                android:name="com.huawei.agconnect.auth.google.GoogleAuthRegistrar"-->
+        <!--                android:value="com.huawei.agconnect.api.component.ComponentRegistrar" />-->
+        <!--            <meta-data-->
+        <!--                android:name="com.huawei.agconnect.auth.facebook.FacebookAuthRegistrar"-->
+        <!--                android:value="com.huawei.agconnect.api.component.ComponentRegistrar" />-->
+        <!--        </service>-->
+        <!--        &lt;!&ndash; auth huawei &ndash;&gt;-->
+
+        <!--        &lt;!&ndash; hianalytics &ndash;&gt;-->
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.client.service.name:hianalytics"-->
+        <!--            android:value="hianalytics:6.3.2.300" />-->
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.min_api_level:hianalytics:hianalytics"-->
+        <!--            android:value="1" />-->
+
+        <!--        <receiver-->
+        <!--            android:name="com.huawei.hms.analytics.receiver.HiAnalyticsSvcEvtReceiver"-->
+        <!--            android:exported="false">-->
+        <!--            <intent-filter>-->
+        <!--                <action android:name="com.huawei.hms.analytics.pps.event" />-->
+        <!--            </intent-filter>-->
+        <!--        </receiver>-->
 
+        <!--        <provider-->
+        <!--            android:name="com.huawei.hms.analytics.provider.AnalyticsInitializeProvider"-->
+        <!--            android:authorities="${applicationId}.AnalyticsKitInitializeProvider"-->
+        <!--            android:exported="false" />-->
+        <!--        &lt;!&ndash; hianalytics &ndash;&gt;-->
+
+        <!--        &lt;!&ndash; opendevice &ndash;&gt;-->
+        <!--        <provider-->
+        <!--            android:name="com.huawei.hms.aaid.InitProvider"-->
+        <!--            android:authorities="${applicationId}.aaidinitprovider"-->
+        <!--            android:exported="false"-->
+        <!--            android:initOrder="500" />-->
+
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.client.service.name:opendevice"-->
+        <!--            android:value="opendevice:5.1.1.306" />-->
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.min_api_level:opendevice:push"-->
+        <!--            android:value="1" />-->
+        <!--        &lt;!&ndash; opendevice &ndash;&gt;-->
+
+        <!-- facebook -->
         <meta-data
-            android:name="com.huawei.hms.client.channel.androidMarket"
-            android:value="false" />
+            android:name="com.facebook.sdk.ApplicationId"
+            android:value="@string/facebook_app_id" />
 
-        <meta-data android:name="com.huawei.hms.client.appid" android:value="appid=105116483"/>
+        <activity
+            android:name="com.facebook.FacebookActivity"
+            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation" />
 
-        <uses-library
-            android:name="org.apache.http.legacy"
-            android:required="false" />
+        <activity
+            android:name="com.facebook.CustomTabActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
 
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="@string/fb_login_protocol_scheme" />
+            </intent-filter>
+        </activity>
+        <!-- facebook -->
+
+        <service
+            android:name="cn.yyxx.eyuancomm.impl.channel.huawei.floatview.FloatCenterService"
+            android:exported="true" />
     </application>
 
 </manifest>

channel_registry/channel_huawei2/src/main/assets/grs_sdk_global_route_config_apptouchupdatesdk.json

@@ -1,62 +0,0 @@
-{
-  "applications":[],
-  "services":[
-    {
-      "name":"com.huawei.apptouch.updatesdk",
-      "routeBy":"ser_country",
-      "servings":[
-        {
-          "countryOrAreaGroup":"DR1",
-          "addresses":{
-            "ROOT":""
-          }
-        },
-        {
-          "countryOrAreaGroup":"DR2",
-          "addresses":{
-            "ROOT":""
-          }
-        },
-        {
-          "countryOrAreaGroup":"DR3",
-          "addresses":{
-            "ROOT":"https://store-at-dre.hispace.dbankcloud.com/hwmarket/api/"
-          }
-        },
-        {
-          "countryOrAreaGroup":"DR4",
-          "addresses":{
-            "ROOT":""
-          }
-        }
-      ],
-      "countryOrAreaGroups":[
-        {
-          "id":"DR1",
-          "name":"China",
-          "countriesOrAreas":["CN"],
-          "description":"China zone"
-        },
-        {
-          "id":"DR2",
-          "name":"Asian",
-          "countriesOrAreas":["AE","AF","AG","AI","AM","AO","AQ","AR","AS","AW","AZ","BB","BD","BF","BH","BI","BJ","BL","BM","BN","BO","BR","BS","BT","BV","BW","BY","BZ","CC","CD","CF","CG","CI","CK","CL","CM","CO","CR","CU","CV","CX","DJ","DM","DO","DZ","EC","EG","EH","ER","ET","FJ","FK","FM","GA","GD","GE","GF","GH","GM","GN","GP","GQ","GS","GT","GU","GW","GY","HK","HM","HN","HT","ID","IN","IO","IQ","JM","JO","JP","KE","KG","KH","KI","KM","KN","KP","KW","KY","KZ","KR","LA","LB","LC","LK","LR","LS","LY","MA","MG","MH","ML","MM","MN","MO","MP","MQ","MR","MS","MU","MV","MW","MX","MY","MZ","NA","NC","NE","NF","NG","NI","NP","NR","NU","OM","PA","PE","PF","PG","PH","PK","PN","PR","PS","PW","PY","QA","RE","RW","SA","SB","SC","SD","SG","SH","SL","SN","SO","SR","SS","ST","SV","SY","SZ","TC","TD","TF","TG","TH","TJ","TK","TL","TM","TN","TO","TT","TV","TW","TZ","UG","UY","UZ","VE","VG","VI","VN","VU","WF","WS","YE","YT","ZA","ZM","ZW"],
-          "description":"Asian-African-Latin American zone"
-        },
-        {
-          "id":"DR3",
-          "name":"Europe",
-          "countriesOrAreas":["AD","AL","AN","AT","AU","AX","BA","BE","BG","BQ","CA","CH","CW","CY","CZ","DE","DK","EE","ES","FI","FO","FR","GB","GG","GI","GL","GR","HR","HU","IE","IL","IM","IS","IT","JE","LI","LT","LU","LV","MC","MD","ME","MF","MK","MT","NL","NO","NZ","PL","PM","PT","RO","RS","SE","SI","SJ","SK","SM","SX","TR","UA","UM","US","VA","VC","XK","YK"],
-          "description":"Europe zone"
-        },
-        {
-          "id":"DR4",
-          "name":"RU",
-          "countriesOrAreas":["RU"],
-          "description":"RU zone"
-        }
-      ]
-    }
-  ],
-  "countryOrAreaGroups":[]
-}

channel_registry/channel_huawei2/src/main/assets/grs_sdk_global_route_config_opensdkService.json

@@ -1,318 +0,0 @@
-{
-    "applications": [],
-    "services": [
-        {
-            "name": "com.huawei.cloud.opensdkhianalytics",
-            "routeBy": "issue_country",
-            "servings": [
-                {
-                    "countryGroup": "DR1",
-                    "addresses": {
-                        "ROOT": "https://metrics1.data.hicloud.com:6447"
-                    }
-                },
-                {
-                    "countryGroup": "DR2",
-                    "addresses": {
-                        "ROOT": "https://metrics-dra.dt.hicloud.com:6447"
-                    }
-                },
-                {
-                    "countryGroup": "DR3",
-                    "addresses": {
-                        "ROOT": "https://metrics2.data.hicloud.com:6447"
-                    }
-                },
-                {
-                    "countryGroup": "DR4",
-                    "addresses": {
-                        "ROOT": "https://metrics5.data.hicloud.com:6447"
-                    }
-                }
-            ],
-            "countryGroups": [
-                {
-                    "id": "DR1",
-                    "name": "China",
-                    "countries": [
-                        "CN"
-                    ],
-                    "description": "China zone"
-                },
-                {
-                    "id": "DR2",
-                    "name": "Asian-African-Latin American",
-                    "countries": [
-                        "AE",
-                        "AF",
-                        "AG",
-                        "AI",
-                        "AM",
-                        "AO",
-                        "AQ",
-                        "AR",
-                        "AS",
-                        "AW",
-                        "AZ",
-                        "BB",
-                        "BD",
-                        "BF",
-                        "BH",
-                        "BI",
-                        "BJ",
-                        "BL",
-                        "BM",
-                        "BN",
-                        "BO",
-                        "BR",
-                        "BS",
-                        "BT",
-                        "BV",
-                        "BW",
-                        "BY",
-                        "BZ",
-                        "CC",
-                        "CD",
-                        "CF",
-                        "CG",
-                        "CI",
-                        "CK",
-                        "CL",
-                        "CM",
-                        "CO",
-                        "CR",
-                        "CU",
-                        "CV",
-                        "CX",
-                        "DJ",
-                        "DM",
-                        "DO",
-                        "DZ",
-                        "EC",
-                        "EG",
-                        "EH",
-                        "ER",
-                        "ET",
-                        "FJ",
-                        "FK",
-                        "FM",
-                        "GA",
-                        "GD",
-                        "GE",
-                        "GF",
-                        "GH",
-                        "GM",
-                        "GN",
-                        "GP",
-                        "GQ",
-                        "GS",
-                        "GT",
-                        "GU",
-                        "GW",
-                        "GY",
-                        "HK",
-                        "HM",
-                        "HN",
-                        "HT",
-                        "ID",
-                        "IN",
-                        "IO",
-                        "IQ",
-                        "JM",
-                        "JO",
-                        "JP",
-                        "KR",
-                        "KE",
-                        "KG",
-                        "KH",
-                        "KI",
-                        "KM",
-                        "KN",
-                        "KP",
-                        "KW",
-                        "KY",
-                        "KZ",
-                        "LA",
-                        "LB",
-                        "LC",
-                        "LK",
-                        "LR",
-                        "LS",
-                        "LY",
-                        "MA",
-                        "MG",
-                        "MH",
-                        "ML",
-                        "MM",
-                        "MN",
-                        "MO",
-                        "MP",
-                        "MQ",
-                        "MR",
-                        "MS",
-                        "MU",
-                        "MV",
-                        "MW",
-                        "MX",
-                        "MY",
-                        "MZ",
-                        "NA",
-                        "NC",
-                        "NE",
-                        "NF",
-                        "NG",
-                        "NI",
-                        "NP",
-                        "NR",
-                        "NU",
-                        "OM",
-                        "PA",
-                        "PE",
-                        "PF",
-                        "PG",
-                        "PH",
-                        "PK",
-                        "PN",
-                        "PR",
-                        "PS",
-                        "PW",
-                        "PY",
-                        "QA",
-                        "RE",
-                        "RW",
-                        "SA",
-                        "SB",
-                        "SC",
-                        "SD",
-                        "SG",
-                        "SH",
-                        "SL",
-                        "SN",
-                        "SO",
-                        "SR",
-                        "SS",
-                        "ST",
-                        "SV",
-                        "SY",
-                        "SZ",
-                        "TC",
-                        "TD",
-                        "TF",
-                        "TG",
-                        "TH",
-                        "TJ",
-                        "TK",
-                        "TL",
-                        "TM",
-                        "TN",
-                        "TO",
-                        "TT",
-                        "TV",
-                        "TW",
-                        "TZ",
-                        "UG",
-                        "UY",
-                        "UZ",
-                        "VE",
-                        "VG",
-                        "VI",
-                        "VN",
-                        "VU",
-                        "WF",
-                        "WS",
-                        "YE",
-                        "YT",
-                        "ZA",
-                        "ZM",
-                        "ZW"
-                    ],
-                    "description": "Asian-African-Latin American zone"
-                },
-                {
-                    "id": "DR3",
-                    "name": "Europe",
-                    "countries": [
-                        "AD",
-                        "AL",
-                        "AN",
-                        "AT",
-                        "AU",
-                        "AX",
-                        "BA",
-                        "BE",
-                        "BG",
-                        "BQ",
-                        "CA",
-                        "CH",
-                        "CW",
-                        "CY",
-                        "CZ",
-                        "DE",
-                        "DK",
-                        "EE",
-                        "ES",
-                        "FI",
-                        "FO",
-                        "FR",
-                        "GB",
-                        "GG",
-                        "GI",
-                        "GL",
-                        "GR",
-                        "HR",
-                        "HU",
-                        "IE",
-                        "IL",
-                        "IM",
-                        "IS",
-                        "IT",
-                        "JE",
-                        "LI",
-                        "LT",
-                        "LU",
-                        "LV",
-                        "MC",
-                        "MD",
-                        "ME",
-                        "MF",
-                        "MK",
-                        "MT",
-                        "NL",
-                        "NO",
-                        "NZ",
-                        "PL",
-                        "PM",
-                        "PT",
-                        "RO",
-                        "RS",
-                        "SE",
-                        "SI",
-                        "SJ",
-                        "SK",
-                        "SM",
-                        "SX",
-                        "TR",
-                        "UA",
-                        "UM",
-                        "US",
-                        "VA",
-                        "VC",
-                        "XK",
-                        "YK"
-                    ],
-                    "description": "Europe zone"
-                },
-                {
-                    "id": "DR4",
-                    "name": "Russia",
-                    "countries": [
-                        "RU"
-                    ],
-                    "description": "Russia zone"
-                }
-            ]
-        }
-    ],
-    "countryGroups": [],
-    "version": "202002120001"
-}

channel_registry/channel_huawei2/src/main/assets/grs_sdk_global_route_config_updatesdk.json

@@ -1,62 +0,0 @@
-{
-    "applications":[],
-    "services":[
-        {
-            "name":"com.huawei.updatesdk",
-            "routeBy":"ser_country",
-            "servings":[
-                {
-                    "countryOrAreaGroup":"DR1",
-                    "addresses":{
-                        "ROOT":"https://store-drcn.hispace.dbankcloud.cn/hwmarket/api/"
-                    }
-                },
-                {
-                    "countryOrAreaGroup":"DR2",
-                    "addresses":{
-                        "ROOT":"https://store-dra.hispace.dbankcloud.com/hwmarket/api/"
-                    }
-                },
-                {
-                    "countryOrAreaGroup":"DR3",
-                    "addresses":{
-                        "ROOT":"https://store-dre.hispace.dbankcloud.com/hwmarket/api/"
-                    }
-                },
-                {
-                    "countryOrAreaGroup":"DR4",
-                    "addresses":{
-                        "ROOT":"https://store-drru.hispace.dbankcloud.com/hwmarket/api/"
-                    }
-                }
-            ],
-            "countryOrAreaGroups":[
-                {
-                    "id":"DR1",
-                    "name":"China",
-                    "countriesOrAreas":["CN"],
-                    "description":"China zone"
-                },
-                {
-                    "id":"DR2",
-                    "name":"Asian",
-                    "countriesOrAreas":["AE","AF","AG","AI","AM","AO","AQ","AR","AS","AW","AZ","BB","BD","BF","BH","BI","BJ","BL","BM","BN","BO","BR","BS","BT","BV","BW","BY","BZ","CC","CD","CF","CG","CI","CK","CL","CM","CO","CR","CU","CV","CX","DJ","DM","DO","DZ","EC","EG","EH","ER","ET","FJ","FK","FM","GA","GD","GE","GF","GH","GM","GN","GP","GQ","GS","GT","GU","GW","GY","HK","HM","HN","HT","ID","IN","IO","IQ","JM","JO","JP","KE","KG","KR","KH","KI","KM","KN","KP","KW","KY","KZ","LA","LB","LC","LK","LR","LS","LY","MA","MG","MH","ML","MM","MN","MO","MP","MQ","MR","MS","MU","MV","MW","MX","MY","MZ","NA","NC","NE","NF","NG","NI","NP","NR","NU","OM","PA","PE","PF","PG","PH","PK","PN","PR","PS","PW","PY","QA","RE","RW","SA","SB","SC","SD","SG","SH","SL","SN","SO","SR","SS","ST","SV","SY","SZ","TC","TD","TF","TG","TH","TJ","TK","TL","TM","TN","TO","TT","TV","TW","TZ","UG","UY","UZ","VE","VG","VI","VN","VU","WF","WS","YE","YT","ZA","ZM","ZW"],
-                    "description":"Asian-African-Latin American zone"
-                },
-                {
-                    "id":"DR3",
-                    "name":"Europe",
-                    "countriesOrAreas":["AD","AL","AN","AT","AU","AX","BA","BE","BG","BQ","CA","CH","CW","CY","CZ","DE","DK","EE","ES","FI","FO","FR","GB","GG","GI","GL","GR","HR","HU","IE","IL","IM","IS","IT","JE","LI","LT","LU","LV","MC","MD","ME","MF","MK","MT","NL","NO","NZ","PL","PM","PT","RO","RS","SE","SI","SJ","SK","SM","SX","TR","UA","UM","US","VA","VC","XK","YK"],
-                    "description":"Europe zone"
-                },
-                {
-                    "id":"DR4",
-                    "name":"RU",
-                    "countriesOrAreas":["RU"],
-                    "description":"RU zone"
-                }
-            ]
-        }
-    ],
-    "countryOrAreaGroups":[]
-}

channel_registry/channel_huawei2/src/main/assets/grs_sdk_server_config.json

@@ -1,13 +0,0 @@
-{
-  "grs_server": {
-    "grs_base_url": [
-      "https://grs.dbankcloud.com",
-      "https://grs.dbankcloud.cn",
-      "https://grs.dbankcloud.eu",
-      "https://grs.dbankcloud.asia"
-    ],
-    "grs_query_endpoint_1.0": "/grs/1.0/%1$s/router",
-    "grs_query_endpoint_2.0": "/grs/2.0/router",
-    "grs_query_timeout": 2
-  }
-}

channel_registry/channel_huawei2/src/main/res/drawable/c_buoycircle_hide_shape.xml

@@ -1,6 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <!-- 圆角 -->
-    <corners android:radius="25dp" />
-
-</shape>

channel_registry/channel_huawei2/src/main/res/drawable/c_buoycircle_hide_shape_red.xml

@@ -1,8 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <!-- 圆角 -->
-    <corners android:radius="25dp" />
-
-    <solid android:color="#FF3320" />
-
-</shape>

channel_registry/channel_huawei2/src/main/res/drawable/hms_game_achievement_bg_shape.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle"
-       android:useLevel="true">
-    <solid android:color="#191919"/>
-    <corners android:radius="16dp"/>
-</shape>

channel_registry/channel_huawei2/src/main/res/drawable/upsdk_cancel_bg.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-
-    <size
-        android:width="40dp"
-        android:height="40dp" />
-    <corners android:radius="4dp" />
-    <stroke android:color="@color/upsdk_color_gray_1" />
-    <solid android:color="@color/upsdk_color_gray_1" />
-
-</shape>

channel_registry/channel_huawei2/src/main/res/drawable/upsdk_third_download_bg.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/upsdk_cancel_bg" android:state_pressed="true" />
-    <item android:drawable="@drawable/upsdk_cancel_bg" android:state_focused="true" />
-</selector>

channel_registry/channel_huawei2/src/main/res/drawable/yyxx_floating_menu_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="85dp" />
+    <solid android:color="#FFFFFF" />
+    <stroke
+        android:width="0.5dp"
+        android:color="#EA4D4D" />
+</shape>

channel_registry/channel_huawei2/src/main/res/drawable/yyxx_hw_container_bg.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="8dp" />
+    <solid android:color="#E6FFFFFF" />
+</shape>

channel_registry/channel_huawei2/src/main/res/layout-land/c_buoycircle_hide_guide_dialog.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="8dp">
-
-    <ScrollView
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_above="@+id/game_id_buoy_hide_guide_checklayout">
-        <LinearLayout
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginStart="24dp"
-            android:layout_marginEnd="24dp"
-            android:layout_marginLeft="24dp"
-            android:layout_marginRight="24dp">
-
-        <TextView
-            android:id="@+id/game_id_buoy_hide_guide_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="15sp"
-            android:gravity="start"
-            />
-
-        <com.huawei.appmarket.component.buoycircle.impl.view.GifImageView
-            android:id="@+id/game_id_buoy_hide_guide_gif"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/c_buoycircle_hide_guide"/>
-        </LinearLayout>
-
-    </ScrollView>
-
-
-    <LinearLayout
-        android:id="@+id/game_id_buoy_hide_guide_checklayout"
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:layout_alignParentBottom="true">
-
-        <CheckBox
-            android:id="@+id/game_id_buoy_hide_guide_remind"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/c_buoycircle_hide_guide_noremind"
-            android:textSize="13sp"/>
-
-    </LinearLayout>
-</RelativeLayout>

channel_registry/channel_huawei2/src/main/res/layout/activity_endisable_service.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingEnd="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:paddingStart="16dp"
-    android:orientation="vertical" >
-    <TextView
-        android:id="@+id/enable_service_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginTop="16dp"
-        android:text="Please enable the HMS service in settings tag"
-        android:textSize="13sp" />
-
-
-</RelativeLayout>

channel_registry/channel_huawei2/src/main/res/layout/c_buoycircle_hide_guide_dialog.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="8dp">
-
-    <TextView
-        android:id="@+id/game_id_buoy_hide_guide_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="15sp"
-        android:gravity="start"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginLeft="24dp"
-        android:layout_marginRight="24dp"
-        />
-
-    <com.huawei.appmarket.component.buoycircle.impl.view.GifImageView
-        android:id="@+id/game_id_buoy_hide_guide_gif"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/game_id_buoy_hide_guide_text"
-        android:src="@drawable/c_buoycircle_hide_guide"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginLeft="24dp"
-        android:layout_marginRight="24dp"/>
-
-    <LinearLayout
-        android:id="@+id/game_id_buoy_hide_guide_checklayout"
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:layout_below="@+id/game_id_buoy_hide_guide_gif">
-
-        <CheckBox
-            android:id="@+id/game_id_buoy_hide_guide_remind"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/c_buoycircle_hide_guide_noremind"
-            android:textSize="13sp"/>
-    </LinearLayout>
-</RelativeLayout>

channel_registry/channel_huawei2/src/main/res/layout/c_buoycircle_hide_notice.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:id="@+id/game_id_buoy_hide_notice_view">
-    <LinearLayout
-        android:id="@+id/top_notice_bg"
-        android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:background="@drawable/c_buoycircle_hide_float_top"
-        android:orientation="horizontal">
-        <RelativeLayout
-            android:id="@+id/rl_top_notice"
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:layout_marginTop="8dp"
-            android:layout_centerHorizontal="true">
-
-            <LinearLayout
-                android:id="@+id/game_id_buoy_hide_notice_bg"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/c_buoycircle_hide_float_eye_off_gray"/>
-
-                <TextView
-                    android:id="@+id/top_notice_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
-                    android:textSize="13sp"
-                    android:textColor="#ffffff"
-                    android:text="@string/c_buoycircle_auto_hide_notice"
-                    android:layout_gravity="center_vertical"/>
-
-            </LinearLayout>
-        </RelativeLayout>
-    </LinearLayout>
-
-</FrameLayout>

channel_registry/channel_huawei2/src/main/res/layout/c_buoycircle_window_small.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/small_window_layout"
-    android:gravity="center"
-    android:layout_width="48dp"
-    android:layout_height="48dp">
-
-    <ImageView 
-        android:id="@+id/half_hide_small_icon"
-        android:src="@drawable/c_buoycircle_icon_normal"
-        android:layout_width="36dp"
-        android:layout_height="36dp"/>
-         
-    
-    <ImageView 
-        android:id="@+id/small_icon"
-        android:src="@drawable/c_buoycircle_icon_normal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-</LinearLayout>

channel_registry/channel_huawei2/src/main/res/layout/hms_download_progress.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingEnd="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:paddingStart="16dp"
-    android:orientation="vertical" >
-        <TextView
-            android:id="@+id/hms_message_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/hms_downloading_loading"
-            android:textSize="13sp" />
-
-        <TextView
-            android:id="@+id/hms_progress_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true"
-            android:layout_marginTop="16dp"
-            android:alpha="0.5"
-            android:textSize="13sp"/>
-
-        <RelativeLayout
-            android:id="@+id/hms_progress_bar"
-            android:layout_width="match_parent"
-            android:layout_height="18dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="16dp"
-            android:layout_below="@+id/hms_message_text">
-
-            <ProgressBar
-                android:id="@+id/download_info_progress"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="match_parent"
-                android:layout_height="7dp"
-                android:layout_centerVertical="true" />
-
-        </RelativeLayout>
-
-</RelativeLayout>

channel_registry/channel_huawei2/src/main/res/layout/hms_game_achievement_finish.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/achievemnet_notice_view"
-             android:layout_width="wrap_content"
-             android:layout_height="36dp"
-             android:orientation="horizontal"
-             android:background="@drawable/hms_game_achievement_bg_shape">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_gravity="center"
-        android:src="@drawable/hms_game_achievement_finish"/>
-
-    <TextView
-        android:id="@+id/achievement_finish_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_gravity="center"
-        android:textColor="#ffffff"
-        android:textSize="16sp"
-        android:fontFamily="textFontFamilyRegular"
-        android:text="@string/hms_game_achievement_finish_notice"/>
-
-</LinearLayout>

channel_registry/channel_huawei2/src/main/res/layout/hms_game_top_async_login.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:id="@+id/login_notice_view"> 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:background="#b3ffffff">
-        
-        <LinearLayout
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_centerInParent="true"
-	        android:layout_marginTop="14dp"
-	        android:layout_marginBottom="14dp"
-	        android:layout_marginLeft="12dp"
-	        android:layout_marginRight="12dp"
-	        android:orientation="horizontal">
-	        
-	        <ImageView 
-	            android:layout_width="32dp"
-	            android:layout_height="32dp"
-	            android:src="@drawable/c_buoycircle_icon"/>
-	        
-	        <TextView 
-	            android:id="@+id/top_notice_text"
-	            android:layout_width="wrap_content"
-	            android:layout_height="wrap_content"
-	            android:layout_marginLeft="8dp"
-	            android:ellipsize="end"
-	            android:singleLine="true"
-	            android:textSize="14dp"
-	            android:textColor="#000000"
-	            android:alpha="0.85"
-	            android:layout_gravity="center_vertical"/>
-	        
-	    </LinearLayout>
-     </RelativeLayout>
-    
-</FrameLayout>

channel_registry/channel_huawei2/src/main/res/layout/upsdk_app_dl_progress_dialog.xml

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/action"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginLeft="24dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="16dp"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:paddingTop="24dp">
-
-            <TextView
-                android:id="@+id/third_app_dl_progress_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_marginEnd="48dp"
-                android:layout_marginRight="48dp"
-                android:textColor="@color/upsdk_color_gray_7"
-                android:textSize="@dimen/upsdk_master_body_2" />
-
-            <TextView
-                android:id="@+id/third_app_warn_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_toStartOf="@id/third_app_dl_progress_text"
-                android:layout_toLeftOf="@id/third_app_dl_progress_text"
-                android:textColor="@color/upsdk_color_gray_10"
-                android:textSize="@dimen/upsdk_master_body_2" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical">
-
-            <RelativeLayout
-                android:id="@+id/cancel_bg"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:background="@drawable/upsdk_third_download_bg"
-                android:focusable="true">
-
-                <ImageView
-                    android:id="@+id/cancel_imageview"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_centerInParent="true"
-                    android:background="@drawable/upsdk_cancel_normal" />
-            </RelativeLayout>
-
-
-            <ProgressBar
-                android:id="@+id/third_app_dl_progressbar"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_toStartOf="@id/cancel_bg"
-                android:layout_toLeftOf="@id/cancel_bg" />
-        </RelativeLayout>
-    </LinearLayout>
-</LinearLayout>

channel_registry/channel_huawei2/src/main/res/layout/upsdk_ota_update_view.xml

@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <ScrollView
-            android:id="@+id/scroll_layout"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:paddingLeft="24dp"
-            android:paddingRight="24dp"
-            android:scrollbarStyle="outsideOverlay">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="16dp" />
-
-                <LinearLayout
-                    android:id="@+id/name_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/upsdk_margin_xs"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/upsdk_ota_app_name"
-                        android:textColor="@color/upsdk_color_gray_10"
-                        android:textSize="@dimen/upsdk_master_subtitle" />
-
-                    <TextView
-                        android:id="@+id/name_textview"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/upsdk_margin_m"
-                        android:layout_marginLeft="@dimen/upsdk_margin_m"
-                        android:fontFamily="HwChinese-medium"
-                        android:textColor="@color/upsdk_color_gray_10"
-                        android:textSize="@dimen/upsdk_master_subtitle" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/version_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/upsdk_margin_xs"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/upsdk_app_version"
-                        android:textColor="@color/upsdk_color_gray_10"
-                        android:textSize="@dimen/upsdk_master_subtitle" />
-
-                    <TextView
-                        android:id="@+id/version_textview"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/upsdk_margin_m"
-                        android:layout_marginLeft="@dimen/upsdk_margin_m"
-                        android:fontFamily="HwChinese-medium"
-                        android:textColor="@color/upsdk_color_gray_10"
-                        android:textSize="@dimen/upsdk_master_subtitle" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/size_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/upsdk_app_size"
-                        android:textColor="@color/upsdk_color_gray_10"
-                        android:textSize="@dimen/upsdk_master_subtitle" />
-
-                    <TextView
-                        android:id="@+id/appsize_textview"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/upsdk_margin_m"
-                        android:layout_marginLeft="@dimen/upsdk_margin_m"
-                        android:fontFamily="HwChinese-medium"
-                        android:textColor="@color/upsdk_color_gray_10"
-                        android:textSize="@dimen/upsdk_master_subtitle" />
-
-                    <TextView
-                        android:id="@+id/allsize_textview"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/upsdk_margin_m"
-                        android:layout_marginLeft="@dimen/upsdk_margin_m"
-                        android:fontFamily="HwChinese-medium"
-                        android:textColor="@color/upsdk_color_gray_10"
-                        android:textSize="@dimen/upsdk_master_subtitle" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/content_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/upsdk_margin_l"
-                        android:gravity="start"
-                        android:text="@string/upsdk_detail"
-                        android:textAlignment="viewStart"
-                        android:textColor="@color/upsdk_color_gray_10"
-                        android:textSize="@dimen/upsdk_master_subtitle" />
-
-                    <TextView
-                        android:id="@+id/content_textview"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/upsdk_margin_m"
-                        android:gravity="start"
-                        android:lineSpacingMultiplier="1.1"
-                        android:textAlignment="viewStart"
-                        android:textColor="@color/upsdk_color_gray_10"
-                        android:textSize="@dimen/upsdk_master_body_2" />
-                </LinearLayout>
-            </LinearLayout>
-        </ScrollView>
-    </LinearLayout>
-</LinearLayout>

channel_registry/channel_huawei2/src/main/res/layout/yyxx_dialog_hw_link.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:background="@drawable/yyxx_hw_container_bg"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="10dp">
+
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="賬號關聯"
+            android:textColor="#EA4D4D"
+            android:textSize="18sp" />
+
+        <ImageView
+            android:id="@+id/yyxx_link_iv_close"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:layout_gravity="center|right"
+            android:src="@drawable/yyxx_close_img" />
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/yyxx_link_iv_hw"
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_weight="1"
+            android:src="@drawable/yyxx_hw_logo_img" />
+
+        <ImageView
+            android:id="@+id/yyxx_link_iv_google"
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_weight="1"
+            android:src="@drawable/yyxx_google_logo_img" />
+
+        <ImageView
+            android:id="@+id/yyxx_link_iv_facebook"
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_weight="1"
+            android:src="@drawable/yyxx_facebook_logo_img" />
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp"
+        android:text="註：點擊圖標關聯其他賬號實現數據互通"
+        android:textColor="#666666"
+        android:textSize="14sp" />
+
+</LinearLayout>

channel_registry/channel_huawei2/src/main/res/layout/yyxx_dialog_hw_login.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:background="@drawable/yyxx_hw_container_bg"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:padding="10dp">
+
+    <ImageView
+        android:id="@+id/yyxx_login_iv_hw"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:clickable="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/yyxx_huawei" />
+
+    <ImageView
+        android:id="@+id/yyxx_login_iv_google"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp"
+        android:clickable="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/yyxx_google" />
+
+    <ImageView
+        android:id="@+id/yyxx_login_iv_facebook"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
+        android:clickable="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/yyxx_facebook" />
+
+</LinearLayout>