创建重构分支,调整依赖包版本,清理无用依赖项,添加Activity,Fragment父类,添加网络请求拦截器

.idea/compiler.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>

.idea/copyright/profiles_settings.xml

@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>

.idea/gradle.xml

@@ -9,6 +9,8 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/codec" />
+            <option value="$PROJECT_DIR$/common" />
             <option value="$PROJECT_DIR$/ucrop" />
             <option value="$PROJECT_DIR$/view" />
           </set>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

app/build.gradle

@@ -132,96 +132,58 @@ repositories {
 }
 
 dependencies {
-    //noinspection GradleCompatible
-    implementation 'com.android.support:cardview-v7:28.0.0-rc01'
-    implementation "com.android.support:design:$supportLibVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation project(':common')
+    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    implementation 'com.google.code.gson:gson:2.8.2'
-    implementation('com.jcodecraeer:xrecyclerview:1.5.9') {
-        //    implementation 'com.shark:screencapture:1.0.0'
-        exclude group: 'com.android.support', module: 'design'
-    }
-    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation('com.jcodecraeer:xrecyclerview:1.5.9')
+    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
     implementation 'org.greenrobot:eventbus:3.1.1'
     implementation 'com.zhy:base-adapter:3.0.3'
-
-    //    implementation 'com.liulishuo.filedownloader:library:1.6.9'
     implementation 'com.tencent.bugly:crashreport_upgrade:1.3.4'
-
-    //其中latest.release指代最新版本号，也可以指定明确的版本号，例如1.2.0
     implementation 'com.tencent.bugly:nativecrashreport:3.3.1'
-
-    //其中latest.release指代最
-
     implementation 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:5.1.6'
-    debugImplementation('com.readystatesoftware.chuck:library:1.1.0') {
-        exclude group: 'com.android.support', module: 'design'
-    }
-
-    //    implementation 'de.hdodenhof:circleimageview:2.2.0'
-    releaseImplementation('com.readystatesoftware.chuck:library-no-op:1.1.0') {
-        exclude group: 'com.android.support', module: 'design'
-    }
+    debugImplementation('com.readystatesoftware.chuck:library:1.1.0')
+    releaseImplementation('com.readystatesoftware.chuck:library-no-op:1.1.0')
     implementation 'org.xutils:xutils:3.5.0'
     implementation 'com.mylhyl:acp:1.1.7'
-
     implementation 'cn.yipianfengye.android:zxing-library:2.2'
     implementation 'com.github.huburt-Hu:NewbieGuide:v1.2.0'
-    debugImplementation 'com.android.support:multidex:1.0.1'
-
+    debugImplementation 'com.android.support:multidex:1.0.3'
     //不要修改这里，相信我
     releaseImplementation 'com.android.support:multidex:1.0.3'
     implementation(name: 'com.kfzs.safe-201809211354', ext: 'aar')
-
     //butterknife
     implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
-
-    //dagger2
-
-    //    implementation 'com.google.dagger:dagger:+'
-
-    //    implementation 'com.google.dagger:dagger-compiler:+'
     compileOnly 'org.glassfish:javax.annotation:10.0-b28'
     implementation 'com.google.dagger:dagger:2.12'
     annotationProcessor 'com.google.dagger:dagger-compiler:2.12'
-
     //retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
-
-    //    implementation 'com.squareup.retrofit2:adapter-rxjava2:+'
-    implementation 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
-
+    implementation 'com.squareup.retrofit2:adapter-rxjava:2.4.0'
     //rxjava
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
-
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
     //获取动态权限三方库
     implementation 'pub.devrel:easypermissions:1.2.0'
     implementation 'net.danlew:android.joda:2.9.3'
-    implementation 'com.orhanobut:logger:1.15'
-
+    implementation 'com.orhanobut:logger:2.2.0'
     //友盟
     implementation 'com.umeng.sdk:common:1.5.3'
-
-    //implementation 'com.umeng.sdk:analytics:latest.integration'
-
     //fast json
-    implementation 'com.alibaba:fastjson:1.2.47'
-
+    implementation 'com.alibaba:fastjson:1.2.48'
     //添加半袋米相关
     implementation(name: 'appstoreutils-201810101432', ext: 'aar')
     implementation project(':view')
-
-    //    implementation(name: 'view-release', ext: 'aar')
     implementation 'com.flipboard:bottomsheet-core:1.5.3'
     implementation 'com.flipboard:bottomsheet-commons:1.5.3'
-
     implementation files('libs/open_sdk_r5923_lite.jar')
-//    implementation files('libs/wechat-sdk-android-with-mta-1.1.6.jar')
     implementation files('libs/umeng_social_tool.jar')
     implementation files('libs/umeng_social_shareboard.jar')
     implementation files('libs/umeng_social_net.jar')
@@ -230,56 +192,35 @@ dependencies {
     implementation files('libs/SocialSDK_WeiXin_Full.jar')
     implementation files('libs/SocialSDK_QQ_Full.jar')
     implementation 'com.zhy:okhttputils:2.6.2'
-
-    //    implementation 'com.kf.framework:kf-utils:latest.integration@aar'
     implementation 'com.kf.framework:kf-utils:1.4.5@aar'
-
-    //    implementation 'com.kf.framework:volleyplus:latest.integration@aar'
     implementation 'com.kf.framework:volleyplus:1.4.5@aar'
-    implementation "com.android.support:support-annotations:$supportLibVersion"
-    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
-//    implementation project(':datashare')
+    implementation "com.android.support:support-annotations:28.0.0"
+    implementation "com.android.support:recyclerview-v7:28.0.0"
     implementation files('libs/jackson-core-2.2.1.jar')
     implementation files('libs/jackson-dataformat-xml-2.1.2.jar')
     implementation 'io.reactivex:rxandroid:1.2.1'
     implementation 'com.github.ithedan:TextViewDrawable:v1.0'
-//    implementation 'com.github.zhangkexpz:LayoutScroll:v1.0'
-//    implementation 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
     implementation(name: 'PhotoPicker-release-201810081154', ext: 'aar')
-    implementation 'com.github.bumptech.glide:glide:4.1.1'
-
-    //    implementation 'com.github.yalantis:ucrop:2.2.1-native'
-
-    //    implementation 'com.google.zxing:core:3.3.0'
+    implementation 'com.github.bumptech.glide:glide:4.8.0'
     implementation project(':ucrop')
-    implementation('com.arialyy.aria:aria-core:3.3.16') {
-        exclude group: 'com.android.support'
-    }
-//    implementation project(':Aria')
-
+    implementation('com.arialyy.aria:aria-core:3.3.16')
     annotationProcessor 'com.arialyy.aria:aria-compiler:3.3.16'
     implementation 'com.sunfusheng:marqueeview:1.3.3'
     implementation files('libs/alipaySdk-20170922.jar')
     //极光
     implementation files('libs/jcore-android-1.2.0.jar')
     implementation files('libs/jpush-android-3.1.2.jar')
-
     //定位
     implementation files('libs/BaiduLBS_Android.jar')
-
     //幂动科技
     implementation files('libs/mdsdk-201810121334.jar')
     //轮播图
     implementation 'com.youth.banner:banner:1.4.10'  //最新版本
     //loading
     implementation 'com.github.ybq:Android-SpinKit:1.1.0'
-//    implementation 'com.github.nanchen2251:CompressHelper:1.0.5'
-//    implementation(name: 'compresshelper-release', ext: 'aar')
     implementation files('libs/compresshelper-release.jar')
     implementation 'com.haibin:calendarview:3.4.4'
-
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-14'
-
     implementation 'org.greenrobot:greendao:3.2.2'
 }
 
@@ -296,4 +237,4 @@ android.applicationVariants.all {
                 }
 
         }
-}
+}

app/src/main/AndroidManifest.xml

@@ -2,13 +2,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.sheep.jiuyan.samllsheep">
-    <!--极光推送-->
+
+    <!-- 极光推送 -->
     <!-- Required -->
     <permission
         android:name="${applicationId}.permission.JPUSH_MESSAGE"
         android:protectionLevel="signature" />
 
-    <!-- Required  一些系统要求的权限，如访问网络等-->
+    <!-- Required  一些系统要求的权限，如访问网络等 -->
     <uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE" />
     <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -33,7 +34,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <!--极光推送end-->
+    <!-- 极光推送end -->
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
@@ -48,13 +49,13 @@
         android:name="android.permission.PACKAGE_USAGE_STATS"
         tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <!--必须的权限配置-->
+    <!-- 必须的权限配置 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission
         android:name="android.permission.READ_LOGS"
         tools:ignore="ProtectedPermissions" />
-    <!--保存资源到SD卡-->
+    <!-- 保存资源到SD卡 -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!-- 推荐的权限 -->
     <!-- 添加如下权限，以便使用更多的第三方SDK和更精准的统计数据 -->
@@ -65,28 +66,28 @@
     <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
 
     <!-- 百度定位权限 start -->
-    <!-- 这个权限用于进行网络定位-->
+    <!-- 这个权限用于进行网络定位 -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <!-- 这个权限用于访问GPS定位-->
+    <!-- 这个权限用于访问GPS定位 -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <!-- 用于访问wifi网络信息，wifi信息会用于进行网络定位-->
+    <!-- 用于访问wifi网络信息，wifi信息会用于进行网络定位 -->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <!-- 获取运营商信息，用于支持提供运营商信息相关的接口-->
+    <!-- 获取运营商信息，用于支持提供运营商信息相关的接口 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!-- 这个权限用于获取wifi的获取权限，wifi信息会用来进行网络定位-->
+    <!-- 这个权限用于获取wifi的获取权限，wifi信息会用来进行网络定位 -->
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <!-- 用于读取手机当前的状态-->
+    <!-- 用于读取手机当前的状态 -->
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <!-- 写入扩展存储，向扩展卡写入数据，用于写入离线定位数据-->
+    <!-- 写入扩展存储，向扩展卡写入数据，用于写入离线定位数据 -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <!-- 访问网络，网络定位需要上网-->
+    <!-- 访问网络，网络定位需要上网 -->
     <uses-permission android:name="android.permission.INTERNET" />
-    <!-- SD卡读取权限，用户写入离线定位数据-->
+    <!-- SD卡读取权限，用户写入离线定位数据 -->
     <uses-permission
         android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
         tools:ignore="ProtectedPermissions" />
-    <!-- 百度定位权限 end -->
 
+    <!-- 百度定位权限 end -->
     <application
         android:name=".SheepApp"
         android:allowBackup="true"
@@ -118,11 +119,10 @@
         <service android:name=".service.DownloadService" />
         <service
             android:name=".service.AutoCheckService"
-            android:priority="1000"
             android:exported="false"
-            android:process=":auto_check"/>
-        <service
-            android:name=".service.FloatShotScreenService" />
+            android:priority="1000"
+            android:process=":auto_check" />
+        <service android:name=".service.FloatShotScreenService" />
         <service
             android:name=".service.ListenerShotService"
             android:enabled="true"
@@ -145,14 +145,13 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
-
-        <!--必须配置-->
+        <!-- 必须配置 -->
         <activity
             android:name="com.tencent.bugly.beta.ui.BetaActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|locale"
             android:theme="@android:style/Theme.Translucent" />
 
-        <!-- 必须配置 fileProvider， 注意： android:authorities="${applicationId}.fileProvider" 不要直接copy，设置为你的包名.fileProvider-->
+        <!-- 必须配置 fileProvider， 注意： android:authorities="${applicationId}.fileProvider" 不要直接copy，设置为你的包名.fileProvider -->
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="${applicationId}.fileProvider"
@@ -161,34 +160,29 @@
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
-
         </provider>
 
         <activity
             android:name="com.sheep.gamegroup.view.activity.PersonalInfoAct"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
 
-        <!--2.0-->
+        <!-- 2.0 -->
         <activity
             android:name="com.sheep.gamegroup.view.activity.LoginAct"
             android:configChanges="keyboardHidden|screenSize|orientation"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:theme="@style/FullScreenTheme">
-
-        </activity>
-
+            android:theme="@style/FullScreenTheme"></activity>
         <activity
             android:name="com.sheep.gamegroup.view.activity.SplashAct"
             android:screenOrientation="portrait"
             android:theme="@style/SplashTheme">
-
             <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.MiddleSchemeAct"
             android:configChanges="keyboardHidden|screenSize|orientation"
@@ -199,12 +193,17 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustPan|stateHidden">
             <intent-filter android:autoVerify="true">
-                <!--协议部分，随便设置-->
-                <data android:scheme="sheep" android:host="small.kfzs.com"/>
-                <!--下面这几行也必须得设置-->
-                <category android:name="android.intent.category.DEFAULT"/>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <!-- 协议部分，随便设置 -->
+                <data
+                    android:host="small.kfzs.com"
+                    android:scheme="sheep" />
+                <!-- 下面这几行也必须得设置 -->
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
         </activity>
         <activity
@@ -255,21 +254,21 @@
             android:name="com.sheep.gamegroup.view.activity.DialogToastAct"
             android:theme="@style/MyDialogActivityTheme" />
 
-        <!--&lt;!&ndash;半袋米首页&ndash;&gt;-->
-        <!--<activity-->
-        <!--android:name="com.kfzs.duanduan.ActMain"-->
-        <!--android:configChanges="keyboardHidden|screenSize|orientation"-->
-        <!--android:exported="true"-->
-        <!--android:hardwareAccelerated="true"-->
-        <!--android:launchMode="singleTask"-->
-        <!--android:screenOrientation="portrait"-->
-        <!--android:theme="@style/AppTheme"-->
-        <!--android:windowSoftInputMode="adjustPan|stateHidden">-->
-        <!--<intent-filter>-->
-        <!--<category android:name="android.intent.category.DEFAULT" />-->
-        <!--<action android:name="android.intent.action.VIEW" />-->
-        <!--</intent-filter>-->
-        <!--</activity>-->
+        <!-- &lt;!&ndash;半袋米首页&ndash;&gt; -->
+        <!-- <activity -->
+        <!-- android:name="com.kfzs.duanduan.ActMain" -->
+        <!-- android:configChanges="keyboardHidden|screenSize|orientation" -->
+        <!-- android:exported="true" -->
+        <!-- android:hardwareAccelerated="true" -->
+        <!-- android:launchMode="singleTask" -->
+        <!-- android:screenOrientation="portrait" -->
+        <!-- android:theme="@style/AppTheme" -->
+        <!-- android:windowSoftInputMode="adjustPan|stateHidden"> -->
+        <!-- <intent-filter> -->
+        <!-- <category android:name="android.intent.category.DEFAULT" /> -->
+        <!-- <action android:name="android.intent.action.VIEW" /> -->
+        <!-- </intent-filter> -->
+        <!-- </activity> -->
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActMain"
             android:configChanges="keyboardHidden|screenSize|orientation"
@@ -281,27 +280,25 @@
             android:windowSoftInputMode="adjustPan|stateHidden">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>
         </activity>
-
         <activity
             android:name="com.sheep.gamegroup.view.activity.AskGetMoneyAct"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActExchangeCMCC"
             android:screenOrientation="portrait" />
-
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActDownloadMgr"
             android:hardwareAccelerated="false"
             android:screenOrientation="portrait" />
 
-        <!--<provider-->
-        <!--android:name="com.kfzs.duanduan.data.graph.provider.KFZSProvider"-->
-        <!--android:authorities="com.kfzs.duanduan.data.graph.provider.${DUANDUAN_GRAPH}"-->
-        <!--android:exported="true" />-->
-
+        <!-- <provider -->
+        <!-- android:name="com.kfzs.duanduan.data.graph.provider.KFZSProvider" -->
+        <!-- android:authorities="com.kfzs.duanduan.data.graph.provider.${DUANDUAN_GRAPH}" -->
+        <!-- android:exported="true" /> -->
 
         <receiver android:name="com.sheep.gamegroup.receiver.AppAddOrDelReceiver">
             <intent-filter>
@@ -317,7 +314,6 @@
             android:name="com.tencent.tauth.AuthActivity"
             android:launchMode="singleTask"
             android:noHistory="true">
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -326,15 +322,11 @@
 
                 <data android:scheme="tencent101461115" />
             </intent-filter>
-
         </activity>
-
         <activity
             android:name="com.tencent.connect.common.AssistActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait" />
-
-
         <activity
             android:name="com.sheep.gamegroup.view.activity.CommitWxAct"
             android:screenOrientation="portrait"
@@ -349,7 +341,6 @@
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActGuideDeblocked"
             android:screenOrientation="portrait" />
-
         <activity
             android:name="com.sheep.gamegroup.view.activity.RealNameAuthenAct"
             android:screenOrientation="portrait" />
@@ -364,7 +355,6 @@
             android:name="me.iwf.photopicker.PhotoPickerActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.NoActionBar" />
-
         <activity
             android:name="me.iwf.photopicker.PhotoPagerActivity"
             android:screenOrientation="portrait"
@@ -373,7 +363,6 @@
             android:name="com.yalantis.ucrop.UCropActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
-
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActNewbieTaskList"
             android:screenOrientation="portrait" />
@@ -404,8 +393,6 @@
         <activity
             android:name="com.sheep.gamegroup.view.activity.FeedbackAct"
             android:screenOrientation="portrait" />
-
-
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActSignCard"
             android:screenOrientation="portrait" />
@@ -432,7 +419,7 @@
             android:screenOrientation="user"
             android:theme="@style/MyDialogActivityTheme" />
 
-        <!--友盟start-->
+        <!-- 友盟start -->
         <meta-data
             android:name="UMENG_APPKEY"
             android:value="${umeng_app_key}" />
@@ -440,8 +427,8 @@
             android:name="UMENG_CHANNEL"
             android:value="xxx" />
 
+        <!-- 极光推送 -->
 
-        <!--极光推送-->
 
         <!-- For test only 测试状态通知栏，需要打开的Activity -->
         <activity
@@ -449,15 +436,16 @@
             android:exported="false">
             <intent-filter>
                 <action android:name="jpush.testAction" />
+
                 <category android:name="jpush.testCategory" />
             </intent-filter>
         </activity>
-        <!-- Rich push 核心功能 since 2.0.6-->
+        <!-- Rich push 核心功能 since 2.0.6 -->
         <activity
             android:name="cn.jpush.android.ui.PopWinActivity"
             android:exported="false"
-            android:theme="@style/MyDialogStyle"></activity>
-        <!-- Required SDK核心功能-->
+            android:theme="@style/MyDialogStyle" />
+        <!-- Required SDK核心功能 -->
         <activity
             android:name="cn.jpush.android.ui.PushActivity"
             android:configChanges="orientation|keyboardHidden"
@@ -471,7 +459,7 @@
             </intent-filter>
         </activity>
 
-        <!-- Required SDK 核心功能-->
+        <!-- Required SDK 核心功能 -->
         <!-- 可配置android:process参数将PushService放在其他进程中 -->
         <service
             android:name="cn.jpush.android.service.PushService"
@@ -484,13 +472,12 @@
                 <action android:name="cn.jpush.android.intent.PUSH_TIME" />
             </intent-filter>
         </service>
-        <!-- since 3.0.9 Required SDK 核心功能-->
+        <!-- since 3.0.9 Required SDK 核心功能 -->
         <provider
             android:name="cn.jpush.android.service.DataProvider"
             android:authorities="${applicationId}.DataProvider"
             android:exported="false" />
 
-
         <!-- since 1.8.0 option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
         <!-- 若不启用该功能可删除该组件，将不拉起其他应用也不能被其他应用拉起 -->
         <service
@@ -499,22 +486,22 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.DaemonService" />
+
                 <category android:name="${applicationId}" />
             </intent-filter>
-
         </service>
-        <!-- since 3.1.0 Required SDK 核心功能-->
+        <!-- since 3.1.0 Required SDK 核心功能 -->
         <provider
             android:name="cn.jpush.android.service.DownloadProvider"
             android:authorities="${applicationId}.DownloadProvider"
             android:exported="true" />
-        <!-- Required SDK核心功能-->
+        <!-- Required SDK核心功能 -->
         <receiver
             android:name="cn.jpush.android.service.PushReceiver"
             android:enabled="true"
             android:exported="false">
             <intent-filter android:priority="1000">
-                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />   <!--Required  显示通知栏 -->
+                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" /> <!-- Required  显示通知栏 -->
                 <category android:name="${applicationId}" />
             </intent-filter>
             <intent-filter>
@@ -530,30 +517,31 @@
             </intent-filter>
         </receiver>
 
-        <!-- Required SDK核心功能-->
+        <!-- Required SDK核心功能 -->
         <receiver
             android:name="cn.jpush.android.service.AlarmReceiver"
             android:exported="false" />
 
-        <!-- User defined.  For test only  用户自定义的广播接收器-->
+        <!-- User defined.  For test only  用户自定义的广播接收器 -->
         <receiver
             android:name="com.sheep.gamegroup.receiver.SheepJpushReceiver"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
-                <action android:name="cn.jpush.android.intent.REGISTRATION" /> <!--Required  用户注册SDK的intent-->
-                <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" /> <!--Required  用户接收SDK消息的intent-->
-                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" /> <!--Required  用户接收SDK通知栏信息的intent-->
-                <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" /> <!--Required  用户打开自定义通知栏的intent-->
-                <action android:name="cn.jpush.android.intent.CONNECTION" /><!-- 接收网络变化 连接/断开 since 1.6.3 -->
+                <action android:name="cn.jpush.android.intent.REGISTRATION" /> <!-- Required  用户注册SDK的intent -->
+                <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" /> <!-- Required  用户接收SDK消息的intent -->
+                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" /> <!-- Required  用户接收SDK通知栏信息的intent -->
+                <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" /> <!-- Required  用户打开自定义通知栏的intent -->
+                <action android:name="cn.jpush.android.intent.CONNECTION" /> <!-- 接收网络变化 连接/断开 since 1.6.3 -->
                 <category android:name="${applicationId}" />
             </intent-filter>
         </receiver>
 
-        <!-- User defined.  For test only  用户自定义接收消息器,3.0.7开始支持,目前新tag/alias接口设置结果会在该广播接收器对应的方法中回调-->
+        <!-- User defined.  For test only  用户自定义接收消息器,3.0.7开始支持,目前新tag/alias接口设置结果会在该广播接收器对应的方法中回调 -->
         <receiver android:name="com.sheep.gamegroup.receiver.SheepJpushMessageReceiver">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
+
                 <category android:name="${applicationId}" />
             </intent-filter>
         </receiver>
@@ -564,10 +552,11 @@
             android:value="developer-default" />
         <meta-data
             android:name="JPUSH_APPKEY"
-            android:value="${jpush_appkey}" /> <!--  </>值来自开发者平台取得的AppKey-->
-        <!--极光推送end-->
+            android:value="${jpush_appkey}" /> <!-- </>值来自开发者平台取得的AppKey -->
+        <!-- 极光推送end -->
+
 
-        <!-- div start-->
+        <!-- div start -->
         <activity
             android:name="com.sheep.gamegroup.view.activity.RechargeAct"
             android:screenOrientation="portrait" />
@@ -577,7 +566,8 @@
         <activity
             android:name="com.sheep.gamegroup.view.activity.RechargeResultAct"
             android:screenOrientation="portrait" />
-        <!-- div end-->
+        <!-- div end -->
+
 
         <!-- alipay 支付宝 sdk begin -->
         <activity
@@ -585,19 +575,21 @@
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"
             android:exported="false"
             android:screenOrientation="behind"
-            android:windowSoftInputMode="adjustResize|stateHidden"></activity>
+            android:windowSoftInputMode="adjustResize|stateHidden" />
 
         <!-- alipay 支付宝 sdk end -->
 
-        <!--  百度定位 sdk start -->
+
+        <!-- 百度定位 sdk start -->
         <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
-            android:value="gXD6RhE7ncVIcl1crk5SeUoVm7ceNtkL"></meta-data>
+            android:value="gXD6RhE7ncVIcl1crk5SeUoVm7ceNtkL" />
+
         <service
             android:name="com.baidu.location.f"
             android:enabled="true"
-            android:process=":remote"></service>
-        <!--  百度定位 sdk end -->
+            android:process=":remote" />
+        <!-- 百度定位 sdk end -->
 
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActNotice"
@@ -684,7 +676,7 @@
             android:name="com.sheep.gamegroup.view.activity.ActInvitation"
             android:screenOrientation="portrait" />
 
-        <!--start幂动科技-->
+        <!-- start幂动科技 -->
 
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActMiDong"
@@ -699,7 +691,6 @@
             android:enabled="true"
             android:priority="1000" />
 
-
         <receiver
             android:name="com.mdad.sdk.mdsdk.AppInstallReceiver"
             android:enabled="true"
@@ -712,7 +703,6 @@
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
-
         <receiver
             android:name="com.mdad.sdk.mdsdk.DownloadCompleteReceiver"
             android:enabled="true"
@@ -722,8 +712,8 @@
                 <action android:name="android.intent.action.DOWNLOAD_NOTIFICATION_CLICKED" />
             </intent-filter>
         </receiver>
-        <!--end幂动科技-->
+        <!-- end幂动科技 -->
+        <activity android:name=".ui.activity.HomeActivity"></activity>
     </application>
 
-
 </manifest>

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -31,7 +31,6 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.RefreshUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.GameCertificationActivity;
 import com.sheep.gamegroup.view.activity.LoginAct;
 import com.sheep.jiuyan.samllsheep.service.AutoCheckService;
@@ -49,7 +48,6 @@ import com.umeng.socialize.UMShareAPI;
 import org.xutils.x;
 
 import cn.jpush.android.api.JPushInterface;
-import rx.functions.Action1;
 
 /**
  * Created by kemllor on 2017/12/21.

app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/HomeActivity.java

@@ -0,0 +1,27 @@
+package com.sheep.jiuyan.samllsheep.ui.activity;
+
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.ui.base.BaseActivity;
+
+/**
+ * Created by: zhoujuncai.
+ * Created date: 2018/10/17.
+ * Description: 主界面
+ */
+public class HomeActivity extends BaseActivity {
+
+    @Override
+    protected int onLayout() {
+        return R.layout.activity_home;
+    }
+
+    @Override
+    protected void onView() {
+
+    }
+
+    @Override
+    protected void onObject() {
+
+    }
+}

app/src/main/java/com/sheep/jiuyan/samllsheep/ui/base/BaseActivity.java

@@ -0,0 +1,56 @@
+package com.sheep.jiuyan.samllsheep.ui.base;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
+import com.trello.rxlifecycle2.components.support.RxAppCompatActivity;
+
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+/**
+ * Created by: zhoujuncai.
+ * Created date: 2018/10/17.
+ * Description: Activity父类
+ */
+@SuppressLint("Registered")
+public abstract class BaseActivity extends RxAppCompatActivity {
+
+    private Unbinder unbinder;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(onLayout());
+        unbinder = ButterKnife.bind(this);
+        onView();
+        onObject();
+    }
+
+    /**
+     * 初始化布局
+     *
+     * @return 返回布局资源ID
+     */
+    protected abstract int onLayout();
+
+    /**
+     * 初始化View
+     */
+    protected abstract void onView();
+
+    /**
+     * 初始化对象
+     */
+    protected abstract void onObject();
+
+    @Override
+    protected void onDestroy() {
+        if (unbinder != null) {
+            unbinder.unbind();
+            unbinder = null;
+        }
+        super.onDestroy();
+    }
+}

app/src/main/java/com/sheep/jiuyan/samllsheep/ui/base/BaseFragment.java

@@ -0,0 +1,59 @@
+package com.sheep.jiuyan.samllsheep.ui.base;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.trello.rxlifecycle2.components.support.RxFragment;
+
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+/**
+ * Created by: zhoujuncai.
+ * Created date: 2018/10/17.
+ * Description: Fragment父类
+ */
+public abstract class BaseFragment extends RxFragment {
+
+    private Unbinder unbinder;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(onLayout(), container);
+        unbinder = ButterKnife.bind(view);
+        onView();
+        onObject();
+        return view;
+    }
+
+    /**
+     * 初始化布局
+     *
+     * @return 返回布局资源ID
+     */
+    protected abstract int onLayout();
+
+    /**
+     * 初始化View
+     */
+    protected abstract void onView();
+
+    /**
+     * 初始化对象
+     */
+    protected abstract void onObject();
+
+    @Override
+    public void onDestroyView() {
+        if (unbinder != null) {
+            unbinder.unbind();
+            unbinder = null;
+        }
+        super.onDestroyView();
+    }
+}

app/src/main/res/drawable/drawable_selector_audit.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/tab_click_shenhe" android:state_activated="true"/>
-    <item android:drawable="@drawable/tab_click_shenhe" android:state_pressed="true"/>
-    <item android:drawable="@drawable/tab_shenhe"/>
-
-</selector>

app/src/main/res/drawable/shape_blue_stroke_withe_radius_5.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-<corners android:radius="5dp"/>
-    <solid android:color="@color/blue_2EC2F7"/>
-</shape>

app/src/main/res/drawable/sp_bg_rectangle_ash.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="#F7F7F7"/>
-    <corners
-        android:radius="@dimen/radius_20"/>
-
-</shape>

app/src/main/res/drawable/umeng_socialize_btn_bg.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/transparent" />
-    <stroke android:width="1dp"
-        android:color="#ffffff"
-
-        />
-
-
-</shape>

app/src/main/res/drawable/umeng_socialize_edit_bg.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/transparent" />
-    <stroke android:width="1dp"
-        android:color="#C3C6C9"
-
-        />
-
-
-</shape>

app/src/main/res/drawable/x_shap_shadow_bg_rectgangle_purple.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!--第一层-->
-    <item>
-        <shape>
-            <solid android:color="@color/button_color_purple_yy" />
-            <!--描边-->
-            <stroke
-                android:width="1px"
-                android:color="@color/button_color_purple_yy"
-                />
-
-            <corners android:radius="10dp" />
-        </shape>
-    </item>
-    <!--第二层-->
-    <item
-        android:left="1px"
-        android:top="1px"
-        android:bottom="1px"
-        android:right="1px">
-        <shape>
-            <solid android:color="@color/button_color_purple" />
-            <!--描边-->
-            <stroke
-                android:width="0.33dp"
-                android:color="@color/button_color_purple" />
-
-            <corners android:radius="10dp" />
-        </shape>
-    </item>
-
-</layer-list>

app/src/main/res/layout-um/umeng_socialize_oauth_dialog.xml

@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="#D4E0E5">
-
-
-    <RelativeLayout
-        android:id="@+id/umeng_socialize_titlebar"
-        android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:background="#0086DC">
-
-        <TextView
-            android:id="@+id/umeng_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text=""
-            android:textColor="#ffffff"
-            android:textSize="18sp" />
-
-        <RelativeLayout
-            android:id="@+id/umeng_back"
-            android:layout_width="60dp"
-            android:layout_height="match_parent"
-
-            android:onClick="onCancel"
-            android:visibility="visible">
-
-            <ImageButton
-
-                android:layout_width="12dp"
-                android:layout_height="20dp"
-                android:layout_centerVertical="true"
-                android:background="@drawable/umeng_socialize_back_icon"
-                android:layout_marginLeft="15dp"
-                android:scaleType="center" />
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/umeng_share_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerInParent="true"
-            android:layout_marginRight="10dp"
-            android:background="@drawable/umeng_socialize_btn_bg"
-            android:padding="4dp"
-            android:text="分享"
-            android:textColor="#ffffff" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/umeng_socialize_follow"
-        android:layout_width="fill_parent"
-        android:layout_height="40dp"
-        android:layout_alignParentBottom="true"
-        android:background="#AAAAAA"
-        android:visibility="visible">
-
-        <CheckBox
-            android:id="@+id/umeng_socialize_follow_check"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="20dp"
-            android:checked="true"
-            android:visibility="gone" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="15dp"
-            android:layout_toRightOf="@id/umeng_socialize_follow_check"
-            android:text="关注官方微博"
-            android:textColor="#f8f8f8"
-            android:textSize="16sp"
-            android:visibility="gone" />
-    </RelativeLayout>
-
-    <!--<LinearLayout-->
-        <!--android:id="@+id/webView_container"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="match_parent"-->
-        <!--android:layout_above="@id/umeng_socialize_follow"-->
-        <!--android:layout_below="@id/umeng_socialize_titlebar"-->
-        <!--android:orientation="horizontal"-->
-        <!--android:visibility="visible" />-->
-
-    <com.tencent.smtt.sdk.WebView
-        android:id="@+id/webView"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="#F2F5F6"
-        android:layout_above="@id/umeng_socialize_follow"
-        android:layout_below="@id/umeng_socialize_titlebar"
-        android:visibility="visible" />
-
-    <RelativeLayout
-        android:id="@+id/progress_bar_parent"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_below="@id/umeng_socialize_titlebar"
-        android:background="#F2F5F6" >
-
-        <LinearLayout
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_centerInParent="true"
-            android:orientation="horizontal">
-
-            <ProgressBar
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_margin="10dp" />
-        </LinearLayout>
-    </RelativeLayout>
-
-</RelativeLayout>

app/src/main/res/layout-um/umeng_socialize_share.xml

@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#D4E0E5"
-    android:id="@+id/root"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:id="@+id/umeng_socialize_share_titlebar"
-        android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:background="#0086DC">
-
-        <TextView
-            android:id="@+id/umeng_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text=""
-            android:textColor="#ffffff"
-            android:textSize="18sp" />
-
-        <RelativeLayout
-            android:id="@+id/umeng_back"
-            android:layout_width="50dp"
-            android:layout_height="match_parent"
-            android:onClick="onCancel"
-            android:visibility="visible">
-
-            <ImageButton
-                android:layout_width="12dp"
-                android:layout_height="20dp"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="15dp"
-                android:background="@drawable/umeng_socialize_back_icon"
-                android:clickable="false"
-                android:scaleType="center" />
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/umeng_share_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:layout_centerInParent="true"
-            android:gravity="center_vertical"
-            android:paddingLeft="15dp"
-            android:paddingRight="15dp"
-            android:text="分享"
-            android:textColor="#ffffff"
-            android:textSize="15sp" />
-    </RelativeLayout>
-
-    <EditText
-        android:id="@+id/umeng_socialize_share_edittext"
-        android:layout_width="fill_parent"
-        android:layout_height="180dp"
-        android:layout_below="@id/umeng_socialize_share_titlebar"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        android:paddingTop="8dp"
-        android:background="#ffffff"
-        android:bufferType="spannable"
-        android:gravity="top"
-        android:hint="编辑分享内容"
-        android:lineSpacingExtra="3dp"
-        android:paddingBottom="10dp"
-        android:textColor="#000000"
-        android:textSize="15sp" />
-
-    <TextView
-        android:id="@+id/umeng_socialize_share_word_num"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignRight="@id/umeng_socialize_share_edittext"
-        android:background="#ffffff"
-        android:layout_below="@id/umeng_socialize_share_edittext"
-        android:paddingBottom="10dp"
-        android:paddingRight="15dp"
-        android:gravity="right"
-        android:singleLine="true"
-        android:textColor="#98999B"
-        android:textSize="14sp" />
-
-    <RelativeLayout
-        android:id="@+id/umeng_socialize_share_bottom_area"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/umeng_socialize_share_word_num"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:background="#F2F5F6"
-        android:visibility="gone">
-        <RelativeLayout
-            android:layout_width="62dp"
-            android:layout_height="62dp"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="15dp"
-            android:layout_marginLeft="15dp"
-            android:id="@+id/umeng_image_edge"
-            android:layout_marginTop="15dp"
-           android:background="@drawable/umeng_socialize_edit_bg"
-            >
-        <ImageView
-            android:id="@+id/umeng_share_icon"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-           android:layout_centerInParent="true"
-            android:src="#2c3035" />
-        </RelativeLayout>
-    <TextView
-        android:layout_width="280dp"
-        android:id="@+id/umeng_web_title"
-        android:layout_toRightOf="@id/umeng_image_edge"
-        android:layout_marginLeft="40dp"
-        android:layout_marginTop="20dp"
-        android:textColor="#575A5C"
-        android:singleLine="true"
-        android:textSize="14sp"
-        android:visibility="gone"
-        android:layout_height="wrap_content" />
-
-    <ImageView
-        android:id="@+id/umeng_del"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_alignRight="@id/umeng_image_edge"
-        android:layout_alignTop="@id/umeng_image_edge"
-        android:layout_marginRight="-10dp"
-        android:layout_marginTop="-10dp"
-        android:background="@drawable/umeng_socialize_delete" />
-
-
-    </RelativeLayout>
-
-</RelativeLayout>

app/src/main/res/layout/activity_home.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.activity.HomeActivity">
+
+    <android.support.design.widget.BottomNavigationView
+        android:id="@+id/bottom_bar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:menu="@menu/home_bottom_navigation" />
+</android.support.constraint.ConstraintLayout>

app/src/main/res/layout/activity_invitation.xml

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#F0F0F0">
-
-    <ImageView
-        android:id="@+id/img_baseactivity_title"
-        android:layout_width="?attr/actionBarSize"
-        android:layout_height="?attr/actionBarSize"
-        android:gravity="center_vertical"
-        android:scaleType="centerInside"
-        android:src="@drawable/narrow_back_black"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-        android:id="@+id/layout_f1"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="#F0F0F0"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:clipChildren="false"
-        app:layout_constraintBottom_toTopOf="@+id/layout_f"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/img_baseactivity_title">
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="300dp"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:clipChildren="false"/>
-
-        <TextView
-            android:id="@+id/tv_flags"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/content_padding_16"
-            android:layout_marginBottom="@dimen/content_padding_16"
-            android:text="左右滑动选择推广页" />
-
-    </LinearLayout>
-
-    <RelativeLayout
-        android:id="@+id/layout_f"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#ffffffff"
-        app:layout_constraintTop_toBottomOf="@+id/layout_f1"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <TextView
-            android:id="@+id/ask_share_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:text="邀请好友"
-            android:textColor="#ff333333"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/tv_copy"
-            android:layout_width="40dp"
-            android:layout_height="20dp"
-            android:layout_alignParentEnd="true"
-            android:layout_marginEnd="15dp"
-            android:layout_marginTop="20dp"
-            android:background="@drawable/shape_blue_stroke_withe_radius_5"
-            android:gravity="center"
-            android:text="复制"
-            android:textColor="@color/white"
-            android:visibility="invisible" />
-
-        <TextView
-            android:id="@+id/tv_invitation_code"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:layout_marginRight="5dp"
-            android:layout_marginTop="15dp"
-            android:layout_toLeftOf="@id/tv_copy"
-            android:gravity="center"
-            android:text="12332"
-            android:textColor="#ff333333"
-            android:visibility="invisible" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:layout_marginRight="5dp"
-            android:layout_marginTop="15dp"
-            android:layout_toLeftOf="@id/tv_invitation_code"
-            android:gravity="center"
-            android:text="你的邀请码："
-            android:textColor="#ff333333"
-            android:visibility="invisible" />
-
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/ask_share_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/ask_share_title"
-            android:layout_marginBottom="15dp"
-            android:layout_marginStart="@dimen/content_padding_15"
-            android:layout_marginTop="20dp" />
-    </RelativeLayout>
-
-
-</android.support.constraint.ConstraintLayout>

app/src/main/res/layout/activity_main.xml

@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/common_container"/>
+    <include layout="@layout/common_container" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -16,7 +17,7 @@
             android:id="@+id/view_pager_container"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"/>
+            android:layout_weight="1" />
 
     </LinearLayout>
 
@@ -25,7 +26,8 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/app_nav_toolbar_height"
         android:layout_alignParentTop="true"
-        android:visibility="gone"/>
+        android:visibility="gone" />
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -36,71 +38,88 @@
             android:id="@+id/tab_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="4dp"
-            android:orientation="horizontal">
-            <View android:layout_weight="1"
+            android:orientation="horizontal"
+            android:paddingTop="4dp">
+
+            <View
                 android:layout_width="0dp"
-                android:layout_height="@dimen/tab_height"/>
+                android:layout_height="@dimen/tab_height"
+                android:layout_weight="1" />
+
             <TextView
                 android:layout_width="wrap_content"
-                android:minWidth="@dimen/tab_width"
                 android:layout_height="@dimen/tab_height"
                 android:drawableTop="@drawable/drawable_selector_task"
-                android:textSize="10sp"
                 android:gravity="center"
+                android:minWidth="@dimen/tab_width"
+                android:text="@string/tab_viewpager_gamestore"
                 android:textColor="@color/selector_color_main_tab"
-                android:text="@string/tab_viewpager_gamestore"/>
-            <View android:layout_weight="2"
+                android:textSize="10sp" />
+
+            <View
                 android:layout_width="0dp"
-                android:layout_height="@dimen/tab_height"/>
+                android:layout_height="@dimen/tab_height"
+                android:layout_weight="2" />
+
             <TextView
                 android:layout_width="wrap_content"
-                android:minWidth="@dimen/tab_width"
                 android:layout_height="@dimen/tab_height"
                 android:drawableTop="@drawable/drawable_selector_task"
-                android:textSize="10sp"
                 android:gravity="center"
+                android:minWidth="@dimen/tab_width"
+                android:text="@string/tab_viewpager_classification"
                 android:textColor="@color/selector_color_main_tab"
-                android:text="@string/tab_viewpager_classification"/>
-            <View android:layout_weight="2"
+                android:textSize="10sp" />
+
+            <View
                 android:layout_width="0dp"
-                android:layout_height="@dimen/tab_height"/>
+                android:layout_height="@dimen/tab_height"
+                android:layout_weight="2" />
+
             <TextView
                 android:layout_width="wrap_content"
-                android:minWidth="@dimen/tab_width"
                 android:layout_height="@dimen/tab_height"
                 android:drawableTop="@drawable/drawable_selector_task"
-                android:textSize="10sp"
                 android:gravity="center"
+                android:minWidth="@dimen/tab_width"
+                android:text="@string/mine_hoggerel"
                 android:textColor="@color/selector_color_main_tab"
-                android:text="@string/mine_hoggerel"/>
-            <View android:layout_weight="2"
+                android:textSize="10sp" />
+
+            <View
                 android:layout_width="0dp"
-                android:layout_height="@dimen/tab_height"/>
+                android:layout_height="@dimen/tab_height"
+                android:layout_weight="2" />
+
             <TextView
                 android:layout_width="wrap_content"
-                android:minWidth="@dimen/tab_width"
                 android:layout_height="@dimen/tab_height"
                 android:drawableTop="@drawable/drawable_selector_task"
-                android:textSize="10sp"
                 android:gravity="center"
+                android:minWidth="@dimen/tab_width"
+                android:text="@string/tab_viewpager_borrowplay"
                 android:textColor="@color/selector_color_main_tab"
-                android:text="@string/tab_viewpager_borrowplay"/>
-            <View android:layout_weight="2"
+                android:textSize="10sp" />
+
+            <View
                 android:layout_width="0dp"
-                android:layout_height="@dimen/tab_height"/>
+                android:layout_height="@dimen/tab_height"
+                android:layout_weight="2" />
+
             <TextView
                 android:layout_width="wrap_content"
-                android:minWidth="@dimen/tab_width"
                 android:layout_height="@dimen/tab_height"
                 android:drawableTop="@drawable/drawable_selector_task"
-                android:textSize="10sp"
                 android:gravity="center"
+                android:minWidth="@dimen/tab_width"
+                android:text="@string/tab_viewpager_borrowplay"
                 android:textColor="@color/selector_color_main_tab"
-                android:text="@string/tab_viewpager_borrowplay"/>
-            <View android:layout_weight="1"
+                android:textSize="10sp" />
+
+            <View
                 android:layout_width="0dp"
-                android:layout_height="@dimen/tab_height"/>
+                android:layout_height="@dimen/tab_height"
+                android:layout_weight="1" />
         </LinearLayout>
 
         <View

app/src/main/res/layout/fgt_playgame_son_refresh_layout.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white">
-
-    <include
-        android:id="@+id/title"
-        layout="@layout/title" />
-
-    <include
-        android:id="@+id/check_net_ll"
-        layout="@layout/check_net_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/title" />
-
-    <include
-        android:id="@+id/empty_view"
-        layout="@layout/empty_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/check_net_ll" />
-
-
-    <com.scwang.smartrefresh.layout.SmartRefreshLayout
-        android:id="@+id/refreshLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="-40dp">
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/view_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="#fff"
-            android:overScrollMode="never" />
-
-    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
-
-</RelativeLayout>

app/src/main/res/layout/float_window.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@color/float_bg"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/float_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="5dp"
-        android:textSize="12sp"
-        android:textColor="@color/black_deep"
-        android:gravity="center"
-        android:text="没有正在运行的任务"/>
-
-</LinearLayout>

app/src/main/res/layout/notification_sheep_shot_screen.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="13dp">
-
-    <ImageView
-        android:layout_width="35dp"
-        android:layout_height="35dp"
-        android:src="@mipmap/icon" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
-        android:gravity="center"
-        android:text="点击回到小绵羊"
-        android:textColor="@color/white"
-        android:textSize="16sp" />
-</LinearLayout>

app/src/main/res/layout/pop_robduty.xml

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <RelativeLayout
-        android:id="@+id/lay_action"
-        android:layout_width="344dp"
-        android:layout_height="418dp"
-        android:layout_centerInParent="true"
-        android:background="@mipmap/qiangrew_bg">
-
-        <ImageView
-            android:id="@+id/iv_duty"
-            android:layout_width="@dimen/content_padding_65"
-            android:layout_height="@dimen/content_padding_65"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="90dp"
-            android:src="@drawable/loading_01" />
-
-        <TextView
-            android:id="@+id/tv_duty_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/iv_duty"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="10dp"
-            android:text="XXX任务已上线"
-            android:textColor="#272727"
-            android:textSize="16sp" />
-
-        <LinearLayout
-            android:id="@+id/llay_money"
-            android:layout_width="match_parent"
-            android:layout_height="45dp"
-            android:layout_below="@id/tv_duty_title"
-            android:layout_centerHorizontal="true"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/tv_robduty_money"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="+1元"
-                android:textColor="#ffff2d4b"
-                android:textSize="18sp"
-                android:textStyle="bold" />
-
-            <TextView
-                style="@style/style_xian_jin"
-                android:layout_marginStart="5dp"
-                android:text="现金" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="60dp">
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1">
-
-                <ImageView
-                    android:id="@+id/iv_change_one"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginEnd="15dp"
-                    android:src="@mipmap/huanyige" />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1">
-
-                <ImageView
-                    android:id="@+id/iv_do_now"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginStart="15dp"
-                    android:src="@mipmap/lijiq" />
-            </RelativeLayout>
-        </LinearLayout>
-    </RelativeLayout>
-
-    <ImageView
-        android:id="@+id/iv_close"
-        android:layout_width="45dp"
-        android:layout_height="45dp"
-        android:layout_below="@id/lay_action"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="20dp"
-        android:src="@mipmap/close" />
-
-</RelativeLayout>

app/src/main/res/layout/task_list_item.xml

@@ -66,7 +66,6 @@
             android:text="完成试玩任务无敌大航" />
 
         <LinearLayout
-            android:id="@+id/tag_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"

app/src/main/res/layout/umeng_socialize_oauth_dialog.xml

@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="#D4E0E5">
-
-
-    <RelativeLayout
-        android:id="@+id/umeng_socialize_titlebar"
-        android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:background="#0086DC">
-
-        <TextView
-            android:id="@+id/umeng_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text=""
-            android:textColor="#ffffff"
-            android:textSize="18sp" />
-
-        <RelativeLayout
-            android:id="@+id/umeng_back"
-            android:layout_width="60dp"
-            android:layout_height="match_parent"
-
-            android:onClick="onCancel"
-            android:visibility="visible">
-
-            <ImageButton
-
-                android:layout_width="12dp"
-                android:layout_height="20dp"
-                android:layout_centerVertical="true"
-                android:background="@drawable/umeng_socialize_back_icon"
-                android:layout_marginLeft="15dp"
-                android:scaleType="center" />
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/umeng_share_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerInParent="true"
-            android:layout_marginRight="10dp"
-            android:background="@drawable/umeng_socialize_btn_bg"
-            android:padding="4dp"
-            android:text="分享"
-            android:textColor="#ffffff" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/umeng_socialize_follow"
-        android:layout_width="fill_parent"
-        android:layout_height="40dp"
-        android:layout_alignParentBottom="true"
-        android:background="#AAAAAA"
-        android:visibility="visible">
-
-        <CheckBox
-            android:id="@+id/umeng_socialize_follow_check"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="20dp"
-            android:checked="true"
-            android:visibility="gone" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="15dp"
-            android:layout_toRightOf="@id/umeng_socialize_follow_check"
-            android:text="关注官方微博"
-            android:textColor="#f8f8f8"
-            android:textSize="16sp"
-            android:visibility="gone" />
-    </RelativeLayout>
-
-    <!--<LinearLayout-->
-        <!--android:id="@+id/webView_container"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="match_parent"-->
-        <!--android:layout_above="@id/umeng_socialize_follow"-->
-        <!--android:layout_below="@id/umeng_socialize_titlebar"-->
-        <!--android:orientation="horizontal"-->
-        <!--android:visibility="visible" />-->
-
-    <com.tencent.smtt.sdk.WebView
-        android:id="@+id/webView"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="#F2F5F6"
-        android:layout_above="@id/umeng_socialize_follow"
-        android:layout_below="@id/umeng_socialize_titlebar"
-        android:visibility="visible" />
-
-    <RelativeLayout
-        android:id="@+id/progress_bar_parent"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_below="@id/umeng_socialize_titlebar"
-        android:background="#F2F5F6" >
-
-        <LinearLayout
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_centerInParent="true"
-            android:orientation="horizontal">
-
-            <ProgressBar
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_margin="10dp" />
-        </LinearLayout>
-    </RelativeLayout>
-
-</RelativeLayout>

app/src/main/res/layout/umeng_socialize_share.xml

@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#D4E0E5"
-    android:id="@+id/root"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:id="@+id/umeng_socialize_share_titlebar"
-        android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:background="#0086DC">
-
-        <TextView
-            android:id="@+id/umeng_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text=""
-            android:textColor="#ffffff"
-            android:textSize="18sp" />
-
-        <RelativeLayout
-            android:id="@+id/umeng_back"
-            android:layout_width="50dp"
-            android:layout_height="match_parent"
-            android:onClick="onCancel"
-            android:visibility="visible">
-
-            <ImageButton
-                android:layout_width="12dp"
-                android:layout_height="20dp"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="15dp"
-                android:background="@drawable/umeng_socialize_back_icon"
-                android:clickable="false"
-                android:scaleType="center" />
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/umeng_share_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:layout_centerInParent="true"
-            android:gravity="center_vertical"
-            android:paddingLeft="15dp"
-            android:paddingRight="15dp"
-            android:text="分享"
-            android:textColor="#ffffff"
-            android:textSize="15sp" />
-    </RelativeLayout>
-
-    <EditText
-        android:id="@+id/umeng_socialize_share_edittext"
-        android:layout_width="fill_parent"
-        android:layout_height="180dp"
-        android:layout_below="@id/umeng_socialize_share_titlebar"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        android:paddingTop="8dp"
-        android:background="#ffffff"
-        android:bufferType="spannable"
-        android:gravity="top"
-        android:hint="编辑分享内容"
-        android:lineSpacingExtra="3dp"
-        android:paddingBottom="10dp"
-        android:textColor="#000000"
-        android:textSize="15sp" />
-
-    <TextView
-        android:id="@+id/umeng_socialize_share_word_num"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignRight="@id/umeng_socialize_share_edittext"
-        android:background="#ffffff"
-        android:layout_below="@id/umeng_socialize_share_edittext"
-        android:paddingBottom="10dp"
-        android:paddingRight="15dp"
-        android:gravity="right"
-        android:singleLine="true"
-        android:textColor="#98999B"
-        android:textSize="14sp" />
-
-    <RelativeLayout
-        android:id="@+id/umeng_socialize_share_bottom_area"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/umeng_socialize_share_word_num"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:background="#F2F5F6"
-        android:visibility="gone">
-        <RelativeLayout
-            android:layout_width="62dp"
-            android:layout_height="62dp"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="15dp"
-            android:layout_marginLeft="15dp"
-            android:id="@+id/umeng_image_edge"
-            android:layout_marginTop="15dp"
-           android:background="@drawable/umeng_socialize_edit_bg"
-            >
-        <ImageView
-            android:id="@+id/umeng_share_icon"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-           android:layout_centerInParent="true"
-            android:src="#2c3035" />
-        </RelativeLayout>
-    <TextView
-        android:layout_width="280dp"
-        android:id="@+id/umeng_web_title"
-        android:layout_toRightOf="@id/umeng_image_edge"
-        android:layout_marginLeft="40dp"
-        android:layout_marginTop="20dp"
-        android:textColor="#575A5C"
-        android:singleLine="true"
-        android:textSize="14sp"
-        android:visibility="gone"
-        android:layout_height="wrap_content" />
-
-    <ImageView
-        android:id="@+id/umeng_del"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_alignRight="@id/umeng_image_edge"
-        android:layout_alignTop="@id/umeng_image_edge"
-        android:layout_marginRight="-10dp"
-        android:layout_marginTop="-10dp"
-        android:background="@drawable/umeng_socialize_delete" />
-
-
-    </RelativeLayout>
-
-</RelativeLayout>

app/src/main/res/layout/view_float_title_card.xml

@@ -16,7 +16,6 @@
         android:paddingBottom="10dp">
 
         <LinearLayout
-            android:id="@+id/but_do_it_every_day"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"

app/src/main/res/layout/x_msg_wv_dialog.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <WebView
-        android:id="@+id/dialog_msg_wv"
-        android:layout_width="match_parent"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="@dimen/content_padding_20"
-        android:layout_marginBottom="@dimen/content_padding_20"
-        android:layout_height="wrap_content" />
-    <include layout="@layout/x_msg_dialog_btn"/>
-</merge>

app/src/main/res/menu/home_bottom_navigation.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/nav_make_money"
+        android:icon="@drawable/homepage_zhuanqian_click"
+        android:title="@string/nav_txt_money" />
+    <item
+        android:id="@+id/nav_game"
+        android:icon="@drawable/tab_game_blue"
+        android:title="@string/nav_txt_game" />
+    <item
+        android:id="@+id/nav_for_user"
+        android:icon="@drawable/tab_click_yaoqing"
+        android:title="@string/nav_txt_for_user" />
+    <item
+        android:id="@+id/nav_look"
+        android:icon="@drawable/homepage_faxian_click"
+        android:title="@string/nav_txt_look" />
+    <item
+        android:id="@+id/nav_user_center"
+        android:icon="@drawable/homepage_wode_click"
+        android:title="@string/nav_txt_user_center" />
+</menu>

app/src/main/res/values-um/umeng_socialize_shareview_strings.xml

@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="umeng_socialize_sharetosina">分享到新浪微博</string>
-    <string name="umeng_socialize_sharetodouban">分享到豆瓣</string>
-    <string name="umeng_socialize_sharetorenren">分享到人人网</string>
 
-    <string name="umeng_socialize_sharetotencent">分享到腾讯微博</string>
-    <string name="umeng_socialize_sharetotwitter">分享到twitter</string>
-    <string name="umeng_socialize_sharetolinkin">分享到领英</string>
 </resources>

app/src/main/res/values-um/umeng_socialize_style.xml

@@ -35,16 +35,6 @@
     <!--</style>-->
 
     <!--网页授权的布局-->
-    <style name="umeng_socialize_popup_dialog" parent="@android:style/Theme.Dialog">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:backgroundDimAmount">0.6</item>
-    </style>
 
 
     <!--<style name="Theme.UMDialog" parent="android:style/Theme.Dialog">-->
@@ -52,8 +42,6 @@
         <!--<item name="android:windowBackground">@android:color/transparent</item>-->
     <!--</style>-->
 
-    <style name="Theme.UMDefault" parent="android:style/Theme.NoTitleBar"></style>
-
     <!--<style name="umeng_socialize_divider">-->
         <!--<item name="android:layout_width">fill_parent</item>-->
         <!--<item name="android:layout_height">1dp</item>-->

app/src/main/res/values-w820dp/dimens.xml

@@ -2,5 +2,4 @@
     <!-- Example customization of dimensions originally defined in res/values/dimens.xml
          (such as screen margins) for screens with more than 820dp of available width. This
          would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
 </resources>

app/src/main/res/values-w820dp/key_strings.xml

@@ -3,10 +3,6 @@
     <string name="kfzs_duanduan_datashare_game_code">kfzs:duanduan:game:code</string>
     <string name="kfzs_duanduan_datashare_package_name">kfzs:duanduan:game:package:name</string>
     <string name="kfzs_duanduan_datashare_package_extras">kfzs:duanduan:game:package:extras</string>
-    <string name="kfzs_duanduan_datashare_game_key">kfzs:duanduan:game:key</string>
     <string name="kfzs_duanduan_datashare_certification_key">kfzs:duanduan:certification:key</string>
     <string name="kfzs_duanduan_datashare_certification_cancel">kfzs:duanduan:certification:cancel</string>
-    <string name="kfzs_duanduan_datashare_certificationed">kfzs:duanduan:certificationed</string>
-    <string name="kfzs_duanduan_datashare_certification_userid">kfzs:duanduan:certification:userid</string>
-    <string name="kfzs_duanduan_datashare_certification_token">kfzs:duanduan:certification:token</string>
 </resources>

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

@@ -24,7 +24,6 @@
     <color name="theme_app_divider_color">#f5f5f5</color>
 
     <color name="button_color_purple">#A528F1</color>
-    <color name="button_color_purple_yy">#10A528F1</color>
 
     <color name="button_color_purple_start">#6C61D2</color>
     <color name="button_color_purple_end">#BE0FFF</color>

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

@@ -8,7 +8,6 @@
     <color name="white">#ffffff</color>
     <color name="green">#4cd117</color>
     <color name="sheep_red">#f00</color>
-    <color name="blue">@color/theme_bule</color>
 
     <color name="bg_class_grey">#f9f9f9</color>
 

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

@@ -4,7 +4,6 @@
     <color name="item_transparent">#00000000</color>
 
     <!--app bg-->
-    <color name="app">#f8f8f8</color>
     <color name="bg_write">#ffffff</color>
 
     <!--app text view-->

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

@@ -1,13 +1,9 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="content_padding">12dp</dimen>
     <dimen name="content_padding_left_new">45dp</dimen>
 
-    <dimen name="frg_app_details_icon">60dp</dimen>
-
 
     <dimen name="textSize1">12sp</dimen>
 

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

@@ -35,7 +35,6 @@
     <color name="blue_end">#1394e8</color>
     <color name="blue_34a6e7">#34a6e7</color>
     <color name="blue_FF53BBF2">#FF53BBF2</color>
-    <color name="blue_2EC2F7">#2EC2F7</color>
     <color name="white_DEDEDE">#DEDEDE</color>
     <color name="white_ededed">#ededed</color>
     <color name="white_FFF7F7F7">#FFF7F7F7</color>
@@ -43,7 +42,6 @@
     <color name="green_60BE5E">#60BE5E</color>
     <color name="blue_91BDD6">#91BDD6</color>
 
-    <color name="float_bg">#33F9F9F9</color>
     <color name="gray_F5F5F5">#F5F5F5</color>
 
     <color name="black_333333">#333333</color>

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

@@ -3,10 +3,6 @@
     <string name="kfzs_duanduan_datashare_game_code">kfzs:duanduan:game:code</string>
     <string name="kfzs_duanduan_datashare_package_name">kfzs:duanduan:game:package:name</string>
     <string name="kfzs_duanduan_datashare_package_extras">kfzs:duanduan:game:package:extras</string>
-    <string name="kfzs_duanduan_datashare_game_key">kfzs:duanduan:game:key</string>
     <string name="kfzs_duanduan_datashare_certification_key">kfzs:duanduan:certification:key</string>
     <string name="kfzs_duanduan_datashare_certification_cancel">kfzs:duanduan:certification:cancel</string>
-    <string name="kfzs_duanduan_datashare_certificationed">kfzs:duanduan:certificationed</string>
-    <string name="kfzs_duanduan_datashare_certification_userid">kfzs:duanduan:certification:userid</string>
-    <string name="kfzs_duanduan_datashare_certification_token">kfzs:duanduan:certification:token</string>
 </resources>

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

@@ -13,7 +13,6 @@
     <string name="mine_hoggerel">小绵羊</string>
     <string name="personal_center">个人中心</string>
     <string name="main_tab_find">发现</string>
-    <string name="main_tab_audit">审核</string>
     <string name="main_tab_invite">邀请</string>
     <string name="main_tab_make_money">赚钱</string>
 

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

@@ -56,9 +56,6 @@
     <string name="get_xiaomi_game_success_dialog">账号：%1$s \n\u3000\u3000密码：%2$s \n </string>
 
 
-    <string name="accessibility_description">需要权限判断任务是否成功</string>
-
-
     <string name="sex">性别</string>
     <string name="birth_day">出生日期</string>
     <string name="male">男</string>
@@ -104,4 +101,9 @@
     <string name="success_copy_inv_code">复制邀请码成功</string>
     <string name="success_copy_code">复制礼包码成功</string>
     <string name="plus_x_yuan">+%s元</string>
+    <string name="nav_txt_money">赚钱</string>
+    <string name="nav_txt_game">游戏</string>
+    <string name="nav_txt_for_user">邀请</string>
+    <string name="nav_txt_look">发现</string>
+    <string name="nav_txt_user_center">个人中心</string>
 </resources>

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

@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="umeng_socialize_sharetosina">分享到新浪微博</string>
-    <string name="umeng_socialize_sharetodouban">分享到豆瓣</string>
-    <string name="umeng_socialize_sharetorenren">分享到人人网</string>
 
-    <string name="umeng_socialize_sharetotencent">分享到腾讯微博</string>
-    <string name="umeng_socialize_sharetotwitter">分享到twitter</string>
-    <string name="umeng_socialize_sharetolinkin">分享到领英</string>
 </resources>

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

@@ -35,16 +35,6 @@
     <!--</style>-->
 
     <!--网页授权的布局-->
-    <style name="umeng_socialize_popup_dialog" parent="@android:style/Theme.Dialog">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:backgroundDimAmount">0.6</item>
-    </style>
 
 
     <!--<style name="Theme.UMDialog" parent="android:style/Theme.Dialog">-->
@@ -52,8 +42,6 @@
         <!--<item name="android:windowBackground">@android:color/transparent</item>-->
     <!--</style>-->
 
-    <style name="Theme.UMDefault" parent="android:style/Theme.NoTitleBar"></style>
-
     <!--<style name="umeng_socialize_divider">-->
         <!--<item name="android:layout_width">fill_parent</item>-->
         <!--<item name="android:layout_height">1dp</item>-->

app/src/main/res/xml/accessibility_config.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
-    android:description="@string/accessibility_description"
-    android:accessibilityEventTypes="typeWindowStateChanged"
-    android:accessibilityFeedbackType="feedbackGeneric"
-    android:accessibilityFlags="flagIncludeNotImportantViews"
-    />

build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        supportLibVersion = "27.1.0"
+        supportLibVersion = "28.0.0"
     }
     repositories {
         jcenter()
@@ -16,7 +16,7 @@ buildscript {
         //aria使用本地library时添加的
         classpath 'com.novoda:bintray-release:0.5.0'
         //Realm数据库
-       // classpath "io.realm:realm-gradle-plugin:3.7.0"
+        // classpath "io.realm:realm-gradle-plugin:3.7.0"
 //        classpath 'com.didi.virtualapk:gradle:0.9.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

codec/build.gradle

@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('codec.aar'))

common/.gitignore

@@ -0,0 +1 @@
+/build

common/build.gradle

@@ -0,0 +1,45 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        minSdkVersion 18
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    api project(':codec')
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    /* RX全家桶 */
+    api "io.reactivex.rxjava2:rxjava:2.2.2"
+    api 'io.reactivex.rxjava2:rxandroid:2.1.0'
+    api 'com.trello.rxlifecycle2:rxlifecycle-components:2.2.2'
+    /* SQ豪华套餐 */
+    api 'com.squareup.retrofit2:retrofit:2.4.0'
+    api 'com.squareup.retrofit2:converter-gson:2.4.0'
+    api 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
+    /* 网络支持 */
+    api 'com.squareup.okhttp3:okhttp:3.11.0'
+    /* JSON解析 */
+    api 'com.google.code.gson:gson:2.8.5'
+    /* 日志打印 */
+    api 'com.orhanobut:logger:2.2.0'
+    /* 图片加载框架 */
+    api 'com.github.bumptech.glide:glide:4.8.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
+}

common/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

common/src/androidTest/java/com/sheep/common/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package com.sheep.common;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.sheep.common.test", appContext.getPackageName());
+    }
+}

common/src/main/AndroidManifest.xml

@@ -0,0 +1,6 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.sheep.common">
+
+    <!-- 网络请求 -->
+    <uses-permission android:name="android.permission.INTERNET" />
+</manifest>

common/src/main/java/com/sheep/common/Client.java

@@ -0,0 +1,60 @@
+package com.sheep.common;
+
+import com.orhanobut.logger.AndroidLogAdapter;
+import com.orhanobut.logger.Logger;
+import com.sheep.common.filter.DecodeInterceptor;
+import com.sheep.common.filter.LoggerInterceptor;
+import com.sheep.common.map.ApiService;
+
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.OkHttpClient;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+/**
+ * Created by: zhoujuncai.
+ * Created date: 2018/10/17.
+ * Description: 客户端类
+ */
+public class Client {
+
+    /* 域名或IP地址 */
+    private final static String BASE_URL = "http://test.sheep.kfzs.com/";
+    /* 网络接口 */
+    private static ApiService api;
+
+    private Client() {
+    }
+
+    /**
+     * 初始化
+     */
+    public static void init() {
+        OkHttpClient.Builder builder = new OkHttpClient.Builder()
+                .addInterceptor(new DecodeInterceptor())
+                .addInterceptor(new LoggerInterceptor())
+                .connectTimeout(15, TimeUnit.SECONDS)
+                .readTimeout(15, TimeUnit.SECONDS)
+                .writeTimeout(15, TimeUnit.SECONDS);
+        api = new Retrofit.Builder()
+                .baseUrl(BASE_URL)
+                .client(builder.build())
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addConverterFactory(GsonConverterFactory.create())
+                .build()
+                .create(ApiService.class);
+        Logger.addLogAdapter(new AndroidLogAdapter());
+    }
+
+    /**
+     * 获取网络接口
+     *
+     * @return 返回ApiService对象
+     * @see ApiService
+     */
+    public static ApiService api() {
+        return Client.api;
+    }
+}

common/src/main/java/com/sheep/common/filter/DecodeInterceptor.java

@@ -0,0 +1,38 @@
+package com.sheep.common.filter;
+
+import android.support.annotation.NonNull;
+
+import java.io.IOException;
+
+import go.kfzssafe.Kfzssafe;
+import okhttp3.Interceptor;
+import okhttp3.Protocol;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+/**
+ * Created by: zhoujuncai.
+ * Created Date: 18-9-27.
+ * Description: 数据解码拦截器
+ */
+public class DecodeInterceptor implements Interceptor {
+
+    @Override
+    public Response intercept(@NonNull Chain chain) throws IOException {
+        Response response = chain.proceed(chain.request());
+        ResponseBody body = response.body();
+        ResponseBody resp = null;
+        String decode;
+        if (body != null) {
+            decode = Kfzssafe.xDecodeS2S(body.string());
+            resp = ResponseBody.create(body.contentType(), decode);
+        }
+        return new Response.Builder()
+                .body(resp)
+                .request(chain.request())
+                .protocol(Protocol.HTTP_1_1)
+                .code(response.code())
+                .message(response.message())
+                .build();
+    }
+}

common/src/main/java/com/sheep/common/filter/LoggerInterceptor.java

@@ -0,0 +1,26 @@
+package com.sheep.common.filter;
+
+import android.support.annotation.NonNull;
+
+import com.orhanobut.logger.Logger;
+import com.sheep.common.utils.Json;
+
+import java.io.IOException;
+
+import okhttp3.Interceptor;
+import okhttp3.Response;
+
+/**
+ * Created by: zhoujuncai.
+ * Created date: 2018/10/17.
+ * Description: 网络数据拦截器
+ */
+public class LoggerInterceptor implements Interceptor {
+
+    @Override
+    public Response intercept(@NonNull Chain chain) throws IOException {
+        Response response = chain.proceed(chain.request());
+        Logger.i(Json.toJson(response));
+        return response;
+    }
+}

common/src/main/java/com/sheep/common/map/ApiService.java

@@ -0,0 +1,9 @@
+package com.sheep.common.map;
+
+/**
+ * Created by: zhoujuncai.
+ * Created date: 2018/10/17.
+ * Description: 服务器路由地址
+ */
+public interface ApiService {
+}

common/src/main/java/com/sheep/common/utils/Json.java

@@ -0,0 +1,42 @@
+package com.sheep.common.utils;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+
+/**
+ * Created By: var.
+ * Created Date: 2018/10/6.
+ * Description: JSON序列化与反序列化工具类
+ */
+public class Json {
+
+    private static Gson gson = new Gson();
+
+    /**
+     * Object序列化为JSON
+     *
+     * @param object 对象
+     * @return 返回序列化后的JSON字符串
+     */
+    public static String toJson(Object object) {
+        return gson.toJson(object);
+    }
+
+    /**
+     * JSON反序列化为Object
+     *
+     * @param json  JSON字符串
+     * @param clazz 反序列化类型
+     * @param <T>   泛型
+     * @return 返回反序列化后的泛型对象, 反序列化异常则返回null
+     */
+    public static <T> T toObject(String json, Class<T> clazz) {
+        T object = null;
+        try {
+            object = gson.fromJson(json, clazz);
+        } catch (JsonSyntaxException e) {
+            e.printStackTrace();
+        }
+        return object;
+    }
+}

common/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">common</string>
+</resources>

common/src/test/java/com/sheep/common/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package com.sheep.common;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}

settings.gradle

@@ -1 +1 @@
-include ':app', ':view', ':ucrop'//, ':Aria', ':datashare', ':AriaAnnotations'
+include ':app', ':view', ':ucrop', ':common', ':codec'//, ':Aria', ':datashare', ':AriaAnnotations'

small_sheep_android.iml

@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

ucrop/build.gradle

@@ -36,6 +36,6 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
-    implementation 'com.squareup.okhttp3:okhttp:3.8.1'
+    implementation "com.android.support:appcompat-v7:28.0.0"
+    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
 }

view/build.gradle

@@ -28,8 +28,8 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
-    implementation "com.android.support:support-v4:$supportLibVersion"
+    implementation "com.android.support:appcompat-v7:28.0.0"
+    implementation "com.android.support:support-v4:28.0.0"
     api files('libs/tbs_sdk_thirdapp_v3.6.0.1325.jar')
 //    implementation 'com.github.bumptech.glide:glide:3.7.0'
 //    implementation ('jp.wasabeef:glide-transformations:2.0.2'){

view/src/main/res/drawable/button_full_normal_green.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="5dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/green" />
-    <solid android:color="@color/green" />
-</shape>

view/src/main/res/drawable/button_full_press_green.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="5dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/green" />
-    <solid android:color="@color/green" />
-</shape>

view/src/main/res/drawable/progress_button_full_green.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-  <item android:state_focused="true" android:drawable="@drawable/button_full_press_green" />
-  <item android:state_checked="true" android:drawable="@drawable/button_full_press_green"/>
-  <item android:state_selected="true" android:drawable="@drawable/button_full_press_green"/>
-  <item android:state_pressed="true" android:drawable="@drawable/button_full_press_green"/>
-  <item android:drawable="@drawable/button_full_normal_green"/>
-</selector>

view/src/main/res/drawable/tag_bg.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- <item android:drawable="@drawable/bg_tag_pressed" android:state_checked="true" android:state_pressed="true"/>
-     <item android:drawable="@drawable/bg_tag_pressed" android:state_checked="true" android:state_pressed="false"/>
-     <item android:drawable="@drawable/bg_tag_pressed" android:state_checked="false" android:state_pressed="true"/>-->
-    <item android:drawable="@drawable/bg_tag_pressed" android:state_checked="true" />
-
-    <item android:drawable="@drawable/bg_tag_normal" />
-
-</selector>