Selaa lähdekoodia

友盟的一些库 和登录 分享操作

xiongxiaohe 8 vuotta sitten
vanhempi
commit
dfc954d714
32 muutettua tiedostoa jossa 671 lisäystä ja 280 poistoa
  1. 0 8
      .idea/gradle.xml
  2. 2 0
      .idea/modules.xml
  3. 116 110
      app/app.iml
  4. 35 29
      app/src/main/AndroidManifest.xml
  5. 13 0
      app/src/main/java/com/sheep/gamegroup/IBase/IBasePresenter.java
  6. 12 0
      app/src/main/java/com/sheep/gamegroup/IBase/IBaseView.java
  7. 22 0
      app/src/main/java/com/sheep/gamegroup/absBase/BaseUMActivity.java
  8. 30 12
      app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java
  9. 23 0
      app/src/main/java/com/sheep/gamegroup/presenter/AskGetMoneyContract.java
  10. 57 0
      app/src/main/java/com/sheep/gamegroup/presenter/AskGetMoneyPresenter.java
  11. 4 2
      app/src/main/java/com/sheep/gamegroup/presenter/LoginContract.java
  12. 30 0
      app/src/main/java/com/sheep/gamegroup/presenter/LoginPresenter.java
  13. 1 1
      app/src/main/java/com/sheep/gamegroup/presenter/PhonePresenter.java
  14. 8 0
      app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java
  15. 110 0
      app/src/main/java/com/sheep/gamegroup/util/FastJsonUtils.java
  16. 11 0
      app/src/main/java/com/sheep/gamegroup/util/ResposeCode.java
  17. 14 0
      app/src/main/java/com/sheep/gamegroup/util/XXTEA.java
  18. 13 4
      app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java
  19. 70 65
      app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java
  20. 2 4
      app/src/main/java/com/sheep/jiuyan/samllsheep/BaseApplication.java
  21. 10 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseActivity.java
  22. 53 8
      app/src/main/res/layout/login_act_layout.xml
  23. 1 1
      app/src/main/res/layout/title.xml
  24. BIN
      app/src/main/res/mipmap-xhdpi/x_ic_login_qq.png
  25. BIN
      app/src/main/res/mipmap-xhdpi/x_ic_login_wx.png
  26. BIN
      app/src/main/res/mipmap-xxhdpi/x_ic_login_qq.png
  27. BIN
      app/src/main/res/mipmap-xxhdpi/x_ic_login_wx.png
  28. BIN
      datashare/acpg-graph/acpg-cli-1.12.0.jar
  29. BIN
      datashare/acpg/acpg-cli-1.12.0.jar
  30. 14 15
      datashare/datashare.iml
  31. 1 0
      view/build.gradle
  32. 19 20
      view/view.iml

+ 0 - 8
.idea/gradle.xml

@@ -5,14 +5,6 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/datashare" />
-            <option value="$PROJECT_DIR$/view" />
-          </set>
-        </option>
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>

+ 2 - 0
.idea/modules.xml

@@ -4,8 +4,10 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/datashare/datashare.iml" filepath="$PROJECT_DIR$/datashare/datashare.iml" />
+      <module fileurl="file://$PROJECT_DIR$/datashare/datashare.iml" filepath="$PROJECT_DIR$/datashare/datashare.iml" />
       <module fileurl="file://$PROJECT_DIR$/small_sheep_android.iml" filepath="$PROJECT_DIR$/small_sheep_android.iml" />
       <module fileurl="file://$PROJECT_DIR$/view/view.iml" filepath="$PROJECT_DIR$/view/view.iml" />
+      <module fileurl="file://$PROJECT_DIR$/view/view.iml" filepath="$PROJECT_DIR$/view/view.iml" />
     </modules>
   </component>
 </project>

+ 116 - 110
app/app.iml

@@ -22,7 +22,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/bandaimitest/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/bandaimitest/debug" />
     <exclude-output />
@@ -41,13 +41,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/bandaimitestDebug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/bandaimitestDebug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/bandaimitestDebug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/bandaimitest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/bandaimitest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitestDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitestDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitestDebug/assets" type="java-test-resource" />
@@ -55,6 +48,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitestDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitestDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/bandaimitest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/bandaimitest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/bandaimitest/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/bandaimitest/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/bandaimitest/assets" type="java-resource" />
@@ -97,13 +97,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -111,6 +104,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
@@ -127,102 +127,108 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="com.android.support:multidex-1.0.1" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:appcompat-v7-27.1.0" level="project" />
-    <orderEntry type="library" exported="" name="com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.squareup.okio:okio:1.14.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="FileDownloader-1.0.0:@aar" level="project" />
-    <orderEntry type="library" exported="" name="cn.bingoogolapple:bga-banner-2.1.7" level="project" />
-    <orderEntry type="library" exported="" name="com.orhanobut:logger-1.15" level="project" />
-    <orderEntry type="library" exported="" name="__local_jars__:D.\Android\asWork\small_sheep_android\app\libs\jackson-core-2.2.1.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="de.hdodenhof:circleimageview-2.2.0" level="project" />
-    <orderEntry type="library" exported="" name="com.kf.framework:volleyplus-1.4.5" level="project" />
-    <orderEntry type="library" exported="" name="io.reactivex:rxandroid-1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:recyclerview-v7-27.1.0" level="project" />
-    <orderEntry type="library" exported="" name="com.nineoldandroids:library:2.4.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support.constraint:constraint-layout-solver:1.0.2@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support.constraint:constraint-layout-1.0.2" level="project" />
-    <orderEntry type="library" exported="" name="com.readystatesoftware.chuck:library-1.1.0" level="project" />
-    <orderEntry type="library" exported="" name="jp.wasabeef:glide-transformations-2.0.2" level="project" />
-    <orderEntry type="library" exported="" name="__local_jars__:D.\Android\asWork\small_sheep_android\app\libs\umeng_social_shareboard.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="top.zibin:Luban-1.0.9" level="project" />
-    <orderEntry type="library" exported="" name="com.liulishuo.filedownloader:library-1.6.9" level="project" />
-    <orderEntry type="library" exported="" name="com.google.code.gson:gson:2.8.2@jar" level="project" />
-    <orderEntry type="library" exported="" name="__local_jars__:D.\Android\asWork\small_sheep_android\app\libs\umeng_shareboard_widget.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="__local_jars__:D.\Android\asWork\small_sheep_android\app\libs\alipaySdk-20170922.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.zhy:okhttputils-2.6.2" level="project" />
-    <orderEntry type="library" exported="" name="appstoreutils:@aar" level="project" />
-    <orderEntry type="library" exported="" name="com.jcodecraeer:xrecyclerview-1.5.2" level="project" />
-    <orderEntry type="library" exported="" name="cn.jiguang.sdk:jpush-3.0.8" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.jakewharton:butterknife-annotations:8.8.1@jar" level="project" />
-    <orderEntry type="library" exported="" name="__local_jars__:D.\Android\asWork\small_sheep_android\app\libs\umeng_social_api.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="android.arch.lifecycle:viewmodel-1.1.0" level="project" />
-    <orderEntry type="library" exported="" name="com.zhy:base-adapter-3.0.3" level="project" />
-    <orderEntry type="library" exported="" name="com.google.protobuf:protobuf-java:3.2.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="__local_jars__:D.\Android\asWork\small_sheep_android\app\libs\SocialSDK_QQ_Full.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.umeng.analytics:analytics:6.0.9@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:support-media-compat-27.0.2" level="project" />
-    <orderEntry type="library" exported="" name="cn.jiguang.sdk:jcore-1.1.6" level="project" />
-    <orderEntry type="library" exported="" name="__local_jars__:D.\Android\asWork\small_sheep_android\app\libs\wechat-sdk-android-with-mta-1.1.6.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.yalantis:ucrop-2.2.0" level="project" />
-    <orderEntry type="library" exported="" name="pub.devrel:easypermissions-1.2.0" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:support-v4-27.0.2" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:animated-vector-drawable-27.1.0" level="project" />
-    <orderEntry type="library" exported="" name="net.danlew:android.joda-2.9.3" level="project" />
-    <orderEntry type="library" exported="" name="com.tencent.mm.opensdk:wechat-sdk-android-with-mta:5.1.4@jar" level="project" />
-    <orderEntry type="library" exported="" name="__local_jars__:D.\Android\asWork\small_sheep_android\app\libs\SocialSDK_WeiXin_Full.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:design-27.0.2" level="project" />
-    <orderEntry type="library" exported="" name="mdl.sinlov.android:log-0.0.2" level="project" />
-    <orderEntry type="library" exported="" name="org.glassfish:javax.annotation:10.0-b28@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.squareup.okhttp3:logging-interceptor:3.10.0@jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="com.android.support:multidex-instrumentation-1.0.1" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:support-core-utils-27.1.0" level="project" />
-    <orderEntry type="library" exported="" name="android.arch.core:common:1.1.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.kf.framework:kf-utils-1.4.5" level="project" />
-    <orderEntry type="library" exported="" name="com.flipboard:bottomsheet-commons-1.5.3" level="project" />
-    <orderEntry type="library" exported="" name="com.flipboard:bottomsheet-core-1.5.3" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:transition-27.0.2" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:support-annotations:27.1.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="javax.inject:javax.inject:1@jar" level="project" />
-    <orderEntry type="library" exported="" name="io.reactivex:rxjava:1.1.6@jar" level="project" />
-    <orderEntry type="library" exported="" name="__local_jars__:D.\Android\asWork\small_sheep_android\app\libs\umeng_social_net.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="joda-time:joda-time:2.9.3:no-tzdb@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.umeng.sdk:analytics:7.4.4@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.squareup.retrofit2:adapter-rxjava:2.1.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.tencent.bugly:crashreport_upgrade-1.3.4" level="project" />
-    <orderEntry type="library" exported="" name="com.mylhyl:acp-1.1.7" level="project" />
-    <orderEntry type="library" exported="" name="com.alibaba:fastjson:1.2.47@jar" level="project" />
-    <orderEntry type="library" exported="" name="org.xutils:xutils-3.5.0" level="project" />
-    <orderEntry type="library" exported="" name="com.kfzs.safe:@aar" level="project" />
-    <orderEntry type="library" exported="" name="com.tencent.bugly:nativecrashreport-3.3.1" level="project" />
-    <orderEntry type="library" exported="" name="android.arch.lifecycle:runtime-1.1.0" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:support-vector-drawable-27.1.0" level="project" />
-    <orderEntry type="library" exported="" name="cn.yipianfengye.android:zxing-library-2.2" level="project" />
-    <orderEntry type="library" exported="" name="android.arch.lifecycle:common:1.1.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.jakewharton:butterknife-8.8.1" level="project" />
-    <orderEntry type="library" exported="" name="io.reactivex.rxjava2:rxandroid-2.0.2" level="project" />
-    <orderEntry type="library" exported="" name="__local_jars__:D.\Android\asWork\small_sheep_android\app\libs\umeng_social_tool.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.squareup.retrofit2:retrofit:2.4.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.github.huburt-Hu:NewbieGuide-v1.2.0" level="project" />
-    <orderEntry type="library" exported="" name="org.reactivestreams:reactive-streams:1.0.2@jar" level="project" />
-    <orderEntry type="library" exported="" name="__local_jars__:D.\Android\asWork\small_sheep_android\app\libs\open_sdk_r5923_lite.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:support-compat-27.1.0" level="project" />
-    <orderEntry type="library" exported="" name="com.squareup.retrofit2:converter-gson:2.4.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:support-core-ui-27.1.0" level="project" />
-    <orderEntry type="library" exported="" name="__local_jars__:D.\Android\asWork\small_sheep_android\app\libs\jackson-dataformat-xml-2.1.2.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="android.arch.lifecycle:livedata-core-1.1.0" level="project" />
-    <orderEntry type="library" exported="" name="com.umeng.sdk:common:1.4.4@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.google.dagger:dagger:2.12@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:support-fragment-27.1.0" level="project" />
-    <orderEntry type="library" exported="" name="org.greenrobot:eventbus:3.1.1@jar" level="project" />
-    <orderEntry type="library" exported="" name="nl.qbusict:cupboard:2.2.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.github.bumptech.glide:glide:3.7.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="io.reactivex.rxjava2:rxjava:2.1.10@jar" level="project" />
-    <orderEntry type="library" exported="" name="android.arch.core:runtime-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="xrecyclerview-1.5.2" level="project" />
+    <orderEntry type="library" exported="" name="Luban-1.0.9" level="project" />
+    <orderEntry type="library" exported="" name="easypermissions-1.2.0" level="project" />
+    <orderEntry type="library" exported="" name="ucrop-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="logging-interceptor-3.10.0" level="project" />
+    <orderEntry type="library" exported="" name="rxandroid-2.0.2" level="project" />
+    <orderEntry type="library" exported="" name="cupboard-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="retrofit-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="support-compat-27.1.0" level="project" />
+    <orderEntry type="library" exported="" name="crashreport_upgrade-1.3.4" level="project" />
+    <orderEntry type="library" exported="" name="NewbieGuide-v1.2.0" level="project" />
+    <orderEntry type="library" exported="" name="android.joda-2.9.3" level="project" />
+    <orderEntry type="library" exported="" name="support-media-compat-27.0.2" level="project" />
+    <orderEntry type="library" exported="" name="FileDownloader-1.0.0-" level="project" />
+    <orderEntry type="library" exported="" name="library-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="glide-transformations-2.0.2" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="multidex-instrumentation-1.0.1" level="project" />
+    <orderEntry type="library" exported="" name="butterknife-annotations-8.8.1" level="project" />
+    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="fastjson-1.2.47" level="project" />
+    <orderEntry type="library" exported="" name="okio-1.14.0" level="project" />
+    <orderEntry type="library" exported="" name="joda-time-2.9.3-no-tzdb" level="project" />
+    <orderEntry type="library" exported="" name="converter-gson-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="adapter-rxjava-2.1.0" level="project" />
+    <orderEntry type="library" exported="" name="eventbus-3.1.1" level="project" />
+    <orderEntry type="library" exported="" name="reactive-streams-1.0.2" level="project" />
+    <orderEntry type="library" exported="" name="umeng_social_tool" level="project" />
+    <orderEntry type="library" exported="" name="livedata-core-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="runtime-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="1_runtime-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="acp-1.1.7" level="project" />
+    <orderEntry type="library" exported="" name="com.kfzs.safe-" level="project" />
+    <orderEntry type="library" exported="" name="support-core-ui-27.1.0" level="project" />
+    <orderEntry type="library" exported="" name="volleyplus-1.4.5" level="project" />
+    <orderEntry type="library" exported="" name="wechat-sdk-android-with-mta-5.1.4" level="project" />
+    <orderEntry type="library" exported="" name="support-fragment-27.1.0" level="project" />
+    <orderEntry type="library" exported="" name="common-1.4.4" level="project" />
+    <orderEntry type="library" exported="" name="butterknife-8.8.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-27.1.0" level="project" />
+    <orderEntry type="library" exported="" name="nativecrashreport-3.3.1" level="project" />
+    <orderEntry type="library" exported="" name="jpush-3.0.8" level="project" />
+    <orderEntry type="library" exported="" name="bga-banner-2.1.7" level="project" />
+    <orderEntry type="library" exported="" name="support-vector-drawable-27.1.0" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.8.2" level="project" />
+    <orderEntry type="library" exported="" name="constraint-layout-1.0.2" level="project" />
+    <orderEntry type="library" exported="" name="alipaySdk-20170922" level="project" />
+    <orderEntry type="library" exported="" name="jcore-1.1.6" level="project" />
+    <orderEntry type="library" exported="" name="log-0.0.2" level="project" />
+    <orderEntry type="library" exported="" name="library-1.6.9" level="project" />
+    <orderEntry type="library" exported="" name="kf-utils-1.4.5" level="project" />
+    <orderEntry type="library" exported="" name="viewmodel-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="javax.annotation-10.0-b28" level="project" />
+    <orderEntry type="library" exported="" name="rxjava-2.1.11" level="project" />
+    <orderEntry type="library" exported="" name="xutils-3.5.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-27.0.2" level="project" />
+    <orderEntry type="library" exported="" name="bottomsheet-core-1.5.3" level="project" />
+    <orderEntry type="library" exported="" name="umeng_social_shareboard" level="project" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-27.1.0" level="project" />
+    <orderEntry type="library" exported="" name="animated-vector-drawable-27.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-27.1.0" level="project" />
+    <orderEntry type="library" exported="" name="glide-3.7.0" level="project" />
+    <orderEntry type="library" exported="" name="analytics-7.4.4" level="project" />
+    <orderEntry type="library" exported="" name="zxing-library-2.2" level="project" />
+    <orderEntry type="library" exported="" name="bottomsheet-commons-1.5.3" level="project" />
+    <orderEntry type="library" exported="" name="umeng_shareboard_widget" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-3.10.0" level="project" />
+    <orderEntry type="library" exported="" name="protobuf-java-3.2.0" level="project" />
+    <orderEntry type="library" exported="" name="constraint-layout-solver-1.0.2" level="project" />
+    <orderEntry type="library" exported="" name="appstoreutils-" level="project" />
+    <orderEntry type="library" exported="" name="rxjava-1.1.6" level="project" />
+    <orderEntry type="library" exported="" name="transition-27.0.2" level="project" />
+    <orderEntry type="library" exported="" name="umeng_social_net" level="project" />
+    <orderEntry type="library" exported="" name="base-adapter-3.0.3" level="project" />
+    <orderEntry type="library" exported="" name="javax.inject-1" level="project" />
+    <orderEntry type="library" exported="" name="design-27.0.2" level="project" />
+    <orderEntry type="library" exported="" name="umeng_social_api" level="project" />
+    <orderEntry type="library" exported="" name="circleimageview-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="rxandroid-1.2.1" level="project" />
+    <orderEntry type="library" exported="" name="analytics-6.0.9" level="project" />
+    <orderEntry type="library" exported="" name="jackson-core-2.2.1" level="project" />
+    <orderEntry type="library" exported="" name="SocialSDK_QQ_Full" level="project" />
+    <orderEntry type="library" exported="" name="support-core-utils-27.1.0" level="project" />
+    <orderEntry type="library" exported="" name="SocialSDK_WeiXin_Full" level="project" />
+    <orderEntry type="library" exported="" name="common-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="1_common-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
+    <orderEntry type="library" exported="" name="wechat-sdk-android-with-mta-1.1.6" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
+    <orderEntry type="library" exported="" name="dagger-2.12" level="project" />
+    <orderEntry type="library" exported="" name="logger-1.15" level="project" />
+    <orderEntry type="library" exported="" name="jackson-dataformat-xml-2.1.2" level="project" />
+    <orderEntry type="library" exported="" name="okhttputils-2.6.2" level="project" />
+    <orderEntry type="library" exported="" name="open_sdk_r5923_lite" level="project" />
     <orderEntry type="module" module-name="datashare" exported="" />
     <orderEntry type="module" module-name="view" exported="" />
-    <orderEntry type="library" exported="" name="android-android-27" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="greendao-api-3.2.2" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="greendao-3.2.2" level="project" />
+    <orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
   </component>
 </module>

+ 35 - 29
app/src/main/AndroidManifest.xml

@@ -14,15 +14,11 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.GET_TASKS"/>
     <uses-permission android:name="android.permission.READ_LOGS"/>
-
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
-
-
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
-
     <!--必须的权限配置-->
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -178,18 +174,11 @@
             android:name=".page.SplashActivity"
             android:screenOrientation="portrait">
 
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
         </activity>
         <activity
             android:name="com.sheep.gamegroup.view.activity.AskRewardAct"
             android:screenOrientation="portrait">
-
         </activity>
-
         <activity
             android:name="com.sheep.gamegroup.view.activity.FriendAndRewardAct"
             android:screenOrientation="portrait">
@@ -202,7 +191,13 @@
         </activity>
 
         <!--2.0-->
-        <activity android:name="com.sheep.gamegroup.view.activity.LoginAct"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.LoginAct">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+            </activity>
+
         <activity android:name="com.sheep.gamegroup.view.activity.PhoneAct"/>
         <activity android:name="com.sheep.gamegroup.view.activity.PersonalCenterAct"/>
         <activity android:name="com.sheep.gamegroup.view.activity.WithdrawalAct"/>
@@ -224,22 +219,6 @@
                 />
         </service>
 
-        <!--友盟start-->
-        <meta-data
-            android:name="DUANDUAN_GRAPH"
-            android:value="${DUANDUAN_GRAPH}" />
-
-        <meta-data
-            android:name="DUANDUAN_DATASHARE"
-            android:value="${DUANDUAN_DATASHARE}" />
-
-        <meta-data
-            android:name="UMENG_CHANNEL"
-            android:value="${UMENG_CHANNEL_VALUE}" />
-        <meta-data
-            android:name="UMENG_APPKEY"
-            android:value="${UMENG_APPKEY}"/>
-        <!--友盟end-->
 
         <!--半袋米首页-->
         <activity
@@ -398,10 +377,37 @@
                 <action android:name="android.intent.action.PACKAGE_ADDED" />
                 <action android:name="android.intent.action.PACKAGE_REMOVED" />
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
-
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
+
+        <activity
+            android:name="com.tencent.tauth.AuthActivity"
+            android:launchMode="singleTask"
+            android:noHistory="true" >
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="tencent101461115" />
+            </intent-filter>
+
+        </activity>
+
+        <activity
+            android:name="com.tencent.connect.common.AssistActivity"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:configChanges="orientation|keyboardHidden|screenSize"/>
+
+
+        <!--友盟start-->
+        <meta-data
+            android:name="UMENG_APPKEY"
+            android:value="5ab0a1da8f4a9d742900035f"></meta-data>
+        <meta-data android:value="xxx" android:name="UMENG_CHANNEL"/>
+
     </application>
 
 

+ 13 - 0
app/src/main/java/com/sheep/gamegroup/IBase/IBasePresenter.java

@@ -0,0 +1,13 @@
+package com.sheep.gamegroup.IBase;
+
+import java.util.HashMap;
+
+/**
+ * Created by Administrator on 2018/3/21.
+ */
+
+public interface IBasePresenter {
+
+    void getTask(HashMap<String,Object> map);
+
+}

+ 12 - 0
app/src/main/java/com/sheep/gamegroup/IBase/IBaseView.java

@@ -0,0 +1,12 @@
+package com.sheep.gamegroup.IBase;
+
+/**
+ * Created by Administrator on 2018/3/21.
+ */
+
+public interface IBaseView {
+
+    void  NetSuccess(int code,String msg);
+    void  NetError(int code ,String  errorMsg);
+
+}

+ 22 - 0
app/src/main/java/com/sheep/gamegroup/absBase/BaseUMActivity.java

@@ -0,0 +1,22 @@
+package com.sheep.gamegroup.absBase;
+
+import android.content.Intent;
+
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.umeng.socialize.UMShareAPI;
+
+/**
+ * Created by Administrator on 2018/3/21.
+ */
+
+public  abstract  class BaseUMActivity extends BaseActivity {
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
+
+
+    }
+
+}

+ 30 - 12
app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -21,6 +21,8 @@ import retrofit2.http.QueryMap;
 import retrofit2.http.Streaming;
 import rx.Observable;
 
+import static com.sheep.gamegroup.util.ConnectAddress.*;
+
 /**
  * 暂时没接口
  * Created by ljy on 2018/3/8.
@@ -40,37 +42,37 @@ public interface ApiService {
      * @return
      */
     @Streaming
-    @POST(ConnectAddress.V1+"app/auth/sms_for_login/")
+    @POST(V1+"app/auth/sms_for_login/")
     Observable<BaseMessage> getCaptcha(@Body JSONObject jsonObject);
 
-    @POST(ConnectAddress.V1+"app/auth/login_by_sms/")
+    @POST(V1+"app/auth/login_by_sms/")
     Observable<BaseMessage> loginByCaptcha(@Body com.alibaba.fastjson.JSONObject jsonObject);
 
     /**
      * 获取用户信息
      */
-    @GET(ConnectAddress.V1+"app/user/get_info/")
+    @GET(V1+"app/user/get_info/")
     Observable<BaseMessage> getInfo();
 
     /**
      * 绑定手机号
      */
-    @PUT(ConnectAddress.V1+"app/user/bind_mobile/")
+    @PUT(V1+"app/user/bind_mobile/")
     Observable<BaseMessage> bindMobile(@Query("mobile") String mobile, @Query("sec_code") String sec_code);
     /**
      * 绑定真实姓名
      */
-    @PUT(ConnectAddress.V1+"app/user/bind_real_name/")
+    @PUT(V1+"app/user/bind_real_name/")
     Observable<BaseMessage> bindRealname(@Query("real_name") String real_name);
     /**
      * 绑定身份证号
      */
-    @PUT(ConnectAddress.V1+"app/user/bind_id_number/")
+    @PUT(V1+"app/user/bind_id_number/")
     Observable<BaseMessage> bindIdNumber(@Query("id_number") String id_number);
     /**
      * 绑定银行卡
      */
-    @PUT(ConnectAddress.V1+"app/user/bind_bank_card/")
+    @PUT(V1+"app/user/bind_bank_card/")
     Observable<BaseMessage> bindBankCard(@Query("bank_card") String bank_card);
 
     /**
@@ -79,31 +81,47 @@ public interface ApiService {
      * type "体现渠道 1:微信 2:支付宝 3:手机充值"
      * now only 1:微信
      */
-    @POST(ConnectAddress.V1 + "app/withdraw/")
+    @POST(V1 + "app/withdraw/")
     Observable<BaseMessage> goWithdrawal(@Body JSONObject parame);
 
     /**
      * 提现绑定微信号
      */
-    @GET(ConnectAddress.V1 + "app/user/bind_wx/")
+    @GET(V1 + "app/user/bind_wx/")
     Observable<BaseMessage> bindWeixin(@Query("code") String code);
 
     /**
      * 获取已接受任务
      */
-    @GET(ConnectAddress.V1 + "app/accepted_task/")
+    @GET(V1 + "app/accepted_task/")
     Observable<BaseMessage> acceptedTask(@Query("page") int page, @Query("per_page") int per_page);
 
     /**
      * 获取自己正在运行的任务
      */
-    @GET(ConnectAddress.V1 + "/app/accepted_task/run_task/")
+    @GET(V1 + "/app/accepted_task/run_task/")
     Observable<BaseMessage> returnTask();
 
     /**
      * 获取正在运行的任务
      */
-    @GET(ConnectAddress.V1 + "/app/release_task/")
+    @GET(V1 + "/app/release_task/")
     Observable<BaseMessage> releaseTask();
 
+
+    /**
+     * 获取正在运行的任务
+     */
+    @GET(V1+"/app/auth/login_by_we_chat")
+    Observable<BaseMessage> LoginByWX(@Body JSONObject jsonObject);
+
+
+
+    /**
+     * 邀请赚钱
+     */
+    @GET(V1+"/app/auth/login_by_we_chat")
+    Observable<BaseMessage> askMakeMoney(@Body String jsonObject);
+
+
 }

+ 23 - 0
app/src/main/java/com/sheep/gamegroup/presenter/AskGetMoneyContract.java

@@ -0,0 +1,23 @@
+package com.sheep.gamegroup.presenter;
+
+import com.sheep.gamegroup.IBase.IBasePresenter;
+import com.sheep.gamegroup.IBase.IBaseView;
+
+/**
+ * Created by Administrator on 2018/3/21.
+ */
+
+public interface AskGetMoneyContract {
+
+
+    interface Presenter extends IBasePresenter{
+
+
+
+    }
+    interface View extends IBaseView{
+
+    }
+
+
+}

+ 57 - 0
app/src/main/java/com/sheep/gamegroup/presenter/AskGetMoneyPresenter.java

@@ -0,0 +1,57 @@
+package com.sheep.gamegroup.presenter;
+
+import com.sheep.gamegroup.IBase.IBasePresenter;
+import com.sheep.gamegroup.IBase.IBaseView;
+import com.sheep.gamegroup.model.api.ApiService;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.util.FastJsonUtils;
+import com.sheep.gamegroup.util.ResposeCode;
+import com.sheep.gamegroup.util.XXTEA;
+
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+
+import rx.Observer;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Administrator on 2018/3/21.
+ */
+
+public class AskGetMoneyPresenter implements AskGetMoneyContract.Presenter {
+    private AskGetMoneyContract.View view;
+    private ApiService apiService;
+    public  AskGetMoneyPresenter(AskGetMoneyContract.View view, ApiService apiService){
+         this.view=view;
+         this.apiService=apiService;
+
+    }
+
+    @Override
+    public void getTask(HashMap<String, Object> map) {
+
+            apiService.askMakeMoney( FastJsonUtils.collectToString(map)).subscribeOn(Schedulers.io())
+                    .subscribe(new Observer<BaseMessage>() {
+                        @Override
+                        public void onCompleted() {
+
+                        }
+                        @Override
+                        public void onError(Throwable throwable) {
+                            view.NetError(ResposeCode.ERROR_NETWORK,throwable.getMessage().toString());
+                        }
+
+                        @Override
+                        public void onNext(BaseMessage baseMessage) {
+
+
+
+                        }
+                    });
+
+    }
+
+
+
+
+}

+ 4 - 2
app/src/main/java/com/sheep/gamegroup/presenter/LoginContract.java

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.presenter;
 
+import com.sheep.gamegroup.IBase.IBaseView;
+
 /**
  * Created by Administrator on 2018/3/10.
  */
@@ -7,10 +9,10 @@ package com.sheep.gamegroup.presenter;
 public interface LoginContract {
 
     interface Presenter{
-
+        void logByAuther(String openid);
     }
 
-    interface View{
+    interface View extends IBaseView{
 
     }
 }

+ 30 - 0
app/src/main/java/com/sheep/gamegroup/presenter/LoginPresenter.java

@@ -1,9 +1,15 @@
 package com.sheep.gamegroup.presenter;
 
+import android.widget.Toast;
+
 import com.sheep.gamegroup.model.api.ApiService;
+import com.sheep.gamegroup.model.entity.BaseMessage;
 
 import javax.inject.Inject;
 
+import rx.Observer;
+import rx.schedulers.Schedulers;
+
 /**
  * Created by Administrator on 2018/3/10.
  */
@@ -17,4 +23,28 @@ public class LoginPresenter implements LoginContract.Presenter {
         this.view = view;
         this.apiService = apiService;
     }
+
+
+
+    @Override
+    public void logByAuther(String openid) {
+        //        apiService.LoginByWX().subscribeOn(Schedulers.io())
+//                .subscribe(new Observer<BaseMessage>() {
+//                    @Override
+//                    public void onCompleted() {
+//
+//                    }
+//
+//                    @Override
+//                    public void onError(Throwable throwable) {
+//                        view.NetError(-1,throwable.getMessage().toString());
+//                    }
+//
+//                    @Override
+//                    public void onNext(BaseMessage baseMessage) {
+//
+//
+//                    }
+//                });
+    }
 }

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/presenter/PhonePresenter.java

@@ -36,6 +36,7 @@ public class PhonePresenter implements PhoneContract.Presenter {
     public PhonePresenter(PhoneContract.View view, ApiService apiService) {
         this.view = view;
         this.apiService = apiService;
+
     }
 
     @Override
@@ -46,7 +47,6 @@ public class PhonePresenter implements PhoneContract.Presenter {
             Log.e("hash-map", map.toString());
             com.alibaba.fastjson.JSONObject j = new com.alibaba.fastjson.JSONObject();
             j.put("account", telphone);
-//        String encry = XXTEA.Encrypt(j.toString(),XXTEA.KEY);
             String encry = XXTEA.bytes2HexStr(XXTEA.Encrypt(j.toString(), XXTEA.KEY).getBytes("utf-8"));
             Log.e("encry----", com.alibaba.fastjson.JSONObject.toJSONString(encry));
             apiService.getCaptcha(j)

+ 8 - 0
app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java

@@ -16,4 +16,12 @@ public class ConnectAddress {
      * 接口地址
      */
     public static final String APP_URL = BASE_HTTP;
+
+    private  static String   getAddress(){
+
+        return BASE_HTTP+V1;
+    }
+
+
+
 }

+ 110 - 0
app/src/main/java/com/sheep/gamegroup/util/FastJsonUtils.java

@@ -0,0 +1,110 @@
+package com.sheep.gamegroup.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.JSONLibDataFormatSerializer;
+import com.alibaba.fastjson.serializer.SerializeConfig;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import org.xutils.common.util.KeyValue;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * fastjson工具类
+ * @version:1.0.0
+ */
+public class FastJsonUtils{
+
+    private static final SerializeConfig config;
+
+    static {
+        config = new SerializeConfig();
+        config.put(java.util.Date.class, new JSONLibDataFormatSerializer()); // 使用和json-lib兼容的日期输出格式
+        config.put(java.sql.Date.class, new JSONLibDataFormatSerializer()); // 使用和json-lib兼容的日期输出格式
+    }
+
+    private static final SerializerFeature[] features = {SerializerFeature.WriteMapNullValue, // 输出空置字段
+            SerializerFeature.WriteNullListAsEmpty, // list字段如果为null,输出为[],而不是null
+            SerializerFeature.WriteNullNumberAsZero, // 数值字段如果为null,输出为0,而不是null
+            SerializerFeature.WriteNullBooleanAsFalse, // Boolean字段如果为null,输出为false,而不是null
+            SerializerFeature.WriteNullStringAsEmpty // 字符类型字段如果为null,输出为"",而不是null
+    };
+
+
+    public static String toJSONString(Object object) {
+        return JSON.toJSONString(object, config, features);
+    }
+
+    public static String toJSONNoFeatures(Object object) {
+        return JSON.toJSONString(object, config);
+    }
+
+
+
+    public static Object toBean(String text) {
+        return JSON.parse(text);
+    }
+
+    public static <T> T toBean(String text, Class<T> clazz) {
+        return JSON.parseObject(text, clazz);
+    }
+
+    // 转换为数组
+    public static <T> Object[] toArray(String text) {
+        return toArray(text, null);
+    }
+
+    // 转换为数组
+    public static <T> Object[] toArray(String text, Class<T> clazz) {
+        return JSON.parseArray(text, clazz).toArray();
+    }
+
+    // 转换为List
+    public static <T> List<T> toList(String text, Class<T> clazz) {
+        return JSON.parseArray(text, clazz);
+    }
+
+    /**
+     * 将javabean转化为序列化的json字符串
+     * @param keyvalue
+     * @return
+     */
+    public static Object beanToJson(KeyValue keyvalue) {
+        String textJson = JSON.toJSONString(keyvalue);
+        Object objectJson  = JSON.parse(textJson);
+        return objectJson;
+    }
+
+    /**
+     * 将string转化为序列化的json字符串
+     * @param
+     * @return
+     */
+    public static Object textToJson(String text) {
+        Object objectJson  = JSON.parse(text);
+        return objectJson;
+    }
+
+    /**
+     * json字符串转化为map
+     * @param s
+     * @return
+     */
+    public static Map stringToCollect(String s) {
+        Map m = JSONObject.parseObject(s);
+        return m;
+    }
+
+    /**
+     * 将map转化为string
+     * @param m
+     * @return
+     */
+    public static String collectToString(Map m) {
+        String s = JSONObject.toJSONString(m);
+        return s;
+    }
+
+}

+ 11 - 0
app/src/main/java/com/sheep/gamegroup/util/ResposeCode.java

@@ -0,0 +1,11 @@
+package com.sheep.gamegroup.util;
+
+/**
+ * Created by Administrator on 2018/3/21.
+ */
+
+public  final class ResposeCode {
+    public  static final    int  ERROR_NETWORK =-1;
+    public  static final  int  ERROR_PARAMETER=-2;
+
+}

+ 14 - 0
app/src/main/java/com/sheep/gamegroup/util/XXTEA.java

@@ -1,11 +1,13 @@
 package com.sheep.gamegroup.util;
 
+import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * XXTEA 加密算法
@@ -211,4 +213,16 @@ public class XXTEA {
 
         return result;
     }
+
+    /**
+     * 将map转换成加密的字符串
+     * @param map
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    public  static String  mapToHashString (Map map) throws UnsupportedEncodingException {
+        return XXTEA.bytes2HexStr(XXTEA.Encrypt(FastJsonUtils.collectToString(map), XXTEA.KEY).getBytes("utf-8"))    ;
+    }
+
+
 }

+ 13 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java

@@ -1,25 +1,24 @@
 package com.sheep.gamegroup.view.activity;
 
-import android.os.Bundle;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.absBase.BaseUMActivity;
+import com.sheep.gamegroup.presenter.AskGetMoneyContract;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
  * Created by Administrator on 2018/3/19.
  */
 
-public class AskGetMoneyAct extends BaseActivity  implements UMShareListener {
+public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener,AskGetMoneyContract.View {
 
 
     @BindView(R.id.tv_size)
@@ -129,4 +128,14 @@ public class AskGetMoneyAct extends BaseActivity  implements UMShareListener {
     public void onCancel(SHARE_MEDIA share_media) {
 
     }
+
+    @Override
+    public void NetSuccess(int code, String msg) {
+
+    }
+
+    @Override
+    public void NetError(int code, String errorMsg) {
+
+    }
 }

+ 70 - 65
app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -3,32 +3,29 @@ package com.sheep.gamegroup.view.activity;
 import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
+import com.sheep.gamegroup.absBase.BaseUMActivity;
 import com.sheep.gamegroup.di.components.DaggerLoginComponent;
-import com.sheep.gamegroup.di.components.LoginComponent;
 import com.sheep.gamegroup.di.modules.LoginModule;
 import com.sheep.gamegroup.presenter.LoginContract;
+import com.sheep.gamegroup.presenter.LoginPresenter;
 import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.page.MainActivity;
-import com.sheep.jiuyan.samllsheep.wxapi.WXEntryActivity;
 import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.bean.SHARE_MEDIA;
-import com.umeng.socialize.utils.SocializeUtils;
-import com.uuzuche.lib_zxing.decoding.Intents;
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -37,12 +34,16 @@ import butterknife.OnClick;
  * Created by ljy on 2018/3/8.
  */
 
-public class LoginAct extends BaseActivity implements LoginContract.View{
-    Activity activity;
-    @BindView(R.id.weixin_login_tv)
-    TextView weixinLoginTv;
+public class LoginAct extends BaseUMActivity implements LoginContract.View {
+
+    @Inject
+    LoginPresenter mPresenter;
     @BindView(R.id.tel_login_tv)
     TextView telLoginTv;
+    @BindView(R.id.iv_wx)
+    ImageView ivWx;
+    @BindView(R.id.iv_qq)
+    ImageView ivQq;
 
     @Override
     protected int getLayoutId() {
@@ -51,21 +52,20 @@ public class LoginAct extends BaseActivity implements LoginContract.View{
 
     @Override
     public void initView() {
-        ActivityManager.getInstance().pushActivity(this);
-        activity = this;
+
         DaggerLoginComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .loginModule(new LoginModule(this))
                 .build()
-        .inject(this);
-        setTvBg(R.id.weixin_login_tv);
+                .inject(this);
+
     }
 
 
-    private  void  requestPremiss(){
-        if(Build.VERSION.SDK_INT>=23){
-            String[] mPermissionList = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.ACCESS_FINE_LOCATION,Manifest.permission.CALL_PHONE,Manifest.permission.READ_LOGS,Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.SET_DEBUG_APP,Manifest.permission.SYSTEM_ALERT_WINDOW,Manifest.permission.GET_ACCOUNTS,Manifest.permission.WRITE_APN_SETTINGS};
-            ActivityCompat.requestPermissions(this,mPermissionList,123);
+    private void requestPremiss() {
+        if (Build.VERSION.SDK_INT >= 23) {
+            String[] mPermissionList = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CALL_PHONE, Manifest.permission.READ_LOGS, Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.SET_DEBUG_APP, Manifest.permission.SYSTEM_ALERT_WINDOW, Manifest.permission.GET_ACCOUNTS, Manifest.permission.WRITE_APN_SETTINGS};
+            ActivityCompat.requestPermissions(this, mPermissionList, 123);
         }
     }
 
@@ -77,7 +77,6 @@ public class LoginAct extends BaseActivity implements LoginContract.View{
     }
 
 
-
     @Override
     public void initListener() {
 
@@ -89,87 +88,93 @@ public class LoginAct extends BaseActivity implements LoginContract.View{
     }
 
 
-    @OnClick({R.id.weixin_login_tv, R.id.tel_login_tv})
-    public void onViewClicked(View view) {
-
-        setTvBg(view.getId());
-        switch (view.getId()) {
-            case R.id.weixin_login_tv:
-                goWeixin();
-                break;
-            case R.id.tel_login_tv:
-                goTelLogin();
-                break;
-        }
-    }
-
-
-
 
     private void goTelLogin() {
-        Intent intent = new Intent(activity, PhoneAct.class);
+        Intent intent = new Intent(this, PhoneAct.class);
         startActivity(intent);
-//        finish();
+        finish();
     }
 
     private void goWeixin() {
         UMShareAPI.get(this).doOauthVerify(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
             @Override
             public void onStart(SHARE_MEDIA platform) {
-
             }
 
             @Override
             public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-
+                mPresenter.logByAuther(data.get("openid"));
             }
 
             @Override
             public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-
+                showToast("微信授权失败");
             }
 
             @Override
             public void onCancel(SHARE_MEDIA platform, int action) {
+                showToast("微信授权取消");
 
+            }
+        });
+
+    }
 
 
+    private  void  loginQQ(){
+        UMShareAPI.get(this).doOauthVerify(this, SHARE_MEDIA.QQ, new UMAuthListener() {
+            @Override
+            public void onStart(SHARE_MEDIA platform) {
+
+            }
+
+            @Override
+            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
+                mPresenter.logByAuther(data.get("openid"));
+            }
+
+            @Override
+            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
+                showToast("微信授权失败");
+            }
+
+            @Override
+            public void onCancel(SHARE_MEDIA platform, int action) {
+                showToast("微信授权取消");
+
             }
         });
 
+
+
     }
+
+
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
+    public void NetSuccess(int code, String msg) {
+        showToast(msg);
+    }
 
+    @Override
+    public void NetError(int code, String errorMsg) {
+        showToast(errorMsg);
 
 
     }
 
-    /**
-     * 设置按钮背景
-     */
-    private void setTvBg(int select){
-        switch (select){
-            case R.id.weixin_login_tv:
-                weixinLoginTv.setBackgroundResource(R.drawable.sp_bg_transparency_line_white);
-                weixinLoginTv.setTextColor(getResources().getColor(R.color.white));
-                telLoginTv.setBackgroundColor(getResources().getColor(R.color.transparent));
-                telLoginTv.setTextColor(getResources().getColor(R.color.grgray));
-                break;
+
+    @OnClick({R.id.tel_login_tv, R.id.iv_wx, R.id.iv_qq})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
             case R.id.tel_login_tv:
-                telLoginTv.setBackgroundResource(R.drawable.sp_bg_transparency_line_white);
-                telLoginTv.setTextColor(getResources().getColor(R.color.white));
-                weixinLoginTv.setBackgroundColor(getResources().getColor(R.color.transparent));
-                weixinLoginTv.setTextColor(getResources().getColor(R.color.grgray));
+                goTelLogin();
                 break;
-            default:
-                weixinLoginTv.setBackgroundResource(R.drawable.sp_bg_transparency_line_white);
-                weixinLoginTv.setTextColor(getResources().getColor(R.color.white));
-                telLoginTv.setBackgroundColor(getResources().getColor(R.color.transparent));
-                telLoginTv.setTextColor(getResources().getColor(R.color.grgray));
+            case R.id.iv_wx:
+                goWeixin();
+                break;
+            case R.id.iv_qq:
+                loginQQ();
                 break;
         }
-
     }
 }

+ 2 - 4
app/src/main/java/com/sheep/jiuyan/samllsheep/BaseApplication.java

@@ -26,9 +26,7 @@ public class BaseApplication extends KFZSApp {
         UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, "5ab0a1da8f4a9d742900035f");
 
         UMShareAPI.get(this);
-        PlatformConfig.setWeixin("wxdc1e388c3822c80b", "3baf1193c85774b3fd9d18447d76cab0");
-        PlatformConfig.setQQZone("100424468", "c7394704798a158208a74ab60104f0ba");
-
-
+        PlatformConfig.setWeixin("wx2be7f59bb7bb963f", "6cf7ca0f6c6ac97c6961d901fee8adb9");
+        PlatformConfig.setQQZone("101461115", "b874bc950bcf066f17fd52cf2bb959e9");
     }
 }

+ 10 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseActivity.java

@@ -8,7 +8,9 @@ import android.support.annotation.Nullable;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Toast;
 
+import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -23,7 +25,7 @@ import butterknife.ButterKnife;
  * Created by kemllor on 2017/12/15.
  */
 
-public abstract class BaseActivity extends AppActivity {
+public abstract class BaseActivity extends AppActivity  {
 
     protected ProgressDialog  mPd;
 
@@ -36,6 +38,7 @@ public abstract class BaseActivity extends AppActivity {
         initView();
         initListener();
         initData();
+        ActivityManager.getInstance().pushActivity(this);
 
     }
 
@@ -60,6 +63,12 @@ public abstract class BaseActivity extends AppActivity {
 
     }
 
+    protected   void  showToast(String msg){
+        Toast.makeText(this,msg,Toast.LENGTH_LONG).show();
+
+
+    }
+
 
 
 

+ 53 - 8
app/src/main/res/layout/login_act_layout.xml

@@ -10,14 +10,8 @@
         android:background="@mipmap/login_bg_img"
         style="@style/login_layout"
         android:layout_marginTop="@dimen/content_padding_80">
-        <TextView
-            android:id="@+id/weixin_login_tv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="微信登录"
-            style="@style/login_btn"
-            android:layout_above="@+id/tel_login_tv"
-            android:focusedByDefault="true"/>
+
+
         <TextView
             android:id="@+id/tel_login_tv"
             android:layout_width="match_parent"
@@ -25,8 +19,59 @@
             android:text="手机号登录"
             android:layout_alignParentBottom="true"
             style="@style/login_btn"
+            android:textColor="@color/txt_white"
+            android:background="@drawable/sp_bg_transparency_line_white"
             android:layout_marginBottom="80dp"
             android:layout_marginTop="@dimen/content_padding_10"/>
+
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_above="@+id/tel_login_tv"
+            android:layout_centerHorizontal="true"
+            >
+            <View
+                android:layout_width="10dp"
+                android:layout_height="1dp"
+                android:background="@color/txt_white"
+                android:layout_gravity="center_vertical"
+                ></View>
+
+            <ImageView
+                android:layout_marginLeft="15dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:src="@mipmap/x_ic_login_wx"
+                android:id="@+id/iv_wx"
+                />
+
+            <View
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_width="2dp"
+                android:layout_height="2dp"
+                android:background="@color/txt_white"
+                android:layout_gravity="center_vertical"
+                ></View>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:src="@mipmap/x_ic_login_qq"
+                android:id="@+id/iv_qq"
+                />
+            <View
+                android:layout_marginLeft="15dp"
+                android:layout_width="10dp"
+                android:layout_height="1dp"
+                android:background="@color/txt_white"
+                android:layout_gravity="center_vertical"
+                ></View>
+        </LinearLayout>
     </RelativeLayout>
 
 </RelativeLayout>

+ 1 - 1
app/src/main/res/layout/title.xml

@@ -3,7 +3,7 @@
                 android:id="@+id/layout_navigationBar"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/layout_heigh_default"
-                android:background="@color/colorPrimary">
+                android:background="@color/white_light">
 
     <ImageView
         android:id="@+id/img_baseactivity_title"

BIN
app/src/main/res/mipmap-xhdpi/x_ic_login_qq.png


BIN
app/src/main/res/mipmap-xhdpi/x_ic_login_wx.png


BIN
app/src/main/res/mipmap-xxhdpi/x_ic_login_qq.png


BIN
app/src/main/res/mipmap-xxhdpi/x_ic_login_wx.png


BIN
datashare/acpg-graph/acpg-cli-1.12.0.jar


BIN
datashare/acpg/acpg-cli-1.12.0.jar


+ 14 - 15
datashare/datashare.iml

@@ -23,7 +23,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
@@ -63,13 +63,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -77,6 +70,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
@@ -97,12 +97,11 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="com.android.support:support-annotations:23.4.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:support-v4-23.4.0" level="project" />
-    <orderEntry type="library" exported="" name="org.greenrobot:greendao-api:3.2.2@jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" exported="" name="org.greenrobot:greendao:3.2.2@jar" level="project" />
-    <orderEntry type="library" exported="" name="android-android-27" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="greendao-api-3.2.2" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
+    <orderEntry type="library" exported="" name="greendao-3.2.2" level="project" />
   </component>
 </module>

+ 1 - 0
view/build.gradle

@@ -10,6 +10,7 @@ android {
         versionCode VERSION_CODE as int
         versionName VERSION_NAME
     }
+
     lintOptions {
         abortOnError false
     }

+ 19 - 20
view/view.iml

@@ -23,7 +23,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
@@ -63,13 +63,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -77,6 +70,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -96,17 +96,16 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="com.android.support:support-annotations:23.4.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.nineoldandroids:library:2.4.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:support-vector-drawable-23.4.0" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:support-v4-23.4.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
-    <orderEntry type="library" exported="" name="cn.bingoogolapple:bga-banner-2.1.7" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:appcompat-v7-23.4.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" exported="" name="jp.wasabeef:glide-transformations-2.0.2" level="project" />
-    <orderEntry type="library" exported="" name="com.android.support:animated-vector-drawable-23.4.0" level="project" />
-    <orderEntry type="library" exported="" name="com.github.bumptech.glide:glide:3.7.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="android-android-27" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="bga-banner-2.1.7" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
+    <orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="glide-3.7.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="glide-transformations-2.0.2" level="project" />
   </component>
 </module>