1:添加一键登录

BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java

@@ -2,28 +2,9 @@ package com.xscm.moduleutil.utils.config;
 
 public enum EnvironmentEnum {
     //     "https://vespa.qxyushen.top/",
-//    PRODUCTION(//生产环境
+    PRODUCTION(//生产环境
-//            //"https://vespa.qxyushen.top/",
-//            "https://yushengapi.qxyushen.top/",
-//            "KvNmqZc+VMzO4CfGMd5zmG6w6OFwpFO/19TwXUWfHDOBgmnl9DgIuE+kbrjNNnxqhtP3pH7bBrnSaSeFtunr72q6sgpLsfuswcUroMvz2slaTBcNzCaLi+GSnM3gB/GdO47mwLdk+iYBTvPUOCIuT608Z29z09w+vPeUDoMCHJBGXu6uh7Nj6PtV1dfGoUvByk1ZF0WYVjIqKDcb3tXY4jonFh3XAWhzMy8xKwN6F2nuK2IcdIwaSPsvuMZmhatP6f9kOE+vnfweyCHS3RxiG474WIoZGJM8omrl3/pOVqE=",
-//            "https://oss-cn-beijing.aliyuncs.com/",
-//            "LTAI5tKgrfcFQxH46ZwWYgFW",
-//            "ZOjTqAJmUL563EKFKySrUwAHtx4hKt",
-//            "midi01",
-//            "https://midi01.oss-cn-beijing.aliyuncs.com/",
-//            "wxc7681513be9f926b",
-//            1600096860,
-//            "3e8f3add448d4692bc1d04c75ffe801b",
-//            //"tcp://1.13.101.98",
-////            "tcp://1.13.20.30",
-//            "tcp://yushengapi.qxyushen.top",
-//           // "https://vespa.qxyushen.top/h5",
-//            "https://yushengapi.qxyushen.top/h5",
-//            0),
-    PRODUCTION(//预测版本
             //"https://vespa.qxyushen.top/",
-            "https://vsyusheng.qxhs.xyz/", //这是要进行正式服测试的地址
+            "https://yushengapi.qxyushen.top/",
-//            "https://yushengapi.qxyushen.top/",
             "KvNmqZc+VMzO4CfGMd5zmG6w6OFwpFO/19TwXUWfHDOBgmnl9DgIuE+kbrjNNnxqhtP3pH7bBrnSaSeFtunr72q6sgpLsfuswcUroMvz2slaTBcNzCaLi+GSnM3gB/GdO47mwLdk+iYBTvPUOCIuT608Z29z09w+vPeUDoMCHJBGXu6uh7Nj6PtV1dfGoUvByk1ZF0WYVjIqKDcb3tXY4jonFh3XAWhzMy8xKwN6F2nuK2IcdIwaSPsvuMZmhatP6f9kOE+vnfweyCHS3RxiG474WIoZGJM8omrl3/pOVqE=",
             "https://oss-cn-beijing.aliyuncs.com/",
             "LTAI5tKgrfcFQxH46ZwWYgFW",
@@ -31,17 +12,36 @@ public enum EnvironmentEnum {
             "midi01",
             "https://midi01.oss-cn-beijing.aliyuncs.com/",
             "wxc7681513be9f926b",
-//            1600096860,
+            1600096860,
-            1600096890,//这是要进行正式服测试的地址
             "3e8f3add448d4692bc1d04c75ffe801b",
             //"tcp://1.13.101.98",
 //            "tcp://1.13.20.30",
-//            "tcp://yushengapi.qxyushen.top",
+            "tcp://yushengapi.qxyushen.top",
-            "tcp://vsyusheng.qxhs.xyz", //这是要进行正式服测试的地址
            // "https://vespa.qxyushen.top/h5",
-            "https://vsyusheng.qxhs.xyz/h5",
+            "https://yushengapi.qxyushen.top/h5",
-//            "https://yushengapi.qxyushen.top/h5",
             0),
+//    PRODUCTION(//预测版本
+//            //"https://vespa.qxyushen.top/",
+//            "https://vsyusheng.qxhs.xyz/", //这是要进行正式服测试的地址
+////            "https://yushengapi.qxyushen.top/",
+//            "KvNmqZc+VMzO4CfGMd5zmG6w6OFwpFO/19TwXUWfHDOBgmnl9DgIuE+kbrjNNnxqhtP3pH7bBrnSaSeFtunr72q6sgpLsfuswcUroMvz2slaTBcNzCaLi+GSnM3gB/GdO47mwLdk+iYBTvPUOCIuT608Z29z09w+vPeUDoMCHJBGXu6uh7Nj6PtV1dfGoUvByk1ZF0WYVjIqKDcb3tXY4jonFh3XAWhzMy8xKwN6F2nuK2IcdIwaSPsvuMZmhatP6f9kOE+vnfweyCHS3RxiG474WIoZGJM8omrl3/pOVqE=",
+//            "https://oss-cn-beijing.aliyuncs.com/",
+//            "LTAI5tKgrfcFQxH46ZwWYgFW",
+//            "ZOjTqAJmUL563EKFKySrUwAHtx4hKt",
+//            "midi01",
+//            "https://midi01.oss-cn-beijing.aliyuncs.com/",
+//            "wxc7681513be9f926b",
+////            1600096860,
+//            1600096890,//这是要进行正式服测试的地址
+//            "3e8f3add448d4692bc1d04c75ffe801b",
+//            //"tcp://1.13.101.98",
+////            "tcp://1.13.20.30",
+////            "tcp://yushengapi.qxyushen.top",
+//            "tcp://vsyusheng.qxhs.xyz", //这是要进行正式服测试的地址
+//            // "https://vespa.qxyushen.top/h5",
+//            "https://vsyusheng.qxhs.xyz/h5",
+////            "https://yushengapi.qxyushen.top/h5",
+//            0),
     Auxiliary(//辅助生产环境
             //"https://vespa.qxyushen.top/",
             "https://details.qxhs.xyz/",

MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java

@@ -216,11 +216,21 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
     }
 
     public void onClick(View view) {
+        int id = view.getId();
+        if (id == R.id.iv_sz) {//设置
+            Intent intent = new Intent(getContext(), SettingActivity.class);
+            Bundle bundle = new Bundle();
+            bundle.putSerializable("userInfo", userInfo);
+            intent.putExtras(bundle);
+            startActivity(intent);
+            return;
+        }
+
         if (userInfo==null ){
             ToastUtils.show("用户数据错误");
             return;
         }
-        int id = view.getId();
+
         if (id == R.id.ll_visit) {
 //            ARouter.getInstance().build(ARouteConstants.ME_VISIT).navigation();
 //            AppLogUtil.reportAppLog(AppLogEvent.C0104);
@@ -274,13 +284,7 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
             startActivity(new Intent(getContext(), MyBagActivity.class));
         } else if (id==R.id.me_daily) {//每日任务
             startActivity(new Intent(getContext(), DailyTasksActivity.class));
-        } else if (id == R.id.iv_sz) {//设置
+        } else if (id == R.id.me_my_dan){//等级
-            Intent intent = new Intent(getContext(), SettingActivity.class);
-            Bundle bundle = new Bundle();
-            bundle.putSerializable("userInfo", userInfo);
-            intent.putExtras(bundle);
-            startActivity(intent);
-        }else if (id == R.id.me_my_dan){//等级
             Intent intent = new Intent(getContext(), WebViewActivity.class);
             intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_GRADE_URL(),SpUtil.getToken()));
             intent.putExtra("title", "等级");

app/build.gradle

@@ -55,15 +55,15 @@ android {
             // 正式版包名：使用基础包名（com.example.myapp）
             applicationIdSuffix ""
 //            // 测试版包名：基础包名 + .beta（com.example.myapp.beta）
-            applicationIdSuffix ".beta"
+//            applicationIdSuffix ".beta"
 
             // 【正式版应用名称】通过resValue动态生成string资源
-            resValue "string", "app_name", "羽声内测"
+            resValue "string", "app_name", "羽声语音"
 //            resValue "string", "app_name", "羽声语音APP"
 
             // 【正式版图标】替换manifest中的占位符（使用main目录下的正式图标）
             manifestPlaceholders = [
-                    appIcon: "@mipmap/icon_nc"  // 需在main/res/mipmap放置该图标
+                    appIcon: "@mipmap/ic_launcher"  // 需在main/res/mipmap放置该图标
             ]
         }
 

app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java

@@ -310,12 +310,12 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
         }
         if (TextUtils.isEmpty(CommonAppContext.getInstance().getToken()) || TextUtils.isEmpty(CommonAppContext.getInstance().getUser().getTencent_im())) {
             Logger.e("SplashEnd", "ARouters.CODE_LOGIN");
-//            if (canOnePass) {
+            if (canOnePass) {
-//                phoneNumberAuthHelper.setAuthListener(tokenResultListener);
+                phoneNumberAuthHelper.setAuthListener(tokenResultListener);
-//                doOnePass();
+                doOnePass();
-//            } else {
+            } else {
-//
+
-//            }
+            }
         } else {
             Logger.e("SplashEnd", "ARouters.MAIN");
 

gradle.properties

@@ -28,8 +28,8 @@ isBuildModule=false
 #org.gradle.deamon=false
 android.injected.testOnly=false
 
-APP_VERSION_NAME=1.0.9.8
+APP_VERSION_NAME=1.0.9.6
-APP_VERSION_CODE=88
+APP_VERSION_CODE=86
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15