FANGLH 9 лет назад
Родитель
Сommit
cf39b85fd0

+ 95 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -1,17 +1,27 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Parcelable;
+import android.text.Editable;
 import android.text.Html;
+import android.text.Selection;
 import android.text.TextUtils;
+import android.util.DisplayMetrics;
 import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.PopupWindow;
+import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -41,6 +51,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -629,10 +640,11 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         if (requestCode == 0x22 && resultCode == 0x20) {
             SelectAimModel model = data.getParcelableExtra("data");
             LogUtil.d(JSON.toJSONString(model));
-            String address = model.getAddress();
-            String name = model.getName();
-            tv_customer_login.setText(name);
-            tv_address_login.setText(address);
+            doEditShortName(model); //编辑地址简称
+//            String address = model.getAddress();
+//            String name = model.getName();
+//            tv_customer_login.setText(name);
+//            tv_address_login.setText(address);
 //            SelectBean b = data.getParcelableExtra("data");
 //            if (b == null || StringUtils.isEmpty(b.getJson())) return;
 //            JsonValidator validator = new JsonValidator();
@@ -690,6 +702,85 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         }
     }
 
+    private TextView title_tv;
+    private PopupWindow popupWindow = null;
+    private void doEditShortName(final SelectAimModel model) {
+        // 一个自定义的布局,作为显示的内容
+        View contentView = LayoutInflater.from(ct).inflate(
+                R.layout.item_select_aim_pop, null);
+
+        // 设置按钮的点击事件
+        final EditText company_et = (EditText) contentView.findViewById(R.id.company_et);
+        TextView address_tv = (TextView) contentView.findViewById(R.id.address_tv);
+        title_tv = (TextView) contentView.findViewById(R.id.title_tv);
+        title_tv.setText("完善客户地址名称");
+        company_et.setText(model.getName());
+        address_tv.setText("客户地址: " + model.getAddress());
+        Editable etext = company_et.getText();
+        Selection.setSelection(etext, etext.length());
+        DisplayMetrics dm = getResources().getDisplayMetrics();
+        int w_screen = dm.widthPixels;
+        int h_screen = dm.heightPixels;
+        w_screen = DisplayUtil.dip2px(this, 300);
+        h_screen = DisplayUtil.dip2px(this, 185);
+
+        contentView.findViewById(R.id.goto_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                tv_customer_login.setText(model.getName() + "");
+                tv_address_login.setText(model.getAddress() + "");
+                popupWindow.dismiss();
+            }
+        });
+        contentView.findViewById(R.id.sure_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String com = company_et.getText().toString();
+                if (!StringUtils.isEmpty(com)) {
+                    tv_customer_login.setText(com);
+                } else {
+                    tv_customer_login.setText(model.getName() + "");
+                }
+                tv_address_login.setText(model.getAddress());
+                popupWindow.dismiss();
+            }
+        });
+        popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
+        popupWindow.setTouchable(true);
+        popupWindow.setOutsideTouchable(false);
+        // 如果不设置PopupWindow的背景,无论是点击外部区域还是Back键都无法dismiss弹框
+        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_main));
+        // 设置好参数之后再show
+        popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
+        setbg(0.4f);
+    }
+    private void setbg(float alpha) {
+        setBackgroundAlpha(this, alpha);
+        if (popupWindow == null) return;
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                setBackgroundAlpha(VisitReportAddActivity.this, 1f);
+            }
+        });
+    }
+
+    /**
+     * 设置页面的透明度
+     * 兼容华为手机(在个别华为手机上 设置透明度会不成功)
+     *
+     * @param bgAlpha 透明度   1表示不透明
+     */
+    public void setBackgroundAlpha(Activity activity, float bgAlpha) {
+        WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+        lp.alpha = bgAlpha;
+        if (bgAlpha == 1) {
+            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//不移除该Flag的话,在有视频的页面上的视频会出现黑屏的bug
+        } else {
+            activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//此行代码主要是解决在华为手机上半透明效果无效的bug
+        }
+        activity.getWindow().setAttributes(lp);
+    }
 
     private void showDateDialog(final FormEditText tv) {
         DateTimePicker picker = new DateTimePicker(this, DateTimePicker.HOUR_OF_DAY);

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddFlihtsActivity.java

@@ -159,7 +159,7 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
                 break;
             case R.id.calender_select_ll:
                 //TODO 进入修改班次的考勤日期选择,跳日历界面
-                ToastMessage("进入修改班次的考勤日期选择,跳日历界面");
+//                ToastMessage("进入修改班次的考勤日期选择,跳日历界面");
                 startActivity(new Intent(getApplicationContext(),FlihtsDateSelectActivity.class));
                 break;
         }

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/OfficeAddressSettingsActivity.java

@@ -639,7 +639,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
         popupWindow.setTouchable(true);
         popupWindow.setOutsideTouchable(false);
         // 如果不设置PopupWindow的背景,无论是点击外部区域还是Back键都无法dismiss弹框
-//        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_main));
+        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_main));
         // 设置好参数之后再show
         popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
         setbg(0.4f);
@@ -763,7 +763,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
                                         finalViewHolder.office_address_delete_im.setEnabled(false);
                                         if (mPosition < listdada_size) {
                                             doDeleteAddress(mPosition);
-                                            finalViewHolder.office_address_delete_im.setEnabled(true);
+//                                            finalViewHolder.office_address_delete_im.setEnabled(true);
                                         } else {
                                             if (mPosition < address_names.size()) {
                                                 address_names.remove(mPosition);
@@ -773,7 +773,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
                                                 address_id.remove(mPosition);
                                                 myadapter.notifyDataSetChanged();
                                                 progressDialog.dismiss();
-                                                finalViewHolder.office_address_delete_im.setEnabled(true);
+//                                                finalViewHolder.office_address_delete_im.setEnabled(true);
                                             }
 
                                         }

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/newpedo/view/NewStepActivity.java

@@ -44,7 +44,7 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
     private TextView stepsTimeTv;
     private TextView totalStepsTv;
     private TextView supportTv;
-    public static String UU_STEP_NOTICE = "UUSTEPNOTICE";
+//    public static String UU_STEP_NOTICE = "UUSTEPNOTICE";
     /**
      * 屏幕长度和宽度
      */

+ 1 - 1
WeiChat/src/main/res/layout/activity_add_flihts.xml

@@ -101,7 +101,7 @@
             <ImageView
                 android:layout_width="30dp"
                 android:layout_height="30dp"
-                android:background="@drawable/uuu"
+                android:background="@drawable/icon_date_nor"
                 />
         </LinearLayout>
         <TextView

+ 1 - 1
WeiChat/src/main/res/layout/flihts_calendar_select.xml

@@ -9,7 +9,7 @@
         android:background="#c9e2fd"
         android:layout_width="match_parent"
         android:layout_height="30dp"
-        android:text="休息"
+        android:text="班次显示"
         android:gravity="center"
         android:textSize="17sp"
         android:layout_marginTop="150dp"

+ 1 - 1
WeiChat/src/main/res/layout/flihts_listview.xml

@@ -44,7 +44,7 @@
                android:text="休息"
                android:gravity="center"
                android:textSize="17sp"
-               android:layout_marginTop="5dp"
+               android:layout_marginTop="10dp"
                android:layout_marginBottom="10dp"
                />
        </LinearLayout>

+ 1 - 1
WeiChat/src/main/res/layout/item_flihts.xml

@@ -9,8 +9,8 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:background="#c9e2fd"
-    android:paddingTop="5dp"
     android:paddingBottom="5dp"
+    android:layout_marginTop="10dp"
     >
     <TextView
         android:id="@+id/item_comdoc_am_list_tv"