1.提交代码

.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>

.idea/gradle.xml

@@ -15,6 +15,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle

@@ -181,7 +181,7 @@ allprojects {
     }
 }
 dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation fileTree(dir: "libs", include: ["*.jar","*.aar"])
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation "com.android.support:appcompat-v7:28.0.0"
     implementation "android.arch.navigation:navigation-fragment:1.0.0"
@@ -196,8 +196,8 @@ dependencies {
     //微信登录、微信支付等
     implementation "com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+"
     //支付宝支付
-    implementation files("libs/alipaySdk-20180601.jar")
-    implementation files("libs/dom4j-1.6.1.jar")
+//    implementation files("libs/alipaySdk-20180601.jar")
+//    implementation files("libs/dom4j-1.6.1.jar")
     //okhttp
     implementation "com.squareup.okhttp3:okhttp:3.4.1"
 
@@ -232,8 +232,8 @@ dependencies {
     //wheelview
     implementation 'com.cncoderx.wheelview:library:1.2.5'
     //阿里一键登录和校验
-    implementation(name: 'crashshield-release', ext: 'aar')
-    implementation(name: 'phoneNumber-L-AuthSDK-2.11.1.1', ext: 'aar')
+//    implementation(name: 'crashshield-release', ext: 'aar')
+//    implementation(name: 'phoneNumber-L-AuthSDK-2.11.1.1', ext: 'aar')
 
 }
 

app/src/main/java/com/edufound/android/xyyf/application/EApplication.java

@@ -48,6 +48,7 @@ public class EApplication extends Application {
         //上线关掉debug模式
         ContextUtil.setIsDebug(true);
         mUMengAppID = getChannelName();
+        mUMengAppID = "3001";
         APP_START_TIME = System.currentTimeMillis();
         //根据appcode初始化支付sdk
 //        UMConfigure.setLogEnabled(true);

app/src/main/java/com/edufound/android/xyyf/phonelogin/PhoneLoginModel.java

@@ -7,7 +7,10 @@ import com.edufound.android.xyyf.util.ContextUtil;
 //做请求操作之类的
 public class PhoneLoginModel implements BaseModel {
 
+    //正式环境
     private final String MEMBER_URL = "http://m-xyyf-api.ai160.com/member/";
+    //测试环境
+    //private final String MEMBER_URL = "http://m-xyyf-api.efunbox.cn/member/";
 
     public PhoneLoginModel() {
 

app/src/main/res/values/projectstring.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--8.0生产环境前端地址 http://ott80-web.ai160.com/stage/index/index.html-->
-    <string name="default_url">http://m-xyyf-web.ai160.com/stage/index/index.html</string>
+    <!--    <string name="default_url">http://m-xyyf-web.ai160.com/stage/index/index.html</string>-->
     <!--    王洋本地-->
-    <!--    <string name="default_url">http://192.168.1.66:8080/efunbox-xyyf-web/1.0.0/stage/index/index.html</string>-->
+<!--    <string name="default_url">http://192.168.1.66:8080/efunbox-xyyf-web/1.0.0/stage/index/index.html</string>-->
+    <!--    测试环境-->
+    <string name="default_url">http://m-xyyf-web.efunbox.cn/stage/index/index.html</string>
     <!--义方渠道-->
     <string name="app_code_yf">2006</string>
     <!--应用宝-->

build.gradle

@@ -4,6 +4,7 @@ buildscript {
     repositories {
         google()
         jcenter()
+        mavenCentral()
         maven { url 'https://dl.bintray.com/umsdk/release' }
     }
     dependencies {

push/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties

@@ -1,3 +1,3 @@
-#Wed Apr 07 10:10:01 CST 2021
+#Mon Apr 19 16:38:05 CST 2021
 G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_bar_image_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\res\\merged\\release\\layout\\upush_bar_image_notification.xml
 G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\res\\merged\\release\\layout\\upush_notification.xml

push/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1,3 +1,3 @@
-#Wed Apr 07 10:09:28 CST 2021
+#Mon Apr 19 16:38:05 CST 2021
 G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_bar_image_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\packaged_res\\release\\layout\\upush_bar_image_notification.xml
 G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\packaged_res\\release\\layout\\upush_notification.xml