提交代码-6-13

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CompanyContactsActivity.java

@@ -42,6 +42,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
+import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout;
 
@@ -82,6 +83,8 @@ public class CompanyContactsActivity extends BaseActivity {
 
     private LayoutInflater mInflater;
     private Activity activity;
+    @ViewInject(R.id.ll_list)
+    private LinearLayout ll_list ;
     @ViewInject(R.id.hv_head_view)
     private HorizontalScrollView hscrollview;
     @ViewInject(R.id.rg_nav_content)
@@ -102,10 +105,6 @@ public class CompanyContactsActivity extends BaseActivity {
         public void handleMessage(android.os.Message msg) {
             HrorgsEntity hEntity;
             switch (msg.what) {
-                case LOAD_SUCCESS_LOGIN:
-                    sessionId = JSON.parseObject(msg.getData().getString("result")).getString("sessionId");
-                    LoadServerData("USOFTSYS", null);
-                    break;
                 case UPDATE_CHANGE_MASTER:
                     Log.i(TAG, "广播接收者...........");
                     Log.i(TAG, "账套：" + CommonUtil.getSharedPreferences(ct, "erp_master"));
@@ -665,10 +664,15 @@ public class CompanyContactsActivity extends BaseActivity {
      * @功能:加载通讯录数据
      */
     public void LoadServerData(String master, String lastdate) {
+        if (StringUtils.isEmpty(master)){
+            reScrollView.setRefreshing(false);
+            ll_content.setVisibility(View.GONE);
+            rl_empty.setVisibility(View.VISIBLE);
+            return;
+        }
         String url = Constants.getAppBaseUrl(this) + "mobile/getAllHrorgEmps.action";
         final Map<String, Object> param = new HashMap<>();
         param.put("master", master);
-        Log.i("gongpengming", master);
         if (lastdate == null) {
             lastdate = "";
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/LinksManFragment.java

@@ -196,6 +196,7 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
         if (manager == null)
             manager = new DBManager(ct);
         String master = CommonUtil.getSharedPreferences(ct, "erp_master"); //待优化   每次都 读取文件耗性能
+        if (StringUtils.isEmpty(master))return;
         List<EmployeesEntity> emList = manager.select_getEmployee(
                 new String[]{master},
                 "whichsys=?");
@@ -504,6 +505,7 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
         DBManager db = new DBManager(ct);
         String master = CommonUtil.getSharedPreferences(ct, "erp_master");
         String emCode = CommonUtil.getSharedPreferences(ct, "erp_username");
+        if (StringUtils.isEmpty(master))return;
         //查找本地数据库，管理群存在，则不创建
         List<HrorgsEntity> hlist = db.queryHrorgList(new String[]{master, emCode}, "whichsys=? and or_headmancode=?");
         if (hlist.isEmpty()) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -444,10 +444,12 @@ public class ViewUtil {
                 mdProcessDialog.cancel();
             }
         }, 1000);
-        if (ct instanceof Activity) {
-            if (((Activity) ct) instanceof MainActivity) {
-            } else {
-                ct.startActivity(new Intent(ct, DataDownloadActivity.class));
+        if (!hasErp){
+            if (ct instanceof Activity) {
+                if (((Activity) ct) instanceof MainActivity) {
+                } else {
+                    ct.startActivity(new Intent(ct, DataDownloadActivity.class));
+                }
             }
         }
         sendBrodcast("B2B");
@@ -523,7 +525,6 @@ public class ViewUtil {
                 } else if (map.getPlatform().equals("B2B")) {
                     b2b_uu = map.getAccount();
                     erp_phone=phone;
-                    LoginB2BTask(phone, password);//登录B2B
                 }
 
             }
@@ -541,6 +542,12 @@ public class ViewUtil {
             } else if (erpEntities.size() > 1) {
                 loginERPItemDialog(phone, password);
             }
+            if (erpEntities.size()>0) {
+               hasErp=true;
+            }else{
+               hasErp=false;
+            }
+            LoginB2BTask(phone, password);//登录B2B
         } else {
             mdProcessDialog.setContent("手机号或者密码失败！");
             handler.postDelayed(new Runnable() {
@@ -550,10 +557,9 @@ public class ViewUtil {
                 }
             }, 2000);
         }
-    }
-
-    ;
+    };
 
+    private  static boolean hasErp=true;//是否有erp
     /**
      * @author LiuJie
      * @功能:比较两个日期大小
@@ -793,4 +799,17 @@ public class ViewUtil {
         intent_web.putExtra("p", text);
         ct.startActivity(intent_web);
     }
+
+    public static void clearAccount(Context ct){
+        CommonUtil.clearSharedPreferences(ct, "erp_baseurl");
+        CommonUtil.clearSharedPreferences(ct, "erp_master");
+        CommonUtil.clearSharedPreferences(ct, "erp_commpany");
+        CommonUtil.clearSharedPreferences(ct, "erp_uu");
+        CommonUtil.clearSharedPreferences(ct, "erp_masterId");
+        CommonUtil.clearSharedPreferences(ct, "erp_login");
+        CommonUtil.clearSharedPreferences(ct, "b2b_login");
+        CommonUtil.clearSharedPreferences(ct, "b2b_uu");
+        CommonUtil.clearSharedPreferences(ct, "Master_ch");
+
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/AutoCreateChatFragment.java

@@ -466,6 +466,7 @@ public class AutoCreateChatFragment extends EasyFragment {
         String master = CommonUtil.getSharedPreferences(mContext, "erp_master");
         String emCode = CommonUtil.getSharedPreferences(mContext, "erp_username");
         //查找本地数据库，管理群存在，则不创建
+        if (StringUtils.isEmpty(master))return;
         List<HrorgsEntity> hlist = db.queryHrorgList(new String[]{master, emCode}, "whichsys=? and or_headmancode=?");
         if (!ListUtils.isEmpty(hlist)) {
             String roomdesc = "本群为管理群！";

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/GroupChatFragment.java

@@ -315,6 +315,9 @@ public class GroupChatFragment extends EasyFragment {
         params.put("pageIndex", String.valueOf(mPageIndex));
         params.put("pageSize", String.valueOf(AppConfig.PAGE_SIZE));
         params.put("access_token", MyApplication.getInstance().mAccessToken);
+        Log.i("Arison", "mAccessToken:" + MyApplication.getInstance().mAccessToken);
+        Log.i("Arison","PAGE_SIZE:"+String.valueOf(AppConfig.PAGE_SIZE));
+        Log.i("Arison","mPageIndex:"+String.valueOf(mPageIndex));
         StringJsonArrayRequest<MucRoom> request = new StringJsonArrayRequest<MucRoom>(
                 mActivity.mConfig.ROOM_LIST_HIS, new ErrorListener() {
             @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SettingActivity.java

@@ -119,8 +119,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         UserSp.getInstance(mContext).clearUserInfo();
-                        CommonUtil.clearSharedPreferences(mContext, "b2b_login");
-                        CommonUtil.clearSharedPreferences(mContext, "erp_login");
+                        ViewUtil.clearAccount(mContext);
                         LoginHelper.broadcastLogout(mContext);
                         SettingActivity.this.finish();
                     }

WeiChat/src/main/res/layout/act_staff_query_list.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
     <com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:ptr="http://schemas.android.com/apk/res-auto"
         android:id="@+id/refresh_top"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="true"
         ptr:ptrAnimationStyle="flip">
-
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <include layout="@layout/erp_empty_view" />
         <LinearLayout
             android:id="@+id/ll_content"
             android:layout_width="match_parent"
@@ -46,6 +46,7 @@
                 android:background="@color/yellow_home" />
 
             <LinearLayout
+                android:id="@+id/ll_list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="horizontal"
@@ -74,7 +75,7 @@
                     android:scrollbars="none"/>
             </LinearLayout>
         </LinearLayout>
-    </com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout>
+    </LinearLayout>
+
 
-    <include layout="@layout/erp_empty_view" />
-</LinearLayout>
+    </com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout>

WeiChat/src/main/res/layout/activity_company.xml

@@ -11,11 +11,12 @@
         android:layout_height="match_parent"
         android:fillViewport="true"
         ptr:ptrAnimationStyle="flip">
-
+        <include layout="@layout/erp_empty_view" />
         <LinearLayout
             android:id="@+id/ll_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             android:orientation="vertical">
 
             <HorizontalScrollView
@@ -74,7 +75,10 @@
                     android:scrollbars="none" />
             </LinearLayout>
         </LinearLayout>
+
     </android.support.v4.widget.SwipeRefreshLayout>
 
-    <include layout="@layout/erp_empty_view" />
+
+
+
 </LinearLayout>

WeiChat/src/main/res/layout/erp_empty_view.xml

@@ -3,13 +3,14 @@
     android:id="@+id/rl_empty"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:visibility="gone"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/textViewMessage"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
+        android:layout_centerHorizontal="true"
         android:layout_marginTop="16dp"
         android:drawableTop="@drawable/icon_not_found"
         android:text="暂时没有数据"