Apex Mobile

调整布局

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

@@ -157,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" />
@@ -281,26 +282,24 @@
             android:label="Apex Mobile Background Service" />
 
         <activity android:name=".saved.CheckSavedActivity" />
-        <activity android:name=".TestAppComActivity"
+        <activity
+            android:name=".TestAppComActivity"
             android:theme="@style/FixedActionbarTheme">
-            <!--<intent-filter>-->
-                <!--<action android:name="android.intent.action.MAIN" />-->
-
-                <!--<category android:name="android.intent.category.LAUNCHER" />-->
-            <!--</intent-filter>-->
-        </activity>
 
-        <activity android:name=".Result.AMResultActivity"
-                  android:screenOrientation="portrait"
-                  >
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
 
-        </activity>
-        <activity android:name=".Result.SearchResultActivity"
-                  android:screenOrientation="portrait"
-                  >
 
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
         </activity>
-
+        <activity
+            android:name=".Result.AMResultActivity"
+            android:screenOrientation="portrait"></activity>
+        <activity
+            android:name=".Result.SearchResultActivity"
+            android:screenOrientation="portrait"></activity>
+        <activity android:name=".ContainerSearchActivity"></activity>
     </application>
 
 </manifest>

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

@@ -0,0 +1,61 @@
+package com.usai.apex;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
+
+public class ContainerSearchActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_container_search);
+
+        setCustomActionBar();
+    }
+
+    private void setCustomActionBar() {
+        ActionBar.LayoutParams lp =new ActionBar.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.MATCH_PARENT, Gravity.CENTER);
+        View mActionBarView = LayoutInflater.from(this).inflate(R.layout.actionbar_customtitle, null);
+
+        TextView titleview = mActionBarView.findViewById(R.id.title);
+        titleview.setText(getIntent().getStringExtra("title"));
+//
+//        mActionBarView.setBackgroundColor(Color.YELLOW);
+//        titleview.setBackgroundColor(Color.BLUE);
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setCustomView(mActionBarView, lp);
+        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+        actionBar.setDisplayShowCustomEnabled(true);
+        actionBar.setDisplayHomeAsUpEnabled(true);
+
+
+//        actionBar.setIcon(getNumberDrawable());
+//        actionBar.setDisplayShowHomeEnabled(true);
+        actionBar.setDisplayShowTitleEnabled(false);
+    }
+
+
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        Intent intent = new Intent();
+        switch (item.getItemId())
+        {
+            case android.R.id.home:
+                finish();
+                break;
+
+            default:
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

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

@@ -3,6 +3,8 @@ package com.usai.apex.mainframe;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
 
 import com.usai.apex.R;
 
@@ -66,5 +68,13 @@ public class HistoryFragment extends TrackingListFragment {
 
         adapter.notifyDataSetChanged();
     }
+    @Override
+    protected View initHeaderView()
+    {
+
+        View headerView = LayoutInflater.from(getActivity()).inflate(R.layout.invisable_listheader, null);
+        return headerView;
+
+    }
 
 }

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

@@ -3,6 +3,8 @@ package com.usai.apex.mainframe;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
 
 import com.usai.apex.R;
 
@@ -66,6 +68,14 @@ public class HomeFragment extends TrackingListFragment {
         adapter.notifyDataSetChanged();
     }
 
+    @Override
+    protected View initHeaderView()
+    {
+
+        View headerView = LayoutInflater.from(getActivity()).inflate(R.layout.home_listheader, null);
+        return headerView;
+
+    }
 
 
 }

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

@@ -3,6 +3,7 @@ package com.usai.apex.mainframe;
 import android.Manifest;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -14,8 +15,8 @@ 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.ContainerSearchActivity;
 import com.usai.apex.R;
 import com.usai.apex.ViewPagerAdapter;
 import com.usai.util.commonUtil;
@@ -46,7 +47,12 @@ public class RootActivity extends AppCompatActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.quick_search:
-                Toast.makeText(this,"跳转至container search activity",Toast.LENGTH_LONG).show();
+
+                Intent intent = new Intent();
+                intent.setClass(RootActivity.this,ContainerSearchActivity.class);
+            startActivity(intent);
+
+//                Toast.makeText(this,"跳转至container search activity",Toast.LENGTH_LONG).show();
                 break;
 
         }

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

@@ -3,6 +3,8 @@ package com.usai.apex.mainframe;
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.ListFragment;
+import android.view.LayoutInflater;
+import android.view.View;
 import android.widget.SimpleAdapter;
 
 import com.usai.apex.R;
@@ -74,6 +76,11 @@ public class StaticModelistFragment extends ListFragment {
         adapter        = new SimpleAdapter(this.getActivity(),
                 getData(jsonobj), R.layout.static_modelist_cell, new String[] { "title",
                 "img","detail" }, new int[] { R.id.tv_name, R.id.iv_icon,R.id.tv_detail });
+
+        View headerView = initHeaderView();
+        if(headerView!=null)
+            getListView().addHeaderView(headerView);
+
         setListAdapter(adapter);
     }
 
@@ -95,6 +102,13 @@ public class StaticModelistFragment extends ListFragment {
 
     }
 
+    protected View initHeaderView()
+    {
+
+        View headerView = LayoutInflater.from(getActivity()).inflate(R.layout.invisable_listheader, null);
+        return headerView;
+
+    }
     protected JSONObject loadjson(int rawid)
     {
 

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

@@ -238,7 +238,12 @@ public class TrackingListFragment extends ListFragment {
     public TrackingListFragment() {
         // Required empty public constructor
     }
+    protected View initHeaderView()
+    {
+
+        return null;
 
+    }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState)
@@ -280,6 +285,9 @@ public class TrackingListFragment extends ListFragment {
 //            }
 //        });
 
+        View headerView = initHeaderView();
+        if(headerView!=null)
+            getListView().addHeaderView(headerView);
         setListAdapter(adapter);
     }
 
@@ -290,8 +298,10 @@ public class TrackingListFragment extends ListFragment {
 
 //        this.getListView().setDivider(new ColorDrawable(Color.RED));
         this.getListView().setDivider(getResources().getDrawable(R.drawable.list_div));
-        this.getListView().setDividerHeight(20);
+//        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));
         this.getListView().setBackgroundColor(getResources().getColor(R.color.table_bg)  );

Apex Mobile/app/src/main/res/drawable/list_bg.xml

@@ -6,6 +6,11 @@
     <!--&lt;!&ndash; 描边 &ndash;&gt;-->
     <!--<stroke android:width="1dp" android:color="@android:color/darker_gray" />-->
 
+
+
+    <!-- 描边 -->
+    <stroke android:width="0.3dp" android:color="@android:color/darker_gray" />
+
     <!-- 实心填充 -->
     <solid android:color="@android:color/white" />
 

Apex Mobile/app/src/main/res/drawable/list_corner_round.xml

@@ -14,9 +14,9 @@
         android:startColor="#BFEEFF" />
 
     <corners
-        android:bottomLeftRadius="8dip"
-        android:bottomRightRadius="8dip"
-        android:topLeftRadius="8dip"
-        android:topRightRadius="8dip" />
+        android:bottomLeftRadius="5dip"
+        android:bottomRightRadius="5dip"
+        android:topLeftRadius="5dip"
+        android:topRightRadius="5dip" />
 
 </shape>

Apex Mobile/app/src/main/res/drawable/list_corner_round_bg.xml

@@ -10,8 +10,8 @@
     <solid android:color="@android:color/white" />
 
     <!-- 圆角 -->
-    <corners android:bottomLeftRadius="8dip"
-        android:bottomRightRadius="8dip" android:topLeftRadius="8dip"
-        android:topRightRadius="8dip" />
+    <corners android:bottomLeftRadius="5dip"
+        android:bottomRightRadius="5dip" android:topLeftRadius="5dip"
+        android:topRightRadius="5dip" />
 
 </shape>  

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

@@ -0,0 +1,35 @@
+<?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.ContainerSearchActivity">
+
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:text="Cancel"
+        app:layout_constraintBottom_toBottomOf="@+id/atv_criterion2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/atv_criterion2" />
+
+    <AutoCompleteTextView
+        android:id="@+id/atv_criterion2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:completionThreshold="1"
+        android:hint="@string/prompt_search_criterion"
+        android:inputType="textAutoComplete"
+        android:maxLines="1"
+        android:singleLine="true"
+        app:layout_constraintEnd_toStartOf="@+id/button2"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"></AutoCompleteTextView>
+
+</android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,22 @@
+<?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">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="@android:color/darker_gray"
+        android:paddingLeft="8dp"
+        android:text="Recent"
+        android:textColor="@color/white"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="0.00001dp"
+    android:visibility="invisible">
+
+</android.support.constraint.ConstraintLayout>