修改渠道调用方式。

demo/build.gradle

@@ -18,7 +18,7 @@ android {
         versionCode 1
         versionName "0.0.1"
 
-        multiDexEnabled false
+        multiDexEnabled true
 
     }
 
@@ -72,9 +72,9 @@ android {
 dependencies {
     implementation project(path: ':library_core')
     implementation project(path: ':library_channel')
-//    implementation project(path: ':library_channel_repository:oppo')
+//    implementation project(path: ':library_platform:platform_hnyy')
 
-    implementation project(path: ':library_channel_repository:hnyy')
+    implementation project(path: ':library_channel_repository:oppo')
 
 
 }

library_channel/build.gradle

@@ -34,9 +34,9 @@ android {
 dependencies {
     compileOnly project(':library_base')
 
+ //    compileOnly project(':library_platform:hnyy')
     compileOnly project(':library_core')
 
-
 }
 
 //apply from: 'buildJar.gradle'

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

@@ -3,7 +3,8 @@ package cn.yyxx.commsdk.impl;
 import android.content.Context;
 
 import cn.yyxx.commsdk.base.internal.feature.IFeature;
-import cn.yyxx.commsdk.impl.channel.ChannelSdk;
+import cn.yyxx.commsdk.impl.merge.channel.ChannelSdk;
+import cn.yyxx.commsdk.impl.merge.platform.PlatformSdk;
 import cn.yyxx.commsdk.impl.entity.ChannelId;
 
 /**
@@ -12,17 +13,16 @@ import cn.yyxx.commsdk.impl.entity.ChannelId;
  */
 public class ChannelSdkGenerator {
 
-    public static IFeature getChannelInstance(Context context, int channelId) {
+    public static IFeature getChannelInstance(Context context, boolean isThird) {
         IFeature instance = null;
-        switch (channelId) {
-            case ChannelId.YYXX:
-                instance = new ChannelSdk(context);
-                break;
-            case ChannelId.OPPO:
-                instance = new ChannelSdk(context);
-                break;
-        }
+        if (isThird){
+            instance = new PlatformSdk(context);
+        }else{
+            instance = new ChannelSdk(context);
 
+        }
         return instance;
     }
+
+
 }

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

@@ -19,6 +19,7 @@ import cn.yyxx.commsdk.base.internal.feature.IApplication;
 import cn.yyxx.commsdk.base.internal.feature.IFeature;
 import cn.yyxx.commsdk.base.internal.feature.ILifeCycle;
 import cn.yyxx.commsdk.base.internal.feature.IOrder;
+import cn.yyxx.commsdk.core.utils.ParamsUtils;
 
 
 /**
@@ -30,9 +31,20 @@ public class ChannelSdkImpl {
     private IFeature impl;
     private int channelId = 1;
 
+    private String [] platforms = new String[]{"HNYY","SHXY","HNQJ","HNXR"};
+
     public ChannelSdkImpl(Context context) {
         //TODO 从配置文件读取channelId
-        impl = ChannelSdkGenerator.getChannelInstance(context, channelId);
+        String channelName = ParamsUtils.getChannelName(context);
+        boolean isThird = true;
+
+        for (String platform : platforms) {
+            if (platform.equals(channelName)){
+                isThird =false;
+            }
+        }
+
+        impl = ChannelSdkGenerator.getChannelInstance(context, isThird);
     }
 
     public void attachBaseContext(Application application, Context context) {
@@ -53,7 +65,6 @@ public class ChannelSdkImpl {
 
     public void initializeSuccess(){
         impl.initializeSuccess();
-
     }
     public void setLogoutListener(Activity activity,ICallback callback){
         impl.setLogoutListener(activity,callback);

library_channel/src/main/java/cn/yyxx/commsdk/impl/channel/user/UserSession.java

@@ -1,39 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.user;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class UserSession {
-
-    public String login_token="",uname = "",password="";
-
-
-    public void reset(){
-        login_token="";
-        uname = "";
-        password = "";
-    }
-
-    public JSONObject toJSONObject(){
-        JSONObject jsonObject = new JSONObject();
-        try {
-            jsonObject.put("login_token", login_token);
-            jsonObject.put("uname", uname);
-            jsonObject.put("password", password);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        return jsonObject;
-
-    }
-
-
-    @Override
-    public String toString() {
-        return "UserSession{" +
-                "login_token='" + login_token + '\'' +
-                ", uname='" + uname + '\'' +
-                ", password='" + password + '\'' +
-                '}';
-    }
-}

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

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel;
+package cn.yyxx.commsdk.impl.merge;
 
 import android.app.Activity;
 import android.text.TextUtils;
@@ -12,8 +12,9 @@ import cn.yyxx.commsdk.base.internal.IRequestCallback;
 import cn.yyxx.commsdk.base.internal.PhoneLoginCallBack;
 import cn.yyxx.commsdk.core.entity.SdkLoginInfo;
 import cn.yyxx.commsdk.core.network.SdkRequest;
-import cn.yyxx.commsdk.impl.channel.user.UserSession;
-import cn.yyxx.commsdk.impl.channel.user.UserSessionManager;
+
+import cn.yyxx.commsdk.impl.merge.user.UserSession;
+import cn.yyxx.commsdk.impl.merge.user.UserSessionManager;
 import cn.yyxx.support.JsonUtils;
 
 public class LoginViewModel {
@@ -176,7 +177,6 @@ public class LoginViewModel {
         });
     }
 
-
     public void verifyChannelinfo(Activity activity,String channelInfo){
         SdkRequest.getInstance().verfifyChannelLoginInfo(activity, channelInfo, new IRequestCallback() {
             @Override

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

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel;
+package cn.yyxx.commsdk.impl.merge.channel;
 
 import android.app.Activity;
 import android.app.Application;

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

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel;
+package cn.yyxx.commsdk.impl.merge.channel;
 
 import android.content.Context;
 
@@ -19,7 +19,7 @@ final class SdkProxyChannelManager {
         }
 
         try {
-            clzBridge = Class.forName("cn.yyxx.commsdk.impl.channel.ChannelBridge");
+            clzBridge = Class.forName("cn.yyxx.commsdk.impl.merge.channel.ChannelBridge");
             //获取构造函数的构造器
             Constructor<?> constructor = clzBridge.getDeclaredConstructor(Context.class);
             sdkBridge = constructor.newInstance(context);

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

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.platform;
+package cn.yyxx.commsdk.impl.merge.platform;
 
 import android.app.Activity;
 import android.app.Application;
@@ -6,7 +6,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.os.NetworkOnMainThreadException;
 
 
 import org.json.JSONObject;
@@ -14,12 +13,10 @@ import org.json.JSONObject;
 import cn.yyxx.commsdk.base.entity.Function;
 
 
-import cn.yyxx.commsdk.base.entity.SdkChargeInfo;
 import cn.yyxx.commsdk.base.entity.SdkOrderInfo;
 import cn.yyxx.commsdk.base.entity.SdkRoleInfo;
 import cn.yyxx.commsdk.base.internal.ICallback;
 import cn.yyxx.commsdk.base.entity.bean.InitBean;
-import cn.yyxx.commsdk.base.internal.IRequestCallback;
 import cn.yyxx.commsdk.base.internal.feature.IApplication;
 import cn.yyxx.commsdk.base.internal.feature.IFeature;
 import cn.yyxx.commsdk.base.internal.feature.ILifeCycle;
@@ -56,34 +53,34 @@ public class PlatformSdk implements IFeature,ILifeCycle, IApplication,IOrder {
 
     private Object getSdkProxyOperationManager(Context context) {
         if (null == mSdkBridge) {
-            mSdkBridge = SdkProxyOperationManager.initSdkProxyOperationManager(context);
+            mSdkBridge = SdkProxyPlatformManager.initSdkProxyPlatformManager(context);
         }
         return mSdkBridge;
     }
 
     private void checkSdkBridgeNull(){
         if (null == mSdkBridge) {
-            mSdkBridge = SdkProxyOperationManager.initSdkProxyOperationManager(context);
+            mSdkBridge = SdkProxyPlatformManager.initSdkProxyPlatformManager(context);
         }
     }
     @Override
     public void initialize(Activity activity, ICallback callback) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.INITIALIZE, new Class[]{Activity.class,ICallback.class}, new Object[]{activity, callback});
+        SdkProxyPlatformManager.call(Function.INITIALIZE, new Class[]{Activity.class,ICallback.class}, new Object[]{activity, callback});
 
     }
 
     @Override
     public void initializeSuccess() {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.INITIALIZE_SUCCESS,  new Class[]{}, new Object[]{});
+        SdkProxyPlatformManager.call(Function.INITIALIZE_SUCCESS,  new Class[]{}, new Object[]{});
 
     }
 
     @Override
     public void setLogoutListener(Activity activity, ICallback callback) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.SET_LOGOUT_LISTENER,  new Class[]{Activity.class, ICallback.class}, new Object[]{activity,callback});
+        SdkProxyPlatformManager.call(Function.SET_LOGOUT_LISTENER,  new Class[]{Activity.class, ICallback.class}, new Object[]{activity,callback});
 
     }
 
@@ -91,14 +88,14 @@ public class PlatformSdk implements IFeature,ILifeCycle, IApplication,IOrder {
 
         checkSdkBridgeNull();
 
-        SdkProxyOperationManager.call(Function.LOGIN, new Class[]{Activity.class,InitBean.class, ICallback.class}, new Object[]{activity,initBean, callback});
+        SdkProxyPlatformManager.call(Function.LOGIN, new Class[]{Activity.class,InitBean.class, ICallback.class}, new Object[]{activity,initBean, callback});
 
     }
 
     @Override
     public void logout() {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.LOGOUT, new Class[]{}, new Object[]{});
+        SdkProxyPlatformManager.call(Function.LOGOUT, new Class[]{}, new Object[]{});
 
     }
 
@@ -106,20 +103,20 @@ public class PlatformSdk implements IFeature,ILifeCycle, IApplication,IOrder {
     @Override
     public boolean hasExitView(Activity activity) {
         checkSdkBridgeNull();
-        return (Boolean) SdkProxyOperationManager.callback(Function.HAS_EXIT_VIEW, new Class[]{Activity.class}, new Object[]{activity});
+        return (Boolean) SdkProxyPlatformManager.callback(Function.HAS_EXIT_VIEW, new Class[]{Activity.class}, new Object[]{activity});
     }
 
 
     public void openExitView(Activity activity, ICallback callback) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.OPEN_EXIT_VIEW, new Class[]{Activity.class, ICallback.class}, new Object[]{activity, callback});
+        SdkProxyPlatformManager.call(Function.OPEN_EXIT_VIEW, new Class[]{Activity.class, ICallback.class}, new Object[]{activity, callback});
 
     }
 
     @Override
     public void uploadRoleInfo(Activity activity, String type, SdkRoleInfo roleInfo) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.UPLOAD_ROLE_INFO, new Class[]{Activity.class, String.class,SdkRoleInfo.class}, new Object[]{activity,type,roleInfo});
+        SdkProxyPlatformManager.call(Function.UPLOAD_ROLE_INFO, new Class[]{Activity.class, String.class,SdkRoleInfo.class}, new Object[]{activity,type,roleInfo});
 
     }
 
@@ -132,56 +129,56 @@ public class PlatformSdk implements IFeature,ILifeCycle, IApplication,IOrder {
     @Override
     public void attachBaseContext(Application application, Context context) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.ATTACH_BASE_CONTEXT,  new Class[]{Application.class, Context.class}, new Object[]{application, context});
+        SdkProxyPlatformManager.call(Function.ATTACH_BASE_CONTEXT,  new Class[]{Application.class, Context.class}, new Object[]{application, context});
 
     }
 
     @Override
     public void initApplication(Application application) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.INIT_APPLICATION,  new Class[]{Application.class}, new Object[]{application});
+        SdkProxyPlatformManager.call(Function.INIT_APPLICATION,  new Class[]{Application.class}, new Object[]{application});
 
     }
 
     @Override
     public void onStart(Activity activity) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.ON_START, new Class[]{Activity.class}, new Object[]{activity});
+        SdkProxyPlatformManager.call(Function.ON_START, new Class[]{Activity.class}, new Object[]{activity});
 
     }
 
     @Override
     public void onResume(Activity activity) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.ON_RESUME, new Class[]{Activity.class}, new Object[]{activity});
+        SdkProxyPlatformManager.call(Function.ON_RESUME, new Class[]{Activity.class}, new Object[]{activity});
 
     }
 
     @Override
     public void onReStart(Activity activity) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.ON_RESTART, new Class[]{Activity.class}, new Object[]{activity});
+        SdkProxyPlatformManager.call(Function.ON_RESTART, new Class[]{Activity.class}, new Object[]{activity});
 
     }
 
     @Override
     public void onPause(Activity activity) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.ON_PAUSE, new Class[]{Activity.class}, new Object[]{activity});
+        SdkProxyPlatformManager.call(Function.ON_PAUSE, new Class[]{Activity.class}, new Object[]{activity});
 
     }
 
     @Override
     public void onStop(Activity activity) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.ON_STOP, new Class[]{Activity.class}, new Object[]{activity});
+        SdkProxyPlatformManager.call(Function.ON_STOP, new Class[]{Activity.class}, new Object[]{activity});
 
     }
 
     @Override
     public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.ON_ACTIVITY_RESULT,
+        SdkProxyPlatformManager.call(Function.ON_ACTIVITY_RESULT,
                 new Class[]{Activity.class, Integer.class, Integer.class, Intent.class},
                 new Object[]{activity, requestCode, resultCode, data});
         
@@ -190,47 +187,47 @@ public class PlatformSdk implements IFeature,ILifeCycle, IApplication,IOrder {
     @Override
     public void onNewIntent(Activity activity, Intent intent) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.ON_NEW_INTENT, new Class[]{Activity.class, Intent.class}, new Object[]{activity, intent});
+        SdkProxyPlatformManager.call(Function.ON_NEW_INTENT, new Class[]{Activity.class, Intent.class}, new Object[]{activity, intent});
 
     }
 
     @Override
     public void onConfigurationChanged(Activity activity, Configuration newConfigs) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.ON_CONFIGURATION_CHANGED, new Class[]{Activity.class,Configuration.class}, new Object[]{activity,newConfigs});
+        SdkProxyPlatformManager.call(Function.ON_CONFIGURATION_CHANGED, new Class[]{Activity.class,Configuration.class}, new Object[]{activity,newConfigs});
 
     }
 
     @Override
     public void onWindowFocusChanged(Activity activity, boolean hasFocus) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.ON_WINDOW_FOCUS_CHANGED, new Class[]{Activity.class,boolean.class}, new Object[]{activity,hasFocus});
+        SdkProxyPlatformManager.call(Function.ON_WINDOW_FOCUS_CHANGED, new Class[]{Activity.class,boolean.class}, new Object[]{activity,hasFocus});
 
     }
 
     @Override
     public void onDestroy(Activity activity) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.ON_DESTROY, new Class[]{Activity.class}, new Object[]{activity});
+        SdkProxyPlatformManager.call(Function.ON_DESTROY, new Class[]{Activity.class}, new Object[]{activity});
 
     }
 
     @Override
     public void onCreate(Activity activity, Bundle savedInstanceState) {
         checkSdkBridgeNull();
-        SdkProxyOperationManager.call(Function.ON_CREATE, new Class[]{Activity.class, Bundle.class}, new Object[]{activity, savedInstanceState});
+        SdkProxyPlatformManager.call(Function.ON_CREATE, new Class[]{Activity.class, Bundle.class}, new Object[]{activity, savedInstanceState});
 
     }
 
     @Override
     public void startPay(final Activity activity, final SdkOrderInfo sdkOrderInfo, ICallback callback) {
 
-        SdkProxyOperationManager.call(Function.START_PAY, new Class[]{Activity.class, SdkOrderInfo.class,ICallback.class}, new Object[]{activity, sdkOrderInfo,callback});
+        SdkProxyPlatformManager.call(Function.START_PAY, new Class[]{Activity.class, SdkOrderInfo.class,ICallback.class}, new Object[]{activity, sdkOrderInfo,callback});
 
     }
 
     @Override
     public String getChannelOrderExt() {
-        return (String) SdkProxyOperationManager.callback(Function.GET_CHANNEL_ORDER_EXT, new Class[]{},new Object[]{});
+        return (String) SdkProxyPlatformManager.callback(Function.GET_CHANNEL_ORDER_EXT, new Class[]{},new Object[]{});
     }
 }

library_platform/src/main/java/cn/yyxx/commsdk/platform/SdkProxyOperationManager.java → library_channel/src/main/java/cn/yyxx/commsdk/impl/merge/platform/SdkProxyPlatformManager.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.platform;
+package cn.yyxx.commsdk.impl.merge.platform;
 
 import android.content.Context;
 
@@ -9,17 +9,17 @@ import java.lang.reflect.Method;
  * @author #Suyghur.
  * Created on 2021/12/25
  */
-final class SdkProxyOperationManager {
+final class SdkProxyPlatformManager {
     static Object sdkBridge = null;
     static Class<?> clzBridge = null;
 
-    public static Object initSdkProxyOperationManager(Context context) {
+    public static Object initSdkProxyPlatformManager(Context context) {
         if (sdkBridge != null) {
             return sdkBridge;
         }
 
         try {
-            clzBridge = Class.forName("cn.yyxx.commsdk.platform.SdkPlatformBridge");
+            clzBridge = Class.forName("cn.yyxx.commsdk.impl.merge.platform.SdkPlatformBridge");
             //获取构造函数的构造器
             Constructor<?> constructor = clzBridge.getDeclaredConstructor(Context.class);
             sdkBridge = constructor.newInstance(context);

library_platform/src/main/java/cn/yyxx/commsdk/platform/user/UserSession.java → library_channel/src/main/java/cn/yyxx/commsdk/impl/merge/user/UserSession.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.platform.user;
+package cn.yyxx.commsdk.impl.merge.user;
 
 import org.json.JSONException;
 import org.json.JSONObject;

library_channel/src/main/java/cn/yyxx/commsdk/impl/channel/user/UserSessionManager.java → library_channel/src/main/java/cn/yyxx/commsdk/impl/merge/user/UserSessionManager.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.user;
+package cn.yyxx.commsdk.impl.merge.user;
 
 import android.text.TextUtils;
 

library_channel_repository/build.gradle

@@ -33,5 +33,4 @@ android {
 
 dependencies {
 
-
 }

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

@@ -1,159 +0,0 @@
-package cn.yyxx.commsdk.impl.channel;
-
-import android.app.Activity;
-import android.app.Application;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.os.Bundle;
-
-
-import org.json.JSONObject;
-
-import cn.yyxx.commsdk.base.entity.SdkOrderInfo;
-import cn.yyxx.commsdk.base.entity.SdkRoleInfo;
-import cn.yyxx.commsdk.base.entity.bean.InitBean;
-import cn.yyxx.commsdk.base.internal.ICallback;
-import cn.yyxx.commsdk.base.internal.feature.IApplication;
-import cn.yyxx.commsdk.base.internal.feature.IFeature;
-import cn.yyxx.commsdk.base.internal.feature.ILifeCycle;
-import cn.yyxx.commsdk.base.internal.feature.IOrder;
-import cn.yyxx.commsdk.impl.channel.hnyy.SdkPlatformImpl;
-
-public class ChannelBridge implements IFeature, ILifeCycle, IApplication,IOrder {
-
-    private SdkPlatformImpl impl = null;
-
-    public ChannelBridge(Context context) {
-        if (null == impl) {
-            impl = new SdkPlatformImpl(context);
-        }
-    }
-
-
-
-
-    @Override
-    public void attachBaseContext(Application application, Context context) {
-        impl.attachBaseContext(application,context);
-    }
-
-    @Override
-    public void initApplication(Application application) {
-        impl.initApplication(application);
-
-    }
-
-    @Override
-    public void initialize(Activity activity, ICallback callback) {
-        impl.initialize(activity,callback);
-    }
-
-    @Override
-    public void initializeSuccess() {
-        impl.initializeSuccess();
-    }
-
-    @Override
-    public void setLogoutListener(Activity activity, ICallback callback) {
-        impl.setLogoutListener(activity,callback);
-    }
-
-    @Override
-    public void login(final Activity activity, InitBean initBean, final ICallback callback) {
-        impl.login(activity,initBean,callback);
-    }
-
-    @Override
-    public void logout() {
-        impl.logout();
-    }
-
-
-
-    @Override
-    public boolean hasExitView(Activity activity) {
-        return impl.hasExitView(activity);
-    }
-
-    @Override
-    public void openExitView(Activity activity,ICallback callback) {
-        impl.openExitView(activity,callback);
-    }
-
-    @Override
-    public void uploadRoleInfo(Activity activity, String type, SdkRoleInfo roleInfo) {
-        impl.uploadRoleInfo(activity,type,roleInfo);
-    }
-
-    @Override
-    public void reportGameEvent(String event, JSONObject message) {
-        impl.reportGameEvent(event,message);
-    }
-
-
-    @Override
-    public void onStart(Activity activity) {
-        impl.onStart(activity);
-    }
-
-    @Override
-    public void onResume(Activity activity) {
-        impl.onResume(activity);
-    }
-
-    @Override
-    public void onReStart(Activity activity) {
-        impl.onResume(activity);
-    }
-
-    @Override
-    public void onPause(Activity activity) {
-        impl.onPause(activity);
-    }
-
-    @Override
-    public void onStop(Activity activity) {
-        impl.onStop(activity);
-    }
-
-    @Override
-    public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
-        impl.onActivityResult(activity,requestCode,resultCode,data);
-    }
-
-    @Override
-    public void onNewIntent(Activity activity, Intent intent) {
-        impl.onNewIntent(activity,intent);
-    }
-
-    @Override
-    public void onConfigurationChanged(Activity activity, Configuration newconfig) {
-        impl.onConfigurationChanged(activity,newconfig);
-    }
-
-    @Override
-    public void onWindowFocusChanged(Activity activity, boolean hasFocus) {
-        impl.onWindowFocusChanged(activity,hasFocus);
-    }
-
-    @Override
-    public void onDestroy(Activity activity) {
-        impl.onDestroy(activity);
-
-    }
-
-    @Override
-    public void onCreate(Activity activity, Bundle savedInstanceState) {
-        impl.onCreate(activity,savedInstanceState);
-    }
-
-    @Override
-    public void startPay(Activity activity, SdkOrderInfo sdkOrderInfo,ICallback callback) {
-        impl.startPay(activity,sdkOrderInfo,callback);
-    }
-    @Override
-    public String getChannelOrderExt() {
-        return  impl.getChannelOrderExt();
-    }
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/activity/BaseLoginActivity.java

@@ -1,136 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.activity;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.Bundle;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentTransaction;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-
-import java.util.LinkedList;
-
-
-
-/**
- * @author #Suyghur.
- * Created on 2021/10/25
- */
-public class BaseLoginActivity extends FragmentActivity {
-
-    protected LinkedList<String> fragmentStack = new LinkedList<>();
-    protected String currentFragmentTag = "";
-    protected int containerId = 0;
-
-
-    public void switchFragment(String tag, Bundle bundle) {
-
-    }
-
-    public void switchFragment(Fragment fragment, String tag, Bundle bundle) {
-
-        if (fragmentStack == null) {
-            return;
-        }
-
-        if (fragmentStack.contains(tag)) {
-            //栈里最后一个与tag相同才执行删除
-            if (fragmentStack.size() > 1 && !fragmentStack.getLast().equals(tag)) {
-                fragmentStack.removeLast();
-            }
-        } else {
-            fragmentStack.add(tag);
-        }
-
-
-        if (bundle !=null ){
-            fragment.setArguments(bundle);
-        }
-
-        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-
-        Fragment tagFragment = getSupportFragmentManager().findFragmentByTag(currentFragmentTag);
-        if (tagFragment != null && !tag.equals(currentFragmentTag)) {
-            tagFragment.onPause();
-            transaction.hide(tagFragment);
-        }
-        tagFragment = getSupportFragmentManager().findFragmentByTag(tag);
-        if (tagFragment == null) {
-            transaction.add(containerId, fragment, tag);
-        } else {
-            tagFragment.onResume();
-            transaction.show(tagFragment);
-        }
-
-
-        currentFragmentTag = tag;
-        transaction.commitAllowingStateLoss();
-    }
-
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
-            View v = getCurrentFocus();
-            if (isShouldHideInput(v, ev)) {
-
-                InputMethodManager imm = (InputMethodManager) this.getSystemService(Context.INPUT_METHOD_SERVICE);
-                if (imm != null) {
-                    imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
-                }
-            }
-            return super.dispatchTouchEvent(ev);
-        }
-        // 必不可少，否则所有的组件都不会有TouchEvent了
-        if (getWindow().superDispatchTouchEvent(ev)) {
-            return true;
-        }
-        return onTouchEvent(ev);
-    }
-
-    protected boolean isShouldHideInput(View v, MotionEvent event) {
-        if ((v instanceof EditText)) {
-            int[] leftTop = {0, 0};
-            //获取输入框当前的location位置
-            v.getLocationInWindow(leftTop);
-            int left = leftTop[0];
-            int top = leftTop[1];
-            int bottom = top + v.getHeight();
-            int right = left + v.getWidth();
-            // 点击的是输入框区域，保留点击EditText的事件
-            return !(event.getX() > left) || !(event.getX() < right) || !(event.getY() > top) || !(event.getY() < bottom);
-        }
-        return false;
-    }
-
-    protected void hideBar() {
-        // The UI options currently enabled are represented by a bitfield.
-        // getSystemUiVisibility() gives us that bitfield.
-        int uiOptions = getWindow().getDecorView().getSystemUiVisibility();
-        int newUiOptions = uiOptions;
-        boolean isImmersiveModeEnabled =
-                ((uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY) == uiOptions);
-        if (!isImmersiveModeEnabled) {
-            if (Build.VERSION.SDK_INT >= 14) {
-                newUiOptions |= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
-            }
-            if (Build.VERSION.SDK_INT >= 16) {
-                newUiOptions |= View.SYSTEM_UI_FLAG_FULLSCREEN;
-            }
-            if (Build.VERSION.SDK_INT >= 18) {
-                newUiOptions |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
-            }
-            getWindow().getDecorView().setSystemUiVisibility(newUiOptions);
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        hideBar();
-    }
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/activity/HNYYLoginActivity.java

@@ -1,176 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.activity;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import cn.yyxx.commsdk.base.internal.ICallback;
-
-import cn.yyxx.commsdk.impl.channel.hnyy.SdkPlatformImpl;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.HNYYLoginFragmentTag;
-import cn.yyxx.commsdk.impl.channel.user.UserSessionManager;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.AutoLoginDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.UserAccountLoginFragment;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.UserPhoneLoginFragment;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.UserPhoneLoginSetpwdFragment;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.UserRegisterFragment;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.UserRetrievePwdFragment;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.UserSwitchAccountLoginFragment;
-import cn.yyxx.support.AndroidBug5497Workaround;
-import cn.yyxx.support.AppUtils;
-import cn.yyxx.support.ResUtils;
-
-public class HNYYLoginActivity extends BaseLoginActivity {
-
-
-
-
-    private UserAccountLoginFragment userAccountLoginFragment;
-    private UserPhoneLoginFragment userPhoneLoginFragment;
-    private UserPhoneLoginSetpwdFragment userPhoneLoginSetpwdFragment;
-    private UserRegisterFragment userRegisterFragment;
-    private UserRetrievePwdFragment userRetrievePwdFragment;
-    private UserSwitchAccountLoginFragment userSwitchAccountLoginFragment;
-
-
-
-
-
-    @Override
-    protected void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            Window window = getWindow();
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-
-
-            WindowManager.LayoutParams lp = getWindow().getAttributes();
-            lp.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
-            getWindow().setAttributes(lp);
-        }
-        containerId = ResUtils.getResId(this, "hnyy_login_container", "id");
-        initView(this);
-        if (UserSessionManager.getInstance().getLocalLastSession() != null){
-            if (SdkPlatformImpl.initConfig.isSwitchAccount){
-                switchFragment(HNYYLoginFragmentTag.PAGE_SWITCH_ACCOUNT_LOGIN,null);
-
-            }else{
-                autoLogin(this);
-            }
-
-        }else{
-            if (SdkPlatformImpl.initConfig.isShowPhoneRegFrist){
-                switchFragment(HNYYLoginFragmentTag.PAGE_PHONE_LOGIN,null);
-            }else{
-                switchFragment(HNYYLoginFragmentTag.PAGE_ACCOUNT_REGISTER,null);
-            }
-        }
-
-    }
-
-    public static void start(Activity activity, ICallback callback) {
-
-        activity.startActivity(new Intent(activity, HNYYLoginActivity.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
-    }
-
-    private void initView(Context context){
-        if (AppUtils.isLandscape(context)) {
-            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
-        }
-        setContentView(ResUtils.getResId(this, "hnyy_login", "layout"));
-
-        if (!AppUtils.isLandscape(context)) {
-            AndroidBug5497Workaround.assistActivity(this);
-        }
-
-
-    }
-
-    @Override
-    public void switchFragment(final String tag,Bundle bundle) {
-        super.switchFragment(tag,bundle);
-       switch (tag){
-           case HNYYLoginFragmentTag.PAGE_ACCOUNT_LOGIN:
-               if (userAccountLoginFragment == null){
-                   userAccountLoginFragment = new UserAccountLoginFragment();
-               }
-               switchFragment(userAccountLoginFragment,tag,bundle);
-               break;
-           case HNYYLoginFragmentTag.PAGE_PHONE_LOGIN:
-               if (userPhoneLoginFragment == null){
-                   userPhoneLoginFragment = new UserPhoneLoginFragment();
-               }
-
-               switchFragment(userPhoneLoginFragment,tag,bundle);
-               break;
-           case HNYYLoginFragmentTag.PAGE_POHONE_SET_PASSWORD:
-               if (userPhoneLoginSetpwdFragment == null){
-                   userPhoneLoginSetpwdFragment = new UserPhoneLoginSetpwdFragment();
-               }
-
-               switchFragment(userPhoneLoginSetpwdFragment,tag,bundle);
-               break;
-           case HNYYLoginFragmentTag.PAGE_ACCOUNT_REGISTER:
-               if (userRegisterFragment == null){
-                   userRegisterFragment = new UserRegisterFragment();
-               }
-               switchFragment(userRegisterFragment,tag,bundle);
-               break;
-           case HNYYLoginFragmentTag.PAGE_RETRIEVE_PASSWORD:
-               if (userRetrievePwdFragment == null){
-                   userRetrievePwdFragment = new UserRetrievePwdFragment();
-               }
-               switchFragment(userRetrievePwdFragment,tag,bundle);
-               break;
-           case HNYYLoginFragmentTag.PAGE_SWITCH_ACCOUNT_LOGIN:
-               if (userSwitchAccountLoginFragment == null){
-                   userSwitchAccountLoginFragment = new UserSwitchAccountLoginFragment();
-               }
-               switchFragment(userSwitchAccountLoginFragment,tag,bundle);
-               break;
-
-       }
-    }
-
-    private void autoLogin(final Activity activity) {
-        AutoLoginDialog.Builder builder = new AutoLoginDialog.Builder(activity,SdkPlatformImpl.loginViewModel);
-        builder.setPositiveButton(new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                //取消回调
-                dialog.dismiss();
-
-                switchFragment(HNYYLoginFragmentTag.PAGE_SWITCH_ACCOUNT_LOGIN,null);
-
-
-            }
-        }).setCloseDialogCallback(new AutoLoginDialog.CloseDialogCallback() {
-
-
-            @Override
-            public void onLoginSuccess() {
-                if (!isFinishing()) {
-                     finish();
-                     SdkPlatformImpl.getInstance(activity).loginSuccess();
-                }
-            }
-            @Override
-            public void onLoginFail() {
-                switchFragment(HNYYLoginFragmentTag.PAGE_SWITCH_ACCOUNT_LOGIN,null);
-            }
-        });
-
-        builder.Create().show();
-    }
-
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/adapter/UserListAdapter.java

@@ -1,91 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-
-import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.user.UserSession;
-import cn.yyxx.commsdk.impl.channel.user.UserSessionManager;
-
-
-public class UserListAdapter extends BaseAdapter {
-	private Context context;
-	public ArrayList<UserSession> list;
-	private LayoutInflater mInflater = null;
-
-
-
-	public UserListAdapter(Context context, ArrayList<UserSession> list) {
-		this.context = context;
-		this.list = list;
-		this.mInflater = LayoutInflater.from(context);
-
-	}
-
-	@Override
-	public int getCount() {
-		// TODO Auto-generated method stub
-		return list.size();
-	}
-
-	@Override
-	public Object getItem(int position) {
-		// TODO Auto-generated method stub
-		return position;
-	}
-
-	@Override
-	public long getItemId(int position) {
-		// TODO Auto-generated method stub
-		return position;
-	}
-
-	@Override
-	public View getView(final int position, View convertView, ViewGroup parent) {
-		// TODO Auto-generated method stub
-		ViewHolder holder = null;
-		if (convertView == null) {
-			convertView = mInflater.inflate(ResourceUtil.getLayoutId(context, "hnyy_user_list_item"), parent,false);
-			holder = new ViewHolder();
-
-			holder.accountName = convertView
-					.findViewById(ResourceUtil.getId(context, "history_account"));
-			holder.closeItem =  convertView
-					.findViewById(ResourceUtil.getId(context, "item_close"));
-			
-			holder.closeItem.setOnClickListener(new OnClickListener() {
-				
-				@Override
-				public void onClick(View v) {
-					// TODO Auto-generated method stub
-					deleteItem(position);
-				}
-			});
-			
-			convertView.setTag(holder);
-		} else {
-			holder = (ViewHolder) convertView.getTag();
-
-		}
-		holder.accountName.setText(list.get(position).uname);
-		return convertView;
-	}
-
-	class ViewHolder {
-		TextView accountName;
-		ImageView closeItem;
-
-	}
-	private void deleteItem(int position){
-		UserSessionManager.getInstance().removeSession(list.get(position).uname);
-	}
-
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/dialog/AutoLoginDialog.java

@@ -1,160 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.dialog;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Looper;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.TextView;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-import cn.yyxx.commsdk.base.entity.ResultInfo;
-import cn.yyxx.commsdk.base.internal.ICallback;
-import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.LoginViewModel;
-import cn.yyxx.commsdk.impl.channel.user.UserSession;
-import cn.yyxx.commsdk.impl.channel.user.UserSessionManager;
-
-public class AutoLoginDialog extends Dialog {
-
-
-    private static TextView hnyy_auto_login_account_text, hnyy_auto_login_cancel_text;
-    private static AutoLoginDialog dialog;
-    private static Timer timer;
-
-    public AutoLoginDialog(Context context, int theme) {
-        super(context, theme);
-
-    }
-
-    public static class Builder {
-        private Context context;
-        private OnClickListener positiveButtonClickListener;
-        private CloseDialogCallback closeDialogCallback;
-
-        private LoginViewModel loginViewModel;
-
-        private UserSession lastUserSession;
-
-        public Builder(Context context, LoginViewModel loginViewModel) {
-            this.context = context;
-            this.loginViewModel = loginViewModel;
-        }
-
-        public Builder setPositiveButton(OnClickListener listener) {
-            this.positiveButtonClickListener = listener;
-            return this;
-        }
-
-        public Builder setCloseDialogCallback(CloseDialogCallback closeDialogCallback) {
-            this.closeDialogCallback = closeDialogCallback;
-            return this;
-        }
-
-
-        public void dialogDismiss() {
-            if (timer != null) {
-                timer.cancel();
-            }
-
-            dialog.dismiss();
-        }
-
-        public AutoLoginDialog Create() {
-            {
-                LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-                dialog = new AutoLoginDialog(context, ResourceUtil.getStyleId(context, "hnyy_auto_login_dialog"));
-                View layout = inflater.inflate(ResourceUtil.getLayoutId(context, "hnyy_quick_login_bar"), null);
-                ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-                Window window = dialog.getWindow();
-                window.setGravity(Gravity.TOP);
-                WindowManager.LayoutParams lp = window.getAttributes();
-
-                lp.y = dp2Px(50, context);  //设置出现的高度，距离顶部
-                window.setAttributes(lp);
-
-                dialog.addContentView(layout, layoutParams);
-
-                hnyy_auto_login_cancel_text = dialog.findViewById(ResourceUtil.getId(context,
-                        "hnyy_auto_login_cancel_text"));
-                hnyy_auto_login_account_text = dialog.findViewById(ResourceUtil.getId(context,
-                        "hnyy_auto_login_account_text"));
-
-
-                if (hnyy_auto_login_cancel_text != null) {
-                    hnyy_auto_login_cancel_text.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            if (timer != null) {
-                                timer.cancel();
-                            }
-
-                            timer = null;
-                            positiveButtonClickListener.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
-                        }
-                    });
-                }
-
-                String hnyy_enter_game_tip = context.getString(ResourceUtil.getStringId(context, "hnyy_enter_game_tip"));
-                lastUserSession = UserSessionManager.getInstance().getLocalLastSession();
-                String autoTip = lastUserSession.uname + hnyy_enter_game_tip;
-
-                hnyy_auto_login_account_text.setText(autoTip);
-                dialog.setCancelable(false);
-                timer = new Timer();
-                timer.schedule(task, 2000);
-                return dialog;
-            }
-        }
-
-        TimerTask task = new TimerTask() {
-
-            @Override
-            public void run() {
-                Looper.prepare();
-
-                dialogDismiss();
-
-                loginViewModel.accountLogin((Activity) context, lastUserSession.uname, lastUserSession.password, lastUserSession.login_token, new ICallback() {
-                    @Override
-                    public void onResult(int code, String result) {
-                        if (code == ResultInfo.CODE_SUCCESS){
-                            closeDialogCallback.onLoginSuccess();
-                        }else {
-                            closeDialogCallback.onLoginFail();
-
-                        }
-
-                    }
-                });
-
-                Looper.loop();
-            }
-
-        };
-
-
-    }
-
-    public interface CloseDialogCallback {
-        void onLoginSuccess();
-
-        void onLoginFail();
-    }
-
-    public static int dp2Px(float dp, Context mContext) {
-        return (int) TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_DIP,
-                dp,
-                mContext.getResources().getDisplayMetrics());
-    }
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/dialog/EmailDialog.java

@@ -1,228 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.dialog;
-
-
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.webkit.DownloadListener;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ImageView;
-
-
-
-import java.net.URISyntaxException;
-
-import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.action.PageJsInteraction;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
-import cn.yyxx.support.AppUtils;
-
-
-public class EmailDialog extends JsBaseDialog {
-
-
-    private ImageView close_btn;
-    private Context context;
-    private WebView webView;
-    private WebSettings webSettings;
-
-    private String url;
-
-
-    public EmailDialog(Context context) {
-        super(context);
-        this.context = context;
-    }
-
-
-    public EmailDialog(Context context, int theme, String url) {
-        super(context, theme);
-        this.context = context;
-        this.url = url;
-
-    }
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-
-        if (!AppUtils.isLandscape(context)){
-
-            setContentView(ResourceUtil.getLayoutId(context,
-                    "hnyy_usercenter_portait_dialog"));
-
-        }else{
-            setContentView(ResourceUtil.getLayoutId(context,
-                    "hnyy_email_dialog"));
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            Window window = getWindow();
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-
-
-            WindowManager.LayoutParams lp = getWindow().getAttributes();
-            lp.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
-            getWindow().setAttributes(lp);
-        }
-
-
-
-        setCancelable(false);
-
-
-
-        webView = findViewById(ResourceUtil.getId(context,
-                "wb_user_info"));
-
-        close_btn = findViewById(ResourceUtil.getId(context,
-                "close_btn"));
-
-
-
-        close_btn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-
-
-                webView.destroy();
-                dismiss();
-
-            }
-        });
-
-        webSettings = webView.getSettings();
-        webSettings.setAllowFileAccess(true);
-        webSettings.setJavaScriptEnabled(true);
-        webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
-        webSettings.setBuiltInZoomControls(false);// 设置支持缩放
-        webSettings.setDomStorageEnabled(true);
-        webView.setHorizontalScrollBarEnabled(false);//水平不显示
-        webView.setVerticalScrollBarEnabled(false); //垂直不显示
-
-        webView.addJavascriptInterface(new PageJsInteraction(this), "yyrhsdk");
-        webView.setWebViewClient(new WebViewClient(){
-            @Override
-            public void onPageFinished(WebView view, String url) {
-                super.onPageFinished(view, url);
-
-            }
-
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-
-
-
-
-                if (url.startsWith("http:") || url.startsWith("https")) {
-                    return super.shouldOverrideUrlLoading(view, url);
-                } else if (url.startsWith("mqqwpa://")) {
-
-                    Intent intent = null;
-                    try {
-                        intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
-                        context.startActivity(intent);
-                    } catch (URISyntaxException e) {
-                        e.printStackTrace();
-                    }
-
-                    webView.goBack();
-                    return true;
-
-                }else{
-                    return true;
-                }
-            }
-
-        });
-
-        webView.setDownloadListener(new DownloadListener() {
-            @Override
-            public void onDownloadStart(String url, String userAgent, String contentDisposition, String mimetype, long contentLength) {
-                Uri uri = Uri.parse(url);
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                context.startActivity(intent);
-            }
-        });
-
-
-        webView.setBackgroundColor(0);
-        webView.getBackground().setAlpha(0);
-
-
-        webView.loadUrl(url);
-    }
-
-
-
-
-
-
-    @Override
-    public void zfColse() {
-        super.zfColse();
-        dismiss();
-    }
-
-    @Override
-    public void showJsMsg(String message) {
-        super.showJsMsg(message);
-        new TosUtil(context,TosUtil.TOAST_ERROR,  message).show();
-    }
-
-
-
-    @Override
-    public void openq0q0(String url) {
-        super.openq0q0(url);
-
-        {
-            Log.i("openq0q0", url);
-            if (TextUtils.isEmpty(url)) {
-                return;
-            }
-            if (url.equals("mqqwpa://")) {
-                try {
-
-                    Intent intent = context.getPackageManager().getLaunchIntentForPackage("com.tencent.mobileqq");
-                    context.startActivity(intent);
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-
-                }
-            } else {
-                Intent intent = null;
-                try {
-                    intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
-                    context.startActivity(intent);
-                } catch (URISyntaxException e) {
-                    e.printStackTrace();
-                }
-
-            }
-
-
-        }
-    }
-
-    @Override
-    public void dismiss() {
-        super.dismiss();
-    }
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/dialog/HnPayDialog.java

@@ -1,188 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.dialog;
-
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.text.TextUtils;
-import android.view.View;
-import android.webkit.DownloadListener;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-
-
-import cn.yyxx.commsdk.base.entity.ResultInfo;
-import cn.yyxx.commsdk.base.entity.SdkOrderInfo;
-import cn.yyxx.commsdk.base.internal.ICallback;
-import cn.yyxx.commsdk.base.internal.IRequestCallback;
-import cn.yyxx.commsdk.core.network.SdkRequest;
-import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.action.PageJsInteraction;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
-import cn.yyxx.support.AppUtils;
-
-
-public class HnPayDialog extends JsBaseDialog implements View.OnClickListener{
-
-
-    private Context context;
-    private WebView webView;
-    private WebSettings webSettings;
-    private String orderId;
-    private ImageView iv_reback_close;
-    private SdkOrderInfo sdkOrderInfo;
-    private ICallback payCallBack;
-
-
-    public HnPayDialog(Context context, int theme, SdkOrderInfo sdkOrderInfo,ICallback callback) {
-        super(context, theme);
-        this.context = context;
-        this.sdkOrderInfo = sdkOrderInfo;
-        this.payCallBack = callback;
-
-    }
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(ResourceUtil.getLayoutId(context,
-                "hnyy_p_webview"));
-
-
-        if (!AppUtils.isLandscape(context)){
-            LinearLayout ll_p_wb = findViewById(ResourceUtil.getId(context, "ll_p_wb"));
-
-            ll_p_wb.setScaleX(0.9f);
-            ll_p_wb.setScaleY(0.9f);
-        }
-
-        iv_reback_close = findViewById(ResourceUtil.getId(context,
-                "iv_reback_close"));
-        iv_reback_close.setOnClickListener(this);
-
-        webView = findViewById(ResourceUtil.getId(context,
-                "wb_with_xd"));
-
-
-
-        webSettings = webView.getSettings();
-        webSettings.setAllowFileAccess(true);
-        webSettings.setJavaScriptEnabled(true);
-        webSettings.setJavaScriptCanOpenWindowsAutomatically(true);
-
-        webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
-        webSettings.setBuiltInZoomControls(false);// 设置支持缩放
-        webSettings.setDomStorageEnabled(true);
-        webView.addJavascriptInterface(new PageJsInteraction(this), "yyrhsdk");
-        webView.setHorizontalScrollBarEnabled(false);//水平不显示
-        webView.setVerticalScrollBarEnabled(false); //垂直不显示
-        webView.setWebChromeClient(new WebChromeClient());
-        webView.setWebViewClient(new WebViewClient(){
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                String httpHead = url.substring(0, 5);
-                if (httpHead.equals("http:") || httpHead.equals("https")) {
-                    return super.shouldOverrideUrlLoading(view, url);
-                } else if (url.equals("yyrhsdk://pay_close")) {
-
-                    dismiss();
-
-                    return true;
-
-                } else if (url.equals("yyrhsdk://pay_success")) {
-                    dismiss();
-                    return true;
-                } else {
-                    if (httpHead.equals("yyrhsdk")) {
-
-                        return true;
-                    } else {
-                        openWXPay(url);
-                        return true;
-                    }
-                }
-            }
-
-            @Override
-            public void onPageFinished(WebView view, String url) {
-                super.onPageFinished(view, url);
-
-            }
-
-            private void openWXPay(String code_url) {
-                try {
-                    Intent it = new Intent(Intent.ACTION_VIEW);
-                    it.setData(Uri.parse(code_url));
-                    context.startActivity(it);
-                } catch (Exception e) {
-
-                }
-            }
-        });
-
-        webView.setDownloadListener(new DownloadListener() {
-            @Override
-            public void onDownloadStart(String url, String userAgent, String contentDisposition, String mimetype, long contentLength) {
-                Uri uri = Uri.parse(url);
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                context.startActivity(intent);
-            }
-        });
-
-
-        webView.loadUrl(sdkOrderInfo.getPay_web_url());
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        if (id == ResourceUtil.getId(context, "iv_reback_close")) {
-            dismiss();
-
-        }
-    }
-
-    @Override
-    public void dismiss() {
-        super.dismiss();
-        if (!TextUtils.isEmpty(orderId)){
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    SdkRequest.getInstance().queryOrder(context, orderId, sdkOrderInfo.getQuery_params(), new IRequestCallback() {
-                        @Override
-                        public void onResponse(ResultInfo resultInfo) {
-                            payCallBack.onResult(resultInfo.code,resultInfo.data);
-                         }
-                    });
-                }
-            },5000);
-
-        }
-    }
-
-
-    @Override
-    public void zfOrder(String message) {
-        super.zfOrder(message);
-        orderId = message;
-    }
-
-    @Override
-    public void zfColse() {
-        super.zfColse();
-        dismiss();
-    }
-
-    @Override
-    public void showJsMsg(String message) {
-        super.showJsMsg(message);
-        new TosUtil(context,TosUtil.TOAST_ERROR,  message).show();
-    }
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/dialog/JsBaseDialog.java

@@ -1,90 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.dialog;
-
-
-import android.app.Dialog;
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import cn.yyxx.commsdk.Version;
-import cn.yyxx.commsdk.base.utils.Logger;
-import cn.yyxx.support.AppUtils;
-
-
-public class JsBaseDialog extends Dialog {
-
-
-    public JsBaseDialog(@NonNull Context context) {
-        super(context);
-    }
-
-    public JsBaseDialog(@NonNull Context context, int themeResId) {
-        super(context, themeResId);
-    }
-
-    protected JsBaseDialog(@NonNull Context context, boolean cancelable, @Nullable OnCancelListener cancelListener) {
-        super(context, cancelable, cancelListener);
-    }
-
-    public void zfColse() {   //提供给js调用的方法
-        Logger.i("zfColse");
-    }
-
-
-
-    public void showJsMsg(String message) {
-        Logger.i("showJsMsg:" + message);
-    }
-
-    public void modifyPwd(String message) {
-        Logger.i("modifyPwd:" + message);
-    }
-
-    public void zfOrder(String message) {   //提供给js调用的方法
-        Logger.i("zfOrder:" + message);
-    }
-
-    public void openq0q0(String url)  {
-
-        Logger.i("openq0q0:" + url);
-
-    }
-    public void switchAccount()  {
-
-        Logger.i("switchAccount");
-
-    }
-
-    public String webExt(){
-
-        JSONObject json = new JSONObject();
-
-
-        try {
-            if (AppUtils.isLandscape(getContext())){
-
-                json.put("orientation","landscape");
-
-            }else{
-
-                json.put("orientation","portrait");
-
-            }
-
-            json.put("version", Version.VERSION_NAME);
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        Logger.i("webExt : " + json.toString());
-        return json.toString();
-    }
-
-    public void realNameResult(String json){
-        Logger.i("realNameResult:"+ json);
-    }
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/dialog/WvPageListDialog.java

@@ -1,277 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.dialog;
-
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.webkit.DownloadListener;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-
-import java.net.URISyntaxException;
-
-import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.action.PageJsInteraction;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
-import cn.yyxx.support.AppUtils;
-
-public class WvPageListDialog extends JsBaseDialog {
-
-
-    private ImageView close_btn,loading;
-    private Context context;
-    private WebView webView;
-    private WebSettings webSettings;
-
-    private String url;
-    public OnClosePageListener listener;
-    private boolean isHiddenClo = false;
-
-    public WvPageListDialog(Context context, int theme, String url) {
-        super(context, theme);
-        this.context = context;
-        this.url = url;
-    }
-
-    public WvPageListDialog(Context context, int theme, String url, OnClosePageListener listener) {
-        super(context, theme);
-        this.context = context;
-
-        this.url = url;
-        this.listener = listener;
-    }
-    public WvPageListDialog(Context context, int theme, String url, OnClosePageListener listener, boolean isHiddenClose) {
-        super(context, theme);
-        this.context = context;
-
-        this.url = url;
-        this.listener = listener;
-        this.isHiddenClo = isHiddenClose;
-    }
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-            setContentView(ResourceUtil.getLayoutId(context,
-                    "hnyy_webview_common_dialog"));
-
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            Window window = getWindow();
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-
-
-            WindowManager.LayoutParams lp = getWindow().getAttributes();
-            lp.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
-            getWindow().setAttributes(lp);
-        }
-
-
-            setCancelable(false);
-
-
-
-        if (!AppUtils.isLandscape(context)){
-
-            LinearLayout ll_webview_common = findViewById(ResourceUtil.getId(context, "ll_webview_common"));
-            ll_webview_common.setScaleX(0.9f);
-            ll_webview_common.setScaleY(0.9f);
-
-        }
-
-        webView = findViewById(ResourceUtil.getId(context,
-                "wb_user_info"));
-
-        close_btn = findViewById(ResourceUtil.getId(context,
-                "close_btn"));
-
-        loading = findViewById(ResourceUtil.getId(context, "hnyy_loading"));
-        Animation rotateAnimation = AnimationUtils.loadAnimation(context, ResourceUtil.getAnimId(context, "hnyy_rotate_anim"));
-        loading.startAnimation(rotateAnimation);
-
-        close_btn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-                if (listener != null){
-                    listener.onClose();
-                }
-
-                webView.destroy();
-                dismiss();
-
-            }
-        });
-        if (isHiddenClo){
-            close_btn.setVisibility(View.GONE);
-        }
-
-        webSettings = webView.getSettings();
-        webSettings.setAllowFileAccess(true);
-        webSettings.setJavaScriptEnabled(true);
-        webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
-        webSettings.setBuiltInZoomControls(false);// 设置支持缩放
-        webSettings.setDomStorageEnabled(true);
-        webView.setHorizontalScrollBarEnabled(false);//水平不显示
-        webView.setVerticalScrollBarEnabled(false); //垂直不显示
-
-        webView.addJavascriptInterface(new PageJsInteraction(this), "yyrhsdk");
-        webView.setWebViewClient(new WebViewClient(){
-            @Override
-            public void onPageFinished(WebView view, String url) {
-                super.onPageFinished(view, url);
-                loading.clearAnimation();
-                loading.setVisibility(View.GONE);
-            }
-
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-
-
-                if (url.startsWith("http:") || url.startsWith("https")) {
-                    return super.shouldOverrideUrlLoading(view, url);
-                } else if (url.startsWith("mqqwpa://")) {
-
-                    Intent intent = null;
-                    try {
-                        intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
-                        context.startActivity(intent);
-                    } catch (URISyntaxException e) {
-                        e.printStackTrace();
-                    }
-
-                    webView.goBack();
-                    return true;
-
-                }else{
-                    return true;
-                }
-            }
-
-        });
-
-        webView.setDownloadListener(new DownloadListener() {
-            @Override
-            public void onDownloadStart(String url, String userAgent, String contentDisposition, String mimetype, long contentLength) {
-                Uri uri = Uri.parse(url);
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                context.startActivity(intent);
-            }
-        });
-
-
-        webView.setBackgroundColor(0);
-        webView.getBackground().setAlpha(0);
-
-        webView.loadUrl(url);
-    }
-
-
-
-
-    public interface OnClosePageListener {
-         void onClose();
-         void onDissmiss();
-         void onRealNameSuccess();
-    }
-
-
-
-    @Override
-    public void zfColse() {
-        super.zfColse();
-        if (listener != null){
-            listener.onClose();
-        }
-        dismiss();
-    }
-
-    @Override
-    public void showJsMsg(String message) {
-        super.showJsMsg(message);
-        new TosUtil(context,TosUtil.TOAST_ERROR,  message).show();
-    }
-
-
-    @Override
-    public void modifyPwd(String message) {
-        super.modifyPwd(message);
-
-
-
-    }
-
-
-    @Override
-    public void openq0q0(String url) {
-        super.openq0q0(url);
-
-
-            if (TextUtils.isEmpty(url)) {
-                return;
-            }
-
-            if (url.equals("mqqwpa://")) {
-                try {
-
-                    Intent intent = context.getPackageManager().getLaunchIntentForPackage("com.tencent.mobileqq");
-                    context.startActivity(intent);
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-
-                }
-            } else {
-                Intent intent = null;
-                try {
-                    intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
-                    context.startActivity(intent);
-                } catch (URISyntaxException e) {
-                    e.printStackTrace();
-                }
-
-            }
-
-
-
-    }
-
-    @Override
-    public void dismiss() {
-        super.dismiss();
-
-        if (listener != null){
-            listener.onDissmiss();
-        }
-
-
-    }
-
-    @Override
-    public void realNameResult(String json) {
-        super.realNameResult(json);
-//        try {
-//
-//            SDKSettings.loginData.rn_si = new JSONObject(json).optString("si");
-//            listener.onRealNameSuccess();
-//
-//        } catch (JSONException e) {
-//            e.printStackTrace();
-//        }
-
-
-    }
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/floating/DotImageView.java

@@ -1,391 +0,0 @@
-/*
- * Copyright (c) 2016, Shanghai YUEWEN Information Technology Co., Ltd.
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- *  Neither the name of Shanghai YUEWEN Information Technology Co., Ltd. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY SHANGHAI YUEWEN INFORMATION TECHNOLOGY CO., LTD. AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-package cn.yyxx.commsdk.impl.channel.hnyy.floating;
-
-import android.animation.Animator;
-import android.animation.ValueAnimator;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Camera;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.animation.LinearInterpolator;
-
-
-/**
- * Created by wengyiming on 2017/7/21.
- */
-
-/**
- * 00%=FF（不透明）    5%=F2    10%=E5    15%=D8    20%=CC    25%=BF    30%=B2    35%=A5    40%=99    45%=8c    50%=7F
- * 55%=72    60%=66    65%=59    70%=4c    75%=3F    80%=33    85%=21    90%=19    95%=0c    100%=00（全透明）
- */
-public class DotImageView extends View {
-    private static final String TAG = DotImageView.class.getSimpleName();
-    public static final int NORMAL = 0;//不隐藏
-    public static final int HIDE_LEFT = 1;//左边隐藏
-    public static final int HIDE_RIGHT = 2;//右边隐藏
-    private Paint mPaint;//用于画anything
-
-    private Paint mPaintBg;//用于画anything
-    private String dotNum = null;//红点数字
-    private float mAlphValue;//透明度动画值
-    private float mRolateValue = 1f;//旋转动画值
-    private boolean inited = false;//标记透明动画是否执行过，防止因onreseme 切换导致重复执行
-
-
-    private Bitmap mBitmap;//logo
-    private final int mLogoBackgroundRadius = dip2px(25);//logo的灰色背景圆的半径
-    private final int mLogoWhiteRadius = dip2px(20);//logo的白色背景的圆的半径
-    private final int mRedPointRadiusWithNum = dip2px(6);//红点圆半径
-    private final int mRedPointRadius = dip2px(3);//红点圆半径
-    private final int mRedPointOffset = dip2px(10);//红点对logo的偏移量，比如左红点就是logo中心的 x - mRedPointOffset
-
-    private boolean isDraging = false;//是否 绘制旋转放大动画，只有 非停靠边缘才绘制
-    private float scaleOffset;//放大偏移值
-    private ValueAnimator mDragingValueAnimator;//放大、旋转 属性动画
-    private LinearInterpolator mLinearInterpolator = new LinearInterpolator();//通用用加速器
-    public boolean mDrawDarkBg = true;//是否绘制黑色背景，当菜单关闭时，才绘制灰色背景
-    private static final float hideOffset = 0.5f;//往左右隐藏多少宽度的偏移值， 隐藏宽度的0.4
-    private static final float hideOffsetAlpha = 0.5f;//往左右隐藏多少宽度的偏移值， 隐藏宽度的0.4
-    private Camera mCamera;//camera用于执行3D动画
-
-    private boolean mDrawNum = false;//只绘制红点还是红点+白色数字
-
-    private int mStatus = NORMAL;//0 正常，1 左，2右,3 中间方法旋转
-    private int mLastStatus = mStatus;
-    private Matrix mMatrix;
-    private boolean mIsResetPosition;
-
-    private int mBgColor = 0x99000000;
-
-
-    public void setBgColor(int bgColor) {
-        mBgColor = bgColor;
-    }
-
-
-    public void setDrawNum(boolean drawNum) {
-        this.mDrawNum = drawNum;
-    }
-
-    public void setDrawDarkBg(boolean drawDarkBg) {
-        mDrawDarkBg = drawDarkBg;
-        invalidate();
-    }
-
-    public int getStatus() {
-        return mStatus;
-    }
-
-
-    public void setStatus(int status) {
-        this.mStatus = status;
-        isDraging = false;
-        if (this.mStatus != NORMAL) {
-            setDrawNum(mDrawNum);
-            this.mDrawDarkBg = true;
-        }
-        invalidate();
-
-    }
-
-    public void setBitmap(Bitmap bitmap) {
-        mBitmap = bitmap;
-    }
-
-    public DotImageView(Context context, Bitmap bitmap) {
-        super(context);
-        this.mBitmap = bitmap;
-        init();
-    }
-
-
-    public DotImageView(Context context) {
-        super(context);
-        init();
-    }
-
-    public DotImageView(Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public DotImageView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init();
-    }
-
-    private void init() {
-        mPaint = new Paint();
-        mPaint.setAntiAlias(true);
-        mPaint.setTextSize(sp2px(10));
-        mPaint.setStyle(Paint.Style.FILL);
-
-        mPaintBg = new Paint();
-        mPaintBg.setAntiAlias(true);
-        mPaintBg.setStyle(Paint.Style.FILL);
-        mPaintBg.setColor(mBgColor);//60% 黑色背景 （透明度 40%）
-
-        mCamera = new Camera();
-        mMatrix = new Matrix();
-    }
-
-    /**
-     * 这个方法是否有优化空间
-     */
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        int wh = mLogoBackgroundRadius * 2;
-        setMeasuredDimension(wh, wh);
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-        float centryX = getWidth() / 2;
-        float centryY = getHeight() / 2;
-        canvas.save();//保存一份快照，方便后面恢复
-        mCamera.save();
-        setAlpha(1.0f);
-        if (mStatus == NORMAL) {
-            if (mLastStatus != NORMAL) {
-                canvas.restore();//恢复画布的原始快照
-                mCamera.restore();
-            }
-
-            if (isDraging) {
-
-                //如果当前是拖动状态则放大并旋转
-               // canvas.scale((scaleOffset + 1f), (scaleOffset + 1f), getWidth() / 2, getHeight() / 2);
-                if (mIsResetPosition) {
-                    //手指拖动后离开屏幕复位时使用 x轴旋转 3d动画
-                    mCamera.save();
-                    mCamera.rotateX(720 * scaleOffset);//0-720度 最多转两圈
-                    mCamera.getMatrix(mMatrix);
-
-                    mMatrix.preTranslate(-getWidth() / 2, -getHeight() / 2);
-                    mMatrix.postTranslate(getWidth() / 2, getHeight() / 2);
-                    canvas.concat(mMatrix);
-                    mCamera.restore();
-                } else {
-                    //手指拖动且手指未离开屏幕则使用 绕图心2d旋转动画
-                    canvas.rotate(60 * mRolateValue, getWidth() / 2, getHeight() / 2);
-                }
-            }
-
-
-        } else if (mStatus == HIDE_LEFT) {
-            canvas.translate(-getWidth() * hideOffset, 0);
-            canvas.rotate(0, getWidth() / 2, getHeight() / 2);
-            setAlpha(hideOffsetAlpha);
-
-        } else if (mStatus == HIDE_RIGHT) {
-            canvas.translate(getWidth() * hideOffset, 0);
-            canvas.rotate(0, getWidth() / 2, getHeight() / 2);
-            setAlpha(hideOffsetAlpha);
-        }
-        canvas.save();
-        if (!isDraging) {
-            if (mDrawDarkBg) {
-                mPaintBg.setColor(Color.TRANSPARENT);
-                canvas.drawCircle(centryX, centryY, mLogoBackgroundRadius, mPaintBg);
-                // 60% 白色 （透明度 40%）
-                mPaint.setColor(0x99ffffff);
-            } else {
-                //100% 白色背景 （透明度 0%）
-                mPaint.setColor(0xFFFFFFFF);
-            }
-            if (mAlphValue != 0) {
-                mPaint.setAlpha((int) (mAlphValue * 255));
-            }
-            canvas.drawCircle(centryX, centryY, mLogoWhiteRadius, mPaint);
-        }
-
-        canvas.restore();
-        //100% 白色背景 （透明度 0%）
-        mPaint.setColor(0xFFFFFFFF);
-        int left = (int) (centryX - mBitmap.getWidth() / 2);
-        int top = (int) (centryY - mBitmap.getHeight() / 2);
-        canvas.drawBitmap(mBitmap, left, top, mPaint);
-
-
-        if (!TextUtils.isEmpty(dotNum)) {
-            int readPointRadus = (mDrawNum ? mRedPointRadiusWithNum : mRedPointRadius);
-            mPaint.setColor(Color.RED);
-            if (mStatus == HIDE_LEFT) {
-                canvas.drawCircle(centryX + mRedPointOffset, centryY - mRedPointOffset, readPointRadus, mPaint);
-                if (mDrawNum) {
-                    mPaint.setColor(Color.WHITE);
-                    canvas.drawText(dotNum, centryX + mRedPointOffset - getTextWidth(dotNum, mPaint) / 2, centryY - mRedPointOffset + getTextHeight(dotNum, mPaint) / 2, mPaint);
-                }
-            } else if (mStatus == HIDE_RIGHT) {
-                canvas.drawCircle(centryX - mRedPointOffset, centryY - mRedPointOffset, readPointRadus, mPaint);
-                if (mDrawNum) {
-                    mPaint.setColor(Color.WHITE);
-                    canvas.drawText(dotNum, centryX - mRedPointOffset - getTextWidth(dotNum, mPaint) / 2, centryY - mRedPointOffset + getTextHeight(dotNum, mPaint) / 2, mPaint);
-                }
-            } else {
-                if (mLastStatus == HIDE_LEFT) {
-                    canvas.drawCircle(centryX + mRedPointOffset, centryY - mRedPointOffset, readPointRadus, mPaint);
-                    if (mDrawNum) {
-                        mPaint.setColor(Color.WHITE);
-                        canvas.drawText(dotNum, centryX + mRedPointOffset - getTextWidth(dotNum, mPaint) / 2, centryY - mRedPointOffset + getTextHeight(dotNum, mPaint) / 2, mPaint);
-                    }
-                } else if (mLastStatus == HIDE_RIGHT) {
-                    canvas.drawCircle(centryX - mRedPointOffset, centryY - mRedPointOffset, readPointRadus, mPaint);
-                    if (mDrawNum) {
-                        mPaint.setColor(Color.WHITE);
-                        canvas.drawText(dotNum, centryX - mRedPointOffset - getTextWidth(dotNum, mPaint) / 2, centryY - mRedPointOffset + getTextHeight(dotNum, mPaint) / 2, mPaint);
-                    }
-                }
-            }
-        }
-        mLastStatus = mStatus;
-    }
-
-
-    public void setDotNum(int num, Animator.AnimatorListener l) {
-        if (!inited) {
-            startAnim(num, l);
-        } else {
-            refreshDot(num);
-        }
-    }
-
-    public void refreshDot(int num) {
-        if (num > 0) {
-            String dotNumTmp = String.valueOf(num);
-            if (!TextUtils.equals(dotNum, dotNumTmp)) {
-                dotNum = dotNumTmp;
-                invalidate();
-            }
-        } else {
-            dotNum = null;
-        }
-    }
-
-    public void startAnim(final int num, Animator.AnimatorListener l) {
-        ValueAnimator valueAnimator = ValueAnimator.ofFloat(1.f, 0.6f, 1f, 0.6f);
-        valueAnimator.setInterpolator(mLinearInterpolator);
-        valueAnimator.setDuration(3000);
-        valueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                mAlphValue = (float) animation.getAnimatedValue();
-                invalidate();
-
-            }
-        });
-        valueAnimator.addListener(l);
-        valueAnimator.addListener(new Animator.AnimatorListener() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                inited = true;
-                refreshDot(num);
-                mAlphValue = 0;
-
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animation) {
-                mAlphValue = 0;
-            }
-
-            @Override
-            public void onAnimationRepeat(Animator animation) {
-
-            }
-        });
-        valueAnimator.start();
-    }
-
-    public void setDraging(boolean draging, float offset, boolean isResetPosition) {
-        isDraging = draging;
-        this.mIsResetPosition = isResetPosition;
-        if (offset > 0 && offset != this.scaleOffset) {
-            this.scaleOffset = offset;
-        }
-        if (isDraging && mStatus == NORMAL) {
-            if (mDragingValueAnimator != null) {
-                if (mDragingValueAnimator.isRunning()) return;
-            }
-            mDragingValueAnimator = ValueAnimator.ofFloat(0, 6f, 12f, 0f);
-            mDragingValueAnimator.setInterpolator(mLinearInterpolator);
-            mDragingValueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-                @Override
-                public void onAnimationUpdate(ValueAnimator animation) {
-                    mRolateValue = (float) animation.getAnimatedValue();
-                    invalidate();
-                }
-            });
-            mDragingValueAnimator.addListener(new Animator.AnimatorListener() {
-                @Override
-                public void onAnimationStart(Animator animation) {
-
-                }
-
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    isDraging = false;
-                    mIsResetPosition = false;
-                }
-
-                @Override
-                public void onAnimationCancel(Animator animation) {
-
-                }
-
-                @Override
-                public void onAnimationRepeat(Animator animation) {
-
-                }
-            });
-            mDragingValueAnimator.setDuration(1000);
-            mDragingValueAnimator.start();
-        }
-    }
-
-    private int dip2px(float dipValue) {
-        final float scale = getContext().getResources().getDisplayMetrics().density;
-        return (int) (dipValue * scale + 0.5f);
-    }
-
-    private int sp2px(float spValue) {
-        final float fontScale = getContext().getResources().getDisplayMetrics().scaledDensity;
-        return (int) (spValue * fontScale + 0.5f);
-    }
-
-    private float getTextHeight(String text, Paint paint) {
-        Rect rect = new Rect();
-        paint.getTextBounds(text, 0, text.length(), rect);
-        return rect.height() / 1.1f;
-    }
-
-    private float getTextWidth(String text, Paint paint) {
-        return paint.measureText(text);
-    }
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/floating/FloatViewManager.java

@@ -1,97 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.floating;
-
-
-import static cn.yyxx.commsdk.base.constants.Constants.CLICK_INTERVAL;
-
-import android.app.Activity;
-import android.graphics.BitmapFactory;
-
-
-
-import cn.yyxx.commsdk.core.entity.SdkLoginInfo;
-import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.UserCenterDialog;
-
-public class FloatViewManager {
-
-    private static FloatViewManager manager = null;
-
-
-
-    private FloatLogoMenu.Builder builder;
-
-
-    private long clickLoginTime = 0L;
-
-
-    private FloatViewManager(Activity activity) {
-        initView(activity);
-    }
-
-
-
-    public static FloatViewManager getInstance(Activity activity) {
-
-
-        if (manager == null) {
-            synchronized (FloatViewManager.class) {
-                if (manager == null) {
-                    manager = new FloatViewManager(activity);
-                }
-            }
-        }
-
-        return manager;
-    }
-
-    public void initView(final Activity activity){
-
-        if (builder == null) {
-
-            builder = new FloatLogoMenu.Builder()
-                    .withActivity(activity)
-                    .logo(BitmapFactory.decodeResource(activity.getResources(), ResourceUtil.getMipmapId(activity,"hnyy_float_icon")))
-                    .setBgDrawable(activity.getResources().getDrawable(ResourceUtil.getDrawableId(activity,"hnyy_game_float_menu_bg")))
-                    .defaultLocation(FloatLogoMenu.LEFT)
-                    .setOnFloatClickListener(new FloatLogoMenu.OnFloatClickListener() {
-                        @Override
-                        public void onClick() {
-
-                            if (System.currentTimeMillis() - clickLoginTime < CLICK_INTERVAL) {
-
-                                return;
-                            }
-
-                            clickLoginTime = System.currentTimeMillis();
-                            new UserCenterDialog(activity,ResourceUtil.getStyleId(activity,"hnyy_half_black_dialog"), SdkLoginInfo.getInstance().user_center).show();
-                        }
-                    });
-
-
-
-
-        }
-    }
-
-    public void showFloat() {
-
-        builder.show();
-    }
-
-
-    public void hideFloat() {
-        if (builder != null){
-            builder.hide();
-        }
-
-    }
-
-    public void releaseFloat(){
-
-        if (builder != null){
-            builder.release();
-        }
-    }
-
-
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/BaseFragment.java

@@ -1,53 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.ImageButton;
-
-import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.activity.HNYYLoginActivity;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.WvPageListDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.SdkPlatformImpl;
-
-public class BaseFragment extends android.support.v4.app.Fragment implements View.OnClickListener {
-    private ImageButton btn_kefu;
-    public HNYYLoginActivity loginImpl;
-
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        btn_kefu = view.findViewById(ResourceUtil.getId(getActivity(),"btn_kefu"));
-        if (btn_kefu != null){
-            btn_kefu.setOnClickListener(this);
-            if (!SdkPlatformImpl.initConfig.isShowKf){
-                btn_kefu.setVisibility(View.GONE);
-            }
-        }
-
-
-        if (getActivity() instanceof HNYYLoginActivity) {
-            loginImpl = (HNYYLoginActivity) getActivity();
-        }
-
-    }
-
-
-
-    @Override
-    public void onClick(View v) {
-        if (v.getId() == ResourceUtil.getId(getActivity(), "btn_kefu")){
-
-            if (!TextUtils.isEmpty(SdkPlatformImpl.initConfig.service_center)){
-
-                new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"hnyy_base_dialog"), SdkPlatformImpl.initConfig.service_center).show();
-
-            }
-
-
-
-        }
-    }
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/HNYYLoginFragmentTag.java

@@ -1,16 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Retention(RetentionPolicy.SOURCE)
-public @interface HNYYLoginFragmentTag {
-    String PAGE_ACCOUNT_LOGIN = "UserAccountLoginFragment";
-    String PAGE_PHONE_LOGIN = "UserPhoneLoginFragment";
-    String PAGE_POHONE_SET_PASSWORD = "UserPhoneLoginSetpwdFragment";
-    String PAGE_ACCOUNT_REGISTER = "UserRegisterFragment";
-    String PAGE_RETRIEVE_PASSWORD = "UserRetrievePwdFragment";
-    String PAGE_SWITCH_ACCOUNT_LOGIN = "UserSwitchAccountLoginFragment";
-
-
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/UserPhoneLoginSetpwdFragment.java

@@ -1,181 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment;
-
-
-import static cn.yyxx.commsdk.base.constants.Constants.CLICK_INTERVAL;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.TextView;
-
-import cn.yyxx.commsdk.base.entity.ResultInfo;
-import cn.yyxx.commsdk.base.internal.ICallback;
-import cn.yyxx.commsdk.base.utils.Logger;
-import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.WvPageListDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.SdkPlatformImpl;
-
-
-public class UserPhoneLoginSetpwdFragment extends BaseFragment {
-
-
-    private EditText reg_pwd_edit;
-    private CheckBox cb_register;
-    private TextView tv_tip,tv_private_policy;
-    private Button reg_compete_btn;
-    private ImageButton close_btn;
-    private long clickLoginTime = 0L;
-
-    private String account,code;
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(ResourceUtil.getLayoutId(getActivity(),"hnyy_phone_register_setpwd_dialog"), container, false);
-        view.setClickable(true);
-
-        Bundle bundle = getArguments();
-        account = bundle.getString("account");
-        code = bundle.getString("code");
-        return view;
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        reg_pwd_edit = view.findViewById(ResourceUtil.getId(getActivity(),"reg_pwd_edit"));
-
-        cb_register = view.findViewById(ResourceUtil.getId(getActivity(),"cb_register"));
-
-        tv_tip = view.findViewById(ResourceUtil.getId(getActivity(),"tv_tip"));
-        tv_tip.setOnClickListener(this);
-
-        tv_private_policy = view.findViewById(ResourceUtil.getId(getActivity(),"tv_private_policy"));
-        tv_private_policy.setOnClickListener(this);
-
-        reg_compete_btn = view.findViewById(ResourceUtil.getId(getActivity(),"reg_compete_btn"));
-        reg_compete_btn.setOnClickListener(this);
-
-
-        close_btn = view.findViewById(ResourceUtil.getId(getActivity(),"close_btn"));
-
-        close_btn.setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-        super.onClick(v);
-        int id = v.getId();
-        if(id == ResourceUtil.getId(getActivity(), "tv_tip")){
-
-            new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"hnyy_base_dialog"), SdkPlatformImpl.initConfig.agreement_user).show();
-
-        }else if(id == ResourceUtil.getId(getActivity(), "tv_private_policy")){
-
-            new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"hnyy_base_dialog"), SdkPlatformImpl.initConfig.agreement_privacy).show();
-
-        }else if(id == ResourceUtil.getId(getActivity(), "reg_compete_btn")){
-
-            if (System.currentTimeMillis() - clickLoginTime < CLICK_INTERVAL) {
-
-                Logger.i("调用登录接口太频繁，拦截此次操作");
-
-                return;
-            }
-            clickLoginTime = System.currentTimeMillis();
-
-            registerWithPhone(getActivity());
-
-        }else if(id == ResourceUtil.getId(getActivity(), "close_btn")){
-
-            loginImpl.switchFragment(HNYYLoginFragmentTag.PAGE_PHONE_LOGIN,null);
-
-        }
-
-
-
-    }
-
-
-
-    private void registerWithPhone(final Activity activity){
-
-        final String pwd = reg_pwd_edit.getText().toString();
-
-
-        if(account.length() < 10 || TextUtils.isEmpty(account))
-        {
-
-            new TosUtil(getActivity(), TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "qj_pls_input_right_phone"))).show();
-
-            return;
-        }
-        if(pwd.length() < 6 || TextUtils.isEmpty(pwd))
-        {
-
-            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "qj_pwd_limit_6"))).show();
-
-            return;
-        }
-        if(code.length() < 4 || TextUtils.isEmpty(code))
-        {
-            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "qj_pls_input_right_code"))).show();
-
-            return;
-        }
-
-        if (!cb_register.isChecked()){
-
-            new TosUtil(getActivity(), TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "qj_pls_checked_reg_tip"))).show();
-
-
-            return;
-
-        }
-
-        SdkPlatformImpl.loginViewModel.setPassword(activity, account, pwd, code, new ICallback() {
-            @Override
-            public void onResult(int code, String result) {
-                if (code == ResultInfo.CODE_SUCCESS){
-                    if (!getActivity().isFinishing()) {
-                        getActivity().finish();
-                        SdkPlatformImpl.getInstance(activity).loginSuccess();
-
-                    }
-
-                }else{
-
-                    new TosUtil(getActivity(),TosUtil.TOAST_ERROR, result).show();
-
-                }
-
-            }
-        });
-
-    }
-
-
-
-
-
-
-    public interface PhoneRegisterCallback {
-
-        void onRegisterSuccess(String msg);
-        void onRegisterFailed(String msg);
-
-
-    }
-
-
-
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/UserRegisterFragment.java

@@ -1,229 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment;
-
-
-
-import static cn.yyxx.commsdk.base.constants.Constants.CLICK_INTERVAL;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.text.method.HideReturnsTransformationMethod;
-import android.text.method.PasswordTransformationMethod;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import java.util.Random;
-
-import cn.yyxx.commsdk.base.entity.ResultInfo;
-import cn.yyxx.commsdk.base.internal.ICallback;
-import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.WvPageListDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.SdkPlatformImpl;
-
-
-public class UserRegisterFragment extends BaseFragment {
-    private EditText reg_account_edit,reg_pwd_edit;
-    private ImageView iv_clear_text,iv_show_pwd;
-    private TextView tv_tip,tv_private_policy;
-    private Button reg_compete_btn,btn_phone_register,btn_account_login;
-    private ImageButton close_btn;
-    private CheckBox cb_register;
-    private boolean isShowPwd = true;
-    private long clickLoginTime = 0L;
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(ResourceUtil.getLayoutId(getActivity(),"hnyy_register_dialog"), container, false);
-        view.setClickable(true);
-
-        return view;
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        reg_account_edit = view.findViewById(ResourceUtil.getId(getActivity(),"reg_account_edit"));
-
-
-        reg_pwd_edit= view.findViewById(ResourceUtil.getId(getActivity(),"reg_pwd_edit"));
-
-
-        reg_account_edit.setText("yyz" + getRandom(7));
-
-        reg_pwd_edit.setText(getRandom(7));
-
-
-        cb_register= view.findViewById(ResourceUtil.getId(getActivity(),"cb_register"));
-
-        iv_clear_text = view.findViewById(ResourceUtil.getId(getActivity(),"iv_clear_text"));
-        iv_clear_text.setOnClickListener(this);
-
-        iv_show_pwd = view.findViewById(ResourceUtil.getId(getActivity(),"iv_show_pwd"));
-        iv_show_pwd.setOnClickListener(this);
-
-        tv_tip = view.findViewById(ResourceUtil.getId(getActivity(),"tv_tip"));
-        tv_tip.setOnClickListener(this);
-
-        tv_private_policy = view.findViewById(ResourceUtil.getId(getActivity(),"tv_private_policy"));
-        tv_private_policy.setOnClickListener(this);
-
-        reg_compete_btn = view.findViewById(ResourceUtil.getId(getActivity(),"reg_compete_btn"));
-        reg_compete_btn.setOnClickListener(this);
-
-        btn_phone_register = view.findViewById(ResourceUtil.getId(getActivity(),"btn_phone_register"));
-        btn_phone_register.setOnClickListener(this);
-
-        btn_account_login = view.findViewById(ResourceUtil.getId(getActivity(),"btn_account_login"));
-        btn_account_login.setOnClickListener(this);
-
-
-        close_btn = view.findViewById(ResourceUtil.getId(getActivity(),"close_btn"));
-        close_btn.setOnClickListener(this);
-
-    }
-
-    @Override
-    public void onClick(View v) {
-        super.onClick(v);
-        int id = v.getId();
-        if (id == ResourceUtil.getId(getActivity(), "reg_compete_btn")){
-            if (System.currentTimeMillis() - clickLoginTime < CLICK_INTERVAL) {
-                return;
-            }
-            clickLoginTime = System.currentTimeMillis();
-            startRegister(reg_account_edit.getText().toString(), reg_pwd_edit.getText().toString());
-        }else if(id == ResourceUtil.getId(getActivity(), "iv_clear_text")){
-            reg_account_edit.setText("");
-        }else if(id == ResourceUtil.getId(getActivity(), "iv_show_pwd")){
-
-            if (isShowPwd) {
-
-                isShowPwd = false;
-                reg_pwd_edit.setTransformationMethod(PasswordTransformationMethod.getInstance());
-                iv_show_pwd.setImageResource(ResourceUtil.getMipmapId(getActivity(), "hnyy_close_eye"));
-
-
-            } else {
-                isShowPwd = true;
-                reg_pwd_edit.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
-                iv_show_pwd.setImageResource(ResourceUtil.getMipmapId(getActivity(), "hnyy_open_eye"));
-            }
-
-        }else if(id == ResourceUtil.getId(getActivity(), "tv_tip")){
-
-
-            new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"hnyy_base_dialog"), SdkPlatformImpl.initConfig.agreement_user).show();
-
-
-        }else if(id == ResourceUtil.getId(getActivity(), "tv_private_policy")){
-
-            new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"hnyy_base_dialog"), SdkPlatformImpl.initConfig.agreement_privacy).show();
-
-
-        }else if(id == ResourceUtil.getId(getActivity(), "btn_phone_register")){
-
-            loginImpl.switchFragment(HNYYLoginFragmentTag.PAGE_PHONE_LOGIN,null);
-
-        }else if(id == ResourceUtil.getId(getActivity(), "btn_account_login")){
-
-            loginImpl.switchFragment(HNYYLoginFragmentTag.PAGE_ACCOUNT_LOGIN,null);
-
-        }else if(id == ResourceUtil.getId(getActivity(), "close_btn")){
-
-                loginImpl.switchFragment(HNYYLoginFragmentTag.PAGE_PHONE_LOGIN,null);
-
-        }
-    }
-
-
-
-
-
-    private void startRegister( String account,  String pwd) {
-        if (!cb_register.isChecked()){
-
-
-            return;
-        }
-        if (TextUtils.isEmpty(account)){
-
-            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "hnyy_band_need_account"))).show();
-
-
-            return;
-        }
-
-        if (TextUtils.isEmpty(pwd)){
-            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "hnyy_band_need_pwd"))).show();
-            return;
-        }
-
-        if (isNumeric(account)){
-            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "hnyy_acount_not_only_number"))).show();
-            return;
-
-        }
-
-        if (account.length() < 6 || pwd.length() > 20) {
-            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "hnyy_regist_account_error"))).show();
-
-
-            return;
-        }
-
-        if (pwd.length() < 6 || pwd.length() > 20) {
-
-            new TosUtil(getActivity(), TosUtil.TOAST_ERROR, getActivity().getString(ResourceUtil.getStringId(getActivity(), "hnyy_regist_pwd_error"))).show();
-            return;
-        }
-
-        SdkPlatformImpl.loginViewModel.accountRegister(getActivity(), account, pwd, new ICallback() {
-            @Override
-            public void onResult(int code, String result) {
-                if (code == ResultInfo.CODE_SUCCESS){
-
-                    if (!getActivity().isFinishing()) {
-                        getActivity().finish();
-                        SdkPlatformImpl.getInstance(getActivity()).loginSuccess();
-
-                    }
-
-                }else{
-                    new TosUtil(getActivity(), TosUtil.TOAST_ERROR, result).show();
-                }
-            }
-        });
-
-
-    }
-
-      String getRandom(int length) {
-        String val = "";
-        Random random = new Random();
-        for (int i = 0; i < length; i++) {
-            val += String.valueOf(random.nextInt(10));
-        }
-        return val;
-    }
-
-     boolean isNumeric(String str){
-        for (int i = str.length();--i>=0;){
-            if (!Character.isDigit(str.charAt(i))){
-                return false;
-            }
-        }
-        return true;
-    }
-
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/UserSwitchAccountLoginFragment.java

@@ -1,204 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment;
-
-
-import static cn.yyxx.commsdk.base.constants.Constants.CLICK_INTERVAL;
-
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-
-import cn.yyxx.commsdk.base.entity.ResultInfo;
-import cn.yyxx.commsdk.base.internal.ICallback;
-import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.AccountLoginListView;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.SdkPlatformImpl;
-import cn.yyxx.commsdk.impl.channel.user.UserSession;
-import cn.yyxx.commsdk.impl.channel.user.UserSessionManager;
-
-public class UserSwitchAccountLoginFragment extends BaseFragment{
-
-    private TextView ib_edit_account,tv_other_login_type;
-
-    private AccountLoginListView all_item_1,all_item_2,all_item_3;
-
-
-    private boolean isEditStatus = false;
-
-    private long clickLoginTime = 0L;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(ResourceUtil.getLayoutId(getActivity(),"hnyy_switch_account_login"), container, false);
-        view.setClickable(true);
-        return view;
-
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        ib_edit_account = view.findViewById(ResourceUtil.getId(getActivity(),"ib_edit_account"));
-
-
-        all_item_1 = view.findViewById(ResourceUtil.getId(getActivity(),"all_item_1"));
-        all_item_2 = view.findViewById(ResourceUtil.getId(getActivity(),"all_item_2"));
-        all_item_3 = view.findViewById(ResourceUtil.getId(getActivity(),"all_item_3"));
-        all_item_1.setOnClickListener(this);
-        all_item_2.setOnClickListener(this);
-        all_item_3.setOnClickListener(this);
-        all_item_3.btn_common_use.setVisibility(View.GONE);
-
-
-        ib_edit_account.setOnClickListener(this);
-
-        tv_other_login_type = view.findViewById(ResourceUtil.getId(getActivity(),
-                "tv_other_login_type"));
-        tv_other_login_type.setOnClickListener(this);
-
-        getTopThirdUserInfo();
-
-    }
-
-    @Override
-    public void onClick(View v) {
-        super.onClick(v);
-        int id = v.getId();
-        if (id == ResourceUtil.getId(getActivity(), "ib_edit_account")) {
-            if (isEditStatus){
-
-                Drawable nav_up=getResources().getDrawable(ResourceUtil.getMipmapId(getActivity(),"hnyy_edit_account"));
-                nav_up.setBounds(0, 0, nav_up.getMinimumWidth(), nav_up.getMinimumHeight());
-                ib_edit_account.setCompoundDrawables(null, null, nav_up, null);
-                ib_edit_account.setText("");
-                isEditStatus = false;
-
-                all_item_1.btn_common_use.setVisibility(View.VISIBLE);
-                all_item_2.btn_common_use.setVisibility(View.VISIBLE);
-
-                all_item_1.btn_delete.setVisibility(View.GONE);
-                all_item_2.btn_delete.setVisibility(View.GONE);
-                all_item_3.btn_delete.setVisibility(View.GONE);
-
-
-                all_item_1.setClickable(true);
-                all_item_2.setClickable(true);
-                all_item_3.setClickable(true);
-
-            }else{
-                ib_edit_account.setCompoundDrawables(null, null, null, null);
-
-
-                ib_edit_account.setText(ResourceUtil.getStringId(getActivity(),"hnyy_commit_edit"));
-                isEditStatus = true;
-                all_item_1.btn_delete.setVisibility(View.VISIBLE);
-                all_item_2.btn_delete.setVisibility(View.VISIBLE);
-                all_item_3.btn_delete.setVisibility(View.VISIBLE);
-
-                all_item_1.btn_common_use.setVisibility(View.GONE);
-                all_item_2.btn_common_use.setVisibility(View.GONE);
-
-
-                all_item_1.setClickable(false);
-                all_item_2.setClickable(false);
-                all_item_3.setClickable(false);
-            }
-
-        }else  if (id == ResourceUtil.getId(getActivity(), "all_item_1")) {
-
-            startLogin(all_item_1.tv_account.getText().toString(),all_item_1.password,all_item_1.login_token);
-
-
-        }else  if (id == ResourceUtil.getId(getActivity(), "all_item_2")) {
-
-            startLogin(all_item_2.tv_account.getText().toString(),all_item_2.password,all_item_2.login_token);
-
-        }else  if (id == ResourceUtil.getId(getActivity(), "all_item_3")) {
-
-            startLogin(all_item_3.tv_account.getText().toString(),all_item_3.password,all_item_3.login_token);
-
-        }else  if (id == ResourceUtil.getId(getActivity(), "tv_other_login_type")) {
-            loginImpl.switchFragment(HNYYLoginFragmentTag.PAGE_PHONE_LOGIN,null);
-        }
-    }
-
-    private void startLogin(final String account, final String pwd,final String login_token){
-        if (System.currentTimeMillis() - clickLoginTime < CLICK_INTERVAL) {
-
-            return;
-        }
-        clickLoginTime = System.currentTimeMillis();
-
-        SdkPlatformImpl.loginViewModel.accountLogin(getActivity(),account, pwd,login_token, new ICallback(){
-            @Override
-            public void onResult(int code, String result) {
-                if (code == ResultInfo.CODE_SUCCESS){
-                    if (!getActivity().isFinishing()) {
-                        getActivity().finish();
-                        SdkPlatformImpl.getInstance(getActivity()).loginSuccess();
-
-                    }
-
-                }else{
-
-                    new TosUtil(getActivity(),TosUtil.TOAST_ERROR, result).show();
-
-                }
-            }
-        });
-
-    }
-
-    private void getTopThirdUserInfo() {
-
-        ArrayList<UserSession> sessions =  UserSessionManager.getInstance().getLocalSessionLimit3();
-
-        for (int i=0;i<sessions.size();i++){
-
-            if (i == 0){
-
-                setAccountLoginListView(all_item_1,sessions.get(i));
-
-            }else if(i == 1){
-
-                setAccountLoginListView(all_item_2,sessions.get(i));
-
-
-            }else if(i == 2){
-
-                setAccountLoginListView(all_item_3,sessions.get(i));
-
-            }
-        }
-
-    }
-
-    private void setAccountLoginListView(AccountLoginListView accountLoginListView, UserSession user){
-        accountLoginListView.setVisibility(View.VISIBLE);
-        accountLoginListView.tv_account.setText(user.uname);
-        accountLoginListView.password = user.password;
-        accountLoginListView.login_token = user.login_token;
-        if (isNumeric(user.uname)){
-            accountLoginListView.tv_account_type.setText(ResourceUtil.getStringId(getActivity(),"hnyy_phone_login_user"));
-            accountLoginListView.iv_account_icon.setImageResource(ResourceUtil.getMipmapId(getActivity(), "hnyy_phone_user"));
-        }
-
-    }
-
-
-    boolean isNumeric(String str){
-        for (int i = str.length();--i>=0;){
-            if (!Character.isDigit(str.charAt(i))){
-                return false;
-            }
-        }
-        return true;
-    }
-}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/widget/TosUtil.java

@@ -1,57 +0,0 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget;
-
-import android.content.Context;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import cn.yyxx.commsdk.core.utils.ResourceUtil;
-
-
-public class TosUtil {
-
-    private Toast mToast;
-    private TextView mTextView;
-    private ImageView mImageView;
-    public static String TOAST_GREEN = "green";
-    public static String TOAST_ERROR = "error";
-    public TosUtil(Context context, String color, String msg) {
-
-
-        LayoutInflater inflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-        View view = inflater.inflate(ResourceUtil.getLayoutId(context, "hnyy_toast_style"), null);
-
-
-        mTextView = view.findViewById(ResourceUtil.getId(context, "toast_text"));
-        mTextView.setText(msg);
-
-        mImageView = view.findViewById(ResourceUtil.getId(context, "toast_iv"));
-        if (color.equals(TOAST_GREEN)) {
-            mImageView.setImageResource(ResourceUtil.getMipmapId(context, "hnyy_tips_success"));
-        }
-        else {
-            mImageView.setImageResource(ResourceUtil.getMipmapId(context, "hnyy_tips_error"));
-        }
-
-        if (mToast == null) {
-            mToast = new Toast(context);
-
-        }
-
-        mToast.setDuration(Toast.LENGTH_SHORT);
-        mToast.setView(view);
-        mToast.setGravity(Gravity.CENTER,0,0);
-    }
-
-
-    public void show() {
-        mToast.show();
-
-    }
-
-
-}

library_channel_repository/oppo/build.gradle

@@ -43,7 +43,11 @@ dependencies {
 
     compileOnly project(':library_core')
 
+
     compileOnly project(':library_channel')
 
 
+
+
+
 }

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

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel;
+package cn.yyxx.commsdk.impl.merge.channel;
 
 import android.app.Activity;
 import android.app.Application;
@@ -17,7 +17,7 @@ import cn.yyxx.commsdk.base.internal.feature.IApplication;
 import cn.yyxx.commsdk.base.internal.feature.IFeature;
 import cn.yyxx.commsdk.base.internal.feature.ILifeCycle;
 import cn.yyxx.commsdk.base.internal.feature.IOrder;
-import cn.yyxx.commsdk.impl.channel.oppo.ChannelBridgeImpl;
+import cn.yyxx.commsdk.impl.merge.channel.oppo.ChannelBridgeImpl;
 
 public class ChannelBridge implements IFeature, ILifeCycle, IApplication, IOrder {
 

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

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.msa;
+package cn.yyxx.commsdk.impl.merge.channel.msa;
 
 import android.content.Context;
 

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

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.oppo;
+package cn.yyxx.commsdk.impl.merge.channel.oppo;
 
 import android.app.Activity;
 import android.app.Application;
@@ -30,8 +30,8 @@ import cn.yyxx.commsdk.base.internal.feature.IApplication;
 import cn.yyxx.commsdk.base.internal.feature.IFeature;
 import cn.yyxx.commsdk.base.internal.feature.ILifeCycle;
 import cn.yyxx.commsdk.base.internal.feature.IOrder;
-import cn.yyxx.commsdk.impl.channel.LoginViewModel;
-import cn.yyxx.commsdk.impl.channel.utils.ParamsUtils;
+import cn.yyxx.commsdk.impl.merge.LoginViewModel;
+import cn.yyxx.commsdk.impl.merge.channel.utils.ParamsUtils;
 
 /**
  * @author #Suyghur.

library_channel_repository/oppo/src/main/java/cn/yyxx/commsdk/impl/channel/utils/ParamsUtils.java → library_channel_repository/oppo/src/main/java/cn/yyxx/commsdk/impl/merge/channel/utils/ParamsUtils.java

@@ -1,8 +1,7 @@
-package cn.yyxx.commsdk.impl.channel.utils;
+package cn.yyxx.commsdk.impl.merge.channel.utils;
 
 import android.content.Context;
 
-import cn.yyxx.commsdk.core.utils.ManifestUtils;
 import cn.yyxx.support.PropertiesUtils;
 
 public class ParamsUtils {

library_channel_repository/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cn.yyxx.commsdk.channel">
+    package="cn.yyxx.commsdk.impl.channel.platform.third.channel">
 
 </manifest>

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

@@ -192,6 +192,7 @@ public class CommonOperationManager {
                 if (resultInfo.code ==ResultInfo.CODE_SUCCESS){
                     initBean = InitBean.toBean(resultInfo.data,activity);
                     SdkDrive.setClientSignature(initBean.access_token);
+                    Logger.i(initBean.toString());
                     callback.onResult(resultInfo.CODE_SUCCESS,activity.getString(ResourceUtil.getStringId(activity,"yyxx_comm_init_success")));
                 }else if (resultInfo.code ==ResultInfo.CODE_FAIL){
                     callback.onResult(resultInfo.CODE_FAIL,activity.getString(ResourceUtil.getStringId(activity,"yyxx_comm_init_fail")));

library_core/src/main/java/cn/yyxx/commsdk/core/impl/SdkBridgeImpl.java

@@ -97,9 +97,6 @@ public final class SdkBridgeImpl {
             public void onResult(int code, String result) {
                 callback.onResult(code,result);
                 if (code == ResultInfo.CODE_SUCCESS){
-                    if (CommonOperationManager.initBean.sdk_login ==1){
-
-                    }
                     SdkProxyManager.call(Function.INITIALIZE_SUCCESS,  new Class[]{}, new Object[]{});
                 }
             }

library_channel_repository/hnyy/build.gradle → library_platform/hnyy/build.gradle

@@ -22,6 +22,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
+
 }
 
 dependencies {
@@ -29,8 +30,12 @@ dependencies {
 
     compileOnly project(':library_base')
 
-    compileOnly project(':library_channel')
 
     compileOnly project(':library_core')
 
+
+    compileOnly project(':library_channel')
+
+
+
 }

library_channel_repository/hnyy/src/main/AndroidManifest.xml → library_platform/hnyy/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     package="cn.yyxx.commsdk.platform_hnyy">
     <application>
         <activity
-            android:name="cn.yyxx.commsdk.impl.channel.hnyy.activity.HNYYLoginActivity"
+            android:name="cn.yyxx.commsdk.impl.merge.platform.hnyy.HNYYLoginActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:imeOptions="flagNoFullscreen|flagNoExtractUi"
             android:launchMode="singleTask"

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/platform/SdkPlatformBridge.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/SdkPlatformBridge.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.platform;
+package cn.yyxx.commsdk.impl.merge.platform;
 
 import android.app.Activity;
 import android.app.Application;
@@ -18,7 +18,7 @@ import cn.yyxx.commsdk.base.internal.feature.IApplication;
 import cn.yyxx.commsdk.base.internal.feature.IFeature;
 import cn.yyxx.commsdk.base.internal.feature.ILifeCycle;
 import cn.yyxx.commsdk.base.internal.feature.IOrder;
-import cn.yyxx.commsdk.impl.channel.hnyy.impl.SdkPlatformImpl;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.impl.SdkPlatformImpl;
 
 public class SdkPlatformBridge implements IFeature, ILifeCycle, IApplication,IOrder {
 

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/BaseLoginActivity.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/BaseLoginActivity.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy;
 
 import android.content.Context;
 import android.os.Build;

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/HNYYLoginActivity.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/HNYYLoginActivity.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy;
 
 import android.app.Activity;
 import android.content.Context;
@@ -13,15 +13,15 @@ import android.view.WindowManager;
 
 import cn.yyxx.commsdk.base.internal.ICallback;
 
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.AutoLoginDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.UserAccountLoginFragment;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.UserPhoneLoginFragment;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.UserPhoneLoginSetpwdFragment;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.UserRegisterFragment;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.UserRetrievePwdFragment;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.UserSwitchAccountLoginFragment;
-import cn.yyxx.commsdk.impl.channel.hnyy.impl.SdkPlatformImpl;
-import cn.yyxx.commsdk.platform.user.UserSessionManager;
+import cn.yyxx.commsdk.impl.merge.user.UserSessionManager;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.AutoLoginDialog;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.UserAccountLoginFragment;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.UserPhoneLoginFragment;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.UserPhoneLoginSetpwdFragment;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.UserRegisterFragment;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.UserRetrievePwdFragment;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.UserSwitchAccountLoginFragment;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.impl.SdkPlatformImpl;
 import cn.yyxx.support.AndroidBug5497Workaround;
 import cn.yyxx.support.AppUtils;
 import cn.yyxx.support.ResUtils;

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/HNYYLoginFragmentTag.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/HNYYLoginFragmentTag.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/action/IJsCallback.java

@@ -0,0 +1,5 @@
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.action;
+
+public interface IJsCallback {
+
+}

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/action/PageJsInteraction.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/action/PageJsInteraction.java

@@ -1,9 +1,9 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.action;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.action;
 
 
 import android.webkit.JavascriptInterface;
 
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.JsBaseDialog;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.JsBaseDialog;
 
 
 public class PageJsInteraction {

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/adapter/UserListAdapter.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/adapter/UserListAdapter.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.adapter;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -12,8 +12,8 @@ import android.widget.TextView;
 import java.util.ArrayList;
 
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.platform.user.UserSession;
-import cn.yyxx.commsdk.platform.user.UserSessionManager;
+import cn.yyxx.commsdk.impl.merge.user.UserSession;
+import cn.yyxx.commsdk.impl.merge.user.UserSessionManager;
 
 
 public class UserListAdapter extends BaseAdapter {

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/dialog/AutoLoginDialog.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/dialog/AutoLoginDialog.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.dialog;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -20,9 +20,9 @@ import java.util.TimerTask;
 import cn.yyxx.commsdk.base.entity.ResultInfo;
 import cn.yyxx.commsdk.base.internal.ICallback;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.platform.LoginViewModel;
-import cn.yyxx.commsdk.platform.user.UserSession;
-import cn.yyxx.commsdk.platform.user.UserSessionManager;
+import cn.yyxx.commsdk.impl.merge.LoginViewModel;
+import cn.yyxx.commsdk.impl.merge.user.UserSession;
+import cn.yyxx.commsdk.impl.merge.user.UserSessionManager;
 
 
 public class AutoLoginDialog extends Dialog {

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

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.dialog;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog;
 
 
 import android.app.Dialog;

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/dialog/EmailDialog.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/dialog/EmailDialog.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.dialog;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog;
 
 
 
@@ -23,8 +23,8 @@ import android.widget.ImageView;
 import java.net.URISyntaxException;
 
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.action.PageJsInteraction;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.action.PageJsInteraction;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.widget.TosUtil;
 import cn.yyxx.support.AppUtils;
 
 

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/dialog/HnPayDialog.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/dialog/HnPayDialog.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.dialog;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog;
 
 
 import android.content.Context;
@@ -23,8 +23,8 @@ import cn.yyxx.commsdk.base.internal.ICallback;
 import cn.yyxx.commsdk.base.internal.IRequestCallback;
 import cn.yyxx.commsdk.core.network.SdkRequest;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.action.PageJsInteraction;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.action.PageJsInteraction;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.widget.TosUtil;
 import cn.yyxx.support.AppUtils;
 
 

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/dialog/JsBaseDialog.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/dialog/JsBaseDialog.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.dialog;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog;
 
 
 import android.app.Dialog;

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/dialog/UserCenterDialog.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/dialog/UserCenterDialog.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.dialog;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog;
 
 
 import android.content.Context;
@@ -22,9 +22,9 @@ import android.widget.ImageView;
 import java.net.URISyntaxException;
 
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.action.PageJsInteraction;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.SdkPlatformImpl;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.action.PageJsInteraction;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.widget.TosUtil;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.impl.SdkPlatformImpl;
 import cn.yyxx.support.AppUtils;
 
 

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/dialog/WvPageListDialog.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/dialog/WvPageListDialog.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.dialog;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog;
 
 
 import android.content.Context;
@@ -22,8 +22,8 @@ import android.widget.LinearLayout;
 import java.net.URISyntaxException;
 
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.action.PageJsInteraction;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.action.PageJsInteraction;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.widget.TosUtil;
 import cn.yyxx.support.AppUtils;
 
 public class WvPageListDialog extends JsBaseDialog {

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/floating/DotImageView.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/floating/DotImageView.java

@@ -10,7 +10,7 @@
  * THIS SOFTWARE IS PROVIDED BY SHANGHAI YUEWEN INFORMATION TECHNOLOGY CO., LTD. AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-package cn.yyxx.commsdk.impl.channel.hnyy.floating;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.floating;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/floating/FloatLogoMenu.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/floating/FloatLogoMenu.java

@@ -10,7 +10,7 @@
  * THIS SOFTWARE IS PROVIDED BY SHANGHAI YUEWEN INFORMATION TECHNOLOGY CO., LTD. AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-package cn.yyxx.commsdk.impl.channel.hnyy.floating;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.floating;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
@@ -38,7 +38,7 @@ import android.view.animation.LinearInterpolator;
 import android.widget.LinearLayout;
 
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.CustomExitGameDialog;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.CustomExitGameDialog;
 
 
 /**

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/floating/FloatViewManager.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/floating/FloatViewManager.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.floating;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.floating;
 
 
 import static cn.yyxx.commsdk.base.constants.Constants.CLICK_INTERVAL;
@@ -10,7 +10,7 @@ import android.graphics.BitmapFactory;
 
 import cn.yyxx.commsdk.core.entity.SdkLoginInfo;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.UserCenterDialog;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.UserCenterDialog;
 
 public class FloatViewManager {
 

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/BaseFragment.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/fragment/BaseFragment.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -7,9 +7,9 @@ import android.view.View;
 import android.widget.ImageButton;
 
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.HNYYLoginActivity;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.WvPageListDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.impl.SdkPlatformImpl;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.HNYYLoginActivity;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.WvPageListDialog;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.impl.SdkPlatformImpl;
 
 public class BaseFragment extends android.support.v4.app.Fragment implements View.OnClickListener {
     private ImageButton btn_kefu;

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/UserAccountLoginFragment.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/fragment/UserAccountLoginFragment.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment;
 
 
 import static cn.yyxx.commsdk.base.constants.Constants.CLICK_INTERVAL;
@@ -25,11 +25,12 @@ import java.util.ArrayList;
 import cn.yyxx.commsdk.base.entity.ResultInfo;
 import cn.yyxx.commsdk.base.internal.ICallback;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.user.UserSession;
-import cn.yyxx.commsdk.impl.channel.user.UserSessionManager;
-import cn.yyxx.commsdk.impl.channel.hnyy.adapter.UserListAdapter;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.SdkPlatformImpl;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.HNYYLoginFragmentTag;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.adapter.UserListAdapter;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.widget.TosUtil;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.impl.SdkPlatformImpl;
+import cn.yyxx.commsdk.impl.merge.user.UserSession;
+import cn.yyxx.commsdk.impl.merge.user.UserSessionManager;
 
 public class UserAccountLoginFragment extends BaseFragment {
 

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/UserPhoneLoginFragment.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/fragment/UserPhoneLoginFragment.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment;
 
 
 import static cn.yyxx.commsdk.base.constants.Constants.CLICK_INTERVAL;
@@ -21,9 +21,10 @@ import cn.yyxx.commsdk.base.entity.ResultInfo;
 import cn.yyxx.commsdk.base.internal.ICallback;
 import cn.yyxx.commsdk.base.internal.PhoneLoginCallBack;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.WvPageListDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.SdkPlatformImpl;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.HNYYLoginFragmentTag;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.WvPageListDialog;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.widget.TosUtil;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.impl.SdkPlatformImpl;
 
 
 public class UserPhoneLoginFragment extends BaseFragment {

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/UserPhoneLoginSetpwdFragment.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/fragment/UserPhoneLoginSetpwdFragment.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment;
 
 
 import static cn.yyxx.commsdk.base.constants.Constants.CLICK_INTERVAL;
@@ -21,10 +21,10 @@ import cn.yyxx.commsdk.base.entity.ResultInfo;
 import cn.yyxx.commsdk.base.internal.ICallback;
 import cn.yyxx.commsdk.base.utils.Logger;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.HNYYLoginFragmentTag;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.WvPageListDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.impl.SdkPlatformImpl;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.HNYYLoginFragmentTag;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.WvPageListDialog;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.widget.TosUtil;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.impl.SdkPlatformImpl;
 
 
 public class UserPhoneLoginSetpwdFragment extends BaseFragment {

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/UserRegisterFragment.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/fragment/UserRegisterFragment.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment;
 
 
 
@@ -25,10 +25,10 @@ import java.util.Random;
 import cn.yyxx.commsdk.base.entity.ResultInfo;
 import cn.yyxx.commsdk.base.internal.ICallback;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.HNYYLoginFragmentTag;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.WvPageListDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.impl.SdkPlatformImpl;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.HNYYLoginFragmentTag;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.WvPageListDialog;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.widget.TosUtil;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.impl.SdkPlatformImpl;
 
 
 public class UserRegisterFragment extends BaseFragment {

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/UserRetrievePwdFragment.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/fragment/UserRetrievePwdFragment.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -17,9 +17,10 @@ import android.widget.TextView;
 import cn.yyxx.commsdk.base.entity.ResultInfo;
 import cn.yyxx.commsdk.base.internal.ICallback;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.WvPageListDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.SdkPlatformImpl;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.HNYYLoginFragmentTag;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.WvPageListDialog;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.widget.TosUtil;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.impl.SdkPlatformImpl;
 
 public class UserRetrievePwdFragment extends BaseFragment {
 

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/UserSwitchAccountLoginFragment.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/fragment/UserSwitchAccountLoginFragment.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment;
 
 
 import static cn.yyxx.commsdk.base.constants.Constants.CLICK_INTERVAL;
@@ -16,12 +16,12 @@ import java.util.ArrayList;
 import cn.yyxx.commsdk.base.entity.ResultInfo;
 import cn.yyxx.commsdk.base.internal.ICallback;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.HNYYLoginFragmentTag;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.AccountLoginListView;
-import cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget.TosUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.impl.SdkPlatformImpl;
-import cn.yyxx.commsdk.platform.user.UserSession;
-import cn.yyxx.commsdk.platform.user.UserSessionManager;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.HNYYLoginFragmentTag;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.widget.AccountLoginListView;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.widget.TosUtil;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.impl.SdkPlatformImpl;
+import cn.yyxx.commsdk.impl.merge.user.UserSession;
+import cn.yyxx.commsdk.impl.merge.user.UserSessionManager;
 
 public class UserSwitchAccountLoginFragment extends BaseFragment{
 

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/widget/AccountLoginListView.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/fragment/widget/AccountLoginListView.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.widget;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -11,8 +11,8 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.CustomExitGameDialog;
-import cn.yyxx.commsdk.impl.channel.user.UserSessionManager;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.CustomExitGameDialog;
+import cn.yyxx.commsdk.impl.merge.user.UserSessionManager;
 
 
 public class AccountLoginListView extends RelativeLayout {

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/fragment/widget/TosUtil.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/fragment/widget/TosUtil.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy.fragment.widget;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.fragment.widget;
 
 import android.content.Context;
 import android.view.Gravity;

library_channel_repository/hnyy/src/main/java/cn/yyxx/commsdk/impl/channel/hnyy/SdkPlatformImpl.java → library_platform/hnyy/src/main/java/cn/yyxx/commsdk/impl/merge/platform/hnyy/impl/SdkPlatformImpl.java

@@ -1,4 +1,4 @@
-package cn.yyxx.commsdk.impl.channel.hnyy;
+package cn.yyxx.commsdk.impl.merge.platform.hnyy.impl;
 
 import android.app.Activity;
 import android.app.Application;
@@ -28,13 +28,14 @@ import cn.yyxx.commsdk.base.utils.Logger;
 import cn.yyxx.commsdk.core.entity.SdkLoginInfo;
 import cn.yyxx.commsdk.core.network.SdkRequest;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
-import cn.yyxx.commsdk.impl.channel.LoginViewModel;
-import cn.yyxx.commsdk.impl.channel.hnyy.activity.HNYYLoginActivity;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.CustomExitGameDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.EmailDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.HnPayDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.dialog.WvPageListDialog;
-import cn.yyxx.commsdk.impl.channel.hnyy.floating.FloatViewManager;
+
+import cn.yyxx.commsdk.impl.merge.LoginViewModel;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.HNYYLoginActivity;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.CustomExitGameDialog;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.EmailDialog;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.HnPayDialog;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.dialog.WvPageListDialog;
+import cn.yyxx.commsdk.impl.merge.platform.hnyy.floating.FloatViewManager;
 import cn.yyxx.support.scheduler.ScheduledWorker;
 
 public class SdkPlatformImpl implements IFeature, ILifeCycle, IApplication, IOrder