فهرست منبع

2017-6-10-12:12报销单 “新增”按钮 逻辑初步完成OA报销单红点加上

FANGLH 8 سال پیش
والد
کامیت
4bfd36fb38

+ 7 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ExpenseReimbursementActivity.java

@@ -1,11 +1,13 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Gravity;
@@ -40,7 +42,7 @@ import com.xzjmyk.pm.activity.view.SquareCenterImageView;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-
+@TargetApi(Build.VERSION_CODES.CUPCAKE)
 /**
  * Created by FANGlh on 2017/6/9.
  * function:
@@ -133,7 +135,10 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
     private void closePopupWindow() {
         if (setWindow != null)
             setWindow.dismiss();
-        DisplayUtil.backgroundAlpha(this, 1f);
+        int VERSION_CODES = android.os.Build.VERSION.SDK_INT;
+//        if (VERSION_CODES  < 24){
+            DisplayUtil.backgroundAlpha(this, 1f);
+//        }
     }
     private void initPopupWindow() {
         View viewContext = LayoutInflater.from(ct).inflate(R.layout.expense_details_menu, null);

+ 1 - 2
WeiChat/src/main/res/layout/expense_details_menu.xml

@@ -26,7 +26,7 @@
                 android:paddingLeft="15dp"
                 android:paddingTop="5dp"
                 android:paddingBottom="5dp"
-                android:numColumns="4">
+                android:numColumns="3">
             </com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView>
 
             <LinearLayout
@@ -46,7 +46,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
                     android:layout_marginRight="20dp"
-                    android:layout_marginTop="10dp"
                     android:background="@drawable/bg_bule_btn"
                     android:padding="10dp"
                     android:text="@string/common_sure"

+ 1 - 1
WeiChat/src/main/res/values-en/strings.xml

@@ -1381,7 +1381,7 @@
     <string name="Consumer_details">Consumer details</string>
     <string name="Add_invoice">Add invoice</string>
     <string name="Results_of_scan">Results</string>
-    <string name="Expense_reimbursement">Expense reimbursement</string>
+    <string name="Expense_reimbursement">Expense Reimbursement</string>
     <string name="RMB">RMB</string>
     <string name="currency">currency</string>
 </resources>