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

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/FriendDao.java

@@ -169,7 +169,7 @@ public class FriendDao {
 				 chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
 				 // 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
 				 chatMessage.setTimeSend(TimeUtils.sk_time_current_time() + 7);
-				 chatMessage.setContent(MyApplication.getInstance().getString(R.string.welcome_user_software));
+				 chatMessage.setContent("暂无新审批流！");
 				 chatMessage.setMySend(false);// 表示不是自己发的
 				 // 往消息表里插入一条记录
 				 ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_ERP_PROCESS, chatMessage);
@@ -193,7 +193,7 @@ public class FriendDao {
 				chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
 				// 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
 				chatMessage.setTimeSend(TimeUtils.sk_time_current_time() + 6);
-				chatMessage.setContent("您有一条新的任务...");
+				chatMessage.setContent("暂无新任务！");
 				chatMessage.setMySend(false);// 表示不是自己发的
 				// 往消息表里插入一条记录
 				ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_ERP_TASK, chatMessage);
@@ -216,7 +216,7 @@ public class FriendDao {
 				chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
 				// 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
 				chatMessage.setTimeSend(TimeUtils.sk_time_current_time() + 5);
-				chatMessage.setContent("您有一条新的消息...");
+				chatMessage.setContent("暂无新消息！");
 				chatMessage.setMySend(false);// 表示不是自己发的
 				// 往消息表里插入一条记录
 				ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_ERP_ZHIHUI, chatMessage);

WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/AvatarHelper.java

@@ -177,7 +177,7 @@ public class AvatarHelper {
 
     public void displayAvatarPng(String userId, final ImageView imageView, final boolean isThumb) {
         final String url = getAvatarUrlPng(userId, isThumb);
-      //  Log.i("Arison","AvatarHelper:displayAvatar:140:"+url);
+        Log.i("Arison","AvatarHelper:displayAvatar:140:"+url);
         if (TextUtils.isEmpty(url)) {
             return;
         }

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,37 +105,29 @@ 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"));
-                    Log.i(TAG, "公司：" + CommonUtil.getSharedPreferences(ct, "erp_commpany"));
-//                    Log.i(TAG, "公司ip地址："+Constants.getAppBaseUrl(ct));
                     String master = CommonUtil.getSharedPreferences(ct, "erp_master");
                     String commpany = CommonUtil.getSharedPreferences(ct, "erp_commpany");
                     if (!TextUtils.isEmpty(master)) {
                         String date = manager.select_getCacheTime(
                                 new String[]{commpany, master},
                                 "ed_company=? and ed_whichsys=?");
-                        Log.i(TAG, "数据库缓存时间：" + date);
-                        LoadServerData(master, date);//需要获取网络数据
+                        //Log.i(TAG, "数据库缓存时间：" + date);
+                        LoadServerData(master, date);
                     } else {
                         if (reScrollView.isRefreshing()) {
                             reScrollView.setRefreshing(false);
                         }
+                        ll_content.setVisibility(View.GONE);
+                        rl_empty.setVisibility(View.VISIBLE);
                     }
                     break;
                 case LOAD_SUCCESS_ALLDATA:
                     String result = msg.getData().getString("result");
-                    Log.i("gongpengming",result);
                     JSONObject jsonobject = JSON.parseObject(result);
                     String server_time = jsonobject.getString("sysdate");
                     List<HrorgsEntity> hrorgsEntities = JSON.parseArray(jsonobject.getString("hrorgs"), HrorgsEntity.class);
                     List<EmployeesEntity> employeesEntities = JSON.parseArray(jsonobject.getString("employees"), EmployeesEntity.class);
-                    Log.i(TAG, result);
                     master = CommonUtil.getSharedPreferences(ct, "erp_master");
                     HrorgsEntity hrEntity = manager.select_getRootData(new String[]{master}, "whichsys=?");
                     boolean isFristLoad = true;//是否第一次加载
@@ -140,8 +135,6 @@ public class CompanyContactsActivity extends BaseActivity {
                         isFristLoad = false;
                     }
                     reScrollView.setRefreshing(true);
-//                    reScrollView.getLoadingLayoutProxy().setRefreshingLabel("正在同步数据,请稍等...");
-                    //空代表取缓存
                     if (!hrorgsEntities.isEmpty() || !employeesEntities.isEmpty()) {
                         insertDataSqlite(isFristLoad, hrorgsEntities, employeesEntities,
                                 server_time);    //写入缓存
@@ -411,6 +404,13 @@ public class CompanyContactsActivity extends BaseActivity {
 
     private void initView() {
         initListener();
+        //reScrollView.setRefreshing(true);
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                reScrollView.setRefreshing(true);
+            }
+        });
         mHandler.sendEmptyMessage(UPDATE_CHANGE_MASTER);
     }
 
@@ -665,10 +665,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/activity/NewsTwoActivity.java

@@ -119,6 +119,7 @@ public class NewsTwoActivity extends BaseActivity {
                     Log.i(TAG, result);
                     mEmptyLayout.setErrorMessage(result + ",请刷新重试！");
                     mEmptyLayout.showError();
+                    progress_bar.setVisibility(View.GONE);
                     ViewUtil.AutoLoginErp(NewsTwoActivity.this);
                     break;
                 default:

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

@@ -70,7 +70,7 @@ public class ScheduleActivity extends BaseActivity{
 				  }
 				  listview_main.onRefreshComplete();
 			} else if (msg.what==0) {
-				mEmptyLayout.setErrorMessage("网络未连接！");
+				mEmptyLayout.setErrorMessage("服务器异常！请刷新重试！");
 				mEmptyLayout.showError();
 				listview_main.onRefreshComplete();
 			}
@@ -150,8 +150,6 @@ public class ScheduleActivity extends BaseActivity{
 		    param.put("employeeCode", CommonUtil.getSharedPreferences(this, "erp_username"));
 		    param.put("currentMaster", CommonUtil.getSharedPreferences(this, "erp_master"));
 		    param.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
-		    Log.i("username", param.toString());
-		    Log.i("username",CommonUtil.getSharedPreferences(this, "erp_username"));
 		    try {
 				reString = hClient.sendGetRequest(url, param);
 			} catch (Exception e1) {
@@ -159,7 +157,6 @@ public class ScheduleActivity extends BaseActivity{
 			}
 	        Message message = new Message();
 	        Bundle bundle=new Bundle();
-	        Log.i("Arison", "result:"+reString);
 	        if (reString!=null&&!reString.equals("500")) {
 	    	   Map<String, Object> results = FlexJsonUtil.fromJson(reString);
 	    	   if (results.get("allProcess")!=null) {

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/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -157,10 +157,7 @@ public class MessageFragment extends EasyFragment {
         if (mNeedUpdate) {
             mNeedUpdate = false;
             loadData();
-            Log.i("MessageFragment", "加载流程数据...........................");
-            FriendDao.getInstance().markUserMessageRead(
-                    MyApplication.getInstance().mLoginUser.getUserId(),
-                    Friend.ID_ERP_ZHIHUI);
+            FriendDao.getInstance().markUserMessageRead(MyApplication.getInstance().mLoginUser.getUserId(), Friend.ID_ERP_ZHIHUI);
             loadERPMsgNum(getActivity());//另外的线程网络请求
             loadGongGaoCount(getActivity());
             loadNoticeCount(getActivity());
@@ -262,7 +259,7 @@ public class MessageFragment extends EasyFragment {
 
     //by gongpm 刷新数据提取方法
     private void refreshUI() {
-        upDataFriend();
+        //upDataFriend();
         loadData();
         FriendDao.getInstance().markUserMessageRead(
                 MyApplication.getInstance().mLoginUser.getUserId(),
@@ -365,7 +362,7 @@ public class MessageFragment extends EasyFragment {
 
                             }
                         }
-                        Log.i("Arison", "MessageFragment:run:360:" + JSON.toJSONString(mFriendList));
+                       // Log.i("Arison", "MessageFragment:run:360:" + JSON.toJSONString(mFriendList));
                         mAdapter.notifyDataSetChanged();
                         mPullToRefreshListView.onRefreshComplete();
                     }

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

@@ -1,21 +1,22 @@
 <?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"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             android:orientation="vertical">
 
             <HorizontalScrollView
@@ -46,6 +47,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 +76,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,26 +3,18 @@
     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_marginTop="16dp"
-        android:drawableTop="@drawable/icon_not_found"
-        android:text="暂时没有数据"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@color/black" />
-
-    <Button
-        android:id="@+id/buttonEmpty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/textViewMessage"
+        android:layout_gravity="center_horizontal|top"
+        android:drawableBottom="@drawable/icon_not_found"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="16dp"
-        android:text=""
-        android:visibility="gone" />
+        android:drawablePadding="5dp"
+        android:gravity="center"
+        android:padding="10dp"
+        android:text="@string/temporarily_no_data"
+        android:textColor="@color/black"
+        android:textSize="@dimen/SmallerTextSize" />
 </RelativeLayout>