Commit 606860abb182077c381f2ef5b4e1eac13504e633
添加三方登录手机号码绑定页面逻辑并测试
Showing
3 changed files
with
15 additions
and
13 deletions
app/strike/src/main/AndroidManifest.xml
| @@ -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="com.cnlive.strike.demo.exoplayer.demo.DemoApplication" | 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" |
app/strike/src/main/java/com/cnlive/strike/MyApp.java
| @@ -4,6 +4,7 @@ import com.alibaba.android.arouter.launcher.ARouter; | @@ -4,6 +4,7 @@ import com.alibaba.android.arouter.launcher.ARouter; | ||
| 4 | import com.baidu.mapapi.CoordType; | 4 | import com.baidu.mapapi.CoordType; |
| 5 | import com.baidu.mapapi.SDKInitializer; | 5 | import com.baidu.mapapi.SDKInitializer; |
| 6 | import com.cnlive.cloud.BuildConfig; | 6 | import com.cnlive.cloud.BuildConfig; |
| 7 | +import com.cnlive.cloud.user.auth.UserService; | ||
| 7 | import com.cnlive.core.libs.base.application.AppConfig; | 8 | import com.cnlive.core.libs.base.application.AppConfig; |
| 8 | import com.cnlive.core.libs.base.application.BaseApplication; | 9 | import com.cnlive.core.libs.base.application.BaseApplication; |
| 9 | 10 | ||
| @@ -13,11 +14,11 @@ public class MyApp extends BaseApplication { | @@ -13,11 +14,11 @@ public class MyApp extends BaseApplication { | ||
| 13 | super.onCreate(); | 14 | super.onCreate(); |
| 14 | AppConfig.init(this, BuildConfig.APP_ID, BuildConfig.APP_KEY, | 15 | AppConfig.init(this, BuildConfig.APP_ID, BuildConfig.APP_KEY, |
| 15 | BuildConfig.APP_SCERET, BuildConfig.SPECIAL_GROUP_MEMBER_LIMIT, | 16 | BuildConfig.APP_SCERET, BuildConfig.SPECIAL_GROUP_MEMBER_LIMIT, |
| 16 | - BuildConfig.VERSION_AS_DEBUG, BuildConfig.BAIDU_MAP_APP_KEY, "", | ||
| 17 | - "10514333", BuildConfig.WECHAT_APPID, | ||
| 18 | - "", "", "", | ||
| 19 | - "", "", "", | ||
| 20 | - BuildConfig.BAIDU_MAP_APP_KEY, ""); | 17 | + BuildConfig.VERSION_AS_DEBUG, BuildConfig.BAIDU_APP_KEY, BuildConfig.BAIDU_APP_SECRET, |
| 18 | + UserService.getUid(this), BuildConfig.WECHAT_APPID, | ||
| 19 | + BuildConfig.SHARE_DOWNLOAD, BuildConfig.SHARE_ICON, BuildConfig.PAY_ACCOUNT, | ||
| 20 | + BuildConfig.SHARE_TITLE, BuildConfig.SHARE_SUBTITLE, BuildConfig.REPORT_URL, | ||
| 21 | + BuildConfig.BAIDU_MAP_APP_KEY, BuildConfig.SHOP_PATH); | ||
| 21 | initARouter(); | 22 | initARouter(); |
| 22 | // if (AppConfig.isDebug()) { | 23 | // if (AppConfig.isDebug()) { |
| 23 | // Constant.SERVICE_ID = 213511; | 24 | // Constant.SERVICE_ID = 213511; |
app/strike/src/main/java/com/cnlive/strike/demo/exoplayer/demo/DemoApplication.java
| @@ -20,6 +20,7 @@ import android.app.Application; | @@ -20,6 +20,7 @@ import android.app.Application; | ||
| 20 | import com.alibaba.android.arouter.launcher.ARouter; | 20 | import com.alibaba.android.arouter.launcher.ARouter; |
| 21 | import com.baidu.mapapi.CoordType; | 21 | import com.baidu.mapapi.CoordType; |
| 22 | import com.baidu.mapapi.SDKInitializer; | 22 | import com.baidu.mapapi.SDKInitializer; |
| 23 | +import com.cnlive.cloud.user.auth.UserService; | ||
| 23 | import com.cnlive.core.libs.base.application.AppConfig; | 24 | import com.cnlive.core.libs.base.application.AppConfig; |
| 24 | import com.cnlive.core.libs.base.application.BaseApplication; | 25 | import com.cnlive.core.libs.base.application.BaseApplication; |
| 25 | import com.google.android.exoplayer2.BuildConfig; | 26 | import com.google.android.exoplayer2.BuildConfig; |
| @@ -79,13 +80,13 @@ public class DemoApplication extends BaseApplication { | @@ -79,13 +80,13 @@ public class DemoApplication extends BaseApplication { | ||
| 79 | ARouter.printStackTrace(); // 打印日志的时候打印线程堆栈 | 80 | ARouter.printStackTrace(); // 打印日志的时候打印线程堆栈 |
| 80 | } | 81 | } |
| 81 | ARouter.init(this); // 尽可能早,推荐在Application中初始化 | 82 | ARouter.init(this); // 尽可能早,推荐在Application中初始化 |
| 82 | - AppConfig.init(this, com.cnlive.cloud.BuildConfig.APP_ID, com.cnlive.cloud.BuildConfig.APP_KEY, | ||
| 83 | - com.cnlive.cloud.BuildConfig.APP_SCERET, com.cnlive.cloud.BuildConfig.SPECIAL_GROUP_MEMBER_LIMIT, | ||
| 84 | - com.cnlive.cloud.BuildConfig.VERSION_AS_DEBUG, com.cnlive.cloud.BuildConfig.BAIDU_MAP_APP_KEY, "", | ||
| 85 | - "10514333", com.cnlive.cloud.BuildConfig.WECHAT_APPID, | ||
| 86 | - "", "", "", | ||
| 87 | - "", "", "", | ||
| 88 | - com.cnlive.cloud.BuildConfig.BAIDU_MAP_APP_KEY, ""); | 83 | + AppConfig.init(this, com.cnlive.cloud.BuildConfig.APP_ID, com.cnlive.cloud.BuildConfig.APP_KEY, |
| 84 | + com.cnlive.cloud.BuildConfig.APP_SCERET, com.cnlive.cloud.BuildConfig.SPECIAL_GROUP_MEMBER_LIMIT, | ||
| 85 | + com.cnlive.cloud.BuildConfig.VERSION_AS_DEBUG, com.cnlive.cloud.BuildConfig.BAIDU_APP_KEY, com.cnlive.cloud.BuildConfig.BAIDU_APP_SECRET, | ||
| 86 | + UserService.getUid(this), com.cnlive.cloud.BuildConfig.WECHAT_APPID, | ||
| 87 | + com.cnlive.cloud.BuildConfig.SHARE_DOWNLOAD, com.cnlive.cloud.BuildConfig.SHARE_ICON, com.cnlive.cloud.BuildConfig.PAY_ACCOUNT, | ||
| 88 | + com.cnlive.cloud.BuildConfig.SHARE_TITLE, com.cnlive.cloud.BuildConfig.SHARE_SUBTITLE, com.cnlive.cloud.BuildConfig.REPORT_URL, | ||
| 89 | + com.cnlive.cloud.BuildConfig.BAIDU_MAP_APP_KEY, com.cnlive.cloud.BuildConfig.SHOP_PATH); | ||
| 89 | // if (AppConfig.isDebug()) { | 90 | // if (AppConfig.isDebug()) { |
| 90 | // Constant.SERVICE_ID = 213511; | 91 | // Constant.SERVICE_ID = 213511; |
| 91 | // } else { | 92 | // } else { |