提交类型 修复bug

提交内容  修改会议出现两个情况

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerManageActivity.java

@@ -5,13 +5,23 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.text.Html;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
+import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.TextUtil;
+import com.common.system.DisplayUtil;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 import com.core.app.Constants;
 import com.core.base.OABaseActivity;
 import com.core.widget.MyListView;
@@ -19,12 +29,16 @@ import com.core.widget.view.MyGridView;
 import com.modular.apputils.activity.BillInputActivity;
 import com.modular.apputils.adapter.EasyBaseAdapter;
 import com.modular.apputils.model.EasyBaseModel;
+import com.uas.appworks.CRM.erp.activity.TaskAddErpActivity;
+import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;
 import com.uas.appworks.R;
 import com.uas.appworks.presenter.CustomerManagePresenter;
 import com.uas.appworks.presenter.imp.ICustomerManage;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class CustomerManageActivity extends OABaseActivity implements ICustomerManage {
     private MyGridView addGridView;
@@ -53,6 +67,22 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
     private CustomerListAdapter mCustomerCareAdapter;//客户关怀适配器
     private EasyBaseAdapter mVisitAdapter;//拜访记录
 
+    private  PopupWindow menuPopWindow;
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_add_icon, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId()==R.id.add_item){
+            showPopupWindow(getWindow().findViewById(R.id.add_item));
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -132,6 +162,59 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
     }
 
 
+    public void showPopupWindow(View parent) {
+        if (menuPopWindow == null) {
+            LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            View view = layoutInflater.inflate(R.layout.pop_crm_list, null);
+            ListView plist =  view.findViewById(R.id.mList);
+            SimpleAdapter adapter = new SimpleAdapter(ct, getPopData(),
+                    R.layout.item_pop_list, new String[]{"item_name"}, new int[]{R.id.tv_item_name});
+            plist.setAdapter(adapter);
+            plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                @Override
+                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                    if(menuPopWindow!=null){
+                        menuPopWindow.dismiss();
+                    }
+                }
+            });
+            menuPopWindow =new PopupWindow(view);
+            menuPopWindow.setWidth(DisplayUtil.dip2px(ct,140));
+            menuPopWindow.setHeight(DisplayUtil.dip2px(ct,135));
+        }
+        // 使其聚集
+        menuPopWindow.setFocusable(true);
+        // 设置允许在外点击消失
+        menuPopWindow.setOutsideTouchable(true);
+        menuPopWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                DisplayUtil.backgroundAlpha(ct, 1f);
+            }
+        });
+        DisplayUtil.backgroundAlpha(this, 0.5f);
+        // 这个是为了点击“返回Back”也能使其消失，并且并不会影响你的背景
+        menuPopWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.top_bubble));
+        // 显示的位置为:屏幕的宽度的一半-PopupWindow的高度的一半
+        menuPopWindow.showAsDropDown(parent, -DisplayUtil.dip2px(ct,50), 0);
+    }
+    private List<Map<String, Object>> getPopData() {
+        List<Map<String, Object>> list = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        if (getIntent() == null || getIntent().getIntExtra("type", 0) != 1) {
+            map.put("item_name", getString(R.string.oacreat_task));
+            list.add(map);
+            map = new HashMap<>();
+            map.put("item_name", getString(R.string.oacreat_calender));
+            list.add(map);
+            map = new HashMap<>();
+        }
+        map.put("item_name", getString(R.string.crm_add_visitrecord));
+        list.add(map);
+        return list;
+    }
+
+
     private List<EasyBaseModel> getAddItems() {
         List<EasyBaseModel> models = new ArrayList<>();
 //        models.add(new EasyBaseModel().setTitle("新建客户").setIconId(R.drawable.icon_customer_manage_add));

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/fragment/CustomerListDetailsFragment.java

@@ -198,6 +198,8 @@ public class CustomerListDetailsFragment extends BaseNetFragment {
                     listFields.addAll(groupModel.getBillFields());
                 }
             }
+            LogUtil.i("gong","listFields="+ListUtils.getSize(listFields));
+
         }
 
 
@@ -208,7 +210,9 @@ public class CustomerListDetailsFragment extends BaseNetFragment {
 
         @Override
         public int getItemCount() {
-            return ListUtils.getSize(listFields);
+            int mItemCount=ListUtils.getSize(listFields);
+            LogUtil.i("gong","mItemCount="+mItemCount);
+            return mItemCount;
         }
 
         class ViewHolder extends RecyclerView.ViewHolder {

app_modular/appworks/src/main/res/drawable/ic_customer_list.xml

@@ -1,22 +1,22 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="15dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportHeight="13"
     android:viewportWidth="16">
     <path
-        android:fillColor="@color/color_public_inquiry_quote"
+        android:fillColor="#878787"
         android:fillType="evenOdd"
         android:pathData="M1.5,0L14.5,0A1.5,1.5 0,0 1,16 1.5L16,1.5A1.5,1.5 0,0 1,14.5 3L1.5,3A1.5,1.5 0,0 1,0 1.5L0,1.5A1.5,1.5 0,0 1,1.5 0z"
         android:strokeColor="#00000000"
         android:strokeWidth="1" />
     <path
-        android:fillColor="@color/color_public_inquiry_quote"
+        android:fillColor="#878787"
         android:fillType="evenOdd"
         android:pathData="M1.5,5L14.5,5A1.5,1.5 0,0 1,16 6.5L16,6.5A1.5,1.5 0,0 1,14.5 8L1.5,8A1.5,1.5 0,0 1,0 6.5L0,6.5A1.5,1.5 0,0 1,1.5 5z"
         android:strokeColor="#00000000"
         android:strokeWidth="1" />
     <path
-        android:fillColor="@color/color_public_inquiry_quote"
+        android:fillColor="#878787"
         android:fillType="evenOdd"
         android:pathData="M1.5,10L14.5,10A1.5,1.5 0,0 1,16 11.5L16,11.5A1.5,1.5 0,0 1,14.5 13L1.5,13A1.5,1.5 0,0 1,0 11.5L0,11.5A1.5,1.5 0,0 1,1.5 10z"
         android:strokeColor="#00000000"

app_modular/appworks/src/main/res/layout/activity_customer_list_3_0.xml

@@ -1,16 +1,19 @@
 <?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"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:orientation="vertical"
     android:layout_height="match_parent">
-
+    <FrameLayout
+        android:id="@+id/customerFl"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
     <com.modular.apputils.widget.DivideRadioGroup
         android:id="@+id/tabBottomRg"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/white"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent">
+        android:orientation="horizontal">
 
         <RadioButton
             android:id="@+id/customerListRb"
@@ -19,6 +22,7 @@
             android:layout_weight="1"
             android:button="@null"
             android:checked="true"
+            android:drawableTop="@drawable/ic_customer_list"
             android:gravity="center"
             android:padding="@dimen/padding"
             android:text="客户列表"
@@ -44,14 +48,7 @@
 
     </com.modular.apputils.widget.DivideRadioGroup>
 
-    <FrameLayout
-        android:id="@+id/customerFl"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/tabBottomRg"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 
 
-</android.support.constraint.ConstraintLayout>
+
+</LinearLayout>

app_modular/appworks/src/main/res/layout/activity_customer_manage.xml

@@ -68,7 +68,8 @@
                 android:layout_width="19dp"
                 android:layout_height="19dp"
                 android:layout_alignParentRight="true"
-                android:src="@drawable/oa_next" />
+                android:layout_centerVertical="true"
+                android:src="@drawable/ic_business_refresh" />
 
             <TextView
                 android:id="@+id/showCustomerRefTimeTv"
@@ -77,6 +78,7 @@
                 android:layout_toLeftOf="@id/showCustomerRefIv"
                 android:text="2018-09-23 17:45"
                 android:textColor="#FF666666"
+                android:layout_centerVertical="true"
                 android:textSize="12sp" />
         </RelativeLayout>
         <!--end 客户看板-->
@@ -99,6 +101,7 @@
             <TextView
                 android:id="@+id/forgetCustomerTv"
                 android:layout_width="wrap_content"
+                android:visibility="visible"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentRight="true"
@@ -125,12 +128,14 @@
                 android:id="@+id/forgetCustomerRefIv"
                 android:layout_width="19dp"
                 android:layout_height="19dp"
+                android:layout_centerVertical="true"
                 android:layout_alignParentRight="true"
-                android:src="@drawable/oa_next" />
+                android:src="@drawable/ic_business_refresh" />
 
             <TextView
                 android:id="@+id/forgetCustomerRefTimeTv"
                 android:layout_width="wrap_content"
+                android:layout_centerVertical="true"
                 android:layout_height="wrap_content"
                 android:layout_toLeftOf="@id/forgetCustomerRefIv"
                 android:text="2018-09-23 17:45"
@@ -185,11 +190,13 @@
                 android:layout_width="19dp"
                 android:layout_height="19dp"
                 android:layout_alignParentRight="true"
-                android:src="@drawable/oa_next" />
+                android:layout_centerVertical="true"
+                android:src="@drawable/ic_business_refresh" />
 
             <TextView
                 android:id="@+id/customerCareRefTimeTv"
                 android:layout_width="wrap_content"
+                android:layout_centerVertical="true"
                 android:layout_height="wrap_content"
                 android:layout_toLeftOf="@id/customerCareRefIv"
                 android:text="2018-09-23 17:45"
@@ -244,12 +251,14 @@
                 android:layout_width="19dp"
                 android:layout_height="19dp"
                 android:layout_alignParentRight="true"
-                android:src="@drawable/oa_next" />
+                android:layout_centerVertical="true"
+                android:src="@drawable/ic_business_refresh" />
 
             <TextView
                 android:id="@+id/visitRefTimeTv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
                 android:layout_toLeftOf="@id/visitRefIv"
                 android:text="2018-09-23 17:45"
                 android:textColor="#FF666666"