developer 分支下拉更新备份及改bug

WeiChat/src/main/AndroidManifest.xml

@@ -156,6 +156,7 @@
         <activity android:name=".ui.erp.activity.ExtraLeaveActivity" />
         <activity android:name=".ui.erp.activity.WorkExtraActivity" />
         <activity android:name=".ui.erp.activity.TravelActivity" />
+        <activity android:name=".ui.erp.activity.TravelDetailsActivity" />
         <activity android:name=".ui.erp.activity.SaleSelectActivity" />
         <activity android:name=".ui.message.SelectActivity" />
         <activity android:name=".ui.erp.activity.SaleChartActivity" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -235,7 +235,7 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         params.put("visible", "3");
 
         if(!TextUtils.isEmpty(dailyexperience)){
-            params.put("text", mTextEdit.getText().toString()+"[来自:工作日报>工作心得分享]");// 消息内容
+            params.put("text", mTextEdit.getText().toString()+"\n\t\t[来自:工作日报>工作心得分享]");// 消息内容
         }else{
             params.put("text", mTextEdit.getText().toString());// 消息内容
         }
@@ -293,7 +293,7 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
                                .setCancelable(false)  //设置点击对话框之外的对话框不消失
                                .setTitle("分享成功")
                                .setMessage("是否立即进入朋友圈查看")
-                               .setNegativeButton("不了，继续编写日报", new DialogInterface.OnClickListener() {
+                               .setNegativeButton("编写日报", new DialogInterface.OnClickListener() {
                                    @Override
                                    public void onClick(DialogInterface dialog, int which) {
                                        finish();

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

@@ -312,6 +312,7 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
                     if ("FeePlease!CCSQ".equals(caller)) {
                         it_detail = new Intent(SaleSelectActivity.this,
                                 TravelActivity.class);
+                               // TravelDetailsActivity.class);
                     }
                     if ("Workovertime".equals(caller)) {
                         it_detail = new Intent(SaleSelectActivity.this,
@@ -353,6 +354,7 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
                 if ("出差单查询".equals(getSupportActionBar().getTitle())) {
                     it_detail = new Intent(SaleSelectActivity.this,
                             TravelActivity.class);
+
                 }
                 if ("加班申请查询".equals(getSupportActionBar().getTitle())) {
                     it_detail = new Intent(SaleSelectActivity.this,

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

@@ -0,0 +1,84 @@
+package com.xzjmyk.pm.activity.ui.erp.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.view.MyListView;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Created by FANGlh on 2016/11/16.
+ */
+public class TravelDetailsActivity extends BaseActivity {
+
+    private ImageView photo_im;
+    private TextView name_tv;
+    private TextView department_tv;
+    private TextView status_tv;
+    private MyListView appflow_lv;
+    private int mkeyValue;
+    private String mCaller;
+    private int mNoc = 1;
+    private final static int COMMON_DOC_REQUEST = 1102;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initView();
+        initDate();
+    }
+
+    public void initView() {
+        setContentView(R.layout.activity_common_docui);
+
+        photo_im = (ImageView) findViewById(R.id.common_docui_photo_img);
+        name_tv = (TextView) findViewById(R.id.common_docui_name_tv);
+        department_tv = (TextView) findViewById(R.id.common_docui_department_tv);
+        status_tv = (TextView) findViewById(R.id.common_docui_status_tv);
+        appflow_lv = (MyListView) findViewById(R.id.common_docui_approval_flow_lv);
+    }
+
+    private void initDate() {
+
+        //请求URL
+        String url = Constants.getAppBaseUrl(getApplicationContext()) + "common/getCurrentJnodes.action";
+        Map<String, Object> param = new HashMap<>();
+
+        param.put("caller", mCaller);
+        param.put("keyValue", mkeyValue);
+        param.put("_noc", mNoc);
+        LinkedHashMap headers = new LinkedHashMap();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
+        ViewUtil.httpSendRequest(getApplicationContext(), url, param, mHandler, headers, COMMON_DOC_REQUEST, null, null, "post");
+    }
+    public Handler mHandler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what){
+                case COMMON_DOC_REQUEST:
+                    String result = msg.getData().getString("result");
+                    LogUtil.prinlnLongMsg("Workovertime", result);
+
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                Toast.makeText(TravelDetailsActivity.this, msg.getData().getString("result"), Toast.LENGTH_SHORT).show();
+                break;
+            }
+        }
+    };
+
+}

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

@@ -24,7 +24,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.MyListView;
 
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 

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

@@ -200,21 +200,20 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
                 if (StringUtils.isEmpty(add_experience.getText().toString())) {
                     ToastMessage("请先填写工作心得再分享");
                 } else {
-                    new android.app.AlertDialog
-                            .Builder(mContext)
-                            .setTitle("温馨提示")
-                            .setMessage("你将进行工作心得分享至朋友圈操作，是否继续？")
-                            .setNegativeButton("取消", null)
-
-                            .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
+//                    new android.app.AlertDialog
+//                            .Builder(mContext)
+//                            .setTitle("温馨提示")
+//                            .setMessage("你将进行工作心得分享至朋友圈操作，是否继续？")
+//                            .setNegativeButton("取消", null)
+//                            .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+//                                @Override
+//                                public void onClick(DialogInterface dialog, int which) {
                                     Intent intent = new Intent(WorkDailyAddActivity.this, SendShuoshuoActivity.class);
                                     intent.putExtra("Experience", add_experience.getText().toString());
                                     intent.putExtra("type", 0);
                                     startActivity(intent);
-                                }
-                            }).show();
+//                                }
+//                            }).show();
                 }
             }
         });

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

@@ -3,8 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#ebe9e9"
-    android:orientation="vertical"
-   >
+    android:orientation="vertical">
 
     <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
         android:layout_width="match_parent"
@@ -18,263 +17,100 @@
             android:layout_height="wrap_content"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:orientation="vertical"
-            android:layout_marginTop="5dp"
+            android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
             >
 
+            <ImageView
+                android:id="@+id/common_docui_photo_img"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:background="@drawable/avatar_normal"
+                android:contentDescription="@string/app_name"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp" />
+
+            <TextView
+                android:id="@+id/common_docui_name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@+id/common_docui_photo_img"
+                android:text="方龙海"
+                android:textColor="#575757"
+                android:textSize="@dimen/text_hine"
+                android:layout_marginTop="10dp"
+
+                />
+            <TextView
+                android:id="@+id/common_docui_department_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@+id/common_docui_photo_img"
+                android:layout_below="@id/common_docui_name_tv"
+                android:text="移动终端部>xx"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_hine"
+                android:layout_marginTop="4dp"/>
+            <TextView
+                android:id="@+id/common_docui_status_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="待审批"
+                android:layout_alignParentRight="true"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="0dp"
+                android:textSize="@dimen/text_hine"/>
+        </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/item_line"/>
             <LinearLayout
-                android:id="@+id/ly_head_display"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:layout_marginBottom="10dp"
-                android:visibility="visible"
-                >
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:layout_marginTop="3dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:background="@color/item_line" />
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:visibility="visible"
-                    >
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    >
-
-                    <TextView
-                        android:id="@+id/work_daily_detail_time_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="left|top"
-                        android:text="2016-11-02"
-                        android:textColor="#000000"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginBottom="0dp"
-                        android:textSize="@dimen/text_main"
-                        android:visibility="gone"/>
-
-                    <ImageView
-                        android:id="@+id/item_daily_details_approval_flow_photo_img"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:background="@drawable/avatar_normal"
-                        android:contentDescription="@string/app_name"
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginTop="10dp"
-                        android:layout_marginBottom="10dp" />
-
-                    <TextView
-                        android:id="@+id/item_daily_details_approval_flow_name_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_toRightOf="@+id/item_daily_details_approval_flow_photo_img"
-                        android:text="方龙海"
-                        android:textColor="#575757"
-                        android:textSize="@dimen/text_hine"
-                        android:layout_marginTop="10dp"
-
-                        />
-                    <TextView
-                        android:id="@+id/item_daily_details_approval_flow_status_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_toRightOf="@+id/item_daily_details_approval_flow_photo_img"
-                        android:layout_below="@id/item_daily_details_approval_flow_name_tv"
-                        android:text="移动终端部>xx"
-                        android:textColor="@color/text_main"
-                        android:textSize="@dimen/text_hine"
-                        android:layout_marginTop="4dp"/>
-                    <TextView
-                        android:id="@+id/work_daily_detail_status_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="待审批"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginBottom="0dp"
-                        android:textSize="@dimen/text_hine"/>
-                </RelativeLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="18sp"
-                    android:text="工作总结"
-                    android:textColor="#575757"
-                    android:layout_marginTop="5dp"
-                    />
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp">
                 <TextView
-                    android:id="@+id/work_daily_detail_summary_et"
                     style="@style/form_relative_right_text1"
-                    android:text="总结啦"
                     android:textColor="#575757"
-                    />
+                    android:text="时间情况"/>
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"/>
-                <LinearLayout
-                    android:id="@+id/work_daily_detail_plan_ll"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:visibility="visible">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="18sp"
-                    android:text="工作计划"
-                    android:layout_marginTop="5dp"
-                    android:textColor="#575757"
-                    />
+                    android:layout_height="1dp"
+                    android:background="@color/item_line"/>
                 <TextView
-                    android:id="@+id/work_daily_detail_plan_tv"
                     style="@style/form_relative_right_text1"
                     android:textColor="#575757"
-                    android:text="计划啦"/>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"/>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/work_daily_detail_experience_ll"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:visibility="visible">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="工作心得"
-                        android:layout_marginTop="5dp"
-                        android:textSize="18sp"
-                        android:textColor="#575757"
-                        />
+                    android:text="出差情况1"/>
 
                 <TextView
-                    android:id="@+id/work_daily_detail_experience_tv"
                     style="@style/form_relative_right_text1"
                     android:textColor="#575757"
-                    android:text="心得啦"
-                    />
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="@dimen/line"
-                            android:background="@color/item_line"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"/>
-                 </LinearLayout>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:visibility="visible">
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:background="#f6f5f5"
-                        android:visibility="visible">
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="已完成任务"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="5dp"
-                    android:textSize="18sp"
-                    android:textColor="#575757"
-                    android:visibility="visible"
-                    />
-                <TextView
-                    android:id="@+id/work_daily_detail_no_task"
-                    style="@style/form_relative_right_text1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="今天暂无分配工作任务"
-                    android:layout_marginLeft="10dp"
-                    android:textColor="#575757"
-                    android:visibility="visible"
-                    />
-
-
-                <com.xzjmyk.pm.activity.view.MyListView
-                    android:id="@+id/work_daily_detail_completedtask_lv"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="#f6f5f5"
-                    android:visibility="visible">
-                </com.xzjmyk.pm.activity.view.MyListView>
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="未完成任务"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginTop="5dp"
-                        android:textSize="18sp"
-                        android:textColor="#575757"
-                        android:visibility="visible"
-                        />
-
-                    <com.xzjmyk.pm.activity.view.MyListView
-                        android:id="@+id/work_daily_detail_uncompletedtask_lv"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="#f6f5f5"
-                        android:visibility="visible">
-                    </com.xzjmyk.pm.activity.view.MyListView>
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="5dp"
-                            android:background="#EBE9E9"
-                            android:layout_marginTop="5dp"
-                            android:visibility="visible"/>
-                        </LinearLayout>
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="10dp"
-                        android:background="@color/white"
-                        android:layout_marginTop="5dp"
-                        android:visibility="visible"/>
-
-                <com.xzjmyk.pm.activity.view.MyListView
-                    android:id="@+id/work_daily_detail_approval_flow_lv"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="visible"
-                    android:background="#ebe9e9"
-                    >
-                </com.xzjmyk.pm.activity.view.MyListView>
+                    android:text="出差情况2"/>
+            </LinearLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="10dp"
+                android:background="@color/white"
+                android:layout_marginTop="5dp"
+                android:visibility="visible"/>
+            <com.xzjmyk.pm.activity.view.MyListView
+                android:id="@+id/common_docui_approval_flow_lv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="visible"
+                android:background="#ebe9e9">
+            </com.xzjmyk.pm.activity.view.MyListView>
 
-                 </LinearLayout>
-             </LinearLayout>
         </LinearLayout>
+
     </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
 
-</LinearLayout>
+</LinearLayout>