v1.0.0开发：增加初始化和登录回调

demo/src/main/java/com/demo/xinrui/DemoActivity.kt

@@ -11,6 +11,7 @@ import android.widget.LinearLayout
 import android.widget.ScrollView
 import android.widget.TextView
 import cn.yyxx.support.hawkeye.LogUtils
+import cn.yyxx.support.hawkeye.ToastUtils
 import com.yyrh.core.entity.Session
 import com.yyrh.core.impl.login.LoginActivity
 import com.yyrh.sdk.SDKEntry
@@ -57,17 +58,20 @@ class DemoActivity : Activity(), View.OnClickListener {
         LogUtils.handler = handler
         SDKEntry.getSdkInstance().initSdk(this, object : InitCallback {
             override fun onInitSuccess(msg: String?) {
-
+                ToastUtils.toastInfo(this@DemoActivity, msg)
             }
 
             override fun onInitFailed(msg: String?) {
+                ToastUtils.toastInfo(this@DemoActivity, msg)
             }
 
-            override fun onInitError(_strError: String?) {
+            override fun onInitError(msg: String?) {
+                ToastUtils.toastInfo(this@DemoActivity, msg)
+
             }
 
             override fun onGetOaid(isSuccess: Boolean, oaid: String?) {
-
+                ToastUtils.toastInfo(this@DemoActivity, oaid)
             }
 
             override fun onShowGameExit() {
@@ -125,38 +129,19 @@ class DemoActivity : Activity(), View.OnClickListener {
                 1 -> {
                     SDKEntry.getSdkInstance().login(this@DemoActivity, object : LoginCallback {
                         override fun onLoginSuccess(token: String?) {
-
+                            ToastUtils.toastInfo(this@DemoActivity, "登录成功，token: $token")
                         }
 
                         override fun onLoginFailed(msg: String?) {
+                            ToastUtils.toastInfo(this@DemoActivity, "登录失败，msg: $msg")
                         }
 
                         override fun onLoginError(msg: String?) {
+                            ToastUtils.toastInfo(this@DemoActivity, "登录失败，msg: $msg")
                         }
 
                     })
                 }
-                2 -> {
-//                    for (i in 0 until 6) {
-//                        val session = Session()
-//                        session.userId = "user_id_$i"
-//                        session.userName = "user_name_$i"
-//                        session.pwd = "pwd123456"
-//                        SessionUtils.getInstance().saveSession(session)
-//                    }
-                    val list = SessionUtils.getInstance().localSessionLimit3
-                    for (item in list) {
-                        YYLog.d(item.toString())
-                    }
-                }
-                6 -> {
-                    LoginActivity.start(this@DemoActivity, false, false) { code, result ->
-
-                    }
-                }
-                7 -> {
-                    TipsToast(this@DemoActivity, "测试测试测试", false).show()
-                }
             }
         }
     }

library_xinrui/src/main/java/com/yyrh/core/impl/login/LoginActivity.java

@@ -34,15 +34,20 @@ import cn.yyxx.support.ResUtils;
 public class LoginActivity extends FragmentActivity {
 
     private static boolean isLandscape = false;
+    public static IImplCallback implCallback = null;
+    private static boolean autoLogin = true;
     private AccountLauncherFragment accountLauncherFragment;
     private QuickRegisterFragment quickRegisterFragment;
     private PhoneRegisterFragment phoneRegisterFragment;
     private final LinkedList<String> fragmentStack = new LinkedList<>();
     private String currentFragmentTag;
-
     private Dialog agreementDialog;
 
-    public static void start(Activity activity, boolean autoLogin, boolean isLand, IImplCallback callback) {
+
+    public static void start(Activity activity, boolean auto, boolean isLand, IImplCallback callback) {
+        isLandscape = isLand;
+        autoLogin = auto;
+        implCallback = callback;
         activity.startActivity(new Intent(activity, LoginActivity.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
     }
 
@@ -50,7 +55,6 @@ public class LoginActivity extends FragmentActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         initView();
     }
 

library_xinrui/src/main/java/com/yyrh/core/impl/login/fragment/AccountLauncherFragment.java

@@ -155,17 +155,19 @@ public class AccountLauncherFragment extends Fragment implements View.OnClickLis
                         session.userName = userName;
                         session.pwd = pwd;
                         SessionUtils.getInstance().saveSession(session);
-                    } catch (JSONException e) {
+                        TipsToast.showSuccessMsg(getActivity(), resultInfo.msg);
+                        LoginActivity.implCallback.onResult(1, jsonObject.getString("token"));
+                        getActivity().finish();
+                    } catch (Exception e) {
                         e.printStackTrace();
                     }
-                    TipsToast.showSuccessMsg(getActivity(), resultInfo.msg);
-                    getActivity().finish();
                 } else {
                     String msg = resultInfo.msg;
                     if (TextUtils.isEmpty(msg)) {
                         msg = "登录发生异常，请重试";
                     }
                     TipsToast.showErrorMsg(getActivity(), msg);
+                    LoginActivity.implCallback.onResult(0, msg);
                 }
             }
         });

library_xinrui/src/main/java/com/yyrh/core/impl/login/fragment/PhoneRegisterFragment.java

@@ -214,17 +214,19 @@ public class PhoneRegisterFragment extends Fragment implements View.OnClickListe
                         session.userName = jsonObject.getString("uname");
                         session.pwd = pwd;
                         SessionUtils.getInstance().saveSession(session);
+                        TipsToast.showSuccessMsg(getActivity(), resultInfo.msg);
+                        LoginActivity.implCallback.onResult(1, jsonObject.getString("token"));
+                        getActivity().finish();
                     } catch (JSONException e) {
                         e.printStackTrace();
                     }
-                    TipsToast.showSuccessMsg(getActivity(), resultInfo.msg);
-                    getActivity().finish();
                 } else {
                     String msg = resultInfo.msg;
                     if (TextUtils.isEmpty(msg)) {
                         msg = "注册发生异常，请重试";
                     }
                     TipsToast.showErrorMsg(getActivity(), msg);
+                    LoginActivity.implCallback.onResult(0, msg);
                 }
             }
         });

library_xinrui/src/main/java/com/yyrh/core/impl/login/fragment/QuickRegisterFragment.java

@@ -169,17 +169,20 @@ public class QuickRegisterFragment extends Fragment implements View.OnClickListe
                         session.userName = userName;
                         session.pwd = pwd;
                         SessionUtils.getInstance().saveSession(session);
+                        TipsToast.showSuccessMsg(getActivity(), resultInfo.msg);
+                        LoginActivity.implCallback.onResult(1, jsonObject.getString("token"));
+                        getActivity().finish();
                     } catch (JSONException e) {
                         e.printStackTrace();
                     }
-                    TipsToast.showSuccessMsg(getActivity(), resultInfo.msg);
-                    getActivity().finish();
+
                 } else {
                     String msg = resultInfo.msg;
                     if (TextUtils.isEmpty(msg)) {
                         msg = "注册发生异常，请重试";
                     }
                     TipsToast.showErrorMsg(getActivity(), msg);
+                    LoginActivity.implCallback.onResult(0, msg);
                 }
             }
         });

library_xinrui/src/main/java/com/yyrh/factory/SdkManager.java

@@ -8,6 +8,7 @@ import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.os.Build;
@@ -57,6 +58,7 @@ public class SdkManager {
 
     public InitBean initBean = null;
     public String channelTag = "";
+    public boolean isLandscape = false;
     private static boolean hasReadIds = false;
     private static String deviceIds = "";
 
@@ -214,8 +216,8 @@ public class SdkManager {
         SDKDrive.getInstance().initDrive(application);
         if (Host.BASEURL.equals("https://sdkapi.ykklayo.com")) {
             Host.MODEL = 1;
-        }else {
-            Host.MODEL=0;
+        } else {
+            Host.MODEL = 0;
         }
     }
 
@@ -226,6 +228,9 @@ public class SdkManager {
 
     public void initSdk(final Activity activity, final InitCallback callback, boolean isDebug) {
         this.initCallback = callback;
+        int orientation = activity.getRequestedOrientation();
+        this.isLandscape = orientation != ActivityInfo.SCREEN_ORIENTATION_PORTRAIT && orientation != ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT &&
+                orientation != ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT && orientation != ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
         ChannelSDK.getInstance().SDKInit(activity, sdkCallback);
         initDeviceInfo(activity);
 

library_xinrui/src/main/java/com/yyrh/factory/YyrhSdkOperation.java

@@ -26,13 +26,13 @@ public class YyrhSdkOperation implements ISdkOperation {
 
     @Override
     public void login(Activity activity) {
-        LoginActivity.start(activity, false, false, new IImplCallback() {
+        LoginActivity.start(activity, true, SdkManager.defaultManager().isLandscape, new IImplCallback() {
             @Override
             public void onResult(int code, String result) {
                 if (code == 1) {
-                    SdkManager.defaultManager().sdkCallback.onLoginSuccess("");
+                    SdkManager.defaultManager().sdkCallback.onLoginSuccess(result);
                 } else {
-                    SdkManager.defaultManager().sdkCallback.onLoginError("");
+                    SdkManager.defaultManager().sdkCallback.onLoginError(result);
                 }
             }
         });

library_xinrui/src/main/java/com/yyrh/utils/Utils.java

@@ -310,14 +310,9 @@ public class Utils {
         return SDKSettings.UserCentUrl + operation + params.substring(0, params.length() - 1);
     }
 
-    public static boolean isLandscape(Activity act) {
-
-        int orientation = act.getRequestedOrientation();
-        if (orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || orientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT ||
-                orientation == ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT || orientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT) {
-            return false;
-        } else {
-            return true;
-        }
+    public static boolean isLandscape(Activity activity) {
+        int orientation = activity.getRequestedOrientation();
+        return orientation != ActivityInfo.SCREEN_ORIENTATION_PORTRAIT && orientation != ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT &&
+                orientation != ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT && orientation != ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
     }
 }