opt

.idea/misc.xml

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

modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java

@@ -32,7 +32,7 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent
 
     @Override
     protected int getLayoutId() {
-        return R.layout.module_apps_activiity_list;
+        return R.layout.module_apps_activity_list;
     }
 
     @Override

modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/PagerIndicator.java

@@ -30,7 +30,7 @@ public class PagerIndicator extends LinearLayout implements PagerSlidingTabStrip
 
     public PagerIndicator( Context context, @Nullable AttributeSet attrs, int defStyleAttr ) {
         super( context, attrs, defStyleAttr );
-        LayoutInflater.from( context ).inflate( R.layout.modle_apps_page_indicator, this, true );
+        LayoutInflater.from( context ).inflate( R.layout.module_apps_page_indicator, this, true );
         mIndicator = findViewById( R.id.module_apps_id_indicator_dot );
     }
 

modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml

@@ -20,9 +20,9 @@
 
   <ImageView
       android:id="@+id/module_apps_id_apps"
-      android:layout_width="@dimen/module_apps_navigation_icon_width"
+      android:layout_width="@dimen/module_apps_all_icon_width"
       android:layout_marginTop="@dimen/apps_margin_top"
-      android:layout_height="@dimen/module_apps_navigation_icon_height"
+      android:layout_height="@dimen/module_apps_all_icon_height"
       app:layout_constraintLeft_toRightOf="@id/module_apps_id_scroller"
       app:layout_constraintTop_toTopOf="@id/module_apps_id_scroller"
       android:layout_marginLeft="@dimen/module_apps_navigation_icon_marginLeft"

modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml

@@ -10,6 +10,7 @@
         android:id="@+id/module_apps_id_app_icon"
         android:layout_width="@dimen/module_apps_navigation_icon_width"
         android:scaleType="fitXY"
+        android:src="@drawable/module_apps_ic_chat"
         android:layout_height="@dimen/module_apps_navigation_icon_height" />
 
     <TextView

modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml

@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_apps_pager_marginTop">117px</dimen>
+    <dimen name="module_apps_pager_marginTop">85px</dimen>
     <dimen name="module_apps_indicator_height">2.7px</dimen>
     <dimen name="module_apps_indicator_width">16px</dimen>
     <dimen name="module_apps_indicator_interval">2.3px</dimen>
     <dimen name="module_apps_indicator_marginBottom">54.9px</dimen>
-    <dimen name="module_apps_navigation_icon_width">50px</dimen>
-    <dimen name="module_apps_navigation_icon_height">50px</dimen>
+    <dimen name="module_apps_navigation_icon_width">96px</dimen>
+    <dimen name="module_apps_navigation_icon_height">@dimen/module_apps_navigation_icon_width</dimen>
     <dimen name="module_apps_navigation_icon_marginLeft">22px</dimen>
     <dimen name="module_apps_navigation_icon_paddingBottom">33px</dimen>
     <dimen name="module_apps_app_name_marginTop">24px</dimen>
-    <dimen name="module_apps_app_name_textSize">18px</dimen>
-    <dimen name="module_apps_page_paddingLeft">112px</dimen>
-    <dimen name="module_apps_page_paddingRight">112px</dimen>
+    <dimen name="module_apps_app_name_textSize">20px</dimen>
+    <dimen name="module_apps_page_paddingLeft">96px</dimen>
+    <dimen name="module_apps_page_paddingRight">96px</dimen>
     <dimen name="apps_id_scroller_width">279px</dimen>
-    <dimen name="module_apps_page_item_verticalSpacing">89px</dimen>
+    <dimen name="module_apps_page_item_verticalSpacing">88px</dimen>
     <dimen name="module_apps_navigation_icon_container_height">95px</dimen>
     <dimen name="apps_margin_top">9.5px</dimen>
     <dimen name="apps_margin_left">18px</dimen>
-
+    <dimen name="module_apps_all_icon_width">50px</dimen>
+    <dimen name="module_apps_all_icon_height">50px</dimen>
 </resources>

modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml

@@ -1,17 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_apps_pager_marginTop">260px</dimen>
+    <dimen name="module_apps_pager_marginTop">160px</dimen>
     <dimen name="module_apps_indicator_height">5px</dimen>
     <dimen name="module_apps_indicator_width">30px</dimen>
     <dimen name="module_apps_indicator_interval">4px</dimen>
     <dimen name="module_apps_indicator_marginBottom">103px</dimen>
-    <dimen name="module_apps_navigation_icon_width">94px</dimen>
-    <dimen name="module_apps_navigation_icon_height">94px</dimen>
+    <dimen name="module_apps_navigation_icon_width">180px</dimen>
+    <dimen name="module_apps_navigation_icon_height">@dimen/module_apps_navigation_icon_width</dimen>
     <dimen name="module_apps_navigation_icon_marginLeft">43px</dimen>
     <dimen name="module_apps_navigation_icon_paddingBottom">60px</dimen>
     <dimen name="module_apps_app_name_marginTop">32px</dimen>
-    <dimen name="module_apps_app_name_textSize">32px</dimen>
-    <dimen name="module_apps_page_paddingLeft">220px</dimen>
-    <dimen name="module_apps_page_paddingRight">220px</dimen>
-    <dimen name="module_apps_page_item_verticalSpacing">154px</dimen>
+    <dimen name="module_apps_app_name_textSize">37.5px</dimen>
+    <dimen name="module_apps_page_paddingLeft">180px</dimen>
+    <dimen name="module_apps_page_paddingRight">180px</dimen>
+    <dimen name="module_apps_page_item_verticalSpacing">136px</dimen>
+    <dimen name="module_apps_navigation_icon_container_height">174px</dimen>
+    <dimen name="apps_id_scroller_width">523px</dimen>
+    <dimen name="apps_margin_top">18px</dimen>
+    <dimen name="apps_margin_left">37px</dimen>
+    <dimen name="module_apps_all_icon_width">120px</dimen>
+    <dimen name="module_apps_all_icon_height">120px</dimen>
 </resources>

modules/mogo-module-apps/src/main/res/values/dimens.xml

@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_apps_pager_marginTop">260px</dimen>
+    <dimen name="module_apps_pager_marginTop">160px</dimen>
     <dimen name="module_apps_indicator_height">5px</dimen>
     <dimen name="module_apps_indicator_width">30px</dimen>
     <dimen name="module_apps_indicator_interval">2.3px</dimen>
     <dimen name="module_apps_indicator_marginBottom">103px</dimen>
-    <dimen name="module_apps_navigation_icon_width">120px</dimen>
-    <dimen name="module_apps_navigation_icon_height">120px</dimen>
+    <dimen name="module_apps_navigation_icon_width">180px</dimen>
+    <dimen name="module_apps_navigation_icon_height">@dimen/module_apps_navigation_icon_width</dimen>
     <dimen name="module_apps_navigation_icon_marginLeft">60px</dimen>
     <dimen name="module_apps_navigation_icon_paddingBottom">60px</dimen>
     <dimen name="module_apps_app_name_marginTop">32px</dimen>
-    <dimen name="module_apps_app_name_textSize">32px</dimen>
-    <dimen name="module_apps_page_paddingLeft">220px</dimen>
-    <dimen name="module_apps_page_paddingRight">220px</dimen>
-    <dimen name="module_apps_page_item_verticalSpacing">154px</dimen>
-  <dimen name="module_apps_navigation_icon_container_height">174px</dimen>
+    <dimen name="module_apps_app_name_textSize">37.5px</dimen>
+    <dimen name="module_apps_page_paddingLeft">180px</dimen>
+    <dimen name="module_apps_page_paddingRight">180px</dimen>
+    <dimen name="module_apps_page_item_verticalSpacing">136px</dimen>
+    <dimen name="module_apps_navigation_icon_container_height">174px</dimen>
     <dimen name="apps_id_scroller_width">523px</dimen>
     <dimen name="apps_margin_top">18px</dimen>
     <dimen name="apps_margin_left">37px</dimen>
+    <dimen name="module_apps_all_icon_width">120px</dimen>
+    <dimen name="module_apps_all_icon_height">120px</dimen>
 </resources>

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java

@@ -56,8 +56,8 @@ import java.util.List;
  * 描述：加载各个模块
  */
 public class MainActivity extends MvpActivity< MainView, MainPresenter > implements MainView,
-    IMogoLocationListener,
-    IMogoMarkerClickListener{
+        IMogoLocationListener,
+        IMogoMarkerClickListener {
 
     private static final String TAG = "MainActivity";
 
@@ -215,7 +215,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
         mPresenter.postLoadModuleMsg();
     }
 
-    private void init(){
+    private void init() {
         mServiceApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation();
         mMogoStatusManager = mServiceApis.getStatusManagerApi();
     }
@@ -290,13 +290,13 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
             // 默认触发第一个卡片
             mOnPageChangeListener.onPageSelected( 0 );
         }
+        mCardCoverUpBottomLayout.setVisibility( View.VISIBLE );
     }
 
     @Override
     public void hideCoverUpLayout() {
         mCoverUpLayout.setVisibility( View.GONE );
         mCardsBkg.setVisibility( View.VISIBLE );
-        mCardCoverUpBottomLayout.setVisibility( View.VISIBLE );
     }
 
     @Override