代码冲突解决

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