CNLive Android Team / newModuleStrike · Commits

Commit c7ad6817de2e56755606dd926cd20b878b3db94f

Authored by YangShuai
1 parent 51ab099b

1 优化基类 

2 重构视频库
3 优化网络请求库
Inline Side-by-side
Showing 100 changed files with 816 additions and 439 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 508 files are displayed.

app/strike/build.gradle
  View file @c7ad681
@@ -174,11 +174,12 @@ dependencies { @@ -174,11 +174,12 @@ dependencies {
174 implementation project(path: ':core:base') 174 implementation project(path: ':core:base')
175 implementation project(path: ':cloud:user') 175 implementation project(path: ':cloud:user')
176 implementation project(path: ':cloud:pay') 176 implementation project(path: ':cloud:pay')
  177 + implementation project(path: ':cloud:video')
177 178
178 implementation project(path: ':core:imageload') 179 implementation project(path: ':core:imageload')
179 implementation project(path: ':module:xiaojiasoundbox') 180 implementation project(path: ':module:xiaojiasoundbox')
180 implementation project(path: ':module:pedometer') 181 implementation project(path: ':module:pedometer')
181 - implementation project(path: ':module:shanghaishop') 182 +// implementation project(path: ':module:shanghaishop')
182 implementation project(path: ':library_baidumap') 183 implementation project(path: ':library_baidumap')
183 implementation 'com.jakewharton.rxbinding3:rxbinding:3.1.0' 184 implementation 'com.jakewharton.rxbinding3:rxbinding:3.1.0'
184 // implementation project(path: ':core:util') 185 // implementation project(path: ':core:util')
app/strike/src/androidTest/java/com/cnlive/strike/strike2/ExampleInstrumentedTest.java renamed to app/strike/src/androidTest/java/com/cnlive/cloud/strike2/ExampleInstrumentedTest.java
  View file @c7ad681
1 -package com.cnlive.strike.strike2; 1 +package com.cnlive.cloud.strike2;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 4
app/strike/src/main/AndroidManifest.xml
  View file @c7ad681
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 - package="com.cnlive.strike"> 4 + package="com.cnlive.cloud">
5 5
6 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 6 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
7 <uses-permission android:name="android.permission.INTERNET" /> 7 <uses-permission android:name="android.permission.INTERNET" />
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> 9 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
10 10
11 <application 11 <application
12 - android:name=".MyApp" 12 + android:name="com.cnlive.strike.MyApp"
13 android:allowBackup="true" 13 android:allowBackup="true"
14 android:icon="@mipmap/ic_launcher" 14 android:icon="@mipmap/ic_launcher"
15 android:label="@string/app_name" 15 android:label="@string/app_name"
@@ -17,14 +17,15 @@ @@ -17,14 +17,15 @@
17 android:roundIcon="@mipmap/ic_launcher_round" 17 android:roundIcon="@mipmap/ic_launcher_round"
18 android:supportsRtl="true" 18 android:supportsRtl="true"
19 android:theme="@style/AppTheme"> 19 android:theme="@style/AppTheme">
20 - <activity android:name=".demo.activity.DemoAnimActivity" /> 20 + <activity android:name="com.cnlive.strike.demo.activity.CNplayerActivity" />
  21 + <activity android:name="com.cnlive.strike.demo.activity.DemoAnimActivity" />
21 <activity 22 <activity
22 - android:name=".LoginSuccessActivity" 23 + android:name="com.cnlive.strike.LoginSuccessActivity"
23 android:label="UserAPI" 24 android:label="UserAPI"
24 android:theme="@style/AppTheme.TranslucentFullScreenTheme" /> 25 android:theme="@style/AppTheme.TranslucentFullScreenTheme" />
25 - <activity android:name=".demo.activity.DemoActivity" />  
26 - <activity android:name=".imgutil.ImgActivity" />  
27 - <activity android:name=".MainActivity"> 26 + <activity android:name="com.cnlive.strike.demo.activity.DemoActivity" />
  27 + <activity android:name="com.cnlive.strike.imgutil.ImgActivity" />
  28 + <activity android:name="com.cnlive.strike.MainActivity">
28 29
29 <intent-filter> 30 <intent-filter>
30 <action android:name="android.intent.action.MAIN" /> 31 <action android:name="android.intent.action.MAIN" />
@@ -32,7 +33,7 @@ @@ -32,7 +33,7 @@
32 <category android:name="android.intent.category.LAUNCHER" /> 33 <category android:name="android.intent.category.LAUNCHER" />
33 </intent-filter> 34 </intent-filter>
34 </activity> 35 </activity>
35 - <activity android:name=".demo.activity.DemoMvpActivity" /> 36 + <activity android:name="com.cnlive.strike.demo.activity.DemoMvpActivity" />
36 37
37 <meta-data 38 <meta-data
38 android:name="com.baidu.lbsapi.API_KEY" 39 android:name="com.baidu.lbsapi.API_KEY"
app/strike/src/main/java/com/cnlive/strike/LoginSuccessActivity.java
  View file @c7ad681
@@ -9,9 +9,9 @@ import androidx.annotation.Nullable; @@ -9,9 +9,9 @@ import androidx.annotation.Nullable;
9 import com.alibaba.android.arouter.facade.annotation.Autowired; 9 import com.alibaba.android.arouter.facade.annotation.Autowired;
10 import com.alibaba.android.arouter.facade.annotation.Route; 10 import com.alibaba.android.arouter.facade.annotation.Route;
11 import com.cnlive.core.libs.base.frame.activity.BaseActivity; 11 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
12 -import com.cnlive.strike.user.model.LoginSuccessInfo;  
13 -import com.cnlive.strike.user.ui.activity.PersonalDataActivity;  
14 -import com.cnlive.strike.user.util.UserRouterHelper; 12 +import com.cnlive.cloud.user.model.LoginSuccessInfo;
  13 +import com.cnlive.cloud.user.ui.activity.PersonalDataActivity;
  14 +import com.cnlive.cloud.user.util.UserRouterHelper;
15 15
16 @Route(path = "/cloud/user/LoginSuccessActivity") 16 @Route(path = "/cloud/user/LoginSuccessActivity")
17 public class LoginSuccessActivity extends BaseActivity { 17 public class LoginSuccessActivity extends BaseActivity {
app/strike/src/main/java/com/cnlive/strike/MainActivity.java
  View file @c7ad681
1 package com.cnlive.strike; 1 package com.cnlive.strike;
2 2
3 3
4 -import android.Manifest;  
5 -import android.app.Activity;  
6 import android.content.Context; 4 import android.content.Context;
7 import android.content.Intent; 5 import android.content.Intent;
8 import android.os.Bundle; 6 import android.os.Bundle;
9 -import android.text.TextUtils;  
10 import android.util.AttributeSet; 7 import android.util.AttributeSet;
11 -import android.util.Log;  
12 import android.view.View; 8 import android.view.View;
13 9
14 -import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;  
15 -import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;  
16 -import com.cnlive.strike.demo.activity.DemoActivity; 10 +import com.cnlive.cloud.R;
17 import com.cnlive.strike.demo.activity.DemoMvpActivity; 11 import com.cnlive.strike.demo.activity.DemoMvpActivity;
18 import com.cnlive.strike.imgutil.ImgActivity; 12 import com.cnlive.strike.imgutil.ImgActivity;
19 -import com.cnlive.strike.user.auth.UserService;  
20 -import com.cnlive.strike.user.ui.activity.FirstLoginActivity;  
21 -import com.cnlive.strike.user.ui.activity.LoginActivity;  
22 -import com.cnlive.strike.user.ui.activity.LoginDialogActivity;  
23 -import com.cnlive.strike.user.ui.activity.PersonalDataActivity;  
24 -import com.cnlive.strike.xiaojiaspeaker.ui.activity.AllDeviceActivity;  
25 13
26 import androidx.annotation.NonNull; 14 import androidx.annotation.NonNull;
27 import androidx.annotation.Nullable; 15 import androidx.annotation.Nullable;
app/strike/src/main/java/com/cnlive/strike/MyApp.java
  View file @c7ad681
1 package com.cnlive.strike; 1 package com.cnlive.strike;
2 2
3 -import android.app.Application;  
4 -  
5 import com.alibaba.android.arouter.launcher.ARouter; 3 import com.alibaba.android.arouter.launcher.ARouter;
6 import com.baidu.mapapi.CoordType; 4 import com.baidu.mapapi.CoordType;
7 import com.baidu.mapapi.SDKInitializer; 5 import com.baidu.mapapi.SDKInitializer;
  6 +import com.cnlive.cloud.BuildConfig;
8 import com.cnlive.core.libs.base.application.AppConfig; 7 import com.cnlive.core.libs.base.application.AppConfig;
9 import com.cnlive.core.libs.base.application.BaseApplication; 8 import com.cnlive.core.libs.base.application.BaseApplication;
10 -import com.cnlive.moudle.pedometer.model.Constant;  
11 9
12 public class MyApp extends BaseApplication { 10 public class MyApp extends BaseApplication {
13 @Override 11 @Override
@@ -21,11 +19,11 @@ public class MyApp extends BaseApplication { @@ -21,11 +19,11 @@ public class MyApp extends BaseApplication {
21 "", "", "", 19 "", "", "",
22 BuildConfig.BAIDU_MAP_APP_KEY, ""); 20 BuildConfig.BAIDU_MAP_APP_KEY, "");
23 initARouter(); 21 initARouter();
24 - if (AppConfig.isDebug()) {  
25 - Constant.SERVICE_ID = 213511;  
26 - } else {  
27 - Constant.SERVICE_ID = 214690;  
28 - } 22 +// if (AppConfig.isDebug()) {
  23 +// Constant.SERVICE_ID = 213511;
  24 +// } else {
  25 +// Constant.SERVICE_ID = 214690;
  26 +// }
29 //在使用SDK各组件之前初始化context信息，传入ApplicationContext 27 //在使用SDK各组件之前初始化context信息，传入ApplicationContext
30 SDKInitializer.initialize(getApplicationContext()); 28 SDKInitializer.initialize(getApplicationContext());
31 //自4.3.0起，百度地图SDK所有接口均支持百度坐标和国测局坐标，用此方法设置您使用的坐标类型. 29 //自4.3.0起，百度地图SDK所有接口均支持百度坐标和国测局坐标，用此方法设置您使用的坐标类型.
app/strike/src/main/java/com/cnlive/strike/demo/activity/CNplayerActivity.java 0 → 100644
  View file @c7ad681
  1 +package com.cnlive.strike.demo.activity;
  2 +
  3 +import androidx.databinding.ViewDataBinding;
  4 +
  5 +import com.cnlive.cloud.BuildConfig;
  6 +import com.cnlive.cloud.R;
  7 +import com.cnlive.cloud.databinding.ActivityCnvideoBinding;
  8 +import com.cnlive.cloud.user.auth.UserService;
  9 +import com.cnlive.core.libs.base.frame.activity.BaseActivity;
  10 +import com.cnlive.core.libs.base.util.AlertUtil;
  11 +import com.cnlive.core.libs.base.util.ChannelUtil;
  12 +import com.libs.video.util.Config;
  13 +import com.libs.video.util.ProbeUtil;
  14 +import com.libs.video.video.VideoView;
  15 +import com.libs.video.video.base.IMediaPlayer;
  16 +
  17 +public class CNplayerActivity extends BaseActivity implements IMediaPlayer.OnPreparedListener,
  18 + IMediaPlayer.OnCompletionListener, IMediaPlayer.OnErrorListener, IMediaPlayer.OnInfoListener,
  19 + IMediaPlayer.OnPlayStateListener {
  20 + private ActivityCnvideoBinding binding;
  21 +
  22 + @Override
  23 + protected int getBindLayoutId() {
  24 + return R.layout.activity_cnvideo;
  25 + }
  26 +
  27 + @Override
  28 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  29 + binding = (ActivityCnvideoBinding) baseBinding;
  30 + }
  31 +
  32 + @Override
  33 + protected void initView() {
  34 + //视讯云配置单
  35 + ProbeUtil.setSid(UserService.getUid(me));
  36 +
  37 + Config.setFromId(ChannelUtil.getChannelFromApk(this));
  38 + Config.init(this, BuildConfig.APP_ID, BuildConfig.APP_KEY);
  39 + binding.videoview.setOnPreparedListener(this);
  40 + binding.videoview.setOnCompletionListener(this);
  41 + binding.videoview.setOnPlayStateListener(this);
  42 + binding.videoview.setOnErrorListener(this);
  43 + binding.videoview.setOnInfoListener(this);
  44 + binding.videoview.setDataSource(new DataSource("223_88c98ab1395f4762b703fbdd9d59d2e5", Config.TYPE_VOD, Config.TYPE_PLAY_RATE_2));
  45 + binding.videoview.setMirror(true);
  46 + binding.videoview.start();
  47 +
  48 +
  49 + }
  50 +
  51 + @Override
  52 + public boolean onInfo(IMediaPlayer mediaplayer, int what, int extra) {
  53 + return false;
  54 + }
  55 +
  56 + @Override
  57 + public boolean onError(IMediaPlayer mediaplayer, int what, int extra) {
  58 + AlertUtil.showDeftToast(me, "onError");
  59 +
  60 + return false;
  61 + }
  62 +
  63 + @Override
  64 + public void onCompletion(IMediaPlayer mediaplayer) {
  65 + AlertUtil.showDeftToast(me, "onCompletion");
  66 + mediaplayer.start();
  67 + }
  68 +
  69 + @Override
  70 + public void onPrepared(IMediaPlayer mediaplayer) {
  71 + AlertUtil.showDeftToast(me, "onPrepared");
  72 + mediaplayer.start();
  73 + }
  74 +
  75 + @Override
  76 + public void onPlayState(boolean isPlay) {
  77 + AlertUtil.showDeftToast(me, "onPlayState" + isPlay);
  78 +
  79 + }
  80 +}
app/strike/src/main/java/com/cnlive/strike/demo/activity/DataSource.java 0 → 100644
  View file @c7ad681
  1 +package com.cnlive.strike.demo.activity;
  2 +
  3 +import com.libs.video.video.base.IDataSource;
  4 +
  5 +/**
  6 + * 创建：wukuiqing
  7 + * <p>
  8 + * 时间：2018/3/21
  9 + * <p>
  10 + * 描述：
  11 + */
  12 +
  13 +
  14 +
  15 +
  16 +public class DataSource implements IDataSource {
  17 +
  18 + private String id;
  19 + private String type;
  20 + private String rate;
  21 +
  22 + public DataSource(String id, String type, String rate) {
  23 + this.id = id;
  24 + this.type = type;
  25 + this.rate = rate;
  26 + }
  27 +
  28 + @Override
  29 + public String getDataSourceId() {
  30 + return id;
  31 + }
  32 +
  33 + @Override
  34 + public String getDataSourceType() {
  35 + return type;
  36 + }
  37 +
  38 + @Override
  39 + public String getDataSourceRate() {
  40 + return rate;
  41 + }
  42 +}
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoActivity.java
  View file @c7ad681
@@ -2,7 +2,7 @@ package com.cnlive.strike.demo.activity; @@ -2,7 +2,7 @@ package com.cnlive.strike.demo.activity;
2 2
3 import com.cnlive.core.libs.base.frame.activity.BaseActivity; 3 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
4 import com.cnlive.core.libs.base.util.StatusBarConfig; 4 import com.cnlive.core.libs.base.util.StatusBarConfig;
5 -import com.cnlive.strike.R; 5 +import com.cnlive.cloud.R;
6 6
7 /** 7 /**
8 * 继承BaseActivity 8 * 继承BaseActivity
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoAnimActivity.java
  View file @c7ad681
1 package com.cnlive.strike.demo.activity; 1 package com.cnlive.strike.demo.activity;
2 2
3 import android.animation.Animator; 3 import android.animation.Animator;
4 -import android.app.Activity;  
5 -import android.content.Intent;  
6 -import android.os.Bundle;  
7 -import android.view.Menu;  
8 -import android.view.MenuItem;  
9 import android.view.View; 4 import android.view.View;
10 import android.view.animation.AccelerateDecelerateInterpolator; 5 import android.view.animation.AccelerateDecelerateInterpolator;
11 import android.widget.AdapterView; 6 import android.widget.AdapterView;
@@ -13,7 +8,7 @@ import android.widget.ListView; @@ -13,7 +8,7 @@ import android.widget.ListView;
13 import android.widget.Toast; 8 import android.widget.Toast;
14 9
15 import com.cnlive.core.libs.base.frame.activity.BaseActivity; 10 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
16 -import com.cnlive.strike.R; 11 +import com.cnlive.cloud.R;
17 import com.daimajia.androidanimations.library.Techniques; 12 import com.daimajia.androidanimations.library.Techniques;
18 import com.daimajia.androidanimations.library.YoYo; 13 import com.daimajia.androidanimations.library.YoYo;
19 14
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoMvpActivity.java
  View file @c7ad681
@@ -13,6 +13,16 @@ import android.widget.TextView; @@ -13,6 +13,16 @@ import android.widget.TextView;
13 import androidx.annotation.NonNull; 13 import androidx.annotation.NonNull;
14 import androidx.databinding.ViewDataBinding; 14 import androidx.databinding.ViewDataBinding;
15 15
  16 +import com.cnlive.cloud.R;
  17 +import com.cnlive.cloud.databinding.ActivityDemoMvpMainBinding;
  18 +import com.cnlive.cloud.user.auth.UserService;
  19 +import com.cnlive.cloud.user.ui.activity.FirstLoginActivity;
  20 +import com.cnlive.cloud.user.ui.activity.LoginActivity;
  21 +import com.cnlive.cloud.user.ui.activity.LoginDialogActivity;
  22 +import com.cnlive.cloud.user.ui.activity.PersonalDataActivity;
  23 +import com.cnlive.cloud.wjjpay.pay.WjjPay;
  24 +import com.cnlive.cloud.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
  25 +import com.cnlive.cloud.xiaojiaspeaker.ui.activity.AllDeviceActivity;
16 import com.cnlive.core.libs.base.frame.activity.BaseActivity; 26 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
17 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener; 27 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
18 import com.cnlive.core.libs.base.util.QMUITipDialogUtil; 28 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
@@ -21,24 +31,16 @@ import com.cnlive.core.network.HttpConn; @@ -21,24 +31,16 @@ import com.cnlive.core.network.HttpConn;
21 import com.cnlive.core.network.NetCallBack; 31 import com.cnlive.core.network.NetCallBack;
22 import com.cnlive.core.network.model.BaseResult; 32 import com.cnlive.core.network.model.BaseResult;
23 import com.cnlive.core.network.request.BaseRequest; 33 import com.cnlive.core.network.request.BaseRequest;
24 -import com.cnlive.libs.wjjpay.pay.WjjPay;  
25 -import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;  
26 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; 34 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
27 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity; 35 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
28 import com.cnlive.strike.MyApp; 36 import com.cnlive.strike.MyApp;
29 -import com.cnlive.strike.R;  
30 -import com.cnlive.strike.databinding.ActivityDemoMvpMainBinding;  
31 import com.cnlive.strike.demo.activity.presenter.DemoActivityPresenter; 37 import com.cnlive.strike.demo.activity.presenter.DemoActivityPresenter;
32 import com.cnlive.strike.demo.activity.view.DemoActivityView; 38 import com.cnlive.strike.demo.activity.view.DemoActivityView;
33 import com.cnlive.strike.network.api.ApiService; 39 import com.cnlive.strike.network.api.ApiService;
  40 +import com.cnlive.strike.network.api.ApiTimeService;
  41 +import com.cnlive.strike.network.api.TimeServiceBean;
  42 +import com.cnlive.strike.network.api.VideoRequest;
34 import com.cnlive.strike.network.bean.TestBean; 43 import com.cnlive.strike.network.bean.TestBean;
35 -import com.cnlive.strike.user.auth.UserService;  
36 -import com.cnlive.strike.user.ui.activity.FirstLoginActivity;  
37 -import com.cnlive.strike.user.ui.activity.LoginActivity;  
38 -import com.cnlive.strike.user.ui.activity.LoginDialogActivity;  
39 -import com.cnlive.strike.user.ui.activity.PersonalDataActivity;  
40 -import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;  
41 -import com.cnlive.strike.xiaojiaspeaker.ui.activity.AllDeviceActivity;  
42 44
43 import org.greenrobot.eventbus.Subscribe; 45 import org.greenrobot.eventbus.Subscribe;
44 import org.greenrobot.eventbus.ThreadMode; 46 import org.greenrobot.eventbus.ThreadMode;
@@ -63,10 +65,9 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity @@ -63,10 +65,9 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity
63 } 65 }
64 66
65 67
66 -  
67 @Override 68 @Override
68 protected void initView() { 69 protected void initView() {
69 - setStatusBarColor(R.color.red,100, StatusBarConfig.BLACK); 70 + setStatusBarColor(R.color.red, 100, StatusBarConfig.BLACK);
70 // //登录页 71 // //登录页
71 binding.btnLogin.setOnClickListener(new View.OnClickListener() { 72 binding.btnLogin.setOnClickListener(new View.OnClickListener() {
72 @Override 73 @Override
@@ -136,9 +137,9 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity @@ -136,9 +137,9 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity
136 binding.btnRoad.setOnClickListener(new View.OnClickListener() { 137 binding.btnRoad.setOnClickListener(new View.OnClickListener() {
137 @Override 138 @Override
138 public void onClick(View v) { 139 public void onClick(View v) {
139 - RaceListActivity.newInstance(me, UserService.getUid(me),  
140 - UserService.getInstance(me).getAppAccount().getNickName(),  
141 - UserService.getInstance(me).getAppAccount().getFaceUrl()); 140 +// RaceListActivity.newInstance(me, UserService.getUid(me),
  141 +// UserService.getInstance(me).getAppAccount().getNickName(),
  142 +// UserService.getInstance(me).getAppAccount().getFaceUrl());
142 } 143 }
143 }); 144 });
144 //获取Handler,onDestory自动解除 145 //获取Handler,onDestory自动解除
@@ -328,7 +329,7 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity @@ -328,7 +329,7 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity
328 } 329 }
329 330
330 @Override 331 @Override
331 - public void onFailure(String errCode, String errMsg) { 332 + public void onFailure(String errCode, String errMsg, Exception e) {
332 QMUITipDialogUtil.failedDialog(me, errMsg); 333 QMUITipDialogUtil.failedDialog(me, errMsg);
333 } 334 }
334 }); 335 });
@@ -358,12 +359,39 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity @@ -358,12 +359,39 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity
358 } 359 }
359 360
360 @Override 361 @Override
361 - public void onFailure(String errCode, String errMsg) { 362 + public void onFailure(String errCode, String errMsg, Exception e) {
362 QMUITipDialogUtil.failedDialog(me, errMsg); 363 QMUITipDialogUtil.failedDialog(me, errMsg);
363 364
364 } 365 }
365 } 366 }
366 ); 367 );
  368 + HttpConn.action(
  369 + VideoRequest.init().service(ApiTimeService.class)
  370 + .getServerTimeStamp(), new NetCallBack<BaseResult<TimeServiceBean>>() {
  371 + @Override
  372 + public void onRequestState(int state) {
  373 +
  374 + }
  375 +
  376 + @Override
  377 + public void onSuccess(BaseResult<TimeServiceBean> data) {
  378 + QMUITipDialogUtil.successDialog(me, "成功" + data.getData().getTimestamp());
  379 +
  380 + }
  381 +
  382 + @Override
  383 + public void onFailure(String errCode, String errMsg, Exception e) {
  384 +
  385 + }
  386 + }
  387 + );
  388 + }
  389 + });
  390 + //视频
  391 + binding.btnCnPlayer.setOnClickListener(new View.OnClickListener() {
  392 + @Override
  393 + public void onClick(View v) {
  394 + startActivity(new Intent(me,CNplayerActivity.class));
367 } 395 }
368 }); 396 });
369 } 397 }
@@ -394,65 +422,65 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity @@ -394,65 +422,65 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity
394 422
395 public void showTopView() { 423 public void showTopView() {
396 /*创建提示消息View*/ 424 /*创建提示消息View*/
397 - View view = LayoutInflater.from(this).inflate(R.layout.view_top_msg, null);  
398 - if (null == view) {  
399 - return;  
400 - }  
401 - LinearLayout ll_ignore = view.findViewById(R.id.ll_ignore);  
402 - LinearLayout ll_lookUp = view.findViewById(R.id.ll_lookUp);  
403 - TextView tv_tip = view.findViewById(R.id.tv_tip);  
404 - //忽略  
405 - ll_ignore.setOnClickListener(new View.OnClickListener() {  
406 - @Override  
407 - public void onClick(View v) {  
408 - if (null != view) {  
409 - MyApp.getInstance().hideTopView(view);  
410 - }  
411 - }  
412 - });  
413 - //查看  
414 - ll_lookUp.setOnClickListener(new View.OnClickListener() {  
415 - @Override  
416 - public void onClick(View v) {  
417 - if (null != view) {  
418 - MyApp.getInstance().hideTopView(view);  
419 - }  
420 - }  
421 - });  
422 -  
423 - /*添加View到当前显示的Activity*/  
424 - MyApp.getInstance().showTopView(view); 425 +// View view = LayoutInflater.from(this).inflate(R.layout.view_top_msg, null);
  426 +// if (null == view) {
  427 +// return;
  428 +// }
  429 +// LinearLayout ll_ignore = view.findViewById(R.id.ll_ignore);
  430 +// LinearLayout ll_lookUp = view.findViewById(R.id.ll_lookUp);
  431 +// TextView tv_tip = view.findViewById(R.id.tv_tip);
  432 +// //忽略
  433 +// ll_ignore.setOnClickListener(new View.OnClickListener() {
  434 +// @Override
  435 +// public void onClick(View v) {
  436 +// if (null != view) {
  437 +// MyApp.getInstance().hideTopView(view);
  438 +// }
  439 +// }
  440 +// });
  441 +// //查看
  442 +// ll_lookUp.setOnClickListener(new View.OnClickListener() {
  443 +// @Override
  444 +// public void onClick(View v) {
  445 +// if (null != view) {
  446 +// MyApp.getInstance().hideTopView(view);
  447 +// }
  448 +// }
  449 +// });
  450 +//
  451 +// /*添加View到当前显示的Activity*/
  452 +// MyApp.getInstance().showTopView(view);
425 } 453 }
426 454
427 public void showBottomView() { 455 public void showBottomView() {
428 /*创建提示消息View*/ 456 /*创建提示消息View*/
429 - View view = LayoutInflater.from(this).inflate(R.layout.view_top_msg, null);  
430 - if (null == view) {  
431 - return;  
432 - }  
433 - LinearLayout ll_ignore = view.findViewById(R.id.ll_ignore);  
434 - LinearLayout ll_lookUp = view.findViewById(R.id.ll_lookUp);  
435 - TextView tv_tip = view.findViewById(R.id.tv_tip);  
436 - //忽略  
437 - ll_ignore.setOnClickListener(new View.OnClickListener() {  
438 - @Override  
439 - public void onClick(View v) {  
440 - if (null != view) {  
441 - MyApp.getInstance().hideBottomView(view);  
442 - }  
443 - }  
444 - });  
445 - //查看  
446 - ll_lookUp.setOnClickListener(new View.OnClickListener() {  
447 - @Override  
448 - public void onClick(View v) {  
449 - if (null != view) {  
450 - MyApp.getInstance().hideBottomView(view);  
451 - }  
452 - }  
453 - });  
454 -  
455 - /*添加View到当前显示的Activity*/  
456 - MyApp.getInstance().showBottomView(view); 457 +// View view = LayoutInflater.from(this).inflate(R.layout.view_top_msg, null);
  458 +// if (null == view) {
  459 +// return;
  460 +// }
  461 +// LinearLayout ll_ignore = view.findViewById(R.id.ll_ignore);
  462 +// LinearLayout ll_lookUp = view.findViewById(R.id.ll_lookUp);
  463 +// TextView tv_tip = view.findViewById(R.id.tv_tip);
  464 +// //忽略
  465 +// ll_ignore.setOnClickListener(new View.OnClickListener() {
  466 +// @Override
  467 +// public void onClick(View v) {
  468 +// if (null != view) {
  469 +// MyApp.getInstance().hideBottomView(view);
  470 +// }
  471 +// }
  472 +// });
  473 +// //查看
  474 +// ll_lookUp.setOnClickListener(new View.OnClickListener() {
  475 +// @Override
  476 +// public void onClick(View v) {
  477 +// if (null != view) {
  478 +// MyApp.getInstance().hideBottomView(view);
  479 +// }
  480 +// }
  481 +// });
  482 +//
  483 +// /*添加View到当前显示的Activity*/
  484 +// MyApp.getInstance().showBottomView(view);
457 } 485 }
458 } 486 }
app/strike/src/main/java/com/cnlive/strike/demo/activity/EffectAdapter.java
  View file @c7ad681
@@ -7,7 +7,7 @@ import android.view.ViewGroup; @@ -7,7 +7,7 @@ import android.view.ViewGroup;
7 import android.widget.BaseAdapter; 7 import android.widget.BaseAdapter;
8 import android.widget.TextView; 8 import android.widget.TextView;
9 9
10 -import com.cnlive.strike.R; 10 +import com.cnlive.cloud.R;
11 import com.daimajia.androidanimations.library.Techniques; 11 import com.daimajia.androidanimations.library.Techniques;
12 12
13 public class EffectAdapter extends BaseAdapter { 13 public class EffectAdapter extends BaseAdapter {
app/strike/src/main/java/com/cnlive/strike/demo/activity/view/DemoActivityView.java
  View file @c7ad681
1 package com.cnlive.strike.demo.activity.view; 1 package com.cnlive.strike.demo.activity.view;
2 2
3 -import android.os.Message;  
4 -  
5 -import androidx.annotation.NonNull;  
6 -  
7 import com.cnlive.core.libs.base.frame.view.BaseView; 3 import com.cnlive.core.libs.base.frame.view.BaseView;
8 -import com.cnlive.core.libs.base.util.QMUITipDialogUtil;  
9 import com.cnlive.strike.demo.activity.DemoMvpActivity; 4 import com.cnlive.strike.demo.activity.DemoMvpActivity;
10 5
11 /** 6 /**
app/strike/src/main/java/com/cnlive/strike/imgutil/ImgActivity.java
  View file @c7ad681
@@ -4,14 +4,11 @@ import androidx.appcompat.app.AppCompatActivity; @@ -4,14 +4,11 @@ import androidx.appcompat.app.AppCompatActivity;
4 4
5 import android.animation.ObjectAnimator; 5 import android.animation.ObjectAnimator;
6 import android.graphics.Bitmap; 6 import android.graphics.Bitmap;
7 -import android.graphics.Rect;  
8 import android.os.Bundle; 7 import android.os.Bundle;
9 import android.os.Handler; 8 import android.os.Handler;
10 import android.os.Message; 9 import android.os.Message;
11 -import android.util.Log;  
12 import android.view.View; 10 import android.view.View;
13 import android.widget.ImageView; 11 import android.widget.ImageView;
14 -import android.widget.Toast;  
15 12
16 import com.bumptech.glide.load.engine.DiskCacheStrategy; 13 import com.bumptech.glide.load.engine.DiskCacheStrategy;
17 import com.bumptech.glide.request.transition.ViewPropertyTransition; 14 import com.bumptech.glide.request.transition.ViewPropertyTransition;
@@ -23,11 +20,9 @@ import com.cnlive.core.imageload.preview.PreviewImageViewActivity; @@ -23,11 +20,9 @@ import com.cnlive.core.imageload.preview.PreviewImageViewActivity;
23 import com.cnlive.core.imageload.preview.model.ImagePreviewShowInfo; 20 import com.cnlive.core.imageload.preview.model.ImagePreviewShowInfo;
24 import com.cnlive.core.imageload.preview.model.PreviewData; 21 import com.cnlive.core.imageload.preview.model.PreviewData;
25 import com.cnlive.core.imageload.util.DownLoadImageService; 22 import com.cnlive.core.imageload.util.DownLoadImageService;
26 -import com.cnlive.core.libs.base.util.GlideUtil;  
27 -import com.cnlive.strike.R;  
28 -import com.cnlive.strike.user.auth.UserService; 23 +import com.cnlive.cloud.R;
  24 +import com.cnlive.cloud.user.auth.UserService;
29 25
30 -import java.io.File;  
31 import java.util.ArrayList; 26 import java.util.ArrayList;
32 27
33 public class ImgActivity extends AppCompatActivity { 28 public class ImgActivity extends AppCompatActivity {
app/strike/src/main/java/com/cnlive/strike/network/api/ApiTimeService.java 0 → 100644
  View file @c7ad681
  1 +package com.cnlive.strike.network.api;
  2 +
  3 +import com.cnlive.core.network.model.BaseResult;
  4 +import com.cnlive.strike.network.bean.LetHimNoSeeBean;
  5 +
  6 +import java.util.Map;
  7 +
  8 +import io.reactivex.Observable;
  9 +import retrofit2.http.GET;
  10 +import retrofit2.http.POST;
  11 +import retrofit2.http.QueryMap;
  12 +
  13 +public interface ApiTimeService {
  14 + @GET("timestamp")
  15 + Observable<BaseResult<TimeServiceBean>> getServerTimeStamp();
  16 +}
app/strike/src/main/java/com/cnlive/strike/network/api/TimeServiceBean.java 0 → 100644
  View file @c7ad681
  1 +package com.cnlive.strike.network.api;
  2 +
  3 +/**
  4 + * 服务器时间戳
  5 + */
  6 +public class TimeServiceBean {
  7 +
  8 + /**
  9 + * timestamp : 1575855515
  10 + */
  11 +
  12 + private int timestamp;
  13 +
  14 + public int getTimestamp() {
  15 + return timestamp;
  16 + }
  17 +
  18 + public void setTimestamp(int timestamp) {
  19 + this.timestamp = timestamp;
  20 + }
  21 +}
app/strike/src/main/java/com/cnlive/strike/network/api/VideoRequest.java 0 → 100644
  View file @c7ad681
  1 +package com.cnlive.strike.network.api;
  2 +
  3 +
  4 +import android.text.TextUtils;
  5 +
  6 +import com.cnlive.core.libs.base.application.AppConfig;
  7 +import com.cnlive.core.network.NetBuilder;
  8 +import com.cnlive.core.network.interceptor.NetPPEncryptInterceptor;
  9 +import com.cnlive.core.network.interceptor.NetPPPayEncryptInterceptor;
  10 +
  11 +import java.util.ArrayList;
  12 +import java.util.List;
  13 +
  14 +import okhttp3.Interceptor;
  15 +
  16 +/**
  17 + * 基本请求
  18 + * ys
  19 + */
  20 +public class VideoRequest {
  21 + private String userSetUrl;
  22 + private static VideoRequest request;
  23 + private long connectTimeout;//连接超时
  24 + private long readTimeout;//读取超时
  25 + private long writeTimeout;//写入超时
  26 + private List<Interceptor> interceptorList;//拦截器
  27 + //时间服务器地址
  28 + private static final String BASE_TIME_URL_DEBUG = "http://test.open.cnlive.com/openapi/api2/";
  29 +
  30 + private static final String BASE_TIME_URL_RELEASE = "https://api.cnlive.com/open/api2/";
  31 +
  32 + /**
  33 + * 初始化接口地址
  34 + */
  35 + private String initBaseUrl(Class clazz) {
  36 + if (clazz == ApiTimeService.class) {
  37 + return AppConfig.isDebug() ? BASE_TIME_URL_DEBUG : BASE_TIME_URL_RELEASE;
  38 + }
  39 + return AppConfig.isDebug() ? "https://apiwjjtest.cnlive.com/" : "https://apiwjj.cnlive.com/";
  40 + }
  41 +
  42 + /**
  43 + * 构造函数初始化
  44 + */
  45 + public VideoRequest() {
  46 + interceptorList = new ArrayList<>();
  47 + }
  48 +
  49 +
  50 + /**
  51 + * 设置连接超时
  52 + *
  53 + * @param connectTimeout
  54 + * @return
  55 + */
  56 + public VideoRequest setConnectTimeout(long connectTimeout) {
  57 + init();
  58 + connectTimeout = connectTimeout;
  59 + return request;
  60 + }
  61 +
  62 + /**
  63 + * 设置读取超时
  64 + *
  65 + * @param readTimeout
  66 + * @return
  67 + */
  68 + public VideoRequest setReadTimeout(long readTimeout) {
  69 + init();
  70 + readTimeout = readTimeout;
  71 + return request;
  72 + }
  73 +
  74 + /**
  75 + * 设置写入超时
  76 + *
  77 + * @param writeTimeout
  78 + * @return
  79 + */
  80 + public VideoRequest setWriteTimeout(long writeTimeout) {
  81 + init();
  82 + writeTimeout = writeTimeout;
  83 + return request;
  84 + }
  85 +
  86 +
  87 + /**
  88 + * 设置连接地址
  89 + *
  90 + * @param url
  91 + * @return
  92 + */
  93 + public VideoRequest setUrl(String url) {
  94 + init();
  95 + userSetUrl = url;
  96 + return request;
  97 + }
  98 +
  99 + /**
  100 + * 添加拦截器
  101 + *
  102 + * @param interceptor
  103 + * @return
  104 + */
  105 + public VideoRequest addInterceptor(Interceptor interceptor) {
  106 + if (null != interceptor) {
  107 + interceptorList.add(interceptor);
  108 + }
  109 + return request;
  110 + }
  111 +
  112 + /**
  113 + * @return
  114 + */
  115 + public static synchronized VideoRequest init() {
  116 + if (null == request) {
  117 + request = new VideoRequest();
  118 + }
  119 + return request;
  120 + }
  121 +
  122 + public <NetService> NetService service(Class<NetService> clz) {
  123 + NetService service = null;
  124 + NetBuilder builder = new NetBuilder(clz);
  125 + if (connectTimeout > 0) {
  126 + builder.setConnectTimeout(connectTimeout);
  127 + }
  128 + if (readTimeout > 0) {
  129 + builder.setReadTimeout(readTimeout);
  130 + }
  131 + if (writeTimeout > 0) {
  132 + builder.setWriteTimeout(writeTimeout);
  133 + }
  134 +
  135 + if (null != interceptorList && interceptorList.size() > 0) {
  136 + builder.addInterceptors(interceptorList);
  137 + }
  138 +
  139 + //设置接口请求头地址
  140 + if (!TextUtils.isEmpty(userSetUrl)) {
  141 + builder.setBaseUrl(userSetUrl);
  142 + userSetUrl = "";
  143 + } else {
  144 + builder.setBaseUrl(initBaseUrl(clz));
  145 + }
  146 + service = (NetService) builder.getService();
  147 + builder = null;
  148 + //重置属性
  149 + resetData();
  150 + return service;
  151 +
  152 + }
  153 +
  154 + public <NetService> NetService serviceEncrypt(Class<NetService> clz) {
  155 + NetService service = null;
  156 + NetBuilder builder = new NetBuilder(clz);
  157 + if (connectTimeout > 0) {
  158 + builder.setConnectTimeout(connectTimeout);
  159 + }
  160 + if (readTimeout > 0) {
  161 + builder.setReadTimeout(readTimeout);
  162 + }
  163 + if (writeTimeout > 0) {
  164 + builder.setWriteTimeout(writeTimeout);
  165 + }
  166 + //添加拦截器
  167 + interceptorList.add(new NetPPEncryptInterceptor());
  168 + if (null != interceptorList && interceptorList.size() > 0) {
  169 + builder.addInterceptors(interceptorList);
  170 + }
  171 + //设置接口请求头地址
  172 + if (!TextUtils.isEmpty(userSetUrl)) {
  173 + builder.setBaseUrl(userSetUrl);
  174 + userSetUrl = "";
  175 + } else {
  176 + builder.setBaseUrl(initBaseUrl(clz));
  177 + }
  178 + service = (NetService) builder.getService();
  179 + builder = null;
  180 + //重置属性
  181 + resetData();
  182 + return service;
  183 +
  184 + }
  185 +
  186 + public <NetService> NetService servicePayEncrypt(Class<NetService> clz) {
  187 + NetService service = null;
  188 + NetBuilder builder = new NetBuilder(clz);
  189 + if (connectTimeout > 0) {
  190 + builder.setConnectTimeout(connectTimeout);
  191 + }
  192 + if (readTimeout > 0) {
  193 + builder.setReadTimeout(readTimeout);
  194 + }
  195 + if (writeTimeout > 0) {
  196 + builder.setWriteTimeout(writeTimeout);
  197 + }
  198 + //添加拦截器
  199 + interceptorList.add(new NetPPPayEncryptInterceptor());
  200 + if (null != interceptorList && interceptorList.size() > 0) {
  201 + builder.addInterceptors(interceptorList);
  202 + }
  203 + //设置接口请求头地址
  204 + if (!TextUtils.isEmpty(userSetUrl)) {
  205 + builder.setBaseUrl(userSetUrl);
  206 + userSetUrl = "";
  207 + } else {
  208 + builder.setBaseUrl(initBaseUrl(clz));
  209 + }
  210 + service = (NetService) builder.getService();
  211 + builder = null;
  212 + //重置属性
  213 + resetData();
  214 + return service;
  215 +
  216 + }
  217 +
  218 + private void resetData() {
  219 + interceptorList.clear();
  220 +
  221 + connectTimeout = 0;
  222 + readTimeout = 0;
  223 + writeTimeout = 0;
  224 + }
  225 +
  226 +
  227 +}
0 \ No newline at end of file 228 \ No newline at end of file
app/strike/src/main/java/com/cnlive/strike/network/bean/TestBean.java
  View file @c7ad681
@@ -31,7 +31,7 @@ public class TestBean implements IBaseResult { @@ -31,7 +31,7 @@ public class TestBean implements IBaseResult {
31 31
32 @Override 32 @Override
33 public boolean isSuccess() { 33 public boolean isSuccess() {
34 - return error; 34 + return !error;
35 } 35 }
36 36
37 @Override 37 @Override
app/strike/src/main/res/layout/activity_cnvideo.xml 0 → 100644
  View file @c7ad681
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<layout>
  3 +
  4 + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  5 + android:layout_width="match_parent"
  6 + android:layout_height="match_parent"
  7 + android:orientation="vertical">
  8 +
  9 + <com.libs.video.video.VideoView
  10 + android:id="@+id/videoview"
  11 + android:background="@color/black"
  12 + android:layout_width="match_parent"
  13 + android:layout_height="300dp"></com.libs.video.video.VideoView>
  14 + </LinearLayout>
  15 +</layout>
0 \ No newline at end of file 16 \ No newline at end of file
app/strike/src/main/res/layout/activity_demo_mvp_main.xml
  View file @c7ad681
@@ -93,6 +93,13 @@ @@ -93,6 +93,13 @@
93 android:text="动画特效" /> 93 android:text="动画特效" />
94 94
95 <Button 95 <Button
  96 + android:id="@+id/btn_cnPlayer"
  97 + android:layout_width="match_parent"
  98 + android:layout_height="wrap_content"
  99 + android:layout_margin="5dp"
  100 + android:text="视频" />
  101 +
  102 + <Button
96 android:id="@+id/btn_pay" 103 android:id="@+id/btn_pay"
97 android:layout_width="match_parent" 104 android:layout_width="match_parent"
98 android:layout_height="wrap_content" 105 android:layout_height="wrap_content"
app/strike/src/main/res/layout/activity_my.xml
  View file @c7ad681
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 xmlns:tools="http://schemas.android.com/tools" 6 xmlns:tools="http://schemas.android.com/tools"
7 android:layout_width="match_parent" 7 android:layout_width="match_parent"
8 android:layout_height="match_parent" 8 android:layout_height="match_parent"
9 - tools:context="com.cnlive.strike.MyActivity"> 9 + tools:context="com.cnlive.cloud.MyActivity">
10 10
11 <LinearLayout 11 <LinearLayout
12 android:id="@+id/fragment_container" 12 android:id="@+id/fragment_container"
app/strike/src/main/res/layout/activity_my1.xml
  View file @c7ad681
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 - tools:context="com.cnlive.strike.MyActivity"> 7 + tools:context="com.cnlive.cloud.MyActivity">
8 <RelativeLayout 8 <RelativeLayout
9 android:id="@+id/fragment_container" 9 android:id="@+id/fragment_container"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
app/strike/src/main/res/layout/fragment_my.xml
  View file @c7ad681
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 xmlns:tools="http://schemas.android.com/tools" 2 xmlns:tools="http://schemas.android.com/tools"
3 android:layout_width="match_parent" 3 android:layout_width="match_parent"
4 android:layout_height="match_parent" 4 android:layout_height="match_parent"
5 - tools:context="com.cnlive.strike.MyFragment"> 5 + tools:context="com.cnlive.cloud.MyFragment">
6 6
7 <!-- TODO: Update blank fragment layout --> 7 <!-- TODO: Update blank fragment layout -->
8 <TextView 8 <TextView
app/strike/src/test/java/com/cnlive/strike/strike2/ExampleUnitTest.java renamed to app/strike/src/test/java/com/cnlive/cloud/strike2/ExampleUnitTest.java
  View file @c7ad681
1 -package com.cnlive.strike.strike2; 1 +package com.cnlive.cloud.strike2;
2 2
3 import org.junit.Test; 3 import org.junit.Test;
4 4
build.gradle
  View file @c7ad681
@@ -130,7 +130,7 @@ allprojects { @@ -130,7 +130,7 @@ allprojects {
130 credentials { username = nexusId; password = nexusPw } 130 credentials { username = nexusId; password = nexusPw }
131 } 131 }
132 //------------------ 资源库配置 END------------------ 132 //------------------ 资源库配置 END------------------
133 - 133 + maven { url 'https://dl.bintray.com/umsdk/release' }
134 //关联微博 134 //关联微博
135 maven { url "https://dl.bintray.com/thelasterstar/maven/" } 135 maven { url "https://dl.bintray.com/thelasterstar/maven/" }
136 maven { 136 maven {
cloud/pay/src/androidTest/java/com/cnlive/strike/pay/ExampleInstrumentedTest.java renamed to cloud/pay/src/androidTest/java/com/cnlive/cloud/pay/ExampleInstrumentedTest.java
  View file @c7ad681
1 -package com.cnlive.strike.pay; 1 +package com.cnlive.cloud.pay;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 4
cloud/pay/src/main/AndroidManifest.xml
  View file @c7ad681
1 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 1 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
2 - package="com.cnlive.strike.pay" /> 2 + package="com.cnlive.cloud.pay" />
cloud/pay/src/main/java/com/cnlive/libs/wjjpay/api/PayRequest.java renamed to cloud/pay/src/main/java/com/cnlive/cloud/wjjpay/api/PayRequest.java
  View file @c7ad681
1 -package com.cnlive.libs.wjjpay.api; 1 +package com.cnlive.cloud.wjjpay.api;
2 2
3 3
4 import android.text.TextUtils; 4 import android.text.TextUtils;
@@ -7,6 +7,7 @@ import com.cnlive.core.libs.base.application.AppConfig; @@ -7,6 +7,7 @@ import com.cnlive.core.libs.base.application.AppConfig;
7 import com.cnlive.core.network.NetBuilder; 7 import com.cnlive.core.network.NetBuilder;
8 import com.cnlive.core.network.interceptor.NetPPEncryptInterceptor; 8 import com.cnlive.core.network.interceptor.NetPPEncryptInterceptor;
9 import com.cnlive.core.network.interceptor.NetPPPayEncryptInterceptor; 9 import com.cnlive.core.network.interceptor.NetPPPayEncryptInterceptor;
  10 +import com.cnlive.core.network.interceptor.SignEncryptInterceptor;
10 11
11 import java.util.ArrayList; 12 import java.util.ArrayList;
12 import java.util.List; 13 import java.util.List;
@@ -127,6 +128,9 @@ public class PayRequest { @@ -127,6 +128,9 @@ public class PayRequest {
127 128
128 if (null != interceptorList && interceptorList.size() > 0) { 129 if (null != interceptorList && interceptorList.size() > 0) {
129 builder.addInterceptors(interceptorList); 130 builder.addInterceptors(interceptorList);
  131 + }else {
  132 + interceptorList.add(new SignEncryptInterceptor());
  133 + builder.addInterceptors(interceptorList);
130 } 134 }
131 135
132 //设置接口请求头地址 136 //设置接口请求头地址
cloud/pay/src/main/java/com/cnlive/libs/wjjpay/api/PayService.java renamed to cloud/pay/src/main/java/com/cnlive/cloud/wjjpay/api/PayService.java
  View file @c7ad681
1 -package com.cnlive.libs.wjjpay.api; 1 +package com.cnlive.cloud.wjjpay.api;
2 2
3 3
  4 +import com.cnlive.cloud.wjjpay.model.EncryptKey;
  5 +import com.cnlive.cloud.wjjpay.model.GroupBalanceInfo;
  6 +import com.cnlive.cloud.wjjpay.model.PaymentPreInfo;
4 import com.cnlive.core.network.model.BaseResult; 7 import com.cnlive.core.network.model.BaseResult;
5 -import com.cnlive.libs.wjjpay.model.EncryptKey;  
6 -import com.cnlive.libs.wjjpay.model.GroupBalanceInfo;  
7 -import com.cnlive.libs.wjjpay.model.PaymentPreInfo;  
8 8
9 import java.util.Map; 9 import java.util.Map;
10 10
11 import io.reactivex.Observable; 11 import io.reactivex.Observable;
12 -import retrofit2.adapter.rxjava2.Result;  
13 import retrofit2.http.POST; 12 import retrofit2.http.POST;
14 import retrofit2.http.QueryMap; 13 import retrofit2.http.QueryMap;
15 14
cloud/pay/src/main/java/com/cnlive/libs/wjjpay/model/EncryptKey.java renamed to cloud/pay/src/main/java/com/cnlive/cloud/wjjpay/model/EncryptKey.java
  View file @c7ad681
1 -package com.cnlive.libs.wjjpay.model; 1 +package com.cnlive.cloud.wjjpay.model;
2 2
3 public class EncryptKey { 3 public class EncryptKey {
4 private String publicKey; 4 private String publicKey;
cloud/pay/src/main/java/com/cnlive/libs/wjjpay/model/GroupBalanceInfo.java renamed to cloud/pay/src/main/java/com/cnlive/cloud/wjjpay/model/GroupBalanceInfo.java
  View file @c7ad681
1 -package com.cnlive.libs.wjjpay.model; 1 +package com.cnlive.cloud.wjjpay.model;
2 2
3 /** 3 /**
4 * 作者: 吴奎庆 4 * 作者: 吴奎庆
cloud/pay/src/main/java/com/cnlive/libs/wjjpay/model/PaymentPreInfo.java renamed to cloud/pay/src/main/java/com/cnlive/cloud/wjjpay/model/PaymentPreInfo.java
  View file @c7ad681
1 -package com.cnlive.libs.wjjpay.model; 1 +package com.cnlive.cloud.wjjpay.model;
2 2
3 /** 3 /**
4 * 作者: 吴奎庆 4 * 作者: 吴奎庆
cloud/pay/src/main/java/com/cnlive/libs/wjjpay/pay/WjjPay.java renamed to cloud/pay/src/main/java/com/cnlive/cloud/wjjpay/pay/WjjPay.java
  View file @c7ad681
1 -package com.cnlive.libs.wjjpay.pay; 1 +package com.cnlive.cloud.wjjpay.pay;
2 2
3 import androidx.annotation.NonNull; 3 import androidx.annotation.NonNull;
4 4
5 -import com.cnlive.core.libs.base.util.TimerWaitUtil; 5 +import com.cnlive.cloud.wjjpay.api.PayRequest;
  6 +import com.cnlive.cloud.wjjpay.api.PayService;
  7 +import com.cnlive.cloud.wjjpay.model.EncryptKey;
  8 +import com.cnlive.cloud.wjjpay.model.GroupBalanceInfo;
  9 +import com.cnlive.cloud.wjjpay.model.PaymentPreInfo;
6 import com.cnlive.core.network.HttpConn; 10 import com.cnlive.core.network.HttpConn;
7 import com.cnlive.core.network.NetCallBack; 11 import com.cnlive.core.network.NetCallBack;
8 import com.cnlive.core.network.model.BaseResult; 12 import com.cnlive.core.network.model.BaseResult;
9 -import com.cnlive.libs.wjjpay.api.PayRequest;  
10 -import com.cnlive.libs.wjjpay.api.PayService;  
11 -import com.cnlive.libs.wjjpay.model.EncryptKey;  
12 -import com.cnlive.libs.wjjpay.model.GroupBalanceInfo;  
13 -import com.cnlive.libs.wjjpay.model.PaymentPreInfo;  
14 13
15 import java.security.MessageDigest; 14 import java.security.MessageDigest;
16 import java.security.NoSuchAlgorithmException; 15 import java.security.NoSuchAlgorithmException;
17 import java.util.HashMap; 16 import java.util.HashMap;
18 import java.util.Map; 17 import java.util.Map;
19 -import java.util.concurrent.TimeUnit;  
20 18
21 -import io.reactivex.Observable;  
22 import io.reactivex.ObservableSource; 19 import io.reactivex.ObservableSource;
23 import io.reactivex.functions.Function; 20 import io.reactivex.functions.Function;
24 21
cloud/pay/src/test/java/com/cnlive/strike/pay/ExampleUnitTest.java renamed to cloud/pay/src/test/java/com/cnlive/cloud/pay/ExampleUnitTest.java
  View file @c7ad681
1 -package com.cnlive.strike.pay; 1 +package com.cnlive.cloud.pay;
2 2
3 import org.junit.Test; 3 import org.junit.Test;
4 4
cloud/share/src/debug/AndroidManifest.xml
  View file @c7ad681
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 5
6 6
7 <activity 7 <activity
8 - android:name="com.cnlive.strike.debug.wxapi.WXEntryActivity" 8 + android:name="com.cnlive.cloud.debug.wxapi.WXEntryActivity"
9 android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" 9 android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
10 android:label="@string/app_name" 10 android:label="@string/app_name"
11 android:exported="true" 11 android:exported="true"
cloud/share/src/debug/java/com/cnlive/strike/debug/wxapi/WXEntryActivity.java renamed to cloud/share/src/debug/java/com/cnlive/cloud/debug/wxapi/WXEntryActivity.java
  View file @c7ad681
1 -package com.cnlive.strike.debug.wxapi; 1 +package com.cnlive.cloud.debug.wxapi;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 -import android.content.ComponentName;  
5 import android.content.Intent; 4 import android.content.Intent;
6 import android.content.SharedPreferences; 5 import android.content.SharedPreferences;
7 import android.os.Bundle; 6 import android.os.Bundle;
8 -import android.os.Handler;  
9 -import android.os.Message;  
10 import android.text.TextUtils; 7 import android.text.TextUtils;
11 -import android.util.Log;  
12 import android.widget.Toast; 8 import android.widget.Toast;
13 9
14 import com.cnlive.core.libs.base.application.AppConfig; 10 import com.cnlive.core.libs.base.application.AppConfig;
@@ -21,9 +17,8 @@ import com.cnlive.share.observable.WechatLoginObservable; @@ -21,9 +17,8 @@ import com.cnlive.share.observable.WechatLoginObservable;
21 import com.cnlive.share.observable.WechatShareObservable; 17 import com.cnlive.share.observable.WechatShareObservable;
22 import com.cnlive.share.util.DateTimeUtil; 18 import com.cnlive.share.util.DateTimeUtil;
23 import com.cnlive.share.util.OkHttpUtils; 19 import com.cnlive.share.util.OkHttpUtils;
24 -import com.cnlive.strike.user.auth.UserService; 20 +import com.cnlive.cloud.user.auth.UserService;
25 import com.google.gson.Gson; 21 import com.google.gson.Gson;
26 -import com.tencent.mm.opensdk.constants.ConstantsAPI;  
27 import com.tencent.mm.opensdk.modelbase.BaseReq; 22 import com.tencent.mm.opensdk.modelbase.BaseReq;
28 import com.tencent.mm.opensdk.modelbase.BaseResp; 23 import com.tencent.mm.opensdk.modelbase.BaseResp;
29 import com.tencent.mm.opensdk.modelmsg.SendAuth; 24 import com.tencent.mm.opensdk.modelmsg.SendAuth;
@@ -34,8 +29,6 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory; @@ -34,8 +29,6 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory;
34 import org.json.JSONException; 29 import org.json.JSONException;
35 import org.json.JSONObject; 30 import org.json.JSONObject;
36 31
37 -import java.lang.ref.WeakReference;  
38 -  
39 /** 32 /**
40 * 作者: 吴奎庆 33 * 作者: 吴奎庆
41 * <p> 34 * <p>
cloud/share/src/main/java/com/cnlive/share/arouter/ARouterUtil.java
  View file @c7ad681
@@ -5,7 +5,7 @@ import android.content.Context; @@ -5,7 +5,7 @@ import android.content.Context;
5 import com.alibaba.android.arouter.launcher.ARouter; 5 import com.alibaba.android.arouter.launcher.ARouter;
6 import com.cnlive.core.libs.base.util.SharedPreferencesHelper; 6 import com.cnlive.core.libs.base.util.SharedPreferencesHelper;
7 import com.cnlive.core.network.action.CoinRainAction; 7 import com.cnlive.core.network.action.CoinRainAction;
8 -import com.cnlive.strike.user.auth.UserService; 8 +import com.cnlive.cloud.user.auth.UserService;
9 9
10 public class ARouterUtil { 10 public class ARouterUtil {
11 /** 11 /**
cloud/share/src/main/java/com/cnlive/share/ui/ShareImgActivity.java
  View file @c7ad681
@@ -23,7 +23,7 @@ import com.cnlive.share.data.IconInfo; @@ -23,7 +23,7 @@ import com.cnlive.share.data.IconInfo;
23 import com.cnlive.share.observable.ShareClickObservable; 23 import com.cnlive.share.observable.ShareClickObservable;
24 import com.cnlive.share.util.ShareUtils; 24 import com.cnlive.share.util.ShareUtils;
25 import com.cnlive.share.util.Util; 25 import com.cnlive.share.util.Util;
26 -import com.cnlive.strike.user.auth.UserService; 26 +import com.cnlive.cloud.user.auth.UserService;
27 import com.sina.weibo.sdk.share.WbShareCallback; 27 import com.sina.weibo.sdk.share.WbShareCallback;
28 import com.sina.weibo.sdk.share.WbShareHandler; 28 import com.sina.weibo.sdk.share.WbShareHandler;
29 import com.tencent.connect.common.Constants; 29 import com.tencent.connect.common.Constants;
cloud/share/src/main/java/com/cnlive/share/util/ShareUtils.java
  View file @c7ad681
@@ -33,7 +33,7 @@ import com.cnlive.share.data.ShareInfo; @@ -33,7 +33,7 @@ import com.cnlive.share.data.ShareInfo;
33 import com.cnlive.share.data.ShareIntegralTypeInfo; 33 import com.cnlive.share.data.ShareIntegralTypeInfo;
34 import com.cnlive.share.model.ShareReleaseInfoUtil; 34 import com.cnlive.share.model.ShareReleaseInfoUtil;
35 import com.cnlive.share.model.ShortLinkInfo; 35 import com.cnlive.share.model.ShortLinkInfo;
36 -import com.cnlive.strike.user.auth.UserService; 36 +import com.cnlive.cloud.user.auth.UserService;
37 import com.google.gson.Gson; 37 import com.google.gson.Gson;
38 import com.sina.weibo.sdk.api.ImageObject; 38 import com.sina.weibo.sdk.api.ImageObject;
39 import com.sina.weibo.sdk.api.TextObject; 39 import com.sina.weibo.sdk.api.TextObject;
@@ -62,7 +62,6 @@ import io.reactivex.Observer; @@ -62,7 +62,6 @@ import io.reactivex.Observer;
62 import io.reactivex.android.schedulers.AndroidSchedulers; 62 import io.reactivex.android.schedulers.AndroidSchedulers;
63 import io.reactivex.disposables.Disposable; 63 import io.reactivex.disposables.Disposable;
64 import io.reactivex.schedulers.Schedulers; 64 import io.reactivex.schedulers.Schedulers;
65 -import retrofit2.adapter.rxjava2.Result;  
66 65
67 import static android.content.Context.MODE_PRIVATE; 66 import static android.content.Context.MODE_PRIVATE;
68 import static com.cnlive.share.util.Util.buildTransaction; 67 import static com.cnlive.share.util.Util.buildTransaction;
@@ -192,7 +191,7 @@ public class ShareUtils { @@ -192,7 +191,7 @@ public class ShareUtils {
192 } 191 }
193 192
194 @Override 193 @Override
195 - public void onFailure(String errCode, String errMsg) { 194 + public void onFailure(String errCode, String errMsg,Exception e) {
196 AlertUtil.showDeftToast(mContext, errMsg); 195 AlertUtil.showDeftToast(mContext, errMsg);
197 } 196 }
198 }); 197 });
@@ -686,7 +685,7 @@ public class ShareUtils { @@ -686,7 +685,7 @@ public class ShareUtils {
686 } 685 }
687 686
688 @Override 687 @Override
689 - public void onFailure(String errCode, String errMsg) { 688 + public void onFailure(String errCode, String errMsg,Exception e) {
690 AlertUtil.showDeftToast(mContext, errMsg); 689 AlertUtil.showDeftToast(mContext, errMsg);
691 } 690 }
692 }); 691 });
cloud/share/src/main/java/com/cnlive/share/util/Util.java
  View file @c7ad681
@@ -23,7 +23,7 @@ import android.text.TextUtils; @@ -23,7 +23,7 @@ import android.text.TextUtils;
23 import com.cnlive.core.libs.base.application.AppConfig; 23 import com.cnlive.core.libs.base.application.AppConfig;
24 import com.cnlive.core.network.util.UriUtil; 24 import com.cnlive.core.network.util.UriUtil;
25 import com.cnlive.share.BuildConfig; 25 import com.cnlive.share.BuildConfig;
26 -import com.cnlive.strike.user.auth.UserService; 26 +import com.cnlive.cloud.user.auth.UserService;
27 import com.sina.weibo.sdk.WbSdk; 27 import com.sina.weibo.sdk.WbSdk;
28 import com.sina.weibo.sdk.auth.AuthInfo; 28 import com.sina.weibo.sdk.auth.AuthInfo;
29 import com.tencent.mm.opensdk.openapi.IWXAPI; 29 import com.tencent.mm.opensdk.openapi.IWXAPI;
cloud/share/src/release/AndroidManifest.xml
  View file @c7ad681
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <application> 4 <application>
5 5
6 <activity 6 <activity
7 - android:name="com.cnlive.strike.wxapi.WXEntryActivity" 7 + android:name="com.cnlive.cloud.wxapi.WXEntryActivity"
8 android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" 8 android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
9 android:exported="true" 9 android:exported="true"
10 android:launchMode="singleTop"> 10 android:launchMode="singleTop">
cloud/share/src/release/java/com/cnlive/strike/wxapi/WXEntryActivity.java
  View file @c7ad681
1 -package com.cnlive.strike.wxapi; 1 +package com.cnlive.cloud.wxapi;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 import android.content.Intent; 4 import android.content.Intent;
@@ -17,7 +17,7 @@ import com.cnlive.share.observable.WechatLoginObservable; @@ -17,7 +17,7 @@ import com.cnlive.share.observable.WechatLoginObservable;
17 import com.cnlive.share.observable.WechatShareObservable; 17 import com.cnlive.share.observable.WechatShareObservable;
18 import com.cnlive.share.util.DateTimeUtil; 18 import com.cnlive.share.util.DateTimeUtil;
19 import com.cnlive.share.util.OkHttpUtils; 19 import com.cnlive.share.util.OkHttpUtils;
20 -import com.cnlive.strike.user.auth.UserService; 20 +import com.cnlive.cloud.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/user/src/androidTest/java/com/cnlive/strike/user/ExampleInstrumentedTest.java renamed to cloud/user/src/androidTest/java/com/cnlive/cloud/user/ExampleInstrumentedTest.java
  View file @c7ad681
1 -package com.cnlive.strike.user; 1 +package com.cnlive.cloud.user;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 4
cloud/user/src/main/AndroidManifest.xml
  View file @c7ad681
1 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 1 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
2 xmlns:tools="http://schemas.android.com/tools" 2 xmlns:tools="http://schemas.android.com/tools"
3 - package="com.cnlive.strike.user"> 3 + package="com.cnlive.cloud.user">
4 4
5 <uses-permission android:name="android.permission.INTERNET" /> 5 <uses-permission android:name="android.permission.INTERNET" />
6 6
@@ -40,36 +40,36 @@ @@ -40,36 +40,36 @@
40 android:value="weibo" /> 40 android:value="weibo" />
41 <!-- 个人签名--> 41 <!-- 个人签名-->
42 <activity 42 <activity
43 - android:name=".ui.activity.SignatureActivity" 43 + android:name="com.cnlive.cloud.user.ui.activity.SignatureActivity"
44 android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation" 44 android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
45 android:launchMode="singleTop" 45 android:launchMode="singleTop"
46 android:screenOrientation="portrait" 46 android:screenOrientation="portrait"
47 android:windowSoftInputMode="stateVisible|adjustPan" /> 47 android:windowSoftInputMode="stateVisible|adjustPan" />
48 <!-- 个人资料姓名--> 48 <!-- 个人资料姓名-->
49 <activity 49 <activity
50 - android:name=".ui.activity.UpdateContentActivity" 50 + android:name="com.cnlive.cloud.user.ui.activity.UpdateContentActivity"
51 android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation" 51 android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
52 android:launchMode="singleTop" 52 android:launchMode="singleTop"
53 android:screenOrientation="portrait" /> 53 android:screenOrientation="portrait" />
54 <!--预览头像--> 54 <!--预览头像-->
55 <activity 55 <activity
56 - android:name=".ui.activity.PersonalImageActivity" 56 + android:name="com.cnlive.cloud.user.ui.activity.PersonalImageActivity"
57 android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation" 57 android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
58 android:launchMode="singleTop" 58 android:launchMode="singleTop"
59 android:screenOrientation="portrait" /> 59 android:screenOrientation="portrait" />
60 <!-- 个人资料页--> 60 <!-- 个人资料页-->
61 <activity 61 <activity
62 - android:name=".ui.activity.PersonalDataActivity" 62 + android:name="com.cnlive.cloud.user.ui.activity.PersonalDataActivity"
63 android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation" 63 android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
64 android:launchMode="singleTop" 64 android:launchMode="singleTop"
65 android:screenOrientation="portrait" /> 65 android:screenOrientation="portrait" />
66 <activity 66 <activity
67 - android:name=".ui.activity.LoginDialogActivity" 67 + android:name="com.cnlive.cloud.user.ui.activity.LoginDialogActivity"
68 android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation" 68 android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
69 android:launchMode="singleTop" 69 android:launchMode="singleTop"
70 android:theme="@style/ProcessHtmlDialogActivityTheme" /> 70 android:theme="@style/ProcessHtmlDialogActivityTheme" />
71 <activity 71 <activity
72 - android:name=".ui.activity.LoginActivity" 72 + android:name="com.cnlive.cloud.user.ui.activity.LoginActivity"
73 android:configChanges="keyboardHidden|screenSize|orientation|smallestScreenSize|screenLayout" 73 android:configChanges="keyboardHidden|screenSize|orientation|smallestScreenSize|screenLayout"
74 android:launchMode="singleTop" 74 android:launchMode="singleTop"
75 android:screenOrientation="portrait" 75 android:screenOrientation="portrait"
@@ -79,19 +79,19 @@ @@ -79,19 +79,19 @@
79 </intent-filter> 79 </intent-filter>
80 </activity> 80 </activity>
81 <activity 81 <activity
82 - android:name=".ui.activity.FirstLoginActivity" 82 + android:name="com.cnlive.cloud.user.ui.activity.FirstLoginActivity"
83 android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation" 83 android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
84 android:launchMode="singleTop" 84 android:launchMode="singleTop"
85 android:screenOrientation="portrait" /> 85 android:screenOrientation="portrait" />
86 <activity 86 <activity
87 - android:name=".ui.activity.SelectCountryActivity" 87 + android:name="com.cnlive.cloud.user.ui.activity.SelectCountryActivity"
88 android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation" 88 android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
89 android:launchMode="singleTask" 89 android:launchMode="singleTask"
90 android:screenOrientation="portrait" 90 android:screenOrientation="portrait"
91 android:windowSoftInputMode="adjustResize" /> 91 android:windowSoftInputMode="adjustResize" />
92 92
93 <service 93 <service
94 - android:name="com.cnlive.strike.user.auth.UserAccountService" 94 + android:name="com.cnlive.cloud.user.auth.UserAccountService"
95 tools:ignore="ExportedService"> 95 tools:ignore="ExportedService">
96 <intent-filter> 96 <intent-filter>
97 <action android:name="android.accounts.AccountAuthenticator" /> 97 <action android:name="android.accounts.AccountAuthenticator" />
@@ -103,7 +103,7 @@ @@ -103,7 +103,7 @@
103 </service> 103 </service>
104 104
105 <service 105 <service
106 - android:name="com.cnlive.strike.user.auth.UserSyncService" 106 + android:name="com.cnlive.cloud.user.auth.UserSyncService"
107 android:exported="true"> 107 android:exported="true">
108 <intent-filter> 108 <intent-filter>
109 <action android:name="android.content.SyncAdapter" /> 109 <action android:name="android.content.SyncAdapter" />
@@ -115,7 +115,7 @@ @@ -115,7 +115,7 @@
115 </service> 115 </service>
116 116
117 <provider 117 <provider
118 - android:name="com.cnlive.strike.user.auth.UserAccountProvider" 118 + android:name="com.cnlive.cloud.user.auth.UserAccountProvider"
119 android:authorities="@string/ACCOUNT_PROVIDE" 119 android:authorities="@string/ACCOUNT_PROVIDE"
120 android:exported="false" 120 android:exported="false"
121 android:syncable="true" /> 121 android:syncable="true" />
cloud/user/src/main/java/com/cnlive/strike/user/UserUtilAction.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/UserUtilAction.java
  View file @c7ad681
1 -package com.cnlive.strike.user; 1 +package com.cnlive.cloud.user;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 import android.os.Environment; 4 import android.os.Environment;
cloud/user/src/main/java/com/cnlive/strike/user/auth/AccountAuthenticatorActivity.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/auth/AccountAuthenticatorActivity.java
  View file @c7ad681
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package com.cnlive.strike.user.auth; 17 +package com.cnlive.cloud.user.auth;
18 18
19 import android.accounts.AccountAuthenticatorResponse; 19 import android.accounts.AccountAuthenticatorResponse;
20 import android.accounts.AccountManager; 20 import android.accounts.AccountManager;
cloud/user/src/main/java/com/cnlive/strike/user/auth/UserAccountAuthenticator.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/auth/UserAccountAuthenticator.java
  View file @c7ad681
1 -package com.cnlive.strike.user.auth; 1 +package com.cnlive.cloud.user.auth;
2 2
3 import android.accounts.AbstractAccountAuthenticator; 3 import android.accounts.AbstractAccountAuthenticator;
4 import android.accounts.Account; 4 import android.accounts.Account;
@@ -24,7 +24,7 @@ public class UserAccountAuthenticator extends AbstractAccountAuthenticator { @@ -24,7 +24,7 @@ public class UserAccountAuthenticator extends AbstractAccountAuthenticator {
24 Log.d(_tag, accountType + " - " + authTokenType); 24 Log.d(_tag, accountType + " - " + authTokenType);
25 Bundle ret = new Bundle(); 25 Bundle ret = new Bundle();
26 try { 26 try {
27 - Class<?> clazz = Class.forName("com.cnlive.strike.moudle.user.ui.activity.LoginActivity"); 27 + Class<?> clazz = Class.forName("com.cnlive.cloud.moudle.user.ui.activity.LoginActivity");
28 Intent intent = new Intent(_context, clazz); 28 Intent intent = new Intent(_context, clazz);
29 intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response); 29 intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
30 ret.putParcelable(AccountManager.KEY_INTENT, intent); 30 ret.putParcelable(AccountManager.KEY_INTENT, intent);
cloud/user/src/main/java/com/cnlive/strike/user/auth/UserAccountProvider.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/auth/UserAccountProvider.java
  View file @c7ad681
1 -package com.cnlive.strike.user.auth; 1 +package com.cnlive.cloud.user.auth;
2 2
3 import android.content.ContentProvider; 3 import android.content.ContentProvider;
4 import android.content.ContentValues; 4 import android.content.ContentValues;
cloud/user/src/main/java/com/cnlive/strike/user/auth/UserAccountService.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/auth/UserAccountService.java
  View file @c7ad681
1 -package com.cnlive.strike.user.auth; 1 +package com.cnlive.cloud.user.auth;
2 2
3 import android.app.Service; 3 import android.app.Service;
4 import android.content.Intent; 4 import android.content.Intent;
cloud/user/src/main/java/com/cnlive/strike/user/auth/UserService.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/auth/UserService.java
  View file @c7ad681
1 -package com.cnlive.strike.user.auth; 1 +package com.cnlive.cloud.user.auth;
2 2
3 import android.accounts.Account; 3 import android.accounts.Account;
4 import android.accounts.AccountManager; 4 import android.accounts.AccountManager;
@@ -10,9 +10,9 @@ import android.text.TextUtils; @@ -10,9 +10,9 @@ import android.text.TextUtils;
10 10
11 import com.cnlive.core.libs.base.application.AppConfig; 11 import com.cnlive.core.libs.base.application.AppConfig;
12 import com.cnlive.core.libs.base.util.SharedPreferencesHelper; 12 import com.cnlive.core.libs.base.util.SharedPreferencesHelper;
13 -import com.cnlive.strike.user.R;  
14 -import com.cnlive.strike.user.model.CNLiveUserInfo;  
15 -import com.cnlive.strike.user.model.CNLiveUserInfoExt; 13 +import com.cnlive.cloud.user.R;
  14 +import com.cnlive.cloud.user.model.CNLiveUserInfo;
  15 +import com.cnlive.cloud.user.model.CNLiveUserInfoExt;
16 import com.cnlive.core.network.model.UserData; 16 import com.cnlive.core.network.model.UserData;
17 import com.google.gson.Gson; 17 import com.google.gson.Gson;
18 18
cloud/user/src/main/java/com/cnlive/strike/user/auth/UserSyncService.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/auth/UserSyncService.java
  View file @c7ad681
1 -package com.cnlive.strike.user.auth; 1 +package com.cnlive.cloud.user.auth;
2 2
3 import android.accounts.Account; 3 import android.accounts.Account;
4 import android.app.Service; 4 import android.app.Service;
cloud/user/src/main/java/com/cnlive/strike/user/frame/data/FirstLoginData.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/data/FirstLoginData.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.data; 1 +package com.cnlive.cloud.user.frame.data;
2 2
3 import androidx.databinding.BaseObservable; 3 import androidx.databinding.BaseObservable;
4 import androidx.databinding.Bindable; 4 import androidx.databinding.Bindable;
5 -import com.cnlive.strike.user.BR; 5 +import com.cnlive.cloud.user.BR;
6 /** 6 /**
7 * Created by xiansong on 2018/1/19. 7 * Created by xiansong on 2018/1/19.
8 */ 8 */
cloud/user/src/main/java/com/cnlive/strike/user/frame/data/OtherUserInfo.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/data/OtherUserInfo.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.data; 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/strike/user/frame/data/QuickLoginData.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/data/QuickLoginData.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.data; 1 +package com.cnlive.cloud.user.frame.data;
2 2
3 3
4 import androidx.databinding.BaseObservable; 4 import androidx.databinding.BaseObservable;
@@ -6,7 +6,7 @@ import androidx.databinding.Bindable; @@ -6,7 +6,7 @@ import androidx.databinding.Bindable;
6 6
7 import com.cnlive.core.network.HttpConn; 7 import com.cnlive.core.network.HttpConn;
8 import com.cnlive.core.network.NetCallBack; 8 import com.cnlive.core.network.NetCallBack;
9 -import com.cnlive.strike.user.BR; 9 +import com.cnlive.cloud.user.BR;
10 10
11 import static android.view.View.GONE; 11 import static android.view.View.GONE;
12 import static android.view.View.VISIBLE; 12 import static android.view.View.VISIBLE;
@@ -99,7 +99,7 @@ public class QuickLoginData extends BaseObservable implements NetCallBack { @@ -99,7 +99,7 @@ public class QuickLoginData extends BaseObservable implements NetCallBack {
99 } 99 }
100 100
101 @Override 101 @Override
102 - public void onFailure(String errCode, String errMsg) { 102 + public void onFailure(String errCode, String errMsg, Exception e) {
103 103
104 } 104 }
105 105
cloud/user/src/main/java/com/cnlive/strike/user/frame/presenter/FirstLoginPresenter.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/presenter/FirstLoginPresenter.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.presenter; 1 +package com.cnlive.cloud.user.frame.presenter;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 import android.text.TextUtils; 4 import android.text.TextUtils;
@@ -7,15 +7,15 @@ import com.cnlive.core.libs.base.frame.presenter.BasePresenter; @@ -7,15 +7,15 @@ import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
7 import com.cnlive.core.network.model.BaseResult; 7 import com.cnlive.core.network.model.BaseResult;
8 import com.cnlive.core.network.HttpConn; 8 import com.cnlive.core.network.HttpConn;
9 import com.cnlive.core.network.NetCallBack; 9 import com.cnlive.core.network.NetCallBack;
10 -import com.cnlive.strike.user.R;  
11 -import com.cnlive.strike.user.UserUtilAction;  
12 -import com.cnlive.strike.user.auth.UserService;  
13 -import com.cnlive.strike.user.frame.view.FirstLoginView; 10 +import com.cnlive.cloud.user.R;
  11 +import com.cnlive.cloud.user.UserUtilAction;
  12 +import com.cnlive.cloud.user.auth.UserService;
  13 +import com.cnlive.cloud.user.frame.view.FirstLoginView;
14 import com.cnlive.core.network.model.FaceData; 14 import com.cnlive.core.network.model.FaceData;
15 import com.cnlive.core.network.model.TokenData; 15 import com.cnlive.core.network.model.TokenData;
16 import com.cnlive.core.network.model.UserData; 16 import com.cnlive.core.network.model.UserData;
17 -import com.cnlive.strike.user.router.user.UserOfflineUtil;  
18 -import com.cnlive.strike.user.util.UserRouterHelper; 17 +import com.cnlive.cloud.user.router.user.UserOfflineUtil;
  18 +import com.cnlive.cloud.user.util.UserRouterHelper;
19 19
20 import java.io.File; 20 import java.io.File;
21 21
@@ -50,7 +50,7 @@ public class FirstLoginPresenter extends BasePresenter&lt;FirstLoginView&gt; { @@ -50,7 +50,7 @@ public class FirstLoginPresenter extends BasePresenter&lt;FirstLoginView&gt; {
50 } 50 }
51 51
52 @Override 52 @Override
53 - public void onFailure(String errCode, String errMsg) { 53 + public void onFailure(String errCode, String errMsg, Exception e) {
54 54
55 } 55 }
56 } 56 }
@@ -104,7 +104,7 @@ public class FirstLoginPresenter extends BasePresenter&lt;FirstLoginView&gt; { @@ -104,7 +104,7 @@ public class FirstLoginPresenter extends BasePresenter&lt;FirstLoginView&gt; {
104 } 104 }
105 105
106 @Override 106 @Override
107 - public void onFailure(String errCode, String errMsg) { 107 + public void onFailure(String errCode, String errMsg, Exception e) {
108 if ("8".equals(errCode) || "9".equals(errCode)) { 108 if ("8".equals(errCode) || "9".equals(errCode)) {
109 // UserOfflineUtil.userInvalid(context); 109 // UserOfflineUtil.userInvalid(context);
110 UserRouterHelper.userInvalid(context); 110 UserRouterHelper.userInvalid(context);
@@ -155,7 +155,7 @@ public class FirstLoginPresenter extends BasePresenter&lt;FirstLoginView&gt; { @@ -155,7 +155,7 @@ public class FirstLoginPresenter extends BasePresenter&lt;FirstLoginView&gt; {
155 } 155 }
156 156
157 @Override 157 @Override
158 - public void onFailure(String errCode, String errMsg) { 158 + public void onFailure(String errCode, String errMsg, Exception e) {
159 if ("8".equals(errCode) || "9".equals(errCode)) { 159 if ("8".equals(errCode) || "9".equals(errCode)) {
160 UserOfflineUtil.userInvalid(context); 160 UserOfflineUtil.userInvalid(context);
161 UserRouterHelper.userInvalid(context); 161 UserRouterHelper.userInvalid(context);
cloud/user/src/main/java/com/cnlive/strike/user/frame/presenter/LoginDialogPresenter.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/presenter/LoginDialogPresenter.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.presenter; 1 +package com.cnlive.cloud.user.frame.presenter;
2 2
3 import android.accounts.Account; 3 import android.accounts.Account;
4 import android.content.Context; 4 import android.content.Context;
@@ -10,18 +10,17 @@ import com.cnlive.core.libs.base.util.TimerWaitUtil; @@ -10,18 +10,17 @@ import com.cnlive.core.libs.base.util.TimerWaitUtil;
10 import com.cnlive.core.network.HttpConn; 10 import com.cnlive.core.network.HttpConn;
11 import com.cnlive.core.network.NetCallBack; 11 import com.cnlive.core.network.NetCallBack;
12 import com.cnlive.core.network.model.BaseResult; 12 import com.cnlive.core.network.model.BaseResult;
13 -import com.cnlive.strike.user.R;  
14 -import com.cnlive.strike.user.UserUtilAction;  
15 -import com.cnlive.strike.user.auth.UserService;  
16 -import com.cnlive.strike.user.frame.data.OtherUserInfo;  
17 -import com.cnlive.strike.user.frame.data.QuickLoginData;  
18 -import com.cnlive.strike.user.frame.view.LoginDialogView;  
19 -import com.cnlive.strike.user.model.CNLiveUserInfo;  
20 -import com.cnlive.strike.user.router.user.UserAction;  
21 -import com.cnlive.strike.user.ui.activity.LoginDialogActivity;  
22 -import com.cnlive.strike.user.ui.fragment.QuickLoginFragment;  
23 -import com.cnlive.strike.user.util.RegexUtils;  
24 -import com.cnlive.strike.user.util.TimeEvent; 13 +import com.cnlive.cloud.user.R;
  14 +import com.cnlive.cloud.user.UserUtilAction;
  15 +import com.cnlive.cloud.user.auth.UserService;
  16 +import com.cnlive.cloud.user.frame.data.OtherUserInfo;
  17 +import com.cnlive.cloud.user.frame.data.QuickLoginData;
  18 +import com.cnlive.cloud.user.frame.view.LoginDialogView;
  19 +import com.cnlive.cloud.user.model.CNLiveUserInfo;
  20 +import com.cnlive.cloud.user.router.user.UserAction;
  21 +import com.cnlive.cloud.user.ui.activity.LoginDialogActivity;
  22 +import com.cnlive.cloud.user.util.RegexUtils;
  23 +import com.cnlive.cloud.user.util.TimeEvent;
25 24
26 import java.util.Arrays; 25 import java.util.Arrays;
27 import java.util.Collections; 26 import java.util.Collections;
@@ -117,7 +116,7 @@ public class LoginDialogPresenter extends BasePresenter&lt;LoginDialogView&gt; { @@ -117,7 +116,7 @@ public class LoginDialogPresenter extends BasePresenter&lt;LoginDialogView&gt; {
117 } 116 }
118 117
119 @Override 118 @Override
120 - public void onFailure(String errCode, String errMsg) { 119 + public void onFailure(String errCode, String errMsg, Exception e) {
121 ifViewAttached(view -> view.showToast(errMsg)); 120 ifViewAttached(view -> view.showToast(errMsg));
122 121
123 } 122 }
cloud/user/src/main/java/com/cnlive/strike/user/frame/presenter/PersonalDataPresenter.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/presenter/PersonalDataPresenter.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.presenter; 1 +package com.cnlive.cloud.user.frame.presenter;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 import android.text.InputFilter; 4 import android.text.InputFilter;
5 import android.text.InputType; 5 import android.text.InputType;
6 import android.text.TextUtils; 6 import android.text.TextUtils;
7 import android.widget.EditText; 7 import android.widget.EditText;
8 -import android.widget.Toast;  
9 8
10 import com.cnlive.core.libs.base.frame.presenter.BasePresenter; 9 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
11 import com.cnlive.core.libs.base.util.AlertUtil; 10 import com.cnlive.core.libs.base.util.AlertUtil;
12 import com.cnlive.core.network.HttpConn; 11 import com.cnlive.core.network.HttpConn;
13 import com.cnlive.core.network.NetCallBack; 12 import com.cnlive.core.network.NetCallBack;
14 import com.cnlive.core.network.model.BaseResult; 13 import com.cnlive.core.network.model.BaseResult;
15 -import com.cnlive.strike.user.UserUtilAction;  
16 -import com.cnlive.strike.user.auth.UserService;  
17 -import com.cnlive.strike.user.frame.view.PersonalDataView;  
18 -import com.cnlive.strike.user.model.CNLiveUserInfoExt;  
19 -import com.cnlive.strike.user.model.msg.UserEventMsg;  
20 -import com.cnlive.strike.user.ui.activity.PersonalDataActivity;  
21 -import com.cnlive.strike.user.util.UserRouterHelper; 14 +import com.cnlive.cloud.user.UserUtilAction;
  15 +import com.cnlive.cloud.user.auth.UserService;
  16 +import com.cnlive.cloud.user.frame.view.PersonalDataView;
  17 +import com.cnlive.cloud.user.model.CNLiveUserInfoExt;
  18 +import com.cnlive.cloud.user.ui.activity.PersonalDataActivity;
  19 +import com.cnlive.cloud.user.util.UserRouterHelper;
22 import com.google.gson.Gson; 20 import com.google.gson.Gson;
23 -import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;  
24 import com.qmuiteam.qmui.widget.dialog.QMUIDialog; 21 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
25 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; 22 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
26 23
27 -import org.greenrobot.eventbus.EventBus;  
28 -  
29 import io.reactivex.disposables.Disposable; 24 import io.reactivex.disposables.Disposable;
30 25
31 //import com.cnlive.tcsdk.LoginManager; 26 //import com.cnlive.tcsdk.LoginManager;
@@ -124,7 +119,7 @@ public class PersonalDataPresenter extends BasePresenter&lt;PersonalDataView&gt; { @@ -124,7 +119,7 @@ public class PersonalDataPresenter extends BasePresenter&lt;PersonalDataView&gt; {
124 } 119 }
125 120
126 @Override 121 @Override
127 - public void onFailure(String errCode, String errMsg) { 122 + public void onFailure(String errCode, String errMsg, Exception e) {
128 if (UserUtilAction.TOKEN_ERROR_CODE.equals(errCode)) { 123 if (UserUtilAction.TOKEN_ERROR_CODE.equals(errCode)) {
129 ifViewAttached(view -> view.showTokenErrorDialog()); 124 ifViewAttached(view -> view.showTokenErrorDialog());
130 } else { 125 } else {
@@ -237,7 +232,7 @@ public class PersonalDataPresenter extends BasePresenter&lt;PersonalDataView&gt; { @@ -237,7 +232,7 @@ public class PersonalDataPresenter extends BasePresenter&lt;PersonalDataView&gt; {
237 } 232 }
238 233
239 @Override 234 @Override
240 - public void onFailure(String errCode, String errMsg) { 235 + public void onFailure(String errCode, String errMsg, Exception e) {
241 if (UserUtilAction.TOKEN_ERROR_CODE.equals(errCode)) { 236 if (UserUtilAction.TOKEN_ERROR_CODE.equals(errCode)) {
242 ifViewAttached(view -> view.showTokenErrorDialog()); 237 ifViewAttached(view -> view.showTokenErrorDialog());
243 } else { 238 } else {
cloud/user/src/main/java/com/cnlive/strike/user/frame/presenter/PersonalImagePresenter.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/presenter/PersonalImagePresenter.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.presenter; 1 +package com.cnlive.cloud.user.frame.presenter;
2 2
3 import android.content.SharedPreferences; 3 import android.content.SharedPreferences;
4 4
@@ -10,11 +10,11 @@ import com.cnlive.core.network.NetCallBack; @@ -10,11 +10,11 @@ import com.cnlive.core.network.NetCallBack;
10 import com.cnlive.core.network.model.BaseResult; 10 import com.cnlive.core.network.model.BaseResult;
11 import com.cnlive.core.network.model.FaceData; 11 import com.cnlive.core.network.model.FaceData;
12 import com.cnlive.core.network.model.TokenData; 12 import com.cnlive.core.network.model.TokenData;
13 -import com.cnlive.strike.user.UserUtilAction;  
14 -import com.cnlive.strike.user.auth.UserService;  
15 -import com.cnlive.strike.user.frame.view.PersonalImageView;  
16 -import com.cnlive.strike.user.ui.activity.PersonalImageActivity;  
17 -import com.cnlive.strike.user.util.UserRouterHelper; 13 +import com.cnlive.cloud.user.UserUtilAction;
  14 +import com.cnlive.cloud.user.auth.UserService;
  15 +import com.cnlive.cloud.user.frame.view.PersonalImageView;
  16 +import com.cnlive.cloud.user.ui.activity.PersonalImageActivity;
  17 +import com.cnlive.cloud.user.util.UserRouterHelper;
18 18
19 import java.io.File; 19 import java.io.File;
20 20
@@ -88,7 +88,7 @@ public class PersonalImagePresenter extends BasePresenter&lt;PersonalImageView&gt; { @@ -88,7 +88,7 @@ public class PersonalImagePresenter extends BasePresenter&lt;PersonalImageView&gt; {
88 } 88 }
89 89
90 @Override 90 @Override
91 - public void onFailure(String errCode, String errMsg) { 91 + public void onFailure(String errCode, String errMsg, Exception e) {
92 ifViewAttached(view -> view.hideLoading()); 92 ifViewAttached(view -> view.hideLoading());
93 if (UserUtilAction.TOKEN_ERROR_CODE.equals(errCode)) { 93 if (UserUtilAction.TOKEN_ERROR_CODE.equals(errCode)) {
94 ifViewAttached(view -> view.showTokenErrorDialog()); 94 ifViewAttached(view -> view.showTokenErrorDialog());
cloud/user/src/main/java/com/cnlive/strike/user/frame/presenter/QuickLoginPresenter.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/presenter/QuickLoginPresenter.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.presenter; 1 +package com.cnlive.cloud.user.frame.presenter;
2 2
3 import android.accounts.Account; 3 import android.accounts.Account;
4 import android.content.Context; 4 import android.content.Context;
@@ -10,17 +10,17 @@ import com.cnlive.core.network.model.BaseResult; @@ -10,17 +10,17 @@ import com.cnlive.core.network.model.BaseResult;
10 import com.cnlive.core.network.HttpConn; 10 import com.cnlive.core.network.HttpConn;
11 import com.cnlive.core.network.NetCallBack; 11 import com.cnlive.core.network.NetCallBack;
12 import com.cnlive.core.libs.base.util.TimerWaitUtil; 12 import com.cnlive.core.libs.base.util.TimerWaitUtil;
13 -import com.cnlive.strike.user.R;  
14 -import com.cnlive.strike.user.UserUtilAction;  
15 -import com.cnlive.strike.user.auth.UserService;  
16 -import com.cnlive.strike.user.frame.data.OtherUserInfo;  
17 -import com.cnlive.strike.user.frame.data.QuickLoginData;  
18 -import com.cnlive.strike.user.frame.view.QuickLoginView;  
19 -import com.cnlive.strike.user.model.CNLiveUserInfo;  
20 -import com.cnlive.strike.user.router.user.UserAction;  
21 -import com.cnlive.strike.user.ui.fragment.QuickLoginFragment;  
22 -import com.cnlive.strike.user.util.RegexUtils;  
23 -import com.cnlive.strike.user.util.TimeEvent; 13 +import com.cnlive.cloud.user.R;
  14 +import com.cnlive.cloud.user.UserUtilAction;
  15 +import com.cnlive.cloud.user.auth.UserService;
  16 +import com.cnlive.cloud.user.frame.data.OtherUserInfo;
  17 +import com.cnlive.cloud.user.frame.data.QuickLoginData;
  18 +import com.cnlive.cloud.user.frame.view.QuickLoginView;
  19 +import com.cnlive.cloud.user.model.CNLiveUserInfo;
  20 +import com.cnlive.cloud.user.router.user.UserAction;
  21 +import com.cnlive.cloud.user.ui.fragment.QuickLoginFragment;
  22 +import com.cnlive.cloud.user.util.RegexUtils;
  23 +import com.cnlive.cloud.user.util.TimeEvent;
24 24
25 import java.util.Arrays; 25 import java.util.Arrays;
26 import java.util.Collections; 26 import java.util.Collections;
@@ -112,7 +112,7 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; { @@ -112,7 +112,7 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
112 } 112 }
113 113
114 @Override 114 @Override
115 - public void onFailure(String errCode, String errMsg) { 115 + public void onFailure(String errCode, String errMsg, Exception e) {
116 ifViewAttached(view -> view.showToast(errMsg)); 116 ifViewAttached(view -> view.showToast(errMsg));
117 117
118 } 118 }
cloud/user/src/main/java/com/cnlive/strike/user/frame/presenter/SelectCountryPresenter.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/presenter/SelectCountryPresenter.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.presenter; 1 +package com.cnlive.cloud.user.frame.presenter;
2 2
3 -import com.cnlive.core.libs.base.frame.activity.BaseActivity;  
4 import com.cnlive.core.libs.base.frame.presenter.BasePresenter; 3 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
5 -import com.cnlive.strike.user.frame.view.SelectCountryView;  
6 -import com.cnlive.strike.user.model.CountryData;  
7 -import com.cnlive.strike.user.ui.activity.SelectCountryActivity; 4 +import com.cnlive.cloud.user.frame.view.SelectCountryView;
  5 +import com.cnlive.cloud.user.model.CountryData;
  6 +import com.cnlive.cloud.user.ui.activity.SelectCountryActivity;
8 import com.google.gson.Gson; 7 import com.google.gson.Gson;
9 import com.google.gson.reflect.TypeToken; 8 import com.google.gson.reflect.TypeToken;
10 -import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;  
11 9
12 import java.lang.reflect.Type; 10 import java.lang.reflect.Type;
13 import java.util.ArrayList; 11 import java.util.ArrayList;
cloud/user/src/main/java/com/cnlive/strike/user/frame/view/FirstLoginView.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/view/FirstLoginView.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.view; 1 +package com.cnlive.cloud.user.frame.view;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 import android.content.Context; 4 import android.content.Context;
5 -import android.content.Intent;  
6 -import android.text.TextUtils;  
7 5
8 import com.cnlive.core.libs.base.frame.view.BaseView; 6 import com.cnlive.core.libs.base.frame.view.BaseView;
9 import com.cnlive.core.libs.base.util.AlertUtil; 7 import com.cnlive.core.libs.base.util.AlertUtil;
10 import com.cnlive.core.libs.base.util.GlideUtil; 8 import com.cnlive.core.libs.base.util.GlideUtil;
11 -import com.cnlive.strike.user.R;  
12 -import com.cnlive.strike.user.model.LoginSuccessInfo;  
13 -import com.cnlive.strike.user.model.msg.UserEventMsg;  
14 -import com.cnlive.strike.user.ui.activity.FirstLoginActivity;  
15 -import com.cnlive.strike.user.ui.fragment.FirstLoginFragment;  
16 -import com.cnlive.strike.user.ui.widget.TokenErrorDialog; 9 +import com.cnlive.cloud.user.R;
  10 +import com.cnlive.cloud.user.model.LoginSuccessInfo;
  11 +import com.cnlive.cloud.user.model.msg.UserEventMsg;
  12 +import com.cnlive.cloud.user.ui.fragment.FirstLoginFragment;
  13 +import com.cnlive.cloud.user.ui.widget.TokenErrorDialog;
17 14
18 import org.greenrobot.eventbus.EventBus; 15 import org.greenrobot.eventbus.EventBus;
19 16
cloud/user/src/main/java/com/cnlive/strike/user/frame/view/LoginDialogView.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/view/LoginDialogView.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.view; 1 +package com.cnlive.cloud.user.frame.view;
2 2
3 import android.accounts.Account; 3 import android.accounts.Account;
4 import android.content.Context; 4 import android.content.Context;
@@ -18,14 +18,14 @@ import com.cnlive.core.libs.base.application.AppConfig; @@ -18,14 +18,14 @@ import com.cnlive.core.libs.base.application.AppConfig;
18 import com.cnlive.core.libs.base.frame.view.BaseView; 18 import com.cnlive.core.libs.base.frame.view.BaseView;
19 import com.cnlive.core.libs.base.util.AlertUtil; 19 import com.cnlive.core.libs.base.util.AlertUtil;
20 import com.cnlive.core.libs.base.util.DoublePressed; 20 import com.cnlive.core.libs.base.util.DoublePressed;
21 -import com.cnlive.strike.user.R;  
22 -import com.cnlive.strike.user.frame.data.OtherUserInfo;  
23 -import com.cnlive.strike.user.sms.OnSmsCatchListener;  
24 -import com.cnlive.strike.user.sms.SmsVerifyCatcher;  
25 -import com.cnlive.strike.user.ui.activity.FirstLoginActivity;  
26 -import com.cnlive.strike.user.ui.activity.LoginActivity;  
27 -import com.cnlive.strike.user.ui.activity.LoginDialogActivity;  
28 -import com.cnlive.strike.user.util.UserRouterHelper; 21 +import com.cnlive.cloud.user.R;
  22 +import com.cnlive.cloud.user.frame.data.OtherUserInfo;
  23 +import com.cnlive.cloud.user.sms.OnSmsCatchListener;
  24 +import com.cnlive.cloud.user.sms.SmsVerifyCatcher;
  25 +import com.cnlive.cloud.user.ui.activity.FirstLoginActivity;
  26 +import com.cnlive.cloud.user.ui.activity.LoginActivity;
  27 +import com.cnlive.cloud.user.ui.activity.LoginDialogActivity;
  28 +import com.cnlive.cloud.user.util.UserRouterHelper;
29 29
30 import java.util.regex.Matcher; 30 import java.util.regex.Matcher;
31 import java.util.regex.Pattern; 31 import java.util.regex.Pattern;
cloud/user/src/main/java/com/cnlive/strike/user/frame/view/PersonalDataView.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/view/PersonalDataView.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.view; 1 +package com.cnlive.cloud.user.frame.view;
2 2
3 import android.text.TextUtils; 3 import android.text.TextUtils;
4 4
@@ -8,11 +8,11 @@ import com.bumptech.glide.request.RequestOptions; @@ -8,11 +8,11 @@ import com.bumptech.glide.request.RequestOptions;
8 import com.cnlive.core.libs.base.frame.view.BaseView; 8 import com.cnlive.core.libs.base.frame.view.BaseView;
9 import com.cnlive.core.libs.base.util.AlertUtil; 9 import com.cnlive.core.libs.base.util.AlertUtil;
10 import com.cnlive.core.libs.base.util.GlideUtil; 10 import com.cnlive.core.libs.base.util.GlideUtil;
11 -import com.cnlive.strike.user.R;  
12 -import com.cnlive.strike.user.auth.UserService;  
13 -import com.cnlive.strike.user.model.CNLiveUserInfo;  
14 -import com.cnlive.strike.user.ui.activity.PersonalDataActivity;  
15 -import com.cnlive.strike.user.ui.widget.TokenErrorDialog; 11 +import com.cnlive.cloud.user.R;
  12 +import com.cnlive.cloud.user.auth.UserService;
  13 +import com.cnlive.cloud.user.model.CNLiveUserInfo;
  14 +import com.cnlive.cloud.user.ui.activity.PersonalDataActivity;
  15 +import com.cnlive.cloud.user.ui.widget.TokenErrorDialog;
16 16
17 import static com.bumptech.glide.request.RequestOptions.bitmapTransform; 17 import static com.bumptech.glide.request.RequestOptions.bitmapTransform;
18 18
cloud/user/src/main/java/com/cnlive/strike/user/frame/view/PersonalImageView.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/view/PersonalImageView.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.view; 1 +package com.cnlive.cloud.user.frame.view;
2 2
3 import android.Manifest; 3 import android.Manifest;
4 -import android.app.Activity;  
5 import android.content.Context; 4 import android.content.Context;
6 import android.content.Intent; 5 import android.content.Intent;
7 import android.os.Environment; 6 import android.os.Environment;
@@ -23,13 +22,12 @@ import com.cnlive.media.picker.ImagePicker; @@ -23,13 +22,12 @@ import com.cnlive.media.picker.ImagePicker;
23 import com.cnlive.media.picker.PickerConfig; 22 import com.cnlive.media.picker.PickerConfig;
24 import com.cnlive.media.picker.utils.FileUtils; 23 import com.cnlive.media.picker.utils.FileUtils;
25 import com.cnlive.media.picker.utils.ImagePickerComUtils; 24 import com.cnlive.media.picker.utils.ImagePickerComUtils;
26 -import com.cnlive.media.picker.utils.PermissionChecker;  
27 -import com.cnlive.strike.user.R;  
28 -import com.cnlive.strike.user.preview.ui.widget.DownLoadImageService;  
29 -import com.cnlive.strike.user.preview.ui.widget.ImageDownLoadCallBack;  
30 -import com.cnlive.strike.user.ui.activity.PersonalImageActivity;  
31 -import com.cnlive.strike.user.ui.widget.TokenErrorDialog;  
32 -import com.cnlive.strike.user.util.UserRouterHelper; 25 +import com.cnlive.cloud.user.R;
  26 +import com.cnlive.cloud.user.preview.ui.widget.DownLoadImageService;
  27 +import com.cnlive.cloud.user.preview.ui.widget.ImageDownLoadCallBack;
  28 +import com.cnlive.cloud.user.ui.activity.PersonalImageActivity;
  29 +import com.cnlive.cloud.user.ui.widget.TokenErrorDialog;
  30 +import com.cnlive.cloud.user.util.UserRouterHelper;
33 31
34 import java.io.File; 32 import java.io.File;
35 import java.io.IOException; 33 import java.io.IOException;
cloud/user/src/main/java/com/cnlive/strike/user/frame/view/QuickLoginView.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/view/QuickLoginView.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.view; 1 +package com.cnlive.cloud.user.frame.view;
2 2
3 import android.accounts.Account; 3 import android.accounts.Account;
4 import android.app.Activity; 4 import android.app.Activity;
@@ -20,15 +20,15 @@ import com.cnlive.core.libs.base.application.AppConfig; @@ -20,15 +20,15 @@ import com.cnlive.core.libs.base.application.AppConfig;
20 import com.cnlive.core.libs.base.frame.view.BaseView; 20 import com.cnlive.core.libs.base.frame.view.BaseView;
21 import com.cnlive.core.libs.base.util.AlertUtil; 21 import com.cnlive.core.libs.base.util.AlertUtil;
22 import com.cnlive.core.libs.base.util.DoublePressed; 22 import com.cnlive.core.libs.base.util.DoublePressed;
23 -import com.cnlive.strike.user.R;  
24 -import com.cnlive.strike.user.frame.data.OtherUserInfo;  
25 -import com.cnlive.strike.user.model.LoginSuccessInfo;  
26 -import com.cnlive.strike.user.sms.OnSmsCatchListener;  
27 -import com.cnlive.strike.user.sms.SmsVerifyCatcher;  
28 -import com.cnlive.strike.user.ui.activity.FirstLoginActivity;  
29 -import com.cnlive.strike.user.ui.activity.LoginActivity;  
30 -import com.cnlive.strike.user.ui.fragment.QuickLoginFragment;  
31 -import com.cnlive.strike.user.util.UserRouterHelper; 23 +import com.cnlive.cloud.user.R;
  24 +import com.cnlive.cloud.user.frame.data.OtherUserInfo;
  25 +import com.cnlive.cloud.user.model.LoginSuccessInfo;
  26 +import com.cnlive.cloud.user.sms.OnSmsCatchListener;
  27 +import com.cnlive.cloud.user.sms.SmsVerifyCatcher;
  28 +import com.cnlive.cloud.user.ui.activity.FirstLoginActivity;
  29 +import com.cnlive.cloud.user.ui.activity.LoginActivity;
  30 +import com.cnlive.cloud.user.ui.fragment.QuickLoginFragment;
  31 +import com.cnlive.cloud.user.util.UserRouterHelper;
32 32
33 import java.util.regex.Matcher; 33 import java.util.regex.Matcher;
34 import java.util.regex.Pattern; 34 import java.util.regex.Pattern;
cloud/user/src/main/java/com/cnlive/strike/user/frame/view/SelectCountryView.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/frame/view/SelectCountryView.java
  View file @c7ad681
1 -package com.cnlive.strike.user.frame.view; 1 +package com.cnlive.cloud.user.frame.view;
2 2
3 import android.content.Intent; 3 import android.content.Intent;
4 import android.view.Gravity; 4 import android.view.Gravity;
@@ -12,10 +12,10 @@ import com.cnlive.core.libs.base.frame.view.BaseView; @@ -12,10 +12,10 @@ import com.cnlive.core.libs.base.frame.view.BaseView;
12 import com.cnlive.core.libs.base.ui.widget.LetterBarView; 12 import com.cnlive.core.libs.base.ui.widget.LetterBarView;
13 import com.cnlive.core.libs.base.util.AlertUtil; 13 import com.cnlive.core.libs.base.util.AlertUtil;
14 import com.cnlive.core.libs.base.util.DensityUtils; 14 import com.cnlive.core.libs.base.util.DensityUtils;
15 -import com.cnlive.strike.user.R;  
16 -import com.cnlive.strike.user.model.CountryData;  
17 -import com.cnlive.strike.user.ui.activity.SelectCountryActivity;  
18 -import com.cnlive.strike.user.ui.adapter.SelectCountryAdapter; 15 +import com.cnlive.cloud.user.R;
  16 +import com.cnlive.cloud.user.model.CountryData;
  17 +import com.cnlive.cloud.user.ui.activity.SelectCountryActivity;
  18 +import com.cnlive.cloud.user.ui.adapter.SelectCountryAdapter;
19 import com.qmuiteam.qmui.widget.QMUITopBar; 19 import com.qmuiteam.qmui.widget.QMUITopBar;
20 20
21 import java.util.List; 21 import java.util.List;
cloud/user/src/main/java/com/cnlive/strike/user/model/BankCardInfo.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/model/BankCardInfo.java
  View file @c7ad681
1 -package com.cnlive.strike.user.model; 1 +package com.cnlive.cloud.user.model;
2 2
3 /** 3 /**
4 * 银行卡信息 4 * 银行卡信息
cloud/user/src/main/java/com/cnlive/strike/user/model/BindPhoneNumberInfo.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/model/BindPhoneNumberInfo.java
  View file @c7ad681
1 -package com.cnlive.strike.user.model; 1 +package com.cnlive.cloud.user.model;
2 2
3 import android.graphics.drawable.Drawable; 3 import android.graphics.drawable.Drawable;
4 4
@@ -7,7 +7,7 @@ import androidx.databinding.BaseObservable; @@ -7,7 +7,7 @@ import androidx.databinding.BaseObservable;
7 import androidx.databinding.Bindable; 7 import androidx.databinding.Bindable;
8 8
9 import java.io.Serializable; 9 import java.io.Serializable;
10 -import com.cnlive.strike.user.BR; 10 +import com.cnlive.cloud.user.BR;
11 /** 11 /**
12 * 作者: 吴奎庆 12 * 作者: 吴奎庆
13 * <p> 13 * <p>
cloud/user/src/main/java/com/cnlive/strike/user/model/CNLiveUserInfo.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/model/CNLiveUserInfo.java
  View file @c7ad681
1 -package com.cnlive.strike.user.model; 1 +package com.cnlive.cloud.user.model;
2 2
3 import android.text.TextUtils; 3 import android.text.TextUtils;
4 4
cloud/user/src/main/java/com/cnlive/strike/user/model/CNLiveUserInfoExt.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/model/CNLiveUserInfoExt.java
  View file @c7ad681
1 -package com.cnlive.strike.user.model; 1 +package com.cnlive.cloud.user.model;
2 2
3 /** 3 /**
4 * Created by xiansong on 2018/4/3. 4 * Created by xiansong on 2018/4/3.
cloud/user/src/main/java/com/cnlive/strike/user/model/CertificationInfo.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/model/CertificationInfo.java
  View file @c7ad681
1 -package com.cnlive.strike.user.model; 1 +package com.cnlive.cloud.user.model;
2 2
3 /** 3 /**
4 * 实名认证信息 4 * 实名认证信息
cloud/user/src/main/java/com/cnlive/strike/user/model/CountryData.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/model/CountryData.java
  View file @c7ad681
1 -package com.cnlive.strike.user.model; 1 +package com.cnlive.cloud.user.model;
2 2
3 import android.text.TextUtils; 3 import android.text.TextUtils;
4 4
5 import androidx.databinding.BaseObservable; 5 import androidx.databinding.BaseObservable;
6 import androidx.databinding.Bindable; 6 import androidx.databinding.Bindable;
7 7
8 -import com.cnlive.strike.user.util.PinyinUtil;  
9 -import com.cnlive.strike.user.util.search.SearchUtil; 8 +import com.cnlive.cloud.user.util.PinyinUtil;
  9 +import com.cnlive.cloud.user.util.search.SearchUtil;
10 10
11 import java.io.Serializable; 11 import java.io.Serializable;
12 import java.util.Locale; 12 import java.util.Locale;
13 -import com.cnlive.strike.user.BR; 13 +import com.cnlive.cloud.user.BR;
14 /** 14 /**
15 * 作者: 吴奎庆 15 * 作者: 吴奎庆
16 * <p> 16 * <p>
cloud/user/src/main/java/com/cnlive/strike/user/model/LaunchPage.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/model/LaunchPage.java
  View file @c7ad681
1 -package com.cnlive.strike.user.model; 1 +package com.cnlive.cloud.user.model;
2 2
3 import android.view.View; 3 import android.view.View;
4 4
5 import androidx.databinding.BaseObservable; 5 import androidx.databinding.BaseObservable;
6 import androidx.databinding.Bindable; 6 import androidx.databinding.Bindable;
7 7
8 -import com.cnlive.strike.user.BR;  
9 -  
10 8
11 public class LaunchPage extends BaseObservable { 9 public class LaunchPage extends BaseObservable {
12 10
@@ -19,6 +17,6 @@ public class LaunchPage extends BaseObservable { @@ -19,6 +17,6 @@ public class LaunchPage extends BaseObservable {
19 17
20 public void setLoading(int loading) { 18 public void setLoading(int loading) {
21 this.loading = loading; 19 this.loading = loading;
22 - notifyPropertyChanged(com.cnlive.strike.user.BR.loading); 20 + notifyPropertyChanged(com.cnlive.cloud.user.BR.loading);
23 } 21 }
24 } 22 }
cloud/user/src/main/java/com/cnlive/strike/user/model/LoginSuccessInfo.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/model/LoginSuccessInfo.java
  View file @c7ad681
1 -package com.cnlive.strike.user.model; 1 +package com.cnlive.cloud.user.model;
2 2
3 import android.net.Uri; 3 import android.net.Uri;
4 4
cloud/user/src/main/java/com/cnlive/strike/user/model/UserData.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/model/UserData.java
  View file @c7ad681
1 -package com.cnlive.strike.user.model; 1 +package com.cnlive.cloud.user.model;
2 2
3 /** 3 /**
4 * Created by Lynn on 2018/10/15. 4 * Created by Lynn on 2018/10/15.
cloud/user/src/main/java/com/cnlive/strike/user/model/UserFaithInfo.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/model/UserFaithInfo.java
  View file @c7ad681
1 -package com.cnlive.strike.user.model; 1 +package com.cnlive.cloud.user.model;
2 2
3 /** 3 /**
4 * 用户信用信息 4 * 用户信用信息
cloud/user/src/main/java/com/cnlive/strike/user/model/WalletInfo.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/model/WalletInfo.java
  View file @c7ad681
1 -package com.cnlive.strike.user.model; 1 +package com.cnlive.cloud.user.model;
2 2
3 /** 3 /**
4 * 我的钱包 / 资产管理 4 * 我的钱包 / 资产管理
cloud/user/src/main/java/com/cnlive/strike/user/model/msg/UserEventMsg.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/model/msg/UserEventMsg.java
  View file @c7ad681
1 -package com.cnlive.strike.user.model.msg; 1 +package com.cnlive.cloud.user.model.msg;
2 2
3 public class UserEventMsg { 3 public class UserEventMsg {
4 public static final int LOGIN_SUCCESS = 0;//登陆成功 4 public static final int LOGIN_SUCCESS = 0;//登陆成功
cloud/user/src/main/java/com/cnlive/strike/user/preview/ui/widget/DownLoadImageService.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/preview/ui/widget/DownLoadImageService.java
  View file @c7ad681
1 -package com.cnlive.strike.user.preview.ui.widget; 1 +package com.cnlive.cloud.user.preview.ui.widget;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 import android.content.Intent; 4 import android.content.Intent;
cloud/user/src/main/java/com/cnlive/strike/user/preview/ui/widget/ImageDownLoadCallBack.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/preview/ui/widget/ImageDownLoadCallBack.java
  View file @c7ad681
1 -package com.cnlive.strike.user.preview.ui.widget; 1 +package com.cnlive.cloud.user.preview.ui.widget;
2 2
3 import java.io.File; 3 import java.io.File;
4 import java.io.IOException; 4 import java.io.IOException;
cloud/user/src/main/java/com/cnlive/strike/user/router/user/UserARouter.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/router/user/UserARouter.java
  View file @c7ad681
1 -package com.cnlive.strike.user.router.user; 1 +package com.cnlive.cloud.user.router.user;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 4
5 import com.alibaba.android.arouter.launcher.ARouter; 5 import com.alibaba.android.arouter.launcher.ARouter;
6 -import com.cnlive.strike.user.R; 6 +import com.cnlive.cloud.user.R;
7 7
8 /** 8 /**
9 * 作者: 吴奎庆 9 * 作者: 吴奎庆
cloud/user/src/main/java/com/cnlive/strike/user/router/user/UserAction.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/router/user/UserAction.java
  View file @c7ad681
1 -package com.cnlive.strike.user.router.user; 1 +package com.cnlive.cloud.user.router.user;
2 2
3 import android.accounts.Account; 3 import android.accounts.Account;
4 import android.app.Activity; 4 import android.app.Activity;
@@ -10,9 +10,9 @@ import com.cnlive.core.network.model.BaseResult; @@ -10,9 +10,9 @@ import com.cnlive.core.network.model.BaseResult;
10 import com.cnlive.core.network.HttpConn; 10 import com.cnlive.core.network.HttpConn;
11 import com.cnlive.core.network.NetCallBack; 11 import com.cnlive.core.network.NetCallBack;
12 import com.cnlive.core.network.model.UserData; 12 import com.cnlive.core.network.model.UserData;
13 -import com.cnlive.strike.user.UserUtilAction;  
14 -import com.cnlive.strike.user.auth.UserService;  
15 -import com.cnlive.strike.user.model.CNLiveUserInfo; 13 +import com.cnlive.cloud.user.UserUtilAction;
  14 +import com.cnlive.cloud.user.auth.UserService;
  15 +import com.cnlive.cloud.user.model.CNLiveUserInfo;
16 16
17 import io.reactivex.Observable; 17 import io.reactivex.Observable;
18 import io.reactivex.disposables.Disposable; 18 import io.reactivex.disposables.Disposable;
@@ -67,7 +67,7 @@ public class UserAction { @@ -67,7 +67,7 @@ public class UserAction {
67 } 67 }
68 68
69 @Override 69 @Override
70 - public void onFailure(String errCode, String errMsg) { 70 + public void onFailure(String errCode, String errMsg, Exception e) {
71 if (null != callBack) { 71 if (null != callBack) {
72 callBack.callback(Integer.parseInt(errCode), errMsg, null); 72 callBack.callback(Integer.parseInt(errCode), errMsg, null);
73 } 73 }
cloud/user/src/main/java/com/cnlive/strike/user/router/user/UserOfflineUtil.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/router/user/UserOfflineUtil.java
  View file @c7ad681
1 -package com.cnlive.strike.user.router.user; 1 +package com.cnlive.cloud.user.router.user;
2 2
3 -import android.app.Activity;  
4 import android.content.Context; 3 import android.content.Context;
5 4
6 -import androidx.appcompat.app.AppCompatActivity;  
7 -  
8 import com.cnlive.core.libs.base.ui.widget.BottomSheet; 5 import com.cnlive.core.libs.base.ui.widget.BottomSheet;
9 import com.cnlive.core.libs.base.util.AlertUtil; 6 import com.cnlive.core.libs.base.util.AlertUtil;
10 import com.cnlive.core.libs.base.util.AppManager; 7 import com.cnlive.core.libs.base.util.AppManager;
11 -import com.cnlive.strike.user.auth.UserService;  
12 -import com.cnlive.strike.user.ui.activity.LoginActivity;  
13 -import com.kongzue.dialog.interfaces.OnMenuItemClickListener; 8 +import com.cnlive.cloud.user.auth.UserService;
  9 +import com.cnlive.cloud.user.ui.activity.LoginActivity;
14 import com.kongzue.dialog.util.DialogSettings; 10 import com.kongzue.dialog.util.DialogSettings;
15 import com.kongzue.dialog.util.TextInfo; 11 import com.kongzue.dialog.util.TextInfo;
16 -import com.kongzue.dialog.v3.BottomMenu;  
17 -  
18 -import org.greenrobot.eventbus.EventBus;  
19 12
20 /** 13 /**
21 * Created by xiansong on 2018/1/4. 14 * Created by xiansong on 2018/1/4.
cloud/user/src/main/java/com/cnlive/strike/user/sms/OnSmsCatchListener.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/sms/OnSmsCatchListener.java
  View file @c7ad681
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 *******************************************************************************/ 15 *******************************************************************************/
16 16
17 -package com.cnlive.strike.user.sms; 17 +package com.cnlive.cloud.user.sms;
18 18
19 public interface OnSmsCatchListener<T> { 19 public interface OnSmsCatchListener<T> {
20 void onSmsCatch(String message); 20 void onSmsCatch(String message);
cloud/user/src/main/java/com/cnlive/strike/user/sms/SmsReceiver.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/sms/SmsReceiver.java
  View file @c7ad681
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 *******************************************************************************/ 15 *******************************************************************************/
16 16
17 -package com.cnlive.strike.user.sms; 17 +package com.cnlive.cloud.user.sms;
18 18
19 import android.content.BroadcastReceiver; 19 import android.content.BroadcastReceiver;
20 import android.content.Context; 20 import android.content.Context;
cloud/user/src/main/java/com/cnlive/strike/user/sms/SmsVerifyCatcher.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/sms/SmsVerifyCatcher.java
  View file @c7ad681
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 *******************************************************************************/ 15 *******************************************************************************/
16 16
17 -package com.cnlive.strike.user.sms; 17 +package com.cnlive.cloud.user.sms;
18 18
19 import android.Manifest; 19 import android.Manifest;
20 import android.app.Activity; 20 import android.app.Activity;
@@ -25,10 +25,8 @@ import android.os.Build; @@ -25,10 +25,8 @@ import android.os.Build;
25 25
26 import androidx.core.app.ActivityCompat; 26 import androidx.core.app.ActivityCompat;
27 import androidx.core.content.ContextCompat; 27 import androidx.core.content.ContextCompat;
28 -import androidx.fragment.app.Fragment;  
29 28
30 import com.cnlive.core.libs.base.frame.fragment.BaseFragment; 29 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
31 -import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;  
32 30
33 /** 31 /**
34 * Created by Anton Bevza on 8/15/16. 32 * Created by Anton Bevza on 8/15/16.
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/FirstLoginActivity.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/activity/FirstLoginActivity.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.activity; 1 +package com.cnlive.cloud.user.ui.activity;
2 2
3 import android.content.Intent; 3 import android.content.Intent;
4 import android.os.Bundle; 4 import android.os.Bundle;
@@ -7,8 +7,8 @@ import android.text.TextUtils; @@ -7,8 +7,8 @@ import android.text.TextUtils;
7 import com.cnlive.core.libs.base.frame.activity.BaseActivity; 7 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
8 import com.cnlive.core.libs.base.util.AlertUtil; 8 import com.cnlive.core.libs.base.util.AlertUtil;
9 import com.cnlive.core.libs.base.util.DoublePressed; 9 import com.cnlive.core.libs.base.util.DoublePressed;
10 -import com.cnlive.strike.user.R;  
11 -import com.cnlive.strike.user.ui.fragment.FirstLoginFragment; 10 +import com.cnlive.cloud.user.R;
  11 +import com.cnlive.cloud.user.ui.fragment.FirstLoginFragment;
12 12
13 /** 13 /**
14 * @author Lynn 14 * @author Lynn
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/LoginActivity.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/activity/LoginActivity.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.activity; 1 +package com.cnlive.cloud.user.ui.activity;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 import android.content.Context; 4 import android.content.Context;
@@ -10,7 +10,7 @@ import androidx.annotation.NonNull; @@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
10 import com.alibaba.android.arouter.facade.annotation.Route; 10 import com.alibaba.android.arouter.facade.annotation.Route;
11 import com.cnlive.core.libs.base.frame.activity.BaseActivity; 11 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
12 import com.cnlive.core.libs.base.frame.fragment.BaseFragment; 12 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
13 -import com.cnlive.strike.user.ui.fragment.QuickLoginFragment; 13 +import com.cnlive.cloud.user.ui.fragment.QuickLoginFragment;
14 14
15 /** 15 /**
16 * @author Lynn 16 * @author Lynn
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/LoginDialogActivity.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/activity/LoginDialogActivity.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.activity; 1 +package com.cnlive.cloud.user.ui.activity;
2 2
3 3
4 import android.app.Activity; 4 import android.app.Activity;
@@ -17,15 +17,15 @@ import com.cnlive.core.libs.base.application.AppConfig; @@ -17,15 +17,15 @@ import com.cnlive.core.libs.base.application.AppConfig;
17 import com.cnlive.core.libs.base.frame.activity.BaseActivity; 17 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
18 import com.cnlive.core.libs.base.util.DoublePressed; 18 import com.cnlive.core.libs.base.util.DoublePressed;
19 import com.cnlive.core.libs.base.util.ScreenUtils; 19 import com.cnlive.core.libs.base.util.ScreenUtils;
20 -import com.cnlive.strike.user.R;  
21 -import com.cnlive.strike.user.databinding.ActivityLoginDialogBinding;  
22 -import com.cnlive.strike.user.frame.data.QuickLoginData;  
23 -import com.cnlive.strike.user.frame.presenter.LoginDialogPresenter;  
24 -import com.cnlive.strike.user.frame.view.LoginDialogView;  
25 -import com.cnlive.strike.user.router.user.UserAction;  
26 -import com.cnlive.strike.user.sms.SmsVerifyCatcher;  
27 -import com.cnlive.strike.user.ui.adapter.UserListAdapter;  
28 -import static com.cnlive.strike.user.ui.activity.LoginActivity.TAG_CLICK_AD; 20 +import com.cnlive.cloud.user.R;
  21 +import com.cnlive.cloud.user.databinding.ActivityLoginDialogBinding;
  22 +import com.cnlive.cloud.user.frame.data.QuickLoginData;
  23 +import com.cnlive.cloud.user.frame.presenter.LoginDialogPresenter;
  24 +import com.cnlive.cloud.user.frame.view.LoginDialogView;
  25 +import com.cnlive.cloud.user.router.user.UserAction;
  26 +import com.cnlive.cloud.user.sms.SmsVerifyCatcher;
  27 +import com.cnlive.cloud.user.ui.adapter.UserListAdapter;
  28 +import static com.cnlive.cloud.user.ui.activity.LoginActivity.TAG_CLICK_AD;
29 29
30 /** 30 /**
31 * 作者: 吴奎庆 31 * 作者: 吴奎庆
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/PersonalDataActivity.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/activity/PersonalDataActivity.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.activity; 1 +package com.cnlive.cloud.user.ui.activity;
2 2
3 import android.app.Dialog; 3 import android.app.Dialog;
4 import android.content.Context; 4 import android.content.Context;
@@ -16,11 +16,11 @@ import com.cnlive.core.libs.base.frame.activity.BaseActivity; @@ -16,11 +16,11 @@ import com.cnlive.core.libs.base.frame.activity.BaseActivity;
16 import com.cnlive.core.libs.base.ui.widget.BottomMenuDialog; 16 import com.cnlive.core.libs.base.ui.widget.BottomMenuDialog;
17 import com.cnlive.core.libs.base.util.GlideUtil; 17 import com.cnlive.core.libs.base.util.GlideUtil;
18 import com.cnlive.core.libs.base.util.StatusBarConfig; 18 import com.cnlive.core.libs.base.util.StatusBarConfig;
19 -import com.cnlive.strike.user.R;  
20 -import com.cnlive.strike.user.auth.UserService;  
21 -import com.cnlive.strike.user.databinding.ActivityPersonalDataBinding;  
22 -import com.cnlive.strike.user.frame.presenter.PersonalDataPresenter;  
23 -import com.cnlive.strike.user.frame.view.PersonalDataView; 19 +import com.cnlive.cloud.user.R;
  20 +import com.cnlive.cloud.user.auth.UserService;
  21 +import com.cnlive.cloud.user.databinding.ActivityPersonalDataBinding;
  22 +import com.cnlive.cloud.user.frame.presenter.PersonalDataPresenter;
  23 +import com.cnlive.cloud.user.frame.view.PersonalDataView;
24 import com.qmuiteam.qmui.widget.QMUITopBar; 24 import com.qmuiteam.qmui.widget.QMUITopBar;
25 25
26 import java.util.ArrayList; 26 import java.util.ArrayList;
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/PersonalImageActivity.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/activity/PersonalImageActivity.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.activity; 1 +package com.cnlive.cloud.user.ui.activity;
2 2
3 import android.app.Dialog; 3 import android.app.Dialog;
4 import android.content.Intent; 4 import android.content.Intent;
@@ -14,11 +14,11 @@ import com.cnlive.core.libs.base.util.GlideUtil; @@ -14,11 +14,11 @@ import com.cnlive.core.libs.base.util.GlideUtil;
14 import com.cnlive.core.libs.base.util.StatusBarConfig; 14 import com.cnlive.core.libs.base.util.StatusBarConfig;
15 import com.cnlive.media.picker.PickerConfig; 15 import com.cnlive.media.picker.PickerConfig;
16 import com.cnlive.media.picker.entity.Media; 16 import com.cnlive.media.picker.entity.Media;
17 -import com.cnlive.strike.user.R;  
18 -import com.cnlive.strike.user.auth.UserService;  
19 -import com.cnlive.strike.user.databinding.ActivityPersonalImageBinding;  
20 -import com.cnlive.strike.user.frame.presenter.PersonalImagePresenter;  
21 -import com.cnlive.strike.user.frame.view.PersonalImageView; 17 +import com.cnlive.cloud.user.R;
  18 +import com.cnlive.cloud.user.auth.UserService;
  19 +import com.cnlive.cloud.user.databinding.ActivityPersonalImageBinding;
  20 +import com.cnlive.cloud.user.frame.presenter.PersonalImagePresenter;
  21 +import com.cnlive.cloud.user.frame.view.PersonalImageView;
22 import com.qmuiteam.qmui.widget.QMUITopBar; 22 import com.qmuiteam.qmui.widget.QMUITopBar;
23 import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; 23 import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
24 import com.top.zibin.luban.CompressionPredicate; 24 import com.top.zibin.luban.CompressionPredicate;
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/SelectCountryActivity.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/activity/SelectCountryActivity.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.activity; 1 +package com.cnlive.cloud.user.ui.activity;
2 2
3 3
4 import android.app.Activity; 4 import android.app.Activity;
@@ -8,10 +8,10 @@ import androidx.databinding.ViewDataBinding; @@ -8,10 +8,10 @@ import androidx.databinding.ViewDataBinding;
8 8
9 import com.cnlive.core.libs.base.frame.activity.BaseActivity; 9 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
10 import com.cnlive.core.libs.base.util.StatusBarConfig; 10 import com.cnlive.core.libs.base.util.StatusBarConfig;
11 -import com.cnlive.strike.user.R;  
12 -import com.cnlive.strike.user.databinding.ActivitySelectCountryBinding;  
13 -import com.cnlive.strike.user.frame.presenter.SelectCountryPresenter;  
14 -import com.cnlive.strike.user.frame.view.SelectCountryView; 11 +import com.cnlive.cloud.user.R;
  12 +import com.cnlive.cloud.user.databinding.ActivitySelectCountryBinding;
  13 +import com.cnlive.cloud.user.frame.presenter.SelectCountryPresenter;
  14 +import com.cnlive.cloud.user.frame.view.SelectCountryView;
15 15
16 import java.util.HashMap; 16 import java.util.HashMap;
17 17
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/SignatureActivity.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/activity/SignatureActivity.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.activity; 1 +package com.cnlive.cloud.user.ui.activity;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 import android.app.Dialog; 4 import android.app.Dialog;
@@ -19,12 +19,12 @@ import com.cnlive.core.libs.base.util.StatusBarConfig; @@ -19,12 +19,12 @@ import com.cnlive.core.libs.base.util.StatusBarConfig;
19 import com.cnlive.core.network.HttpConn; 19 import com.cnlive.core.network.HttpConn;
20 import com.cnlive.core.network.NetCallBack; 20 import com.cnlive.core.network.NetCallBack;
21 import com.cnlive.core.network.model.BaseResult; 21 import com.cnlive.core.network.model.BaseResult;
22 -import com.cnlive.strike.user.R;  
23 -import com.cnlive.strike.user.UserUtilAction;  
24 -import com.cnlive.strike.user.auth.UserService;  
25 -import com.cnlive.strike.user.databinding.ActivitySignatureBinding;  
26 -import com.cnlive.strike.user.model.CNLiveUserInfoExt;  
27 -import com.cnlive.strike.user.ui.widget.TokenErrorDialog; 22 +import com.cnlive.cloud.user.R;
  23 +import com.cnlive.cloud.user.UserUtilAction;
  24 +import com.cnlive.cloud.user.auth.UserService;
  25 +import com.cnlive.cloud.user.databinding.ActivitySignatureBinding;
  26 +import com.cnlive.cloud.user.model.CNLiveUserInfoExt;
  27 +import com.cnlive.cloud.user.ui.widget.TokenErrorDialog;
28 import com.google.gson.Gson; 28 import com.google.gson.Gson;
29 import com.qmuiteam.qmui.widget.QMUITopBar; 29 import com.qmuiteam.qmui.widget.QMUITopBar;
30 import io.reactivex.disposables.Disposable; 30 import io.reactivex.disposables.Disposable;
@@ -168,7 +168,7 @@ public class SignatureActivity extends BaseActivity implements View.OnClickListe @@ -168,7 +168,7 @@ public class SignatureActivity extends BaseActivity implements View.OnClickListe
168 } 168 }
169 169
170 @Override 170 @Override
171 - public void onFailure(String errCode, String errMsg) { 171 + public void onFailure(String errCode, String errMsg, Exception e) {
172 right.setClickable(true); 172 right.setClickable(true);
173 if (UserUtilAction.TOKEN_ERROR_CODE.equals(errCode)) { 173 if (UserUtilAction.TOKEN_ERROR_CODE.equals(errCode)) {
174 showTokenErrorDialog(); 174 showTokenErrorDialog();
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/UpdateContentActivity.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/activity/UpdateContentActivity.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.activity; 1 +package com.cnlive.cloud.user.ui.activity;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 import android.app.Dialog; 4 import android.app.Dialog;
@@ -22,12 +22,12 @@ import com.cnlive.core.libs.base.util.StatusBarConfig; @@ -22,12 +22,12 @@ import com.cnlive.core.libs.base.util.StatusBarConfig;
22 import com.cnlive.core.network.HttpConn; 22 import com.cnlive.core.network.HttpConn;
23 import com.cnlive.core.network.NetCallBack; 23 import com.cnlive.core.network.NetCallBack;
24 import com.cnlive.core.network.model.BaseResult; 24 import com.cnlive.core.network.model.BaseResult;
25 -import com.cnlive.strike.user.R;  
26 -import com.cnlive.strike.user.UserUtilAction;  
27 -import com.cnlive.strike.user.auth.UserService;  
28 -import com.cnlive.strike.user.databinding.ActivityUpdateContentBinding;  
29 -import com.cnlive.strike.user.ui.widget.TokenErrorDialog;  
30 -import com.cnlive.strike.user.util.UserRouterHelper; 25 +import com.cnlive.cloud.user.R;
  26 +import com.cnlive.cloud.user.UserUtilAction;
  27 +import com.cnlive.cloud.user.auth.UserService;
  28 +import com.cnlive.cloud.user.databinding.ActivityUpdateContentBinding;
  29 +import com.cnlive.cloud.user.ui.widget.TokenErrorDialog;
  30 +import com.cnlive.cloud.user.util.UserRouterHelper;
31 import com.qmuiteam.qmui.widget.QMUITopBar; 31 import com.qmuiteam.qmui.widget.QMUITopBar;
32 32
33 import java.util.regex.Matcher; 33 import java.util.regex.Matcher;
@@ -273,7 +273,7 @@ public class UpdateContentActivity extends BaseActivity implements View.OnClickL @@ -273,7 +273,7 @@ public class UpdateContentActivity extends BaseActivity implements View.OnClickL
273 } 273 }
274 274
275 @Override 275 @Override
276 - public void onFailure(String errCode, String errMsg) { 276 + public void onFailure(String errCode, String errMsg, Exception e) {
277 if (UserUtilAction.TOKEN_ERROR_CODE.equals(errCode)) { 277 if (UserUtilAction.TOKEN_ERROR_CODE.equals(errCode)) {
278 showTokenErrorDialog(); 278 showTokenErrorDialog();
279 } else { 279 } else {
cloud/user/src/main/java/com/cnlive/strike/user/ui/adapter/SelectCountryAdapter.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/adapter/SelectCountryAdapter.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.adapter; 1 +package com.cnlive.cloud.user.ui.adapter;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 import android.view.LayoutInflater; 4 import android.view.LayoutInflater;
@@ -9,10 +9,10 @@ import androidx.recyclerview.widget.RecyclerView; @@ -9,10 +9,10 @@ import androidx.recyclerview.widget.RecyclerView;
9 9
10 import com.cnlive.core.libs.base.frame.adapter.DataBindingAdapter; 10 import com.cnlive.core.libs.base.frame.adapter.DataBindingAdapter;
11 import com.cnlive.core.libs.base.frame.adapter.holder.DataBindingViewHolder; 11 import com.cnlive.core.libs.base.frame.adapter.holder.DataBindingViewHolder;
12 -import com.cnlive.strike.user.R;  
13 -import com.cnlive.strike.user.databinding.ItemSelectContryCatgryBinding;  
14 -import com.cnlive.strike.user.databinding.ItemSelectCountryBinding;  
15 -import com.cnlive.strike.user.model.CountryData; 12 +import com.cnlive.cloud.user.R;
  13 +import com.cnlive.cloud.user.databinding.ItemSelectContryCatgryBinding;
  14 +import com.cnlive.cloud.user.databinding.ItemSelectCountryBinding;
  15 +import com.cnlive.cloud.user.model.CountryData;
16 16
17 /** 17 /**
18 * 作者: 吴奎庆 18 * 作者: 吴奎庆
cloud/user/src/main/java/com/cnlive/strike/user/ui/adapter/UserListAdapter.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/adapter/UserListAdapter.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.adapter; 1 +package com.cnlive.cloud.user.ui.adapter;
2 2
3 import android.accounts.Account; 3 import android.accounts.Account;
4 import android.content.Context; 4 import android.content.Context;
@@ -12,7 +12,7 @@ import android.widget.TextView; @@ -12,7 +12,7 @@ import android.widget.TextView;
12 import androidx.annotation.NonNull; 12 import androidx.annotation.NonNull;
13 import androidx.annotation.Nullable; 13 import androidx.annotation.Nullable;
14 14
15 -import com.cnlive.strike.user.R; 15 +import com.cnlive.cloud.user.R;
16 16
17 17
18 /** 18 /**
cloud/user/src/main/java/com/cnlive/strike/user/ui/fragment/FirstLoginFragment.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/fragment/FirstLoginFragment.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.fragment; 1 +package com.cnlive.cloud.user.ui.fragment;
2 2
3 import android.Manifest; 3 import android.Manifest;
4 import android.app.Dialog; 4 import android.app.Dialog;
@@ -20,16 +20,16 @@ import com.cnlive.core.libs.base.util.GlideUtil; @@ -20,16 +20,16 @@ import com.cnlive.core.libs.base.util.GlideUtil;
20 import com.cnlive.media.picker.ImagePicker; 20 import com.cnlive.media.picker.ImagePicker;
21 import com.cnlive.media.picker.PickerConfig; 21 import com.cnlive.media.picker.PickerConfig;
22 import com.cnlive.media.picker.entity.Media; 22 import com.cnlive.media.picker.entity.Media;
23 -import com.cnlive.strike.user.R;  
24 -import com.cnlive.strike.user.auth.UserService;  
25 -import com.cnlive.strike.user.databinding.FragmentFirstLoginBinding;  
26 -import com.cnlive.strike.user.frame.data.FirstLoginData;  
27 -import com.cnlive.strike.user.frame.presenter.FirstLoginPresenter;  
28 -import com.cnlive.strike.user.frame.view.FirstLoginView;  
29 -import com.cnlive.strike.user.model.CNLiveUserInfo;  
30 -import com.cnlive.strike.user.router.user.UserOfflineUtil;  
31 -import com.cnlive.strike.user.ui.activity.FirstLoginActivity;  
32 -import com.cnlive.strike.user.ui.activity.LoginActivity; 23 +import com.cnlive.cloud.user.R;
  24 +import com.cnlive.cloud.user.auth.UserService;
  25 +import com.cnlive.cloud.user.databinding.FragmentFirstLoginBinding;
  26 +import com.cnlive.cloud.user.frame.data.FirstLoginData;
  27 +import com.cnlive.cloud.user.frame.presenter.FirstLoginPresenter;
  28 +import com.cnlive.cloud.user.frame.view.FirstLoginView;
  29 +import com.cnlive.cloud.user.model.CNLiveUserInfo;
  30 +import com.cnlive.cloud.user.router.user.UserOfflineUtil;
  31 +import com.cnlive.cloud.user.ui.activity.FirstLoginActivity;
  32 +import com.cnlive.cloud.user.ui.activity.LoginActivity;
33 33
34 import java.util.List; 34 import java.util.List;
35 35
cloud/user/src/main/java/com/cnlive/strike/user/ui/fragment/QuickLoginFragment.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/fragment/QuickLoginFragment.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.fragment; 1 +package com.cnlive.cloud.user.ui.fragment;
2 2
3 import android.app.ProgressDialog; 3 import android.app.ProgressDialog;
4 import android.content.Intent; 4 import android.content.Intent;
@@ -12,16 +12,16 @@ import androidx.databinding.ViewDataBinding; @@ -12,16 +12,16 @@ import androidx.databinding.ViewDataBinding;
12 import com.cnlive.core.libs.base.application.AppConfig; 12 import com.cnlive.core.libs.base.application.AppConfig;
13 import com.cnlive.core.libs.base.frame.fragment.BaseFragment; 13 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
14 import com.cnlive.core.libs.base.util.DoublePressed; 14 import com.cnlive.core.libs.base.util.DoublePressed;
15 -import com.cnlive.strike.user.R;  
16 -import com.cnlive.strike.user.databinding.FragmentQuickLoginBinding;  
17 -import com.cnlive.strike.user.frame.data.QuickLoginData;  
18 -import com.cnlive.strike.user.frame.presenter.QuickLoginPresenter;  
19 -import com.cnlive.strike.user.frame.view.QuickLoginView;  
20 -import com.cnlive.strike.user.router.user.UserAction;  
21 -import com.cnlive.strike.user.sms.SmsVerifyCatcher;  
22 -import com.cnlive.strike.user.ui.activity.LoginActivity;  
23 -import com.cnlive.strike.user.ui.activity.SelectCountryActivity;  
24 -import com.cnlive.strike.user.ui.adapter.UserListAdapter; 15 +import com.cnlive.cloud.user.R;
  16 +import com.cnlive.cloud.user.databinding.FragmentQuickLoginBinding;
  17 +import com.cnlive.cloud.user.frame.data.QuickLoginData;
  18 +import com.cnlive.cloud.user.frame.presenter.QuickLoginPresenter;
  19 +import com.cnlive.cloud.user.frame.view.QuickLoginView;
  20 +import com.cnlive.cloud.user.router.user.UserAction;
  21 +import com.cnlive.cloud.user.sms.SmsVerifyCatcher;
  22 +import com.cnlive.cloud.user.ui.activity.LoginActivity;
  23 +import com.cnlive.cloud.user.ui.activity.SelectCountryActivity;
  24 +import com.cnlive.cloud.user.ui.adapter.UserListAdapter;
25 25
26 /** 26 /**
27 * @author Lynn 27 * @author Lynn
cloud/user/src/main/java/com/cnlive/strike/user/ui/widget/Bar.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/widget/Bar.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.widget; 1 +package com.cnlive.cloud.user.ui.widget;
2 2
3 import android.graphics.Canvas; 3 import android.graphics.Canvas;
4 import android.graphics.Paint; 4 import android.graphics.Paint;
cloud/user/src/main/java/com/cnlive/strike/user/ui/widget/FontSliderBar.java renamed to cloud/user/src/main/java/com/cnlive/cloud/user/ui/widget/FontSliderBar.java
  View file @c7ad681
1 -package com.cnlive.strike.user.ui.widget; 1 +package com.cnlive.cloud.user.ui.widget;
2 2
3 import android.animation.ValueAnimator; 3 import android.animation.ValueAnimator;
4 import android.content.Context; 4 import android.content.Context;