CNLive Android Team / newModuleStrike · Commits

Commit 67acd2ba50b980ca1e01d676963ed11707c4bac6

Authored by 韩亚云
1 parent c4a42b75

代码冲突解决

Inline Side-by-side
Showing 14 changed files with 33 additions and 13 deletions
cloud/third_tool/src/debug/java/com/cnlive/strike/debug/wxapi/WXEntryActivity.java
  View file @67acd2b
@@ -7,6 +7,7 @@ import android.os.Bundle; @@ -7,6 +7,7 @@ import android.os.Bundle;
7 import android.text.TextUtils; 7 import android.text.TextUtils;
8 import android.widget.Toast; 8 import android.widget.Toast;
9 9
  10 +import com.cnlive.cloud.user.auth.UserService;
10 import com.cnlive.core.libs.base.application.AppConfig; 11 import com.cnlive.core.libs.base.application.AppConfig;
11 import com.cnlive.core.libs.base.util.AlertUtil; 12 import com.cnlive.core.libs.base.util.AlertUtil;
12 import com.cnlive.share.BuildConfig; 13 import com.cnlive.share.BuildConfig;
@@ -17,7 +18,6 @@ import com.cnlive.login.observer.WechatLoginObservable; @@ -17,7 +18,6 @@ import com.cnlive.login.observer.WechatLoginObservable;
17 import com.cnlive.share.observable.WechatShareObservable; 18 import com.cnlive.share.observable.WechatShareObservable;
18 import com.cnlive.share.util.DateTimeUtil; 19 import com.cnlive.share.util.DateTimeUtil;
19 import com.cnlive.share.util.OkHttpUtils; 20 import com.cnlive.share.util.OkHttpUtils;
20 -import com.cnlive.strike.user.auth.UserService;  
21 import com.google.gson.Gson; 21 import com.google.gson.Gson;
22 import com.tencent.mm.opensdk.modelbase.BaseReq; 22 import com.tencent.mm.opensdk.modelbase.BaseReq;
23 import com.tencent.mm.opensdk.modelbase.BaseResp; 23 import com.tencent.mm.opensdk.modelbase.BaseResp;
cloud/third_tool/src/main/java/com/cnlive/login/model/ThirdLoginInfo.java
  View file @67acd2b
1 package com.cnlive.login.model; 1 package com.cnlive.login.model;
2 2
3 3
  4 +import com.cnlive.cloud.user.frame.data.OtherUserInfo;
  5 +
4 /** 6 /**
5 * 作者: 吴奎庆 7 * 作者: 吴奎庆
6 * <p> 8 * <p>
cloud/third_tool/src/main/java/com/cnlive/login/utils/ThirdLoginUtil.java
  View file @67acd2b
@@ -3,7 +3,7 @@ package com.cnlive.login.utils; @@ -3,7 +3,7 @@ package com.cnlive.login.utils;
3 import android.content.Context; 3 import android.content.Context;
4 import android.text.TextUtils; 4 import android.text.TextUtils;
5 5
6 -import com.cnlive.login.model.OtherUserInfo; 6 +import com.cnlive.cloud.user.frame.data.OtherUserInfo;
7 import com.cnlive.login.model.ThirdLoginInfo; 7 import com.cnlive.login.model.ThirdLoginInfo;
8 import com.cnlive.login.observer.ThirdLoginObservable; 8 import com.cnlive.login.observer.ThirdLoginObservable;
9 import com.sina.weibo.sdk.auth.Oauth2AccessToken; 9 import com.sina.weibo.sdk.auth.Oauth2AccessToken;
cloud/user/build.gradle
  View file @67acd2b
@@ -49,6 +49,6 @@ dependencies { @@ -49,6 +49,6 @@ dependencies {
49 implementation "com.cnlive.libs:emoj:$rootProject.libEmoj" 49 implementation "com.cnlive.libs:emoj:$rootProject.libEmoj"
50 //图片选择器 50 //图片选择器
51 implementation "com.cnlive.libs:mediapicker:$rootProject.libMediaPicker" 51 implementation "com.cnlive.libs:mediapicker:$rootProject.libMediaPicker"
52 - implementation project(path: ':cloud:third_tool') 52 +// implementation project(path: ':cloud:third_tool')
53 53
54 } 54 }
cloud/third_tool/src/main/java/com/cnlive/login/model/OtherUserInfo.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/data/OtherUserInfo.java
  View file @67acd2b
1 -package com.cnlive.login.model; 1 +package com.cnlive.cloud.user.frame.data;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 4
cloud/user/src/main/java/com/cnlive/cloud/user/frame/presenter/QuickLoginPresenter.java
  View file @67acd2b
@@ -7,6 +7,7 @@ import android.text.TextUtils; @@ -7,6 +7,7 @@ import android.text.TextUtils;
7 import com.cnlive.cloud.user.R; 7 import com.cnlive.cloud.user.R;
8 import com.cnlive.cloud.user.UserUtilAction; 8 import com.cnlive.cloud.user.UserUtilAction;
9 import com.cnlive.cloud.user.auth.UserService; 9 import com.cnlive.cloud.user.auth.UserService;
  10 +import com.cnlive.cloud.user.frame.data.OtherUserInfo;
10 import com.cnlive.cloud.user.frame.data.QuickLoginData; 11 import com.cnlive.cloud.user.frame.data.QuickLoginData;
11 import com.cnlive.cloud.user.frame.view.QuickLoginView; 12 import com.cnlive.cloud.user.frame.view.QuickLoginView;
12 import com.cnlive.cloud.user.model.CNLiveUserInfo; 13 import com.cnlive.cloud.user.model.CNLiveUserInfo;
@@ -20,7 +21,6 @@ import com.cnlive.core.network.model.BaseResult; @@ -20,7 +21,6 @@ import com.cnlive.core.network.model.BaseResult;
20 import com.cnlive.core.network.HttpConn; 21 import com.cnlive.core.network.HttpConn;
21 import com.cnlive.core.network.NetCallBack; 22 import com.cnlive.core.network.NetCallBack;
22 import com.cnlive.core.libs.base.util.TimerWaitUtil; 23 import com.cnlive.core.libs.base.util.TimerWaitUtil;
23 -import com.cnlive.login.model.OtherUserInfo;  
24 24
25 import java.util.Arrays; 25 import java.util.Arrays;
26 import java.util.Collections; 26 import java.util.Collections;
cloud/user/src/main/java/com/cnlive/cloud/user/frame/view/QuickLoginView.java
  View file @67acd2b
@@ -17,6 +17,7 @@ import android.view.View; @@ -17,6 +17,7 @@ import android.view.View;
17 17
18 import com.alibaba.android.arouter.launcher.ARouter; 18 import com.alibaba.android.arouter.launcher.ARouter;
19 import com.cnlive.cloud.user.R; 19 import com.cnlive.cloud.user.R;
  20 +import com.cnlive.cloud.user.frame.data.OtherUserInfo;
20 import com.cnlive.cloud.user.model.LoginSuccessInfo; 21 import com.cnlive.cloud.user.model.LoginSuccessInfo;
21 import com.cnlive.cloud.user.sms.OnSmsCatchListener; 22 import com.cnlive.cloud.user.sms.OnSmsCatchListener;
22 import com.cnlive.cloud.user.sms.SmsVerifyCatcher; 23 import com.cnlive.cloud.user.sms.SmsVerifyCatcher;
@@ -27,7 +28,6 @@ import com.cnlive.core.libs.base.application.AppConfig; @@ -27,7 +28,6 @@ import com.cnlive.core.libs.base.application.AppConfig;
27 import com.cnlive.core.libs.base.frame.view.BaseView; 28 import com.cnlive.core.libs.base.frame.view.BaseView;
28 import com.cnlive.core.libs.base.util.AlertUtil; 29 import com.cnlive.core.libs.base.util.AlertUtil;
29 import com.cnlive.core.libs.base.util.DoublePressed; 30 import com.cnlive.core.libs.base.util.DoublePressed;
30 -import com.cnlive.login.model.OtherUserInfo;  
31 import java.util.regex.Matcher; 31 import java.util.regex.Matcher;
32 import java.util.regex.Pattern; 32 import java.util.regex.Pattern;
33 33
cloud/user/src/main/java/com/cnlive/cloud/user/ui/activity/LoginDialogActivity.java
  View file @67acd2b
@@ -13,18 +13,19 @@ import androidx.annotation.NonNull; @@ -13,18 +13,19 @@ import androidx.annotation.NonNull;
13 import androidx.databinding.ViewDataBinding; 13 import androidx.databinding.ViewDataBinding;
14 14
15 import com.alibaba.android.arouter.facade.annotation.Route; 15 import com.alibaba.android.arouter.facade.annotation.Route;
  16 +import com.cnlive.cloud.user.databinding.ActivityLoginDialogBinding;
16 import com.cnlive.core.libs.base.application.AppConfig; 17 import com.cnlive.core.libs.base.application.AppConfig;
17 import com.cnlive.core.libs.base.frame.activity.BaseActivity; 18 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
18 import com.cnlive.core.libs.base.util.DoublePressed; 19 import com.cnlive.core.libs.base.util.DoublePressed;
19 import com.cnlive.core.libs.base.util.ScreenUtils; 20 import com.cnlive.core.libs.base.util.ScreenUtils;
20 import com.cnlive.cloud.user.R; 21 import com.cnlive.cloud.user.R;
21 -import com.cnlive.cloud.user.databinding.ActivityLoginDialogBinding;  
22 import com.cnlive.cloud.user.frame.data.QuickLoginData; 22 import com.cnlive.cloud.user.frame.data.QuickLoginData;
23 import com.cnlive.cloud.user.frame.presenter.LoginDialogPresenter; 23 import com.cnlive.cloud.user.frame.presenter.LoginDialogPresenter;
24 import com.cnlive.cloud.user.frame.view.LoginDialogView; 24 import com.cnlive.cloud.user.frame.view.LoginDialogView;
25 import com.cnlive.cloud.user.router.user.UserAction; 25 import com.cnlive.cloud.user.router.user.UserAction;
26 import com.cnlive.cloud.user.sms.SmsVerifyCatcher; 26 import com.cnlive.cloud.user.sms.SmsVerifyCatcher;
27 import com.cnlive.cloud.user.ui.adapter.UserListAdapter; 27 import com.cnlive.cloud.user.ui.adapter.UserListAdapter;
  28 +
28 import static com.cnlive.cloud.user.ui.activity.LoginActivity.TAG_CLICK_AD; 29 import static com.cnlive.cloud.user.ui.activity.LoginActivity.TAG_CLICK_AD;
29 30
30 /** 31 /**
cloud/user/src/main/java/com/cnlive/cloud/user/ui/activity/PersonalDataActivity.java
  View file @67acd2b
@@ -12,13 +12,13 @@ import com.alibaba.android.arouter.facade.annotation.Route; @@ -12,13 +12,13 @@ import com.alibaba.android.arouter.facade.annotation.Route;
12 import com.alibaba.android.arouter.launcher.ARouter; 12 import com.alibaba.android.arouter.launcher.ARouter;
13 import com.bumptech.glide.load.engine.DiskCacheStrategy; 13 import com.bumptech.glide.load.engine.DiskCacheStrategy;
14 import com.bumptech.glide.request.RequestOptions; 14 import com.bumptech.glide.request.RequestOptions;
  15 +import com.cnlive.cloud.user.databinding.ActivityPersonalDataBinding;
15 import com.cnlive.core.libs.base.frame.activity.BaseActivity; 16 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
16 import com.cnlive.core.libs.base.ui.widget.BottomMenuDialog; 17 import com.cnlive.core.libs.base.ui.widget.BottomMenuDialog;
17 import com.cnlive.core.libs.base.util.GlideUtil; 18 import com.cnlive.core.libs.base.util.GlideUtil;
18 import com.cnlive.core.libs.base.util.StatusBarConfig; 19 import com.cnlive.core.libs.base.util.StatusBarConfig;
19 import com.cnlive.cloud.user.R; 20 import com.cnlive.cloud.user.R;
20 import com.cnlive.cloud.user.auth.UserService; 21 import com.cnlive.cloud.user.auth.UserService;
21 -import com.cnlive.cloud.user.databinding.ActivityPersonalDataBinding;  
22 import com.cnlive.cloud.user.frame.presenter.PersonalDataPresenter; 22 import com.cnlive.cloud.user.frame.presenter.PersonalDataPresenter;
23 import com.cnlive.cloud.user.frame.view.PersonalDataView; 23 import com.cnlive.cloud.user.frame.view.PersonalDataView;
24 import com.qmuiteam.qmui.widget.QMUITopBar; 24 import com.qmuiteam.qmui.widget.QMUITopBar;
cloud/user/src/main/java/com/cnlive/cloud/user/ui/activity/PersonalImageActivity.java
  View file @67acd2b
@@ -8,6 +8,7 @@ import android.view.View; @@ -8,6 +8,7 @@ import android.view.View;
8 8
9 import androidx.databinding.ViewDataBinding; 9 import androidx.databinding.ViewDataBinding;
10 10
  11 +import com.cnlive.cloud.user.databinding.ActivityPersonalImageBinding;
11 import com.cnlive.core.libs.base.frame.activity.BaseActivity; 12 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
12 import com.cnlive.core.libs.base.util.AlertUtil; 13 import com.cnlive.core.libs.base.util.AlertUtil;
13 import com.cnlive.core.libs.base.util.GlideUtil; 14 import com.cnlive.core.libs.base.util.GlideUtil;
@@ -16,7 +17,6 @@ import com.cnlive.media.picker.PickerConfig; @@ -16,7 +17,6 @@ import com.cnlive.media.picker.PickerConfig;
16 import com.cnlive.media.picker.entity.Media; 17 import com.cnlive.media.picker.entity.Media;
17 import com.cnlive.cloud.user.R; 18 import com.cnlive.cloud.user.R;
18 import com.cnlive.cloud.user.auth.UserService; 19 import com.cnlive.cloud.user.auth.UserService;
19 -import com.cnlive.cloud.user.databinding.ActivityPersonalImageBinding;  
20 import com.cnlive.cloud.user.frame.presenter.PersonalImagePresenter; 20 import com.cnlive.cloud.user.frame.presenter.PersonalImagePresenter;
21 import com.cnlive.cloud.user.frame.view.PersonalImageView; 21 import com.cnlive.cloud.user.frame.view.PersonalImageView;
22 import com.qmuiteam.qmui.widget.QMUITopBar; 22 import com.qmuiteam.qmui.widget.QMUITopBar;
cloud/user/src/main/java/com/cnlive/cloud/user/ui/activity/SelectCountryActivity.java
  View file @67acd2b
@@ -6,10 +6,10 @@ import android.content.Intent; @@ -6,10 +6,10 @@ import android.content.Intent;
6 6
7 import androidx.databinding.ViewDataBinding; 7 import androidx.databinding.ViewDataBinding;
8 8
  9 +import com.cnlive.cloud.user.databinding.ActivitySelectCountryBinding;
9 import com.cnlive.core.libs.base.frame.activity.BaseActivity; 10 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
10 import com.cnlive.core.libs.base.util.StatusBarConfig; 11 import com.cnlive.core.libs.base.util.StatusBarConfig;
11 import com.cnlive.cloud.user.R; 12 import com.cnlive.cloud.user.R;
12 -import com.cnlive.cloud.user.databinding.ActivitySelectCountryBinding;  
13 import com.cnlive.cloud.user.frame.presenter.SelectCountryPresenter; 13 import com.cnlive.cloud.user.frame.presenter.SelectCountryPresenter;
14 import com.cnlive.cloud.user.frame.view.SelectCountryView; 14 import com.cnlive.cloud.user.frame.view.SelectCountryView;
15 15
cloud/user/src/main/java/com/cnlive/cloud/user/ui/fragment/QuickLoginFragment.java
  View file @67acd2b
@@ -9,6 +9,7 @@ import android.text.TextUtils; @@ -9,6 +9,7 @@ import android.text.TextUtils;
9 import androidx.annotation.NonNull; 9 import androidx.annotation.NonNull;
10 import androidx.databinding.ViewDataBinding; 10 import androidx.databinding.ViewDataBinding;
11 11
  12 +import com.cnlive.cloud.user.databinding.FragmentQuickLoginBinding;
12 import com.cnlive.cloud.user.frame.presenter.QuickLoginPresenter; 13 import com.cnlive.cloud.user.frame.presenter.QuickLoginPresenter;
13 import com.cnlive.core.libs.base.application.AppConfig; 14 import com.cnlive.core.libs.base.application.AppConfig;
14 import com.cnlive.core.libs.base.frame.fragment.BaseFragment; 15 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
@@ -21,7 +22,6 @@ import com.cnlive.cloud.user.sms.SmsVerifyCatcher; @@ -21,7 +22,6 @@ import com.cnlive.cloud.user.sms.SmsVerifyCatcher;
21 import com.cnlive.cloud.user.ui.activity.LoginActivity; 22 import com.cnlive.cloud.user.ui.activity.LoginActivity;
22 import com.cnlive.cloud.user.ui.activity.SelectCountryActivity; 23 import com.cnlive.cloud.user.ui.activity.SelectCountryActivity;
23 import com.cnlive.cloud.user.ui.adapter.UserListAdapter; 24 import com.cnlive.cloud.user.ui.adapter.UserListAdapter;
24 -import com.cnlive.strike.user.databinding.FragmentQuickLoginBinding;  
25 25
26 /** 26 /**
27 * @author Lynn 27 * @author Lynn
cloud/user/src/main/res/values/style.xml
  View file @67acd2b
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<resources> 2 +<resources xmlns:tools="http://schemas.android.com/tools">
3 <style name="Login.Spinner" parent="Widget.AppCompat.Spinner"></style> 3 <style name="Login.Spinner" parent="Widget.AppCompat.Spinner"></style>
4 4
5 <!-- 个人资料--> 5 <!-- 个人资料-->
@@ -27,4 +27,21 @@ @@ -27,4 +27,21 @@
27 <item name="android:windowActionBar">true</item> 27 <item name="android:windowActionBar">true</item>
28 <item name="android:windowCloseOnTouchOutside">false</item> 28 <item name="android:windowCloseOnTouchOutside">false</item>
29 </style> 29 </style>
  30 +
  31 + <style name="AppProgressDialog" parent="Theme.AppCompat.Dialog.Alert">
  32 + <!--文字大小-->
  33 + <item name="android:textSize">16sp</item>
  34 + <!-- 这里是修改顶部标题背景颜色，具体颜色自己定，可以是图片 -->
  35 + <item name="android:topDark">@android:color/white</item>
  36 + <!--修改底部背景颜色-->
  37 + <item name="android:bottomDark">@android:color/white</item>
  38 + <!-- 这里是修改内容区域背景颜色 -->
  39 + <item name="android:centerDark">@android:color/white</item>
  40 + <!--//窗口半透明-->
  41 + <item name="android:windowIsTranslucent">true</item>
  42 + <item name="android:textColor">@color/color_232326</item>
  43 + <!--设置progressbar的颜色-->
  44 + <item name="android:indeterminateTint" tools:ignore="NewApi">#008577</item>
  45 + <item name="android:indeterminateTintMode" tools:ignore="NewApi">src_atop</item>
  46 + </style>
30 </resources> 47 </resources>
cloud/video/build.gradle
  View file @67acd2b
@@ -12,5 +12,5 @@ dependencies { @@ -12,5 +12,5 @@ dependencies {
12 //友盟 12 //友盟
13 implementation "com.umeng.umsdk:analytics:8.0.0" 13 implementation "com.umeng.umsdk:analytics:8.0.0"
14 implementation "com.umeng.umsdk:common:2.0.0" 14 implementation "com.umeng.umsdk:common:2.0.0"
15 - compile project(path: ':core:network') 15 + implementation project(path: ':core:network')
16 } 16 }