Эх сурвалжийг харах

1.修改Android Apex Drivers Home渐变色。

Pen Li 7 жил өмнө
parent
commit
441db5d0e0
20 өөрчлөгдсөн 119 нэмэгдсэн , 24 устгасан
  1. 2 0
      ApexDrivers/app/src/main/AndroidManifest.xml
  2. 4 1
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/MainActivity.java
  3. 56 0
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/base/BasicActivity.java
  4. 2 1
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/detail/DetailActivity.java
  5. 2 1
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/filter/OrderFilterActivity.java
  6. 2 1
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/home/HomeMoreActivity.java
  7. 4 0
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/home/HomeOrderModel.java
  8. 2 1
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/message/MessageActivity.java
  9. 2 1
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/setting/SettingActivity.java
  10. 2 1
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/setting/option/OptionActivity.java
  11. 2 1
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/signature/SignatureActivity.java
  12. 2 1
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/update/PhotoPreviewActivity.java
  13. 2 1
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/update/UpdateActivity.java
  14. 2 1
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/upload/UploadListActivity.java
  15. 9 0
      ApexDrivers/app/src/main/res/drawable/gradient_color.xml
  16. 10 0
      ApexDrivers/app/src/main/res/layout/activity_basic.xml
  17. 7 7
      ApexDrivers/app/src/main/res/layout/home_header_view.xml
  18. 3 3
      ApexDrivers/app/src/main/res/layout/home_order_cell.xml
  19. 1 0
      ApexDrivers/app/src/main/res/values/colors.xml
  20. 3 3
      ApexDrivers/app/src/main/res/values/styles.xml

+ 2 - 0
ApexDrivers/app/src/main/AndroidManifest.xml

@@ -134,6 +134,8 @@
         </activity>
         <activity android:name=".setting.option.OptionActivity">
         </activity>
+        <activity android:name=".base.BasicActivity">
+        </activity>
     </application>
 
 </manifest>

+ 4 - 1
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/MainActivity.java

@@ -22,8 +22,10 @@ import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.RelativeLayout;
 
+import com.usai.redant.apexdrivers.base.BasicActivity;
 import com.usai.redant.apexdrivers.home.HomeFragment;
 import com.usai.redant.apexdrivers.login.LoginFragment;
 import com.usai.redant.apexdrivers.network.Network;
@@ -32,7 +34,7 @@ import com.usai.redant.rautils.utils.RAUtil;
 import com.usai.redant.rautils.utils.dbgUtil;
 
 
-public class MainActivity extends AppCompatActivity implements LoginFragment.LoginCallBack {
+public class MainActivity extends BasicActivity implements LoginFragment.LoginCallBack {
 
     private RelativeLayout mRootContainer;
     private final static String FragmentTag = "ContentFragmentTag";
@@ -130,6 +132,7 @@ public class MainActivity extends AppCompatActivity implements LoginFragment.Log
 
         Test();
     }
+
     void checkPowerManagement()
     {
         Intent intent = new Intent();

+ 56 - 0
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/base/BasicActivity.java

@@ -0,0 +1,56 @@
+package com.usai.redant.apexdrivers.base;
+
+import android.os.Looper;
+import android.os.MessageQueue;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+
+import com.usai.redant.apexdrivers.R;
+
+public class BasicActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+//        setContentView(R.layout.activity_basic);
+
+//        Looper.myQueue().addIdleHandler(new MessageQueue.IdleHandler() {
+//            @Override
+//            public boolean queueIdle() {
+//                if (true) {
+//                    initStatusBar();
+//                    getWindow().getDecorView().addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+//                        @Override
+//                        public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+//                            initStatusBar();
+//                        }
+//                    });
+//                }
+//                return false;
+//            }
+//        });
+
+        getWindow().getDecorView().addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+            @Override
+            public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                initStatusBar();
+            }
+        });
+
+    }
+
+
+    private void initStatusBar() {
+        View statusBarView = null;
+        if (statusBarView == null) {
+            //android系统级的资源id得这么拿,不然拿不到
+            int identifier = getResources().getIdentifier("statusBarBackground", "id", "android");
+            statusBarView = getWindow().findViewById(identifier);
+        }
+        if (statusBarView != null) {
+            statusBarView.setBackgroundResource(R.drawable.gradient_color);
+        }
+    }
+}

+ 2 - 1
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/detail/DetailActivity.java

@@ -31,6 +31,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.usai.redant.apexdrivers.ApexDriverApplication;
+import com.usai.redant.apexdrivers.base.BasicActivity;
 import com.usai.redant.apexdrivers.detail.model.DetailActionSelectionModel;
 import com.usai.redant.apexdrivers.detail.model.DetailLocationModel;
 import com.usai.redant.apexdrivers.detail.model.DetailSubActionModel;
@@ -55,7 +56,7 @@ import static com.usai.redant.apexdrivers.detail.model.DetailSubActionModel.Deta
 import static com.usai.redant.apexdrivers.detail.model.DetailSubActionModel.DetailActionSubType.DetailActionSubTypeUpdate;
 import static com.usai.redant.rautils.utils.Network.RESULT_TRUE;
 
-public class DetailActivity extends AppCompatActivity implements DetailAdapter.DetailActionDelegate {
+public class DetailActivity extends BasicActivity implements DetailAdapter.DetailActionDelegate {
 
 
     private final static String IntentOrderIDKey = "orderID";

+ 2 - 1
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/filter/OrderFilterActivity.java

@@ -14,6 +14,7 @@ import android.widget.ExpandableListView;
 import android.widget.RelativeLayout;
 
 import com.usai.redant.apexdrivers.R;
+import com.usai.redant.apexdrivers.base.BasicActivity;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -23,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-public class OrderFilterActivity extends AppCompatActivity {
+public class OrderFilterActivity extends BasicActivity {
 
     private static final String OrderFilterKey = "OrderFilterKey";
     private static final String OrderFilterSavedKey = "OrderFilterSavedKey";

+ 2 - 1
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/home/HomeMoreActivity.java

@@ -24,6 +24,7 @@ import android.widget.BaseAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.usai.redant.apexdrivers.base.BasicActivity;
 import com.usai.redant.apexdrivers.detail.DetailActivity;
 import com.usai.redant.apexdrivers.filter.OrderFilterActivity;
 import com.usai.redant.apexdrivers.R;
@@ -39,7 +40,7 @@ import java.util.ArrayList;
 import static com.usai.redant.rautils.utils.RAUtil.dp2px;
 import static com.usai.redant.rautils.utils.RAUtil.sp2px;
 
-public class HomeMoreActivity extends AppCompatActivity implements AbsListView.OnScrollListener {
+public class HomeMoreActivity extends BasicActivity implements AbsListView.OnScrollListener {
 
     private final static String OrderTypeKey = "OrderTypeKey";
     private final static String TitleKey = "TitleKey";

+ 4 - 0
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/home/HomeOrderModel.java

@@ -68,6 +68,10 @@ public class HomeOrderModel {
 //                    String url = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1535609923557&di=ae4e880ba67797a64ccb8336f5fdee3f&imgtype=0&src=http%3A%2F%2Fpic48.nipic.com%2F20140909%2F6608733_105101600000_2.jpg";
                     Bitmap bitmap = ImageUtil.loadImageFromURL(mCtx,new URI(iconURL));
 
+                    final float scale = mCtx.getResources().getDisplayMetrics().density;
+                    int size = (int) (60 * scale);
+                    bitmap = Bitmap.createScaledBitmap(bitmap, size, size, true);
+
                     return bitmap;
 
                 } catch (Exception e) {

+ 2 - 1
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/message/MessageActivity.java

@@ -24,6 +24,7 @@ import android.widget.TextView;
 
 import com.usai.redant.apexdrivers.ApexDriverApplication;
 import com.usai.redant.apexdrivers.R;
+import com.usai.redant.apexdrivers.base.BasicActivity;
 import com.usai.redant.apexdrivers.detail.DetailActivity;
 import com.usai.redant.apexdrivers.message.model.MessageModel;
 import com.usai.redant.apexdrivers.network.Network;
@@ -39,7 +40,7 @@ import java.util.ArrayList;
 import static com.usai.redant.rautils.utils.RAUtil.dp2px;
 import static com.usai.redant.rautils.utils.RAUtil.sp2px;
 
-public class MessageActivity extends AppCompatActivity implements AbsListView.OnScrollListener {
+public class MessageActivity extends BasicActivity implements AbsListView.OnScrollListener {
 
     public static void startMessageActivity(Context context) {
         if (context == null) {

+ 2 - 1
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/setting/SettingActivity.java

@@ -14,6 +14,7 @@ import android.widget.Toast;
 
 import com.usai.redant.apexdrivers.ApexDriverApplication;
 import com.usai.redant.apexdrivers.R;
+import com.usai.redant.apexdrivers.base.BasicActivity;
 import com.usai.redant.apexdrivers.network.Network;
 import com.usai.redant.apexdrivers.setting.changepassword.ChangePasswordDialog;
 import com.usai.redant.apexdrivers.setting.model.ActionModel;
@@ -30,7 +31,7 @@ import org.json.JSONObject;
 import java.io.File;
 import java.util.ArrayList;
 
-public class SettingActivity extends AppCompatActivity implements SettingAdapter.SettingAdapterDelegate {
+public class SettingActivity extends BasicActivity implements SettingAdapter.SettingAdapterDelegate {
 
     public static void startSettingActivity(Context context) {
         if (context == null) {

+ 2 - 1
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/setting/option/OptionActivity.java

@@ -17,6 +17,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.usai.redant.apexdrivers.R;
+import com.usai.redant.apexdrivers.base.BasicActivity;
 import com.usai.redant.apexdrivers.setting.model.SettingOption;
 
 import org.json.JSONArray;
@@ -25,7 +26,7 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-public class OptionActivity extends AppCompatActivity {
+public class OptionActivity extends BasicActivity {
 
     private static final String OptionsKey = "OptionsKey";
     public static final String SelectedKey = "SelectedKey";

+ 2 - 1
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/signature/SignatureActivity.java

@@ -11,6 +11,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 
 import com.usai.redant.apexdrivers.R;
+import com.usai.redant.apexdrivers.base.BasicActivity;
 import com.usai.redant.rautils.utils.FileManager;
 import com.usai.redant.rautils.utils.ImageUtil;
 import com.usai.redant.rautils.utils.RAUtil;
@@ -20,7 +21,7 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-public class SignatureActivity extends AppCompatActivity {
+public class SignatureActivity extends BasicActivity {
 
     public static void startSignature(Activity context,int requestCode) {
 

+ 2 - 1
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/update/PhotoPreviewActivity.java

@@ -10,13 +10,14 @@ import android.view.Menu;
 import android.view.MenuItem;
 
 import com.usai.redant.apexdrivers.R;
+import com.usai.redant.apexdrivers.base.BasicActivity;
 import com.usai.redant.apexdrivers.update.xuanimageview.XuanImageView;
 import com.usai.redant.apexdrivers.update.xuanimageview.XuanImageViewSettings;
 import com.usai.redant.rautils.utils.ImageUtil;
 
 import java.io.File;
 
-public class PhotoPreviewActivity extends AppCompatActivity {
+public class PhotoPreviewActivity extends BasicActivity {
 
     public final static String PreviewActionDeleteKey = "delete";
 

+ 2 - 1
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/update/UpdateActivity.java

@@ -30,6 +30,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.usai.redant.apexdrivers.ApexDriverApplication;
+import com.usai.redant.apexdrivers.base.BasicActivity;
 import com.usai.redant.apexdrivers.codescanner.CaptureActivity;
 import com.usai.redant.apexdrivers.home.HomeFragment;
 import com.usai.redant.apexdrivers.MainActivity;
@@ -62,7 +63,7 @@ import java.util.Objects;
 
 import static com.usai.redant.rautils.utils.Network.RESULT_TRUE;
 
-public class UpdateActivity extends AppCompatActivity implements UpdateAdapter.UpdateAdapterDelegate {
+public class UpdateActivity extends BasicActivity implements UpdateAdapter.UpdateAdapterDelegate {
 
     private final static String OrderIDKey = "OrderID";
     private final static String ActionIDKey = "ActionID";

+ 2 - 1
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/upload/UploadListActivity.java

@@ -26,13 +26,14 @@ import android.widget.TextView;
 
 import com.usai.redant.apexdrivers.ApexDriversBackgroundService;
 import com.usai.redant.apexdrivers.R;
+import com.usai.redant.apexdrivers.base.BasicActivity;
 import com.usai.redant.rautils.upload.RAUploadManager;
 
 
 import java.util.ArrayList;
 
 
-public class UploadListActivity extends AppCompatActivity {
+public class UploadListActivity extends BasicActivity {
 
 
     private ArrayList<Bundle> displaylist = new ArrayList<Bundle>();

+ 9 - 0
ApexDrivers/app/src/main/res/drawable/gradient_color.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <gradient
+        android:angle="45"
+        android:endColor="@color/ApexDriverOrangeWhiteColor"
+        android:startColor="@color/ApexDriverOrange" />
+
+</shape>

+ 10 - 0
ApexDrivers/app/src/main/res/layout/activity_basic.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=".base.BasicActivity">
+
+</android.support.constraint.ConstraintLayout>

+ 7 - 7
ApexDrivers/app/src/main/res/layout/home_header_view.xml

@@ -2,7 +2,7 @@
 <com.usai.redant.apexdrivers.home.HomeHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-    android:background="@color/ApexDriverOrange"
+    android:background="@drawable/gradient_color"
     >
 
     <LinearLayout
@@ -41,7 +41,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:textAlignment="center"
-                    android:textSize="20sp"
+                    android:textSize="17sp"
                     android:textColor="@color/ApexDriverWhite"
                     android:text="0"
                     />
@@ -50,7 +50,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:textAlignment="center"
-                    android:textSize="20sp"
+                    android:textSize="17sp"
                     android:textColor="@color/ApexDriverWhite"
                     android:text="New"
                     />
@@ -84,7 +84,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:textAlignment="center"
-                    android:textSize="20sp"
+                    android:textSize="17sp"
                     android:textColor="@color/ApexDriverWhite"
                     android:text="0"
                     />
@@ -93,7 +93,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:textAlignment="center"
-                    android:textSize="20sp"
+                    android:textSize="17sp"
                     android:textColor="@color/ApexDriverWhite"
                     android:text="Processing"
                     />
@@ -127,7 +127,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:textAlignment="center"
-                    android:textSize="20sp"
+                    android:textSize="17sp"
                     android:textColor="@color/ApexDriverWhite"
                     android:text="0"
                     />
@@ -136,7 +136,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:textAlignment="center"
-                    android:textSize="20sp"
+                    android:textSize="17sp"
                     android:textColor="@color/ApexDriverWhite"
                     android:text="Finished"
                     />

+ 3 - 3
ApexDrivers/app/src/main/res/layout/home_order_cell.xml

@@ -24,7 +24,7 @@
         <TextView
             android:id="@+id/title_tv"
             android:layout_width="match_parent"
-            android:layout_height="20dp"
+            android:layout_height="25dp"
             android:layout_margin="5dp"
             android:layout_toLeftOf="@id/order_mark_view"
             android:textSize="17sp"
@@ -41,8 +41,8 @@
 
             <ImageView
                 android:id="@+id/status_view"
-                android:layout_width="70dp"
-                android:layout_height="70dp"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
                 android:layout_marginLeft="5dp"
                 android:layout_marginRight="5dp"
                 android:layout_centerVertical="true"

+ 1 - 0
ApexDrivers/app/src/main/res/values/colors.xml

@@ -23,5 +23,6 @@
     <color name="ApexDriverOrange">#EC6C23</color>
     <color name="ApexDriverGray">#4f5356</color>
     <color name="ApexDriverWhite">#ffffff</color>
+    <color name="ApexDriverOrangeWhiteColor">#ff5555</color>
 
 </resources>

+ 3 - 3
ApexDrivers/app/src/main/res/values/styles.xml

@@ -29,7 +29,7 @@
 
         <item name="colorPrimary">@color/ApexDriverOrange</item> <!--Action Bar-->
 
-        <item name="colorPrimaryDark">@color/ApexDriverOrange</item> <!--Status Bar-->
+        <item name="colorPrimaryDark">@color/ApexDriverOrangeWhiteColor</item> <!--Status Bar-->
 
         <!--Title Color 包括Dialog字体颜色-->
         <!--<item name="android:textColorPrimary">@color/ApexDriverWhite</item>-->
@@ -51,12 +51,12 @@
     </style>
 
     <style name="MyActionBar" parent="@style/Widget.AppCompat.ActionBar">
-        <item name="android:background">@color/ApexDriverOrange</item>
+        <item name="android:background">@drawable/gradient_color</item>
         <item name="android:titleTextStyle">@style/MyActionBarTitleText</item>
         <item name="android:backgroundStacked">@color/ApexDriverOrange</item>
 
         <!-- Support library compatibility -->
-        <item name="background">@color/ApexDriverOrange</item>
+        <item name="background">@drawable/gradient_color</item>
         <item name="titleTextStyle">@style/MyActionBarTitleText</item>
         <item name="backgroundStacked">@color/ApexDriverOrange</item>
     </style>