沉浸式主题代码同步

d52dd3c4 · 宁斌 · 75ed3aab · d52dd3c4 · d52dd3c4 · d52dd3c4
Commit d52dd3c4 authored Apr 20, 2021 by 宁斌
11 changed files
--- a/component-login/src/main/java/com/gingersoft/gsa/cloud/login/ComponentLogin.java
+++ b/component-login/src/main/java/com/gingersoft/gsa/cloud/login/ComponentLogin.java
 package com.gingersoft.gsa.cloud.login;
 import android.content.Intent;
 import com.billy.cc.core.component.CC;
 import com.billy.cc.core.component.CCResult;
 import com.billy.cc.core.component.CCUtil;
@@ -11,9 +10,9 @@ import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
 import com.gingersoft.gsa.cloud.component.ComponentAction;
 import com.gingersoft.gsa.cloud.component.ComponentName;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.ChooseRestaurantActivity;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.LoginActivity;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.SwitchServerActivity;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.WelcomeActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.WelcomeActivity;
 import com.gingersoft.gsa.cloud.pay.pos.hyweb.command.CommandImpl;

--- a/component-login/src/main/java/com/gingersoft/gsa/cloud/login/di/component/LoginComponent.java
+++ b/component-login/src/main/java/com/gingersoft/gsa/cloud/login/di/component/LoginComponent.java
@@ -2,13 +2,12 @@ package com.gingersoft.gsa.cloud.login.di.component;
 import dagger.BindsInstance;
 import dagger.Component;
-import com.jess.arms.di.component.AppComponent;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
+import com.jess.arms.di.component.AppComponent;
 import com.gingersoft.gsa.cloud.login.di.module.LoginModule;
 import com.gingersoft.gsa.cloud.login.mvp.contract.LoginContract;
 import com.jess.arms.di.scope.ActivityScope;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.LoginActivity;
 /**

--- a/component-login/src/main/java/com/gingersoft/gsa/cloud/login/di/component/WelcomeComponent.java
+++ b/component-login/src/main/java/com/gingersoft/gsa/cloud/login/di/component/WelcomeComponent.java
@@ -4,7 +4,6 @@ import com.gingersoft.gsa.cloud.login.di.module.WelcomeModule;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.WelcomeActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.di.scope.ActivityScope;
 import dagger.Component;
 @ActivityScope

--- a/component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/contract/LoginInterfaceImpl.java
+++ b/component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/contract/LoginInterfaceImpl.java
@@ -4,10 +4,8 @@ import android.app.Dialog;
 import android.content.Intent;
 import android.view.Gravity;
 import android.widget.LinearLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.billy.cc.core.component.CC;
 import com.gingersoft.gsa.cloud.common.core.login.LoginBean;
 import com.gingersoft.gsa.cloud.common.core.restaurant.BrandInfo;
@@ -25,8 +23,8 @@ import com.gingersoft.gsa.cloud.login.R;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.login.mvp.presenter.BaseLoginPresenter;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.ChooseRestaurantActivity;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.LoginActivity;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.SwitchServerActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
 import com.gingersoft.gsa.cloud.login.mvp.ui.adapter.LoginLimitAdapter;
 import com.gingersoft.gsa.cloud.ui.utils.DialogUtils;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.ChooseRestaurantDialog;

--- a/component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/BaseLoginPresenter.java
+++ b/component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/BaseLoginPresenter.java
@@ -15,7 +15,7 @@ import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
 import com.gingersoft.gsa.cloud.common.utils.okhttpUtils.OkHttp3Utils;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.login.mvp.contract.BaseLoginContract;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.LoginActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.http.imageloader.ImageLoader;
 import com.jess.arms.integration.AppManager;

--- a/component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/ChooseRestaurantPresenter.java
+++ b/component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/ChooseRestaurantPresenter.java
 package com.gingersoft.gsa.cloud.login.mvp.presenter;
 import android.app.Application;
 import com.gingersoft.gsa.cloud.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.common.core.restaurant.bean.BrandsBean;
 import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
 import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.login.mvp.contract.ChooseRestaurantContract;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.LoginActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.jess.arms.di.scope.ActivityScope;

--- a/component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/LoginPresenter.java
+++ b/component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/LoginPresenter.java
@@ -2,22 +2,19 @@ package com.gingersoft.gsa.cloud.login.mvp.presenter;
 import android.app.Application;
 import android.text.TextUtils;
 import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
 import com.gingersoft.gsa.cloud.common.oaId.DeviceID;
 import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
 import com.gingersoft.gsa.cloud.login.R;
 import com.gingersoft.gsa.cloud.login.mvp.contract.LoginContract;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.LoginActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.http.imageloader.ImageLoader;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.utils.ArmsUtils;
 import com.jess.arms.utils.PermissionUtil;
 import com.tbruyelle.rxpermissions2.RxPermissions;
 import java.util.List;
 import javax.inject.Inject;
 import me.jessyan.rxerrorhandler.core.RxErrorHandler;

--- a/component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/ChooseRestaurantActivity.java
+++ b/component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/ChooseRestaurantActivity.java
@@ -7,13 +7,11 @@ import android.os.Bundle;
 import android.view.Gravity;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.billy.cc.core.component.CC;
 import com.gingersoft.gsa.cloud.common.constans.AppConstans;
 import com.gingersoft.gsa.cloud.common.core.restaurant.BrandInfo;
@@ -34,6 +32,8 @@ import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.login.di.module.ChooseRestaurantModule;
 import com.gingersoft.gsa.cloud.login.mvp.contract.ChooseRestaurantContract;
 import com.gingersoft.gsa.cloud.login.mvp.presenter.ChooseRestaurantPresenter;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.WelcomeActivity;
 import com.gingersoft.gsa.cloud.login.mvp.ui.adapter.LoginLimitAdapter;
 import com.gingersoft.gsa.cloud.ui.adapter.BasTextSectiontAdapter;
 import com.gingersoft.gsa.cloud.ui.bean.view.SectionHeader;
@@ -48,15 +48,11 @@ import com.qmuiteam.qmui.widget.QMUITopBar;
 import com.qmuiteam.qmui.widget.section.QMUISection;
 import com.qmuiteam.qmui.widget.section.QMUIStickySectionAdapter;
 import com.qmuiteam.qmui.widget.section.QMUIStickySectionLayout;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import javax.inject.Inject;
 import butterknife.BindView;
 import static com.jess.arms.utils.Preconditions.checkNotNull;

--- a/component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/WelcomeActivity.java
+++ b/component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/WelcomeActivity.java
-package com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity;
+package com.gingersoft.gsa.cloud.login.mvp.ui.activity;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ -41,6 +41,7 @@ import com.gingersoft.gsa.cloud.login.mvp.bean.GuideBean;
 import com.gingersoft.gsa.cloud.login.mvp.contract.LoginInterfaceImpl;
 import com.gingersoft.gsa.cloud.login.mvp.contract.WelcomeContract;
 import com.gingersoft.gsa.cloud.login.mvp.presenter.WelcomePresenter;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.ChooseRestaurantActivity;
 import com.gingersoft.gsa.cloud.login.mvp.ui.adapter.GuideAdapter;
 import com.gingersoft.gsa.cloud.ui.widget.Indicator.UIndicator;
 import com.gyf.immersionbar.ImmersionBar;
@@ -137,10 +138,10 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem
                            intent.putExtra("form", clazz.getName());
                            launchActivity(intent);
                        } else {
-                            startActivity(new Intent(mContext, LoginActivity.class));
+                            startActivity(new Intent(mContext, com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity.class));
                        }
                    } else {
-                        startActivity(new Intent(mContext, LoginActivity.class));
+                        startActivity(new Intent(mContext, com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity.class));
                    }
                }
            }
@@ -336,7 +337,7 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem
            //去登陸頁，設置下次不顯示引導頁
            //立即體驗
            SPUtils.put(UserConstans.IS_GUIDE, false);
-            startActivity(new Intent(mContext, LoginActivity.class));
+            startActivity(new Intent(mContext, com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity.class));
        }
    }
 }
--- a/component-supply-chain/src/main/res/layout/item_image.xml
+++ b/component-supply-chain/src/main/res/layout/item_image.xml
@@ -3,14 +3,22 @@
    android:layout_width="wrap_content"
    android:layout_height="wrap_content">
+<!--    <ImageView-->
+<!--        android:id="@+id/iv_img"-->
+<!--        android:layout_width="@dimen/dp_58"-->
+<!--        android:layout_height="@dimen/dp_58"-->
+<!--        android:layout_marginTop="@dimen/dp_8"-->
+<!--        android:layout_marginRight="@dimen/dp_8"-->
+<!--        android:scaleType="fitXY"-->
+<!--        android:src="@drawable/awe" />-->
    <ImageView
        android:id="@+id/iv_img"
        android:layout_width="@dimen/dp_58"
        android:layout_height="@dimen/dp_58"
        android:layout_marginTop="@dimen/dp_8"
        android:layout_marginRight="@dimen/dp_8"
-        android:scaleType="fitXY"
+        android:scaleType="fitXY" />
-        android:src="@drawable/awe" />
    <ImageView
        android:id="@+id/iv_img_delete"

--- a/library-common/src/main/java/com/gingersoft/gsa/cloud/common/utils/encryption/Aes.java
+++ b/library-common/src/main/java/com/gingersoft/gsa/cloud/common/utils/encryption/Aes.java
@@ -3,13 +3,10 @@ package com.gingersoft.gsa.cloud.common.utils.encryption;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
 import javax.crypto.spec.SecretKeySpec;
-import Decoder.BASE64Decoder;
 /**
 * AES的加密和解密
 *
@@ -170,7 +167,7 @@ public class Aes {
     * 测试
     */
    public static void main(String[] args) {
-        String content = "1.0_1577277614752_1be33e87b9024e08800c458df235adca";
+        String content = "abc";
        System.out.println("加密前：" + content);
        System.out.println("加密密钥和解密密钥：" + KEY);
        String encrypt = aesEncrypt(content, KEY).replaceAll("\r|\n", "");;