修复菜单切换错误、优化关于UI

app/src/main/java/com/jld/vod/base/BaseActivity.kt

@@ -82,8 +82,8 @@ abstract class BaseActivity : XPageActivity() {
                         {
 
                             handlerBaseActivity.removeCallbacks(runnableBaseActivity)
-                            handlerBaseActivity.postDelayed(runnableBaseActivity, 5 * 1000)
-                            //handlerBaseActivity.postDelayed(runnableBaseActivity, 1800 * 1000)
+                            //handlerBaseActivity.postDelayed(runnableBaseActivity, 5 * 1000)
+                            handlerBaseActivity.postDelayed(runnableBaseActivity, 1800 * 1000)
 
                             LogUtils.logD( "dispatchTouchEvent:ACTION_UP");
                         }

app/src/main/java/com/jld/vod/service/LatLongService.kt

@@ -180,15 +180,12 @@ class LatLongService :Service() {
      * 初始化广告模块
      */
     private fun initAdVert(sid : Long?) {
-
-        LogUtils.logD("sid"+sid)
         OkHttpUtils.getInstance().getDataAsyn(Config.ApiBaseUrl+"/advert/findGEOAdvert?sid="+sid,object :OkHttpUtils.MyNetCall{
             override fun failed(call: Call?, e: IOException?) {
                 LogUtils.logE(e.toString())
             }
             override fun success(call: Call?, response: Response?) {
                 val json = response!!.body!!.string()
-                LogUtils.logD("initGEOAdVert"+json)
 
                 val mGEOAdvertBean= gson!!.fromJson(json, GEOAdvertBean::class.java)
                 val msg = Message()

app/src/main/java/com/jld/vod/view/HomeActivity.kt

@@ -160,6 +160,7 @@ class HomeActivity : BaseActivity() {
 
                         val bpos = Bundle()
                         bpos.putInt("pos", pos)
+                        bpos.putString("rtName", res[pos].rtName)
                         //旋转动画
                         ratateImage!!.startSpin()
 
@@ -167,6 +168,7 @@ class HomeActivity : BaseActivity() {
                             override fun onAnimationRepeat(animation: Animation?) {}
                             override fun onAnimationEnd(animation: Animation?) {
                                 ratateImage!!.stopSpin()
+
                                 go<MainActivity>(bpos)
                             }
                             override fun onAnimationStart(animation: Animation?) {}

app/src/main/java/com/jld/vod/view/MainActivity.kt

@@ -57,6 +57,7 @@ class MainActivity : BaseActivity() {
     private var language: Array<String?> ?=null
     private var mAllModularRotateImgBean:List<AllModularRotateImgBean> ?=null
     private val password : String = "123456"
+    private var rtName :String = "RES_GAME"
     private var pos = 0
     private val mHandler = Handler()
 
@@ -78,6 +79,7 @@ class MainActivity : BaseActivity() {
         //点击图标位置
         val intent = intent
         val bundle = intent.extras
+        rtName = bundle!!.getString("rtName").toString()
         pos = bundle!!.getInt("pos")
 
         mUpCircleMenuLayout = findViewById(R.id.id_mymenulayout) as UpCircleMenuLayout
@@ -145,7 +147,7 @@ class MainActivity : BaseActivity() {
             LogUtils.logD("findPositionAdvertLiveData"+res.data)
             when (res?.code) {
                 BaseBean.SUCCESS -> {
-                    if (res.data!!.size != 0)
+                    if (res.data != null)
                     {
                         val isFirstShowAds = SharedPrefUtils.getBoolean(this,"isFirstShowAds",true)
                         if (isFirstShowAds)
@@ -351,7 +353,7 @@ class MainActivity : BaseActivity() {
                 Glide.with(this)
                     .load(Config.ApiBaseUrl + "/synchronization/previewImg?imgUrl=" + it.data.get(9).garden)
                     .into(iv_mymenu_center)
-                when (it.data.get(pos).mid) {
+                when (rtName) {
                     "RES_MOVIE" -> {
                         openPage(MovieFragment::class.java)
                     }

app/src/main/java/com/jld/vod/view/fragment/AboutFragment.kt

@@ -45,7 +45,7 @@ class AboutFragment : BaseFragment() {
             .get(AboutViewModel::class.java)
 
         //初始化recyclerview
-        val gridlayoutManager = GridLayoutManager(activity, 4)
+        val gridlayoutManager = GridLayoutManager(activity, 2)
         mRecyclerView!!.layoutManager = gridlayoutManager
 
         val adapter = AboutAdapter()

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

@@ -7,7 +7,8 @@
     android:gravity="center"
     android:layout_gravity="center"
     android:layout_marginTop="30dp"
-    android:layout_marginRight="35dp"
+    android:layout_marginRight="35px"
+    android:layout_marginLeft="30px"
     >
     <LinearLayout
         android:layout_width="wrap_content"
@@ -20,11 +21,11 @@
            android:layout_margin="15dp"
             android:id="@+id/aciv_item_browser_pic"
             android:src="@mipmap/ic_launcher"
-            android:paddingTop="15dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:layout_width="140dp"
-            android:layout_height="140dp"
+            android:paddingTop="22px"
+            android:paddingLeft="22px"
+            android:paddingRight="22px"
+            android:layout_width="310px"
+            android:layout_height="138px"
             android:scaleType="fitXY"
             >
         </ImageView>