push

.idea/android_goodmoney.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/../../android_goodmoney/gen" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/../../android_goodmoney/gen" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/../../android_goodmoney/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/../../android_goodmoney/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/../../android_goodmoney/assets" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/../../android_goodmoney/libs" />
+        <option name="PROGUARD_LOGS_FOLDER_RELATIVE_PATH" value="/../../android_goodmoney/proguard_logs" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="Android API 30 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/android_goodmoney.iml" filepath="$PROJECT_DIR$/.idea/android_goodmoney.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

.idea/workspace.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
+  <component name="BranchesTreeState">
+    <expand>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+    </expand>
+    <select />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="5591e6ab-691c-445c-87a7-05c9c0b6b8f1" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/android_goodmoney.iml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="master" />
+      </map>
+    </option>
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="1qy7NePKR8L0wwvhkzGGEh5uTqz" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/GoodMoney" />
+    <property name="settings.editor.selected.configurable" value="vcs.Git" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="5591e6ab-691c-445c-87a7-05c9c0b6b8f1" name="Default Changelist" comment="" />
+      <created>1618039936363</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1618039936363</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="1">
+          <value>
+            <State>
+              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="HEAD" />
+                      </list>
+                    </value>
+                  </entry>
+                  <entry key="structure">
+                    <value>
+                      <list>
+                        <option value="dir:D:/Androidproject/android_goodmoney/GoodMoney" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </State>
+          </value>
+        </entry>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="OPEN_GENERIC_TABS">
+      <map>
+        <entry key="1" value="TOOL_WINDOW" />
+      </map>
+    </option>
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="223" y="67" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1618040266324">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="223" y="67" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824@0.0.1536.824" timestamp="1618040266324" />
+    <state x="470" y="212" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1618040423430">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="470" y="212" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1536.824@0.0.1536.824" timestamp="1618040423430" />
+    <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1618040545629">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1618040545629" />
+    <state x="270" y="56" key="SettingsEditor" timestamp="1618040174821">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="270" y="56" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1618040174821" />
+  </component>
+</project>
\ No newline at end of file

GoodMoney/app/build.gradle

@@ -351,4 +351,24 @@ dependencies {
 //    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 //    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
+
+    //小满
+    implementation ("com.bx:adsdk:1.4.2.2"){
+        exclude group:"com.miit.sdk"
+        transitive = true
+        changing = true
+    }
+
+//    implementation ('com.google.code.gson:gson:2.8.2'){
+//        exclude group:"com.miit.sdk"
+//    }
+//    implementation ('com.qq.e.union:union:4.310.1180'){
+//        exclude group:"com.miit.sdk"
+//    } // 普通版本
+
+//    compile(name: 'open_ad_sdk', ext: 'aar')
+
+
+
+
 }

GoodMoney/app/src/main/AndroidManifest.xml

@@ -30,7 +30,6 @@
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.SET_WALLPAPER" />
-    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
 
     <!--  来电秀  -->
     <uses-permission android:name="android.permission.READ_CALL_LOG" />
@@ -42,6 +41,12 @@
     <!--  蘑菇星球  -->
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES"/>
 
+    <!--小满-->
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.READ_SETTINGS" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
+
     <permission
         android:name="com.mints.goodmoney.permission"
         android:protectionLevel="normal" />
@@ -246,6 +251,8 @@
         <activity
             android:name=".call.detail.DetailApplyActivity"
             android:screenOrientation="portrait" />
+        <activity android:name=".ui.activitys.XiaomanActivity"
+            android:screenOrientation="portrait"/>
 
         <service
             android:name=".service.UpdateService"
@@ -373,6 +380,11 @@
             android:name="com.qq.e.comm.DownloadService"
             android:exported="false" />
 
+        <!--小滿廣告-->
+        <activity
+            android:name="com.qq.e.tg.ADActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
+
         <activity
             android:name="com.qq.e.ads.ADActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
@@ -386,6 +398,16 @@
             android:screenOrientation="landscape"
             tools:replace="android:screenOrientation" />
 
+        <provider
+            android:name="com.qq.e.comm.GDTFileProvider"
+            android:authorities="${applicationId}.gdt.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/gdt_file_path" />
+        </provider>
+
         <!-- 闪电盒子广告 -->
         <provider
             android:name="com.wannuosili.sdk.ad.component.WNFileProvider"

GoodMoney/app/src/main/java/com/mints/goodmoney/InitAppService.kt

@@ -50,7 +50,7 @@ class InitAppService : IntentService("InitializeService") {
     }
 
     /**
-     * 子线程进行初始化SDK操作
+     * 子线程进行初始化SDK操作【此处sdk属于非及时使用】
      */
     private fun initApplication() {
         // 初始化ShareSDK

GoodMoney/app/src/main/java/com/mints/goodmoney/MintsApplication.java

@@ -21,6 +21,7 @@ import com.mints.goodmoney.manager.RsNewsManager;
 import com.mints.goodmoney.manager.TtCsjAdManager;
 import com.mints.goodmoney.manager.TzManager;
 import com.mints.goodmoney.manager.WnManager;
+import com.mints.goodmoney.manager.XmManager;
 import com.mints.goodmoney.manager.YlVideoManager;
 import com.mints.goodmoney.manager.YlhAdManager;
 import com.mints.goodmoney.net.LoanService;
@@ -131,9 +132,12 @@ public class MintsApplication extends MultiDexApplication {
         // 枫岚广告
         MhManager.INSTANCE.initMn(this);
 
-        // 天卓珊瑚
+        // 天卓珊瑚[INSTANCE是设置单例模式]
         TzManager.INSTANCE.initTz(this);
 
+        //小满
+        XmManager.INSTANCE.initXm(this);
+
         // 一览视频
         YlVideoManager.INSTANCE.init(this);
 

GoodMoney/app/src/main/java/com/mints/goodmoney/common/AppConfig.java

@@ -3,7 +3,6 @@ package com.mints.goodmoney.common;
 /**
  * 描述：配置app设置开关
  * 作者：孟崔广
- * 时间：2017/10/10 17:51
  * 邮箱：mengcga@163.com
  */
 public class AppConfig {
@@ -84,11 +83,11 @@ public class AppConfig {
     /**
      * csjFull 剩余广告播放数
      */
-    public static int csjFullVideoAdCount = 5;
+    public static int csjFullVideoAdCount = 0;
     /**
      * flVideo 剩余广告播放数
      */
-    public static int flVideoAdCount = 5;
+    public static int flVideoAdCount = 0;
     /**
      * shVideo 剩余广告播放数
      */

GoodMoney/app/src/main/java/com/mints/goodmoney/common/Constant.kt

@@ -5,6 +5,7 @@ import com.mints.goodmoney.manager.UserManager
 
 object Constant {
 
+
     /**
      * 首次弹出权限声明
      */
@@ -89,6 +90,7 @@ object Constant {
     const val MAIN_CUR_COIN = "main_cur_coin" //当前金币展示
     const val MAIN_EXTRA_ID = "main_extra_id" //额外ID
     const val MAIN_CARRIER_TYPE = "main_carrier_type" //载体
+    const val MAIN_CARRIER_TITLE = "main_carrier_title" //载体
     const val MAIN_AID = "main_aid" // 体验安装过APP的aid
 
 
@@ -182,6 +184,9 @@ object Constant {
     const val EVENT_TYPE_GAMEINFO = "GAMEINFO"
 
     // 热门活动类型
+    //小满
+    const val HOT_ACTIVITY_SHEEP = "TO_XMKJ"
+
     const val HOT_ACTIVITY_WATER = "water"
     const val HOT_ACTIVITY_WALK = "walk"
     const val HOT_ACTIVITY_CARD = "card"
@@ -246,4 +251,8 @@ object Constant {
 
     // 蘑菇星球引导页
     const val MOKU_FLAG_GUIDE = "moku_flag_guide"
+
+    //page
+    const val ACTIVITY_ID = "activity_id"
+    const val ACTIVITY_TITLE = "activity_title"
 }

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/ReaderManager.kt

@@ -21,6 +21,7 @@ import com.chineseall.reader17ksdk.utils.book.ScreenUtils
  * 邮箱：mengcga@163.com
  */
 object ReaderManager {
+
     private const val APP_ID = "1242"
     private const val SECRET = "hzq@1242"
     private const val APP = "32"

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/TtCsjAdManager.java

@@ -44,6 +44,7 @@ public class TtCsjAdManager {
     public static String TT_AD_VEDIO_SMALLHOMEVEDIO = "945744186";// 短视频翻倍
     public static String TT_AD_VEDIO_KYLVEDIO = "945791766";// 来电秀视频
     public static String TT_AD_VEDIO_READ = "945997554";// 听读
+    public static String TT_AD_VEDIO_XIAOMAN = "946012845";// 小满科技
     /*全屏视频*/
     public static String TT_AD_FULLVEDIO_ALL = "945752969";// 通用
     /*信息流*/

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/XmManager.kt

+package com.mints.goodmoney.manager
+
+import android.app.Application
+import android.text.TextUtils
+import android.util.Log
+import android.view.View
+import android.widget.ImageView
+import com.bumptech.glide.Glide
+import com.bx.adsdk.AdSdk
+import com.bx.adsdk.util.MaterialTm
+import com.bytedance.sdk.openadsdk.TTAdConfig
+import com.bytedance.sdk.openadsdk.TTAdConstant
+import com.bytedance.sdk.openadsdk.TTAdSdk
+import com.fendasz.moku.planet.exception.MokuException
+import com.fendasz.moku.planet.helper.MokuHelper
+import com.mints.goodmoney.MintsApplication
+import com.mints.goodmoney.utils.LogUtil
+import com.qq.e.comm.managers.GDTADManager
+import kotlinx.android.synthetic.main.activity_layout_xiaoman.*
+
+/**
+ * 描述：小满
+ */
+object XmManager {
+
+    private var placeMateId = ""
+    private var materialId = ""
+    private const val ACCESSKEY = "hzq-az_rvkvdy"
+    private const val SECRETKEY = "22FvHjUzvQ516214"
+
+    fun initXm(application: Application) {
+//        //打开日志，上线之前记得关闭
+        try {
+            //        //打开日志，上线之前记得关闭
+            AdSdk.setDebug(true);
+            //初始化 需要在Applicaiton 中
+            AdSdk.init(application, ACCESSKEY, SECRETKEY)
+        } catch (e: Exception) {//这里应该是小满的异常
+            e.printStackTrace()
+        }
+    }
+
+    fun loadMater(placeid: String) {
+        if (TextUtils.isEmpty(placeMateId)) {
+            val tm: MaterialTm by lazy { MaterialTm() }
+            tm!!.loadMaterialData(UserManager.getInstance().userID, placeid, object : MaterialTm.Callback {
+                //对应PlaceID会有对应的素材
+                override fun onSuccess(imgUrl: String, placeMateId2: String, materialId2: String) {
+                    placeMateId = placeMateId2
+                    materialId = materialId2
+                    AdSdk.exposure(UserManager.getInstance().userID, placeid, placeMateId, materialId);
+                    LogUtil.d("******exposure*********${UserManager.getInstance().userID}******$placeMateId********$materialId****************$placeid**")
+                }
+
+                override fun onFailure(code: String, errmsg: String) {
+                    LogUtil.d("$code$errmsg")
+                }
+            })
+        } else {
+            AdSdk.exposure(UserManager.getInstance().userID, placeid, placeMateId, materialId);
+            LogUtil.d("******exposure*********${UserManager.getInstance().userID}******$placeMateId********$materialId****************$placeid**")
+
+        }
+    }
+
+
+    /**
+     * 入口点击上报
+     * @param view
+     */
+    fun exprotClick(placeid: String) {
+        AdSdk.click(UserManager.getInstance().userID, placeid, materialId, materialId);
+        LogUtil.d( "******exprotClick*******${UserManager.getInstance().userID}*******$placeMateId********$materialId******$placeid")
+    }
+
+}
\ No newline at end of file

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/YlhAdManager.kt

@@ -37,6 +37,7 @@ object YlhAdManager {
     var YLH_AD_VEDIO_HOMEVEDIO_POSTID= "4051451341464487" // 首页视频翻倍
     var YLH_AD_VEDIO_SMALLHOMEVEDIO_POSTID= "9051152341362610" // 短视频翻倍
     var YLH_AD_VEDIO_KYLVEDIO_POSTID= "8001950728967276" // 来电秀视频
+    var YLH_AD_VEDIO_XIAOMAN_POSTID= "3081971852112087" // 小满科技
 
     /*信息流*/
     var YLH_AD_NATIVEEXPRESS_JULEYUN = "8041941770890627" //聚乐云

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/BannerBean.java

@@ -31,6 +31,12 @@ public class BannerBean implements Serializable {
         private String title;
         private String toUrl;
 
+        public String getXmPlaceId() {
+            return xmPlaceId;
+        }
+
+        private String xmPlaceId;
+
         public String getUrl() {
             return url;
         }
@@ -70,5 +76,9 @@ public class BannerBean implements Serializable {
         public void setToUrl(String toUrl) {
             this.toUrl = toUrl;
         }
+//        public String getxmPlaceId() {
+//            return xmPlaceId;
+//        }
+
     }
 }

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/BaseResponse.java

@@ -5,7 +5,6 @@ import java.io.Serializable;
 /**
  * 描述：BaseResponse
  * 作者：孟崔广
- * 时间：2017/10/10 10:51
  * 邮箱：mengcga@163.com
  */
 public class BaseResponse<T> implements Serializable {

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/JsBridgeBean.java

+package com.mints.goodmoney.mvp.model;
+
+public class JsBridgeBean {
+  public String adType;
+  public String requestId;
+  public String prizeTitle;//中奖物品名称
+  public String type;//1代表有奖励，type为0代表没奖励
+  public String pid;//广告位id
+  public String ua;//UserAgent
+  public int logType;
+
+  //public boolean playState;
+
+  public String osType = "1";
+}
\ No newline at end of file

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/MyPresenter.kt

@@ -310,7 +310,7 @@ open class MyPresenter : BasePresenter<MyView>() {
                             }
                         })
     }
-
+//暂时先用着，什么功能不清楚
     fun myRotationChart() {
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.myRotationChart(),

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/Presenter.java

@@ -3,7 +3,6 @@ package com.mints.goodmoney.mvp.presenters;
 /**
  * 描述：Presenter
  * 作者：孟崔广
- * 时间：2017/10/10 10:51
  * 邮箱：mengcga@163.com
  */
 public interface Presenter<V> {

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/VersionUpdatePresenter.java

@@ -43,7 +43,6 @@ import rx.android.schedulers.AndroidSchedulers;
 /**
  * 描述：版本更新
  * 作者：孟崔广
- * 时间：2017/10/10 10:51
  * 邮箱：mengcga@163.com
  */
 public class VersionUpdatePresenter {

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/views/BaseView.java

@@ -5,7 +5,6 @@ import com.mints.goodmoney.MintsApplication;
 /**
  * 描述：BaseView
  * 作者：孟崔广
- * 时间：2017/10/10 17:51
  * 邮箱：mengcga@163.com
  */
 public interface BaseView {

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/views/MyView.kt

@@ -33,5 +33,8 @@ interface MyView : BaseView {
 
     fun getHallBaseMsgSuc(data: UserTaskMsgBean)
 
+    /**
+     * 相应数据
+     */
     fun getMyRotationChartSuc(data: RotationChartBean)
 }

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/DrawcashActivity.kt

@@ -318,9 +318,8 @@ class DrawcashActivity : BaseActivity(),
                 "ksWeight:${data.kS_VEDIO}"
         )
         // 广告视频数
-        AppConfig.csjVideoAdCount = 10
-        AppConfig.ylhAdCount = 10
-        AppConfig.csjFullVideoAdCount = 10
+        AppConfig.csjVideoAdCount = 5
+        AppConfig.ylhAdCount = 5
     }
 
     /**

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/MobileLoginActivity.kt

@@ -111,6 +111,7 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
         progressDialog?.dismiss()
 
         readyGo(MainActivity::class.java)
+//        readyGo(ZaActivity::class.java)
     }
 
     override fun sendCodeSuc() {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/WxLoginActivity.kt

@@ -90,6 +90,7 @@ class WxLoginActivity : BaseActivity()
             }
             R.id.tvLoginMobile -> {
                 readyGo(MobileLoginActivity::class.java)
+//                readyGo(ZaActivity::class.java)
             }
             R.id.rlLoginWx -> {
                 val wechat = ShareSDK.getPlatform(Wechat.NAME)
@@ -132,6 +133,7 @@ class WxLoginActivity : BaseActivity()
         progressDialog?.dismiss()
         if (TextUtils.equals(channel, Constant.CHANNEL_SHARE)) {
             readyGo(MainActivity::class.java)
+
         }
         finish()
     }

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/BannerBaseAdapter.java

@@ -21,7 +21,6 @@ import java.util.List;
 
 /**
  * @author Pinger
- * @since 2017/3/8 0008 下午 6:29
  * ViewPager基类适配器，需要传入Item视图和数据
  */
 public abstract class BannerBaseAdapter<T> extends PagerAdapter {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/GvMyAdapter.java

@@ -4,6 +4,7 @@ package com.mints.goodmoney.ui.adapter;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,6 +17,7 @@ import com.mints.goodmoney.R;
 import com.mints.goodmoney.common.Constant;
 import com.mints.goodmoney.manager.BxmManager;
 import com.mints.goodmoney.manager.UserManager;
+import com.mints.goodmoney.manager.XmManager;
 import com.mints.goodmoney.mvp.model.BannerBean;
 import com.mints.library.utils.GlideUtils;
 

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt

@@ -231,10 +231,12 @@ class MyFragment : BaseFragment(),
     override fun getMyHotActivitySuc(data: BannerBean?) {
         if (activity != null && !requireActivity().isFinishing) {
             data?.let {
+                /*if (it.ListBean().toUrl.equals(Constant.HOT_ACTIVITY_SHEEP)){
+                    Log.d("MyFragment","*************************不是吧")
+                }*/
                 vp_grid.visibility = View.VISIBLE
                 hotList.clear()
                 hotList.addAll(it.list)
-
                 generateGridData(hotList)
             }
         }
@@ -243,11 +245,17 @@ class MyFragment : BaseFragment(),
     // 生成热门活动数据
     private fun generateGridData(data: List<BannerBean.ListBean>) {
         val inflater = LayoutInflater.from(mContext)
-
+        for (i in 0..data.size-1) {
+            if (data.get(i).toUrl.equals(Constant.HOT_ACTIVITY_SHEEP)) {
+                XmManager.loadMater(data.get(i).xmPlaceId)
+                break
+            }
+        }
         val pageCount = ceil(data.size * 1.0 / HOT_PAGE_SIZE).toInt()
         val pagerList = arrayListOf<View>()
 
         for (i in 0 until pageCount) {
+
             val gridView = inflater.inflate(R.layout.item_fragment_main_my_promotions_gv,
                     vp_grid, false) as GridView
             gridView.adapter = GvMyAdapter(requireActivity(), data, i, HOT_PAGE_SIZE)
@@ -880,6 +888,7 @@ class MyFragment : BaseFragment(),
             R.id.ll_my_login -> {
                 if (!userManager.userIsLogin()) {
                     readyGo(WxLoginActivity::class.java)
+//                    readyGo(ZaActivity::class.java)
                 }
             }
             R.id.tv_left_subtitle -> {
@@ -919,7 +928,6 @@ class MyFragment : BaseFragment(),
                     myPresenter.getAutoUserHallBaseMsg()
                     return
                 }
-
                 readyGo(CoinRecordActivity::class.java)
             }
             R.id.item_title_friends -> {
@@ -938,6 +946,13 @@ class MyFragment : BaseFragment(),
             if (!TextUtils.isEmpty(hotBean.toUrl)) {
                 // 自有界面
                 when (hotBean.toUrl) {
+                    Constant.HOT_ACTIVITY_SHEEP -> {
+                        XmManager.exprotClick(hotBean.xmPlaceId)
+                        val bundle = Bundle()
+                        bundle.putString(Constant.ACTIVITY_TITLE, hotBean.title)
+                        bundle.putString(Constant.ACTIVITY_ID, hotBean.xmPlaceId)
+                        readyGo(XiaomanActivity::class.java, bundle)
+                    }
                     Constant.HOT_ACTIVITY_WATER -> {
                         TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WATER)
                         readyGo(WaterActivity::class.java)
@@ -1269,6 +1284,7 @@ class MyFragment : BaseFragment(),
         AppConfig.shVideoAdCount = data.vedioRules.corAl_VIDEO.surplus
         AppConfig.ksVideoAdCount = data.vedioRules.kS_VEDIO.surplus
         AppConfig.rtaVideoAdCount = data.vedioRules.rtA_VEDIO.surplus
+        AppConfig.csjFullVideoAdCount = data.vedioRules.csjfulL_VEDIO.surplus
         LogUtil.d(TAG, "首页视频数：csjCount:${AppConfig.csjVideoAdCount}    " +
                 "ylhCount:${AppConfig.ylhAdCount}    " +
                 "sdhzCount:${AppConfig.wnVideoAdCount}    " +

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/BannerView.java

@@ -3,7 +3,6 @@ package com.mints.goodmoney.ui.widgets;
 /*
  * Author:   renjinlong
  * Email:    chinarenlong@foxmail.com
- * Date:     2017/8/15
  * Description:
  */
 
@@ -38,7 +37,6 @@ import java.lang.reflect.Field;
 
 /**
  * @author Pinger
- * @since 2017/3/8 0008 下午 3:26
  * 自定义无限轮转的海报控件，抽离了适配器和滑动事件，更加轻便。
  * 请在布局使用当前类，相关属性可以通过布局或者代码设置，
  * 适配器继承BannerBaseAdapter，指定数据类型，填充布局即可

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/dialog/BaseDialog.java

@@ -10,7 +10,6 @@ import androidx.annotation.StyleRes;
 /**
  * 描述：dialog屏幕适配
  * 作者：孟崔广
- * 时间：2017/10/10 17:51
  * 邮箱：mengcga@163.com
  */
 public abstract class BaseDialog extends Dialog {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/dialog/LoadingDialog.java

@@ -18,7 +18,6 @@ import com.mints.goodmoney.R;
 /**
  * 描述：加载中dialog
  * 作者：孟崔广
- * 时间：2017/10/10 17:51
  * 邮箱：mengcga@163.com
  */
 public class LoadingDialog extends Dialog {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/seekbar/BubbleConfigBuilder.java

@@ -11,7 +11,6 @@ import static com.mints.goodmoney.ui.widgets.seekbar.BubbleUtils.sp2px;
 /**
  * config BubbleSeekBar's attributes
  * <p/>
- * Created by woxingxiao on 2017-03-14.
  */
 public class BubbleConfigBuilder {
 

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/wheelsruf/listener/RotateListener.java

@@ -4,7 +4,6 @@ import android.animation.ValueAnimator;
 import android.widget.ImageView;
 
 /**
- * Created by cretin on 2017/12/27.
  * 用于回调动画过程和结果
  */
 

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/wheelsruf/view/WheelSurfPanView.java

@@ -27,10 +27,6 @@ import com.mints.goodmoney.ui.widgets.wheelsruf.listener.RotateListener;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Created by cretin on 2017/12/26.
- */
-
 public class WheelSurfPanView extends View {
     private Context mContext;
     //记录视图的大小

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/wheelsruf/view/WheelSurfView.java

@@ -19,10 +19,6 @@ import com.mints.goodmoney.ui.widgets.wheelsruf.listener.RotateListener;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Created by cretin on 2017/12/26.
- */
-
 public class WheelSurfView extends RelativeLayout {
     //当前的圆盘VIew
     private WheelSurfPanView mWheelSurfPanView;

GoodMoney/app/src/main/java/com/mints/goodmoney/utils/MiscUtil.java

@@ -4,10 +4,6 @@ import android.content.Context;
 import android.graphics.Paint;
 import android.view.View;
 
-/**
- * Created by littlejie on 2017/2/22.
- */
-
 public class MiscUtil {
 
     /**

GoodMoney/app/src/main/java/com/mints/goodmoney/utils/PermissionUtils.java

@@ -15,8 +15,6 @@ import java.util.List;
 
 /**
  * Desction:授权工具类
- * Author:pengjianbo
- * Date:2017/1/15 AM2:39
  */
 public class PermissionUtils {
 

GoodMoney/app/src/main/java/com/mints/goodmoney/utils/ToastUtil.java

@@ -16,7 +16,6 @@ import com.mints.goodmoney.R;
 /**
  * 描述：Toast
  * 作者：孟崔广
- * 时间：2017/10/10 17:51
  * 邮箱：mengcga@163.com
  */
 public class ToastUtil {

GoodMoney/app/src/main/java/com/mints/goodmoney/utils/ToolUtil.java

@@ -181,7 +181,6 @@ public class ToolUtil {
      * 数字格式化显示
      * 小于万默认显示 大于万以1.7万方式显示最大是9999.9万
      * 大于亿以1.1亿方式显示最大没有限制都是亿单位
-     * make by dongxh 2017年12月28日上午10:05:22
      * </pre>
      *
      * @param num   格式化的数字

GoodMoney/app/src/main/res/layout/activity_layout_xiaoman.xml

+<?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:background="@color/white"
+    android:orientation="vertical">
+
+
+    <include
+        android:id="@+id/layoutWrapper"
+        layout="@layout/header_layout" />
+
+    <FrameLayout
+        android:id="@+id/frame_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+
+    <FrameLayout
+        android:id="@+id/bannerContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"></FrameLayout>
+
+</LinearLayout>
\ No newline at end of file

GoodMoney/app/src/main/res/layout/activity_zmain.xml

+<?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:background="@color/white"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/back_z"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="25dp"
+        android:paddingTop="40dp"
+        android:paddingRight="25dp"
+        android:paddingBottom="10dp"
+        android:scaleType="center"
+        android:src="@mipmap/ic_activity_quit" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="50dp"
+            android:src="@mipmap/ic_launcher_main" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="30dp"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:id="@+id/Login_z"
+                android:layout_width="match_parent"
+                android:layout_height="52dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginLeft="40dp"
+                android:layout_marginTop="230dp"
+                android:layout_marginRight="40dp"
+                android:background="@drawable/shape_green">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:drawableLeft="@mipmap/ic_wx_white_login"
+                    android:drawablePadding="10dp"
+                    android:gravity="center_vertical"
+                    android:text="点击响应"
+                    android:textColor="@color/white"
+                    android:textSize="14sp" />
+            </RelativeLayout>
+
+
+            <TextView
+                android:id="@+id/other_login_z"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:padding="24dp"
+                android:text="其他登录方式"
+                android:textColor="@color/gray"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/agreement_login_z"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dp"
+                android:layout_marginRight="30dp"
+                android:layout_gravity="center_horizontal"
+                android:textColor="@color/color_707A8D"
+                android:textSize="12sp" />
+        </LinearLayout>
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file

GoodMoney/app/src/main/res/xml/network_security_config.xml

 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <base-config cleartextTrafficPermitted="true" />
+    <base-config cleartextTrafficPermitted="true" >
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
 </network-security-config>
\ No newline at end of file

GoodMoney/build.gradle

@@ -52,6 +52,11 @@ buildscript {
         maven {
             url 'http://maven.aliyun.com/nexus/content/repositories/releases/'
         }
+
+        // 添加小满科技
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
+        maven { url "https://maven.google.com"}
+        maven { url "https://maven.linzhuxin.com/repository/lzoom_read_sdk_prd/"}
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.1'
@@ -79,6 +84,8 @@ allprojects {
         maven {
             url 'http://maven.aliyun.com/nexus/content/repositories/releases/'
         }
+        //小满
+        maven { url "http://47.97.184.214:8081/nexus/content/groups/public" }
     }
 }