Bläddra i källkod

提交代码-6-13

Arisono 10 år sedan
förälder
incheckning
ff3e7b75d1

+ 3 - 3
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);

+ 11 - 10
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CompanyContactsActivity.java

@@ -106,32 +106,28 @@ public class CompanyContactsActivity extends BaseActivity {
             HrorgsEntity hEntity;
             switch (msg.what) {
                 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;//是否第一次加载
@@ -139,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);    //写入缓存
@@ -410,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);
     }
 

+ 1 - 0
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:

+ 1 - 4
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) {

+ 1 - 0
WeiChat/src/main/res/layout/act_staff_query_list.xml

@@ -16,6 +16,7 @@
             android:id="@+id/ll_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             android:orientation="vertical">
 
             <HorizontalScrollView

+ 8 - 17
WeiChat/src/main/res/layout/erp_empty_view.xml

@@ -5,25 +5,16 @@
     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_gravity="center_horizontal|top"
+        android:drawableBottom="@drawable/icon_not_found"
         android:layout_centerHorizontal="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_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>