发布版本

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

@@ -481,7 +481,6 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
         String url = "plm/record/msgTask.action";
         Map<String, Object> param = new HashMap<String, Object>();
         param.put("ra_id", ra_id);
-        Log.i("gongpengming", "ra_id=" + ra_id);
         sendDataToServer(url, param, LOAD_SUCCESS_MSGTASK);
     }
 

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

@@ -398,7 +398,6 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             if (validator.validate(b.getObject())) {
                 com.alibaba.fastjson.JSONObject object = JSON.parseObject(b.getObject());
                 cu_code = object.containsKey("CU_CODE") ? object.getString("CU_CODE") : "";
-                Log.i("gongpengming", "cu_code=" + (StringUtils.isEmpty(cu_code) ? "空的" : cu_code));
                 tv_customer_login.setText(object.containsKey("CU_NAME") ? object.getString("CU_NAME") : " ");
                 tv_linksman_login.setText(object.containsKey("CU_CONTACT") ? object.getString("CU_CONTACT") : " ");
                 tv_address_login.setText(object.containsKey("CU_ADD1") ? object.getString("CU_ADD1") : " ");

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

@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -470,11 +469,8 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                 String json = b.getJson();
                 String o = (String) b.getObject();
                 if (StringUtils.isEmpty(json)) {
-                    Log.i("gongpengming", "返回为空的");
                     return;
                 }
-                Log.i("gongpengming", "json=" + json);
-                Log.i("gongpengming", "object=" + o);
                 JsonValidator validator = new JsonValidator();
                 if (validator.validate(json)) {
                     JSONObject object = JSON.parseObject(json);

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

@@ -209,7 +209,6 @@ public class AlarmReceiver extends BroadcastReceiver {
         AlarmManager alarm = (AlarmManager) ct.getSystemService(ct.ALARM_SERVICE);
         alarm.cancel(pi);
     }
-
     //TODO 在这里提醒时候会延迟6分钟不知道为什么
     private void setArmmanager(Context ct, long time) {
         unArmmanager(ct);

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

@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -119,12 +118,11 @@ public class SelectActivity extends BaseActivity {
     private void initView() {
         if (!StringUtils.isEmpty(title)) getSupportActionBar().setTitle(title);
         list = (ListView) findViewById(R.id.list);
-
         emptyLayout = new EmptyLayout(ct, list);
         emptyLayout.setShowLoadingButton(false);
         emptyLayout.setShowEmptyButton(false);
         emptyLayout.setShowErrorButton(false);
-        emptyLayout.setEmptyViewRes(R.layout.oa_empty_list);
+        emptyLayout.setEmptyViewRes(R.layout.view_empty);
         adapter = new ListAdapter();
         list.setAdapter(adapter);
         if (type == 1)
@@ -134,10 +132,6 @@ public class SelectActivity extends BaseActivity {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                 if (isSingle) {
                     SelectBean bean = formBeaan.get(i);
-                    if (bean.getObject() == null) {
-                        Log.i("gongpengming", "空的");
-                    } else
-                        Log.i("gongpengming", "不是空的" + bean.getObject());
                     Intent intent = new Intent();
                     intent.putExtra("data", bean);
                     setResult(0x20, intent);
@@ -166,11 +160,6 @@ public class SelectActivity extends BaseActivity {
             param = intent.getParcelableExtra("showKey");
             Bundle bundle = getIntent().getExtras();
             param = (HashMap<String, Object>) bundle.getSerializable("param");
-            Log.i("gongpengming", "action=" + action);
-            Log.i("gongpengming", "key=" + key);
-            Log.i("gongpengming", "showKey=" + showKey);
-            Log.i("gongpengming", "param=" + param == null ? "空的" : "不为空");
-            Log.i("gongpengming", "param1=" + param.get("caller"));
         } else if (type == 2) {
             formBeaan = intent.getParcelableArrayListExtra("data");
         }
@@ -185,10 +174,8 @@ public class SelectActivity extends BaseActivity {
         if (param != null) {
             param.put("sessionId", sessionId);
         } else {
-            Log.i("gongepngming", "是空的的");
             return;
         }
-        Log.i("gongpengming", "url" + url);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x11, null, null, "post");

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

@@ -93,10 +93,7 @@ public class SigninAdapter extends RecyclerView.Adapter<SigninAdapter.ViewHoler>
                     end = "";
             boolean isFrist = false;
             for (String e : b.getSigninList()) {
-                Log.i("gongpengmingTime", e);
-                Log.i("gongpengmingTime", b.getStartSignin());
                 if (!isFrist && e.compareTo(b.getStartSignin()) > 0 && e.compareTo(getNext90(b.getStartTime(), true)) < 0) {
-                    Log.i("gongpengmingTime", "进来了");
                     holder.signin.setText(e);
                     start = getTag(b.getStartTime(), b.getStartSignin(), getNext90(b.getStartTime(), true), e, true);
                     isFrist = true;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/views/MonthView.java

@@ -128,10 +128,8 @@ public class MonthView extends View {
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-        Log.i("gongpengming", "onTouchEvent");
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
-                Log.i("gongpengming", "MotionEvent.ACTION_DOWN");
                 mScroller.forceFinished(true);
                 mSlideMode = null;
                 isNewEvent = true;
@@ -139,7 +137,6 @@ public class MonthView extends View {
                 lastPointY = (int) event.getY();
                 break;
             case MotionEvent.ACTION_MOVE:
-                Log.i("gongpengming", "MotionEvent.ACTION_MOVE");
                 if (isNewEvent) {
                     if (Math.abs(lastPointX - event.getX()) > 100) {
                         mSlideMode = SlideMode.HOR;
@@ -158,7 +155,6 @@ public class MonthView extends View {
                 }
                 break;
             case MotionEvent.ACTION_UP:
-                Log.i("gongpengming", "MotionEvent.ACTION_UP");
                 if (mSlideMode == SlideMode.VER) {
                     if (Math.abs(lastPointY - event.getY()) > 25) {
                         if (lastPointY < event.getY()) {
@@ -221,13 +217,8 @@ public class MonthView extends View {
 
     @Override
     protected void onSizeChanged(int w, int h, int oldW, int oldH) {
-        Log.i("gongpengming", "onSizeChanged");
-        Log.i("gongpengming", "w=" + w + "   oldW=" + oldW);
-        Log.i("gongpengming", "h=" + h + "    h=" + oldH);
-
         width = w;
         height = h;
-
         criticalWidth = (int) (1F / 5F * width);
         criticalHeight = (int) (1F / 5F * height);
 

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

@@ -296,7 +296,6 @@
 
         <com.xzjmyk.pm.activity.view.MyListView
             android:id="@+id/oa_listview"
-            android:layout_marginTop="6dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="30dp"

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

@@ -3,23 +3,16 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="#EBE9E9"
-    android:orientation="horizontal">
+    android:orientation="vertical">
 
     <View
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="#EBE9E9" />
+        android:layout_width="match_parent"
+        android:layout_height="20dp" />
 
     <ImageView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:src="@drawable/oa_empty" />
 
-    <View
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="#EBE9E9" />
 </LinearLayout>