Apex Mobile

调整布局

Apex Mobile/app/app.iml

@@ -49,13 +49,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -63,6 +56,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -70,13 +70,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -84,36 +77,46 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="com.android.support:multidex-1.0.2" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.4.2" level="project" />
     <orderEntry type="library" name="com.android.support:support-media-compat-26.1.0" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/Apex Mobile/app/libs/core-2.3.0.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.android.support:recyclerview-v7-26.1.0" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/macmini1/android project/Apex Mobile/app/libs/httpmime-4.1.1.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/Apex Mobile/app/libs/BaiduLBS_Android.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="android.arch.lifecycle:common:1.0.0@jar" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-base-license-11.4.2" level="project" />
     <orderEntry type="library" name="com.android.support:support-fragment-26.1.0" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/macmini1/android project/Apex Mobile/app/libs/bcprov-jdk15on-157.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-vector-drawable-26.1.0" level="project" />
     <orderEntry type="library" name="android.arch.lifecycle:runtime-1.0.0" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/macmini1/android project/Apex Mobile/app/libs/core-2.3.0.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.android.support:appcompat-v7-26.1.0" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-maps-license-11.4.2" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-basement-license-11.4.2" level="project" />
@@ -123,19 +126,19 @@
     <orderEntry type="library" name="com.android.support:support-core-utils-26.1.0" level="project" />
     <orderEntry type="library" name="com.android.support.constraint:constraint-layout-1.0.2" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-ui-26.1.0" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/Apex Mobile/app/libs/httpmime-4.1.1.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-compat-26.1.0" level="project" />
     <orderEntry type="library" name="android.arch.core:common:1.0.0@jar" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.4.2" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-maps-11.4.2" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/Apex Mobile/app/libs/bcprov-jdk15on-157.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-v4-26.1.0" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-location-11.4.2" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-location-license-11.4.2" level="project" />
     <orderEntry type="library" name="com.android.support:animated-vector-drawable-26.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support:multidex-instrumentation-1.0.2" level="project" />
     <orderEntry type="library" name="com.android.support:design-26.1.0" level="project" />
     <orderEntry type="library" name="com.android.support:transition-26.1.0" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-base-11.4.2" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/macmini1/android project/Apex Mobile/app/libs/BaiduLBS_Android.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="org.apache.http.legacy-android-26" level="project" />
   </component>
 </module>

Apex Mobile/app/src/main/AndroidManifest.xml

@@ -34,6 +34,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
     <!--
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -143,7 +144,7 @@
             android:label="@string/title_activity_apex"
             android:logo="@drawable/apexlogo_2"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan"></activity>
+            android:windowSoftInputMode="adjustPan" />
         <!--
              <activity
             android:name="com.usai.apex.LoginFragment"
@@ -156,7 +157,8 @@
         </activity>
         -->
 
-        <activity android:name=".mainframe.RootActivity">
+        <activity android:name=".mainframe.RootActivity"
+            android:theme="@style/FixedActionbarTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -180,58 +182,58 @@
         <activity
             android:name=".SearchActivity"
             android:label="@string/title_activity_search"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".AnnouncementActivity"
             android:label="@string/title_activity_announcements"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".CustomizeFieldsActivity"
             android:label="@string/title_activity_customize_fields"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ResultActivity"
-            android:label="@string/title_activity_result"></activity>
+            android:label="@string/title_activity_result" />
         <activity
             android:name=".LocationDetailActivity"
-            android:label="@string/title_activity_location_detail"></activity>
+            android:label="@string/title_activity_location_detail" />
         <activity
             android:name=".InnerMapActivity"
-            android:label="@string/title_activity_inner_map"></activity>
+            android:label="@string/title_activity_inner_map" />
         <activity
             android:name=".HelpActivity"
             android:label="@string/title_activity_help"
             android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Holo.NoActionBar"></activity>
+            android:theme="@android:style/Theme.Holo.NoActionBar" />
         <activity
             android:name=".SearchListActivity"
             android:label="@string/title_activity_search_list"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden"></activity>
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".RetrievePasswordActivity"
             android:label="@string/title_activity_retrieve_password"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".MessageActivity"
             android:label="@string/title_activity_message"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".SearchHistoryActivity"
             android:label="@string/title_activity_search_history"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ChangePasswordActivity"
             android:label="Change Password"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize|stateVisible"></activity>
+            android:windowSoftInputMode="adjustResize|stateVisible" />
         <activity
             android:name=".AboutActivity"
             android:label="@string/title_activity_about"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".WebActivity"
-            android:label="@string/title_activity_web"></activity>
+            android:label="@string/title_activity_web" />
 
         <receiver
             android:name=".BootBroadcastReceiver"
@@ -251,33 +253,41 @@
         <activity
             android:name=".MessageDetailActivity"
             android:label="@string/title_activity_message_detail"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".InnerToolsActivity"
             android:label="@string/title_activity_inner_tools"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".DocumentsActivity"
             android:label="@string/title_activity_documents"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".LocalDocumentActivity"
             android:label="@string/title_activity_localdocuments"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ApexHistoryActivity"
             android:label="@string/title_activity_apexhistory"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
 
         <service
             android:name=".ApexBackgroundService"
-            android:label="Apex Mobile Background Service"></service>
+            android:label="Apex Mobile Background Service" />
+
+        <activity android:name=".saved.CheckSavedActivity" />
+        <activity android:name=".TestAppComActivity"
+            android:theme="@style/FixedActionbarTheme">
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN" />-->
 
-        <activity android:name=".saved.CheckSavedActivity"></activity>
+                <!--<category android:name="android.intent.category.LAUNCHER" />-->
+            <!--</intent-filter>-->
+        </activity>
 
         <activity android:name=".Result.AMResultActivity"
                   android:screenOrientation="portrait"

Apex Mobile/app/src/main/java/com/usai/apex/TestAppComActivity.java

@@ -0,0 +1,57 @@
+package com.usai.apex;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Menu;
+
+public class TestAppComActivity extends AppCompatActivity {
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.quick_search,menu);
+        return  true;
+    }
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_test_app_com);
+
+
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setLogo(R.drawable.apexlogo);
+//        actionBar.setIcon(R.drawable.ic_launcher);
+
+        actionBar.setDisplayUseLogoEnabled(true);
+        actionBar.setDisplayShowHomeEnabled(true);
+//        actionBar.setHomeAsUpIndicator(R.drawable.ic_launcher);
+        actionBar.setDisplayHomeAsUpEnabled(false);
+        actionBar.setDisplayShowTitleEnabled(false);
+
+
+//        actionBar.add
+//        getSupportActionBar().setIcon(R.drawable.ic_launcher);
+//        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+//        Toolbar toolbar =(Toolbar) findViewById(R.id.toolbar);
+//        setSupportActionBar(toolbar);
+//
+//        setSupportActionBar(toolbar);
+////        setTitle("aaaa");//设置标题
+////        toolbar.setNavigationIcon(R.mipmap.ic_launcher_round);//设置返回键，我这里没有，就有icon代替吧
+////        toolbar.setNavigationOnClickListener(new OnClickListener() {
+////            @Override
+////            public void onClick(View view) {
+////                finish();
+////            }
+////        });//返回监听
+//        toolbar.setLogo(R.drawable.apexlogo_2);//设置logo
+////        toolbar.setSubtitle("bbbb");//设置副标题
+//
+//
+
+    }
+}

Apex Mobile/app/src/main/java/com/usai/apex/BottomNavigationViewHelper.java → Apex Mobile/app/src/main/java/com/usai/apex/mainframe/BottomNavigationViewHelper.java

@@ -1,4 +1,4 @@
-package com.usai.apex;
+package com.usai.apex.mainframe;
 
 import android.support.design.internal.BottomNavigationItemView;
 import android.support.design.internal.BottomNavigationMenuView;
@@ -8,6 +8,8 @@ import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.usai.apex.ApexTrackingApplication;
+
 import java.lang.reflect.Field;
 
 // 利用反射，改变 item 中 mShiftingMode 的值
@@ -43,8 +45,8 @@ public class BottomNavigationViewHelper {
                 final View iconView = itemView.findViewById(android.support.design.R.id.icon);
                 final ViewGroup.LayoutParams layoutParams = iconView.getLayoutParams();
                 final DisplayMetrics displayMetrics = ApexTrackingApplication.get_instance().getResources().getDisplayMetrics();
-                layoutParams.height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30, displayMetrics);
-                layoutParams.width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30, displayMetrics);
+                layoutParams.height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 26, displayMetrics);
+                layoutParams.width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 26, displayMetrics);
                 iconView.setLayoutParams(layoutParams);
 
 

Apex Mobile/app/src/main/java/com/usai/apex/mainframe/RootActivity.java

@@ -10,10 +10,12 @@ import android.support.design.widget.BottomNavigationView;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.view.Menu;
 import android.view.MenuItem;
+import android.widget.Toast;
 
-import com.usai.apex.BottomNavigationViewHelper;
 import com.usai.apex.R;
 import com.usai.apex.ViewPagerAdapter;
 import com.usai.util.commonUtil;
@@ -31,11 +33,44 @@ public class RootActivity extends AppCompatActivity {
     int selectedMenuItem;
     boolean login=false;
 
+
+    Menu actionbutton;
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        actionbutton = menu;
+        getMenuInflater().inflate(R.menu.quick_search,menu);
+        return  true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.quick_search:
+                Toast.makeText(this,"跳转至container search activity",Toast.LENGTH_LONG).show();
+                break;
+
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_root);
 
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setLogo(R.drawable.apexlogo);
+//        actionBar.setIcon(R.drawable.ic_launcher);
+
+        actionBar.setDisplayUseLogoEnabled(true);
+        actionBar.setDisplayShowHomeEnabled(true);
+//        actionBar.setHomeAsUpIndicator(R.drawable.ic_launcher);
+        actionBar.setDisplayHomeAsUpEnabled(false);
+        actionBar.setDisplayShowTitleEnabled(false);
+
+
         viewPager = (ViewPager) findViewById(R.id.viewpager);
         bottomNavigationView = (BottomNavigationView) findViewById(R.id.bottom_navigation);
 
@@ -48,8 +83,10 @@ public class RootActivity extends AppCompatActivity {
                 new BottomNavigationView.OnNavigationItemSelectedListener() {
                     @Override
                     public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+                        actionbutton.getItem(0).setVisible(false);
                         switch (item.getItemId()) {
                             case R.id.item_login:
+
                                 viewPager.setCurrentItem(0);
                                 return true;
 
@@ -62,6 +99,7 @@ public class RootActivity extends AppCompatActivity {
                                 return true;
 
                             case R.id.item_home:
+                                actionbutton.getItem(0).setVisible(true);
                                 viewPager.setCurrentItem(0);
                                 return true;
 
@@ -329,7 +367,8 @@ public class RootActivity extends AppCompatActivity {
 
         if(login)
         {
-
+            if(actionbutton!=null)
+                actionbutton.getItem(0).setVisible(true);
             bottomNavigationView.getChildAt(0).setSelected(true);
             bottomNavigationView.getMenu().clear();
 //                bottomNavigationView.getMenu().
@@ -383,7 +422,8 @@ public class RootActivity extends AppCompatActivity {
         }
         else
         {
-
+            if(actionbutton!=null)
+                actionbutton.getItem(0).setVisible(false);
             bottomNavigationView.getChildAt(0).setSelected(true);
             bottomNavigationView.getMenu().clear();
             bottomNavigationView.inflateMenu(R.menu.navi_logout);

Apex Mobile/app/src/main/java/com/usai/apex/mainframe/StaticModelistFragment.java

@@ -84,7 +84,8 @@ public class StaticModelistFragment extends ListFragment {
 
 //        this.getListView().setDivider(new ColorDrawable(Color.RED));
         this.getListView().setDivider(getResources().getDrawable(R.drawable.list_div));
-        this.getListView().setDividerHeight(20);
+        int px=commonUtil.dp2px(getActivity(), 8.75f);
+        this.getListView().setDividerHeight(px);
 
 
 //        this.getListView().setBackground(getResources().getDrawable(R.drawable.list_corner_round_bg));

Apex Mobile/app/src/main/java/com/usai/util/commonUtil.java

@@ -26,6 +26,32 @@ public class commonUtil {
     public static final int MY_PERMISSIONS_REQUEST = 1;
     private static final AtomicInteger sNextGeneratedId = new AtomicInteger(1);
 
+
+
+
+    public static int dp2px(Context context, float dipValue)
+
+    {
+
+        float m=context.getResources().getDisplayMetrics().density ;
+
+        return (int)(dipValue * m + 0.5f) ;
+
+    }
+
+
+
+    public static int px2dp(Context context, float pxValue)
+
+    {
+
+        float m=context.getResources().getDisplayMetrics().density ;
+
+        return (int)(pxValue / m + 0.5f) ;
+
+    }
+
+
     public static Boolean checkPermissions(Activity activity, String[] permissions) {
         if (Build.VERSION.SDK_INT >= 23) {
             return checkPermissions_23(activity, permissions);

Apex Mobile/app/src/main/res/layout/activity_test_app_com.xml

@@ -0,0 +1,10 @@
+<?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="com.usai.apex.TestAppComActivity">
+
+</android.support.constraint.ConstraintLayout>

Apex Mobile/app/src/main/res/layout/static_modelist_cell.xml

@@ -9,7 +9,7 @@
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="64dp">
+        android:layout_height="56dp">
 
         <TextView
             android:id="@+id/tv_name"
@@ -18,20 +18,21 @@
             android:layout_gravity="center"
             android:layout_marginEnd="16dp"
             android:layout_marginStart="8dp"
+            android:layout_marginTop="4dp"
             android:layout_weight="1"
             android:gravity="left"
             android:text="Tool name"
             android:textAlignment="viewStart"
             android:textColor="@android:color/black"
-            android:textSize="20sp"
+            android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/iv_icon"
             app:layout_constraintTop_toTopOf="@+id/iv_icon" />
 
         <ImageView
             android:id="@+id/iv_icon"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
+            android:layout_width="42dp"
+            android:layout_height="42dp"
             android:layout_marginStart="16dp"
             android:src="@drawable/ic_launcher"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -43,9 +44,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
+            android:lines="1"
             android:text="TextView"
-            app:layout_constraintBottom_toBottomOf="@+id/iv_icon"
-            app:layout_constraintStart_toEndOf="@+id/iv_icon" />
+            android:textSize="9.7sp"
+            app:layout_constraintStart_toEndOf="@+id/iv_icon"
+            app:layout_constraintTop_toBottomOf="@+id/tv_name" />
     </android.support.constraint.ConstraintLayout>
 
 </LinearLayout>

Apex Mobile/app/src/main/res/layout/toolbar_test.xml

@@ -0,0 +1,10 @@
+<android.support.v7.widget.Toolbar   xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:background="@color/colorPrimary"
+    android:layout_height="wrap_content"
+    android:minHeight="?attr/actionBarSize"
+    android:id="@+id/toolbar"
+    >
+
+</android.support.v7.widget.Toolbar  >

Apex Mobile/app/src/main/res/layout/tracking_list_cell.xml

@@ -8,18 +8,17 @@
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="110dp"
+        android:layout_height="96dp"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
         android:background="@drawable/list_corner_round_bg">
 
         <ImageView
             android:id="@+id/iv_status"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="5dp"
-            app:layout_constraintStart_toStartOf="parent"
+            android:layout_width="42dp"
+            android:layout_height="42dp"
+            android:layout_marginTop="4dp"
+            app:layout_constraintStart_toStartOf="@+id/tv_title"
             app:layout_constraintTop_toBottomOf="@+id/tv_time"
             app:srcCompat="@drawable/ic_launcher" />
 
@@ -27,12 +26,14 @@
             android:id="@+id/tv_title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="15dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginEnd="13dp"
+            android:layout_marginStart="13dp"
+            android:layout_marginTop="8dp"
+            android:ellipsize="end"
+            android:singleLine="true"
             android:text="TextView"
             android:textColor="@color/icon_gray"
-            android:textSize="15sp"
+            android:textSize="12.7sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -42,38 +43,37 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="3dp"
+            android:layout_marginTop="2dp"
             android:text="TextView"
             android:textColor="@color/icon_red"
-            android:textSize="12sp"
+            android:textSize="9.7sp"
             app:layout_constraintEnd_toStartOf="@+id/tv_port"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/tv_title"
             app:layout_constraintTop_toBottomOf="@+id/tv_title" />
 
         <TextView
             android:id="@+id/tv_port"
             android:layout_width="94dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="15dp"
             android:layout_marginTop="3dp"
             android:gravity="right"
             android:text="CNTAO - USLAX"
             android:textColor="@color/icon_red"
-            android:textSize="12sp"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:textSize="9.7sp"
+            app:layout_constraintEnd_toEndOf="@+id/tv_title"
             app:layout_constraintTop_toBottomOf="@+id/tv_title" />
 
         <TextView
             android:id="@+id/tv_description"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="15dp"
-            android:layout_marginStart="8dp"
+            android:layout_height="16dp"
+            android:layout_marginStart="7dp"
+            android:ellipsize="end"
+            android:singleLine="true"
             android:text="TextView"
             android:textColor="@color/icon_gray"
-            android:textSize="15sp"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:textSize="12.7sp"
+            app:layout_constraintEnd_toEndOf="@+id/tv_title"
             app:layout_constraintStart_toEndOf="@+id/iv_status"
             app:layout_constraintTop_toTopOf="@+id/iv_status" />
 
@@ -81,14 +81,16 @@
             android:id="@+id/tv_detail"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginEnd="15dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="5dp"
+            android:layout_marginBottom="2dp"
+            android:layout_marginStart="7dp"
+            android:layout_marginTop="2dp"
+            android:ellipsize="end"
+            android:lines="2"
             android:text="TextView"
             android:textColor="@android:color/darker_gray"
-            android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="@+id/iv_status"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:textSize="9.7sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/tv_title"
             app:layout_constraintStart_toEndOf="@+id/iv_status"
             app:layout_constraintTop_toBottomOf="@+id/tv_description" />
     </android.support.constraint.ConstraintLayout>

Apex Mobile/app/src/main/res/menu/navi_login.xml

@@ -3,24 +3,24 @@
     <item
         android:id="@+id/item_home"
         android:icon="@drawable/tab_home"
-        android:title="home" />
+        android:title="Home" />
     <item
         android:id="@+id/item_history"
         android:icon="@drawable/tab_history"
-        android:title="history" />
+        android:title="History" />
 
     <item
         android:id="@+id/item_search"
         android:icon="@drawable/tab_search"
-        android:title="search" />
+        android:title="Search" />
 
     <item
         android:id="@+id/item_tool"
         android:icon="@drawable/tab_tools"
-        android:title="tool" />
+        android:title="Tool" />
     <item
         android:id="@+id/item_my"
         android:icon="@drawable/tab_my"
-        android:title="my" />
+        android:title="My" />
 
 </menu>

Apex Mobile/app/src/main/res/menu/navi_logout.xml

@@ -3,10 +3,10 @@
     <item
         android:id="@+id/item_login"
         android:icon="@drawable/tab_login"
-        android:title="login" />
+        android:title="Login" />
     <item
         android:id="@+id/item_otool"
         android:icon="@drawable/tab_tools"
-        android:title="tool" />
+        android:title="Tool" />
 
 </menu>

Apex Mobile/app/src/main/res/menu/quick_search.xml

@@ -0,0 +1,14 @@
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/quick_search"
+        android:orderInCategory="100"
+        android:icon="@drawable/tab_search"
+        android:title="Search"
+        android:visible="false"
+        app:showAsAction="always" />
+
+
+
+</menu>

Apex Mobile/app/src/main/res/raw/fake_container_list.json

@@ -1,11 +1,11 @@
 {
     "container_list": [
                        {
-                       "title": "FACTORY/CUSTOMER",
+                       "title": "CN - E.S.KLUFT & COMPANY,LLC",
                        "icon": "status_departport",
-                       "description": "A1801350973 (6 containers)",
+                       "description": "A1709396526(1 containers)",
                        "detail": "Container# MOFU0744152 depart relay port SINGAPORE (SGSIN)",
-                       "date": "12/10/2017 - 02/18/2018",
+                       "date": "09/07/2017 - 09/23/2017",
                        "port": "CNTAO - USLAX"
                        },
                        {

Apex Mobile/app/src/main/res/raw/my.json

@@ -1,44 +1,46 @@
 {
-    "remark":"my菜单",
-    "modelist": [
-                 {
-                 "name": "Saved Detail",
-                 "detail": "View saved detail information",
-                 "icon": "mode_detail",
-                 "type": "saved_detail"
-                 },
-                 {
-                 "name": "Saved Search",
-                 "detail": "View saved search criteria",
-                 "icon": "mode_search",
-                 "type": "saved_search"
-                 },
-                 {
-                 "name": "Saved Documents",
-                 "detail": "Documents you have downloaded",
-                 "icon": "mode_document",
-                 "type": "saved_document"
-                 },
-                 {
-                 "name": "Message",
-                 "detail": "Notifacation message",
-                 "icon": "mode_message",
-                 "type": "message"
-                 },
-                 {
-                 "name": "Change Password",
-                 "detail": "Update login password",
-                 "icon": "mode_change_password",
-                 "type": "change_password"
-                 },
-                 {
-                 "name": "Logout",
-                 "detail": "Sign out",
-                 "icon": "mode_logout",
-                 "type": "logout"
-                 }
-                 ],
-    "title": "My",
-    "icon":"tab_my"
+  "remark":"my菜单",
+  "modelist": [
+    {
+      "name": "Saved Detail",
+      "detail": "View saved detail information",
+      "icon": "mode_detail",
+      "type": "saved_detail"
+    },
+    {
+      "name": "Saved Search",
+      "detail": "View saved search criteria",
+      "icon": "mode_search",
+      "type": "saved_search"
+    },
+    {
+      "name": "Saved Documents",
+      "detail": "Documents you have downloaded",
+      "icon": "mode_document",
+      "type": "saved_document"
+    },
+    {
+      "name": "Change Password",
+      "detail": "Update login password",
+      "icon": "mode_change_password",
+      "type": "change_password"
+    },
+    {
+      "name": "Logout",
+      "detail": "Sign out",
+      "icon": "mode_logout",
+      "type": "logout"
+    }
+  ],
+  "title": "My",
+  "icon":"tab_my",
+  "removed modelist":[
+    {
+      "name": "Message",
+      "detail": "Notifacation message",
+      "icon": "mode_message",
+      "type": "message"
+    }
+  ]
 }
 

Apex Mobile/app/src/main/res/values/attrs.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="Theme">
+        <attr name="statusBarColor" format="color|reference" />
+        <attr name="windowBackground" format="color|reference" />
+    </declare-styleable>
+
+</resources>

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

@@ -6,7 +6,7 @@
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
 
-
+    <color name="white">#ffffff</color>
     <color name="icon_red">#b22123</color>
     <color name="icon_gray">#444445</color>
     <color name="table_bg">#efeff4</color>

Apex Mobile/app/src/main/res/values/styles.xml

@@ -31,11 +31,12 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <!--<item name="textColorPrimary">@color/icon_gray</item>-->
     </style>
 
 
@@ -45,4 +46,27 @@
     <item name="android:padding">16dp</item>
     </style>
 
+
+
+
+    <style name="TestAppTheme" parent="Theme.AppCompat.Light">
+        <!-- Customize your theme here. -->
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/icon_red</item>
+
+    </style>
+
+    <style name="FixedActionbarTheme" parent="Theme.AppCompat.Light">
+        <item name="actionBarSize">39dp</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <!--<item name="windowBackground">@color/white</item>-->
+        <item name="colorAccent">@color/icon_red</item>
+        <!--<item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
+        <!--<item name="statusBarColor">@color/icon_red</item>-->
+        <!--<item name="android:windowLightStatusBar">true</item>-->
+    </style>
+
 </resources>