Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sat Oct 13 17:08:49 CST 2018
-debugName=901
+#Mon Oct 15 14:16:50 CST 2018
+debugName=916
 versionName=651
-debugCode=901
+debugCode=916
 versionCode=191

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

@@ -44,6 +44,7 @@ public class ContactsListActivity extends BaseActivity implements  ContactsLocal
      private ContactsListFragment fragmentMeList,fragmentCusList;
      private LocalContactsListFragment localContactsListFragment;
      private MenuVoiceSearchView mVoiceSearchView;
+    
      
      
 

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/adapter/ContactLocalSortAdapter.java

@@ -5,13 +5,15 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.SectionIndexer;
 import android.widget.TextView;
 
 import com.common.data.StringUtil;
 import com.common.system.SystemUtil;
-import com.core.utils.NotifyUtils;
+import com.core.app.MyApplication;
+import com.core.utils.ToastUtil;
 import com.core.utils.sortlist.BaseSortModel;
 import com.core.utils.sortlist.PingYinUtil;
 import com.uas.appcontact.model.contacts.ContactsModel;
@@ -34,6 +36,15 @@ public class ContactLocalSortAdapter extends BaseAdapter implements SectionIndex
     private boolean isRefeshed;
     private Map<Integer, String> isLog;
 
+    private FrameLayout frameLayout;
+
+    public FrameLayout getFrameLayout() {
+        return frameLayout;
+    }
+
+    public void setFrameLayout(FrameLayout frameLayout) {
+        this.frameLayout = frameLayout;
+    }
 
     public ContactLocalSortAdapter(Context context, List<BaseSortModel<ContactsModel>> sortFriends) {
         mContext = context;
@@ -112,10 +123,12 @@ public class ContactLocalSortAdapter extends BaseAdapter implements SectionIndex
                     if (matcher.matches()) {
                         SystemUtil.phoneAction(mContext, model.getPhone());
                     } else {
-                        NotifyUtils.ToastMessage(mContext,mContext.getString(R.string.not_format_phone));
+                      //  NotifyUtils.ToastMessage(mContext,mContext.getString(R.string.not_format_phone));
+                        ToastUtil.showToast(MyApplication.getInstance(),mContext.getString(R.string.not_format_phone));
                     }
                 } else {
-                    NotifyUtils.ToastMessage(mContext,mContext.getString(R.string.not_phone));
+                   // NotifyUtils.ToastMessage(mContext,mContext.getString(R.string.not_phone));
+                    ToastUtil.showToast(MyApplication.getInstance(),mContext.getString(R.string.not_format_phone));
                 }
             }
         });

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/adapter/ContactSortAdapter.java

@@ -1,18 +1,20 @@
 package com.uas.appworks.crm3_0.adapter;
 
 import android.app.Activity;
-import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.SectionIndexer;
 import android.widget.TextView;
 
 import com.common.data.StringUtil;
 import com.common.system.SystemUtil;
-import com.core.utils.NotifyUtils;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.utils.ToastUtil;
 import com.core.utils.sortlist.BaseSortModel;
 import com.uas.appworks.R;
 import com.uas.appworks.crm3_0.model.ContactsBean;
@@ -29,13 +31,22 @@ import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 
 public class ContactSortAdapter extends BaseAdapter implements SectionIndexer, StickyListHeadersAdapter {
 
-    private Context mContext;
+    private BaseActivity mContext;
     private List<BaseSortModel<ContactsBean>> mSortFriends;
     private boolean isRefeshed;
     private Map<Integer, String> isLog;
+    
+    private FrameLayout frameLayout;
+
+    public FrameLayout getFrameLayout() {
+        return frameLayout;
+    }
 
+    public void setFrameLayout(FrameLayout frameLayout) {
+        this.frameLayout = frameLayout;
+    }
 
-    public ContactSortAdapter(Context context, List<BaseSortModel<ContactsBean>> sortFriends) {
+    public ContactSortAdapter(BaseActivity context, List<BaseSortModel<ContactsBean>> sortFriends) {
         mContext = context;
         mSortFriends = (sortFriends == null ? new ArrayList<BaseSortModel<ContactsBean>>() : sortFriends);
         isLog = new HashMap<>();
@@ -122,10 +133,12 @@ public class ContactSortAdapter extends BaseAdapter implements SectionIndexer, S
                             }
 
                         } else {
-                            NotifyUtils.ToastMessage(mContext,mContext.getString(com.uas.appworks.R.string.not_format_phone));
+                           // NotifyUtils.ToastMessage(mContext,mContext.getString(com.uas.appworks.R.string.not_format_phone));
+                            ToastUtil.showToast(MyApplication.getInstance(),mContext.getString(com.uas.appworks.R.string.not_format_phone));
                         }
                     } else {
-                        NotifyUtils.ToastMessage(mContext,mContext.getString(com.uas.appworks.R.string.not_phone));
+                        ToastUtil.showToast(MyApplication.getInstance(),mContext.getString(com.uas.appworks.R.string.not_phone));
+                       // NotifyUtils.ToastMessage(mContext,mContext.getString(com.uas.appworks.R.string.not_phone));
                     }
                 }
             });
@@ -141,10 +154,10 @@ public class ContactSortAdapter extends BaseAdapter implements SectionIndexer, S
                                 SystemUtil.phoneAction(mContext, phone);
                             }
                         } else {
-                            NotifyUtils.ToastMessage(mContext,mContext.getString(com.uas.appworks.R.string.not_format_phone));
+                            ToastUtil.showToast(MyApplication.getInstance(),MyApplication.getInstance().getString(R.string.not_format_phone));
                         }
                     } else {
-                        NotifyUtils.ToastMessage(mContext,mContext.getString(com.uas.appworks.R.string.not_phone));
+                        ToastUtil.showToast(MyApplication.getInstance(),MyApplication.getInstance().getString(R.string.not_phone));
                     }
                 }
             });

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

@@ -64,7 +64,7 @@ public class ContactsListFragment extends ViewPagerLazyFragment implements OnSma
     private int tabItem;
     List<ContactsBean> datas;
     ItemContactsMeAdapter adapter;
-
+    
 
     StickyListHeadersListView refreshListView;
     private BaseComparator comparator;
@@ -151,6 +151,7 @@ public class ContactsListFragment extends ViewPagerLazyFragment implements OnSma
         });
         
         mAdapter = new ContactSortAdapter(ct, allDatas);
+        mAdapter.setFrameLayout(getContentView());
         refreshListView.setAdapter(mAdapter);
         
         dialogTV = (TextView) findViewById(R.id.dialogTV);
@@ -192,6 +193,7 @@ public class ContactsListFragment extends ViewPagerLazyFragment implements OnSma
         switch (tabItem){
             case 1:
                 //我的联系人-不分页
+                progressDialog.show();
                 HttpClient httpClient = new HttpClient.Builder("https://mobile.ubtob.com:8443/linkman/")
                         .isDebug(true)
                         .build();
@@ -210,7 +212,7 @@ public class ContactsListFragment extends ViewPagerLazyFragment implements OnSma
                             
                             allDatas=getAllDatas(datas);
                             mAdapter.setData(allDatas);
-                            
+                            progressDialog.dismiss();
 //                            adapter=new ItemContactsMeAdapter(getActivity(),datas);
 //                            mListView.setAdapter(adapter);
 //                            LogUtil.d(TAG,JSON.toJSONString(datas));

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

@@ -82,6 +82,7 @@ public class LocalContactsListFragment extends ViewPagerLazyFragment implements
     private void initView() {
         refreshListView =  findViewById(R.id.mListView);
         mAdapter = new ContactLocalSortAdapter(ct, allDatas);
+        mAdapter.setFrameLayout(getContentView());
         refreshListView.setAdapter(mAdapter);
 
         dialogTV = findViewById(R.id.dialogTV);

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

@@ -6,13 +6,14 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 
 import com.common.LogUtil;
 import com.common.data.StringUtil;
+import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
 import com.core.widget.CustomProgressDialog;
 import com.me.network.app.http.HttpClient;
@@ -21,6 +22,7 @@ import com.me.network.app.http.rx.ResultSubscriber;
 import com.modular.apputils.listener.OnSmartHttpListener;
 import com.modular.apputils.network.Parameter;
 import com.modular.apputils.network.Tags;
+import com.uas.appworks.R;
 
 /**
  * 时间：2017/10/30 17:18
@@ -29,7 +31,8 @@ import com.modular.apputils.network.Tags;
 public abstract class ViewPagerLazyFragment extends Fragment {
     private static final String STATE_SAVE_IS_HIDDEN = "STATE_SAVE_IS_HIDDEN";
     protected View rootView;
-    protected AppCompatActivity ct;
+    protected BaseActivity ct;
+    private FrameLayout contentFl;
 
     private boolean isVisible = false;//当前Fragment是否可见
     private boolean isInitView = false;//是否与View建立起映射关系
@@ -49,7 +52,7 @@ public abstract class ViewPagerLazyFragment extends Fragment {
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        ct = (AppCompatActivity) context;
+        ct = (BaseActivity) context;
     }
 
     public View getRootView() {
@@ -92,7 +95,13 @@ public abstract class ViewPagerLazyFragment extends Fragment {
                 parent.removeView(rootView);
             }
         } else {
-            rootView = inflater.inflate(inflater(), container, false);
+            rootView = inflater.inflate(R.layout.base_bar_layout, container, false);
+            contentFl = rootView.findViewById(R.id.contentFl);
+            int layoutId = inflater();
+            if (layoutId > 0) {
+                View contentView = inflater.inflate(layoutId, container, false);
+                contentFl.addView(contentView);
+            }
         }
         isInitView = true;
         progressDialog = CustomProgressDialog.createDialog(getContext());
@@ -120,6 +129,11 @@ public abstract class ViewPagerLazyFragment extends Fragment {
         }
     }
 
+    public FrameLayout getContentView() {
+        return contentFl;
+    }
+
+
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
         if (isVisibleToUser) {

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

@@ -34,7 +34,7 @@
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:layout_toLeftOf="@+id/iv_icon"
-        android:layout_marginRight="@dimen/dp_4"
+        android:layout_marginRight="@dimen/dp_10"
         android:text=""
         android:layout_centerInParent="true"/>
     <ImageView
@@ -43,6 +43,7 @@
         android:layout_height="match_parent"
         android:foregroundGravity="center_vertical"
         android:layout_alignParentRight="true"
+        android:layout_marginRight="15dp"
         android:layout_centerInParent="true"
         android:src="@drawable/phone"/>
 </RelativeLayout>