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

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="71"
-    android:versionName="5.5.7">
+    android:versionCode="72"
+    android:versionName="5.5.9">
 
     <uses-sdk
         android:minSdkVersion="11"

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/WorkDailyAdapter.java

@@ -2,6 +2,7 @@
 package com.xzjmyk.pm.activity.adapter;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -69,8 +70,12 @@ public class WorkDailyAdapter extends BaseAdapter {
         }else{
             viewHolder.WorkDailyDate.setText(mWorkDailyBeanList.get(position).getWD_DATE());
         }
-
-        //为日报列表界面赋值（状态，总结）
+        //为日报列表界面赋值（状态，总结）,注意已审批和待审批的字体颜色
+        if(mWorkDailyBeanList.get(position).getSTATUS().equals("已审批")){
+            viewHolder.WorkDailyStatus.setTextColor(Color.GREEN);
+        }else {
+            viewHolder.WorkDailyStatus.setTextColor(Color.RED);
+        }
         viewHolder.WorkDailyStatus.setText(mWorkDailyBeanList.get(position).getSTATUS());
         viewHolder.WorkDailySummary.setText(mWorkDailyBeanList.get(position).getWD_COMMENT());
         return convertView;

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/message/SubscriptionMessage.java

@@ -1,9 +1,11 @@
 package com.xzjmyk.pm.activity.bean.message;
 
+import java.io.Serializable;
+
 /**
  * Created by gongpm on 2016/6/3.
  */
-public class SubscriptionMessage {
+public class SubscriptionMessage implements Serializable{
 
     private int ID_;
     private int NUM_ID_;        //订阅id

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

@@ -24,6 +24,7 @@ import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
@@ -36,13 +37,14 @@ import org.apache.http.cookie.Cookie;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * Created by Administrator on 2016/4/5.
  */
-public class WebViewCommActivity extends BaseActivity {
+public class WebViewCommActivity extends BaseActivity implements View.OnClickListener {
     public static final String TIME = "WebViewCommActivity_time";
     private PullToRefreshWebView webView;
     private ProgressBar pb;
@@ -54,6 +56,14 @@ public class WebViewCommActivity extends BaseActivity {
     private boolean isStartApp = false;
     private boolean isCookie;
     private int reCode = 201;
+
+    private ArrayList<SubscriptionMessage> mSubscriptionMessages;
+    private String mSubsAct;
+    private int mPosition;
+
+    private String mSubsurl;
+    private TextView mPreTv;
+    private TextView mNextTv;
     private  Handler hander = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -94,12 +104,44 @@ public class WebViewCommActivity extends BaseActivity {
         Intent intent = getIntent();
         setContentView(R.layout.activity_webview);
         webView = (PullToRefreshWebView) findViewById(R.id.webView_listview);
+        mPreTv = (TextView) findViewById(R.id.web_previous_tv);
+        mNextTv = (TextView) findViewById(R.id.web_next_tv);
+
         isStartApp = false;
         pb = (ProgressBar) findViewById(R.id.pb);
         pb.setMax(100);
         url = intent.getStringExtra("url");
+        mSubsurl = intent.getStringExtra("url");
         isCookie = intent.getBooleanExtra("cookie", false);
         String StartApp = intent.getStringExtra("isStartApp");//参数账套
+
+        mSubsAct = intent.getStringExtra("subsact");
+        mPosition = intent.getIntExtra("position",-1);
+        mSubscriptionMessages = (ArrayList<SubscriptionMessage>) intent.getSerializableExtra("subsdata");
+
+        if (mSubsAct != null && mSubsAct.equals("subsDetail")){
+            url = mSubsurl  + "?numId=" + mSubscriptionMessages.get(mPosition).getNUM_ID_()
+                    + "&mainId=" + mSubscriptionMessages.get(mPosition).getINSTANCE_ID_()
+                    + "&insId=" + mSubscriptionMessages.get(mPosition).getID_()
+                    + "&title=" + mSubscriptionMessages.get(mPosition).getTITLE_();
+            if (mSubscriptionMessages.size() == 1){
+                mPreTv.setVisibility(View.GONE);
+                mNextTv.setVisibility(View.GONE);
+            }else if (mPosition == 0){
+                mPreTv.setVisibility(View.GONE);
+                mNextTv.setVisibility(View.VISIBLE);
+            }else if (mPosition == mSubscriptionMessages.size() - 1){
+                mPreTv.setVisibility(View.VISIBLE);
+                mNextTv.setVisibility(View.GONE);
+            }else {
+                mPreTv.setVisibility(View.VISIBLE);
+                mNextTv.setVisibility(View.VISIBLE);
+            }
+
+            mPreTv.setOnClickListener(this);
+            mNextTv.setOnClickListener(this);
+        }
+
         if (!StringUtils.isEmpty(StartApp)) {
             if (StartApp.equals("true")) {
                 isStartApp = true;
@@ -182,6 +224,36 @@ public class WebViewCommActivity extends BaseActivity {
         super.onResume();
     }
 
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.web_previous_tv:
+                mPosition--;
+                break;
+            case R.id.web_next_tv:
+                mPosition++;
+                break;
+        }
+        getSupportActionBar().setTitle(mSubscriptionMessages.get(mPosition).getTITLE_());
+        if (mPosition == 0){
+            mPreTv.setVisibility(View.GONE);
+            mNextTv.setVisibility(View.VISIBLE);
+        }else if (mPosition == mSubscriptionMessages.size() - 1){
+            mPreTv.setVisibility(View.VISIBLE);
+            mNextTv.setVisibility(View.GONE);
+        }else {
+            mPreTv.setVisibility(View.VISIBLE);
+            mNextTv.setVisibility(View.VISIBLE);
+        }
+        url = mSubsurl  + "?numId=" + mSubscriptionMessages.get(mPosition).getNUM_ID_()
+                + "&mainId=" + mSubscriptionMessages.get(mPosition).getINSTANCE_ID_()
+                + "&insId=" + mSubscriptionMessages.get(mPosition).getID_()
+                + "&title=" + mSubscriptionMessages.get(mPosition).getTITLE_();
+        Map<String,String> headers=new HashMap<>();
+        headers.put("client-name","uasClient");
+        webView.getRefreshableView().loadUrl(url,headers);
+    }
+
 
     public class WebChromeClient extends android.webkit.WebChromeClient {
         @Override

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

@@ -142,7 +142,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_date_start.setText(getJSONString(object, "vr_visittime"));
             tv_date_end.setText(getJSONString(object, "vr_visitend"));
             tv_customer_login.setText(getJSONString(object, "custname"));
-            tv_linksman_login.setText(getJSONString(object, "vr_cucontact"));
+            tv_linksman_login.setText(getJSONString(object, "vr_contact"));
             tv_address_login.setText(getJSONString(object, "address"));
             tv_visit_theme.setText(getJSONString(object, "vr_title"));
             tv_visit_steps.setText(getJSONString(object, "vr_nichestep"));

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

@@ -1,6 +1,7 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -133,6 +134,11 @@ public class DailydetailsActivity extends BaseActivity {
         if (!TextUtils.isEmpty(summary) && !TextUtils.isEmpty(status) && !TextUtils.isEmpty(date)) {
             wdd_data.setText(date);
             wdd_summary.setText(summary);
+            if(status.equals("已审批")){
+                wdd_status.setTextColor(Color.GREEN);
+            }else{
+                wdd_status.setTextColor(Color.RED);
+            }
             wdd_status.setText(status);
             wdd_plan.setText(plan);
             wdd_experience.setText(experience);

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

@@ -161,9 +161,9 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
        add_submit.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
-               if(add_summary.testValidity()){
+             //  if(add_summary.testValidity()){
                    sendAble();
-               }
+           //    }
            }
        });
        share_experience.setOnClickListener(new View.OnClickListener() {

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

@@ -12,11 +12,11 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 
 /**
- *
+ * BaseFragment 采用工厂模式
  * Created by RaoMeng on 2016/8/19.
  */
 public abstract class BaseFragment extends Fragment {
-    protected View root;
+    protected View root;//fragment的布局对象
     protected CustomProgressDialog progressDialog;
 
     //工厂模式
@@ -45,7 +45,8 @@ public abstract class BaseFragment extends Fragment {
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         progressDialog = CustomProgressDialog.createDialog(getActivity());
-
+        progressDialog.setMessage("努力加载中...");
+//        progressDialog.setCancelable(false);
         initViews();
         initEvents();
         initDatas();

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

@@ -398,7 +398,6 @@ public class SubscriptionAllFragment extends BaseFragment {
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case GET_ALL_SUBSCRIPTION:
-                    progressDialog.dismiss();
                     if (mDbManager.getDb().isOpen()){
                         mDbManager.deleteMasterAllSubs(currentMaster, currentUser);
                     }
@@ -421,6 +420,7 @@ public class SubscriptionAllFragment extends BaseFragment {
                                 mPullToRefreshListView.onRefreshComplete();
                                 Crouton.makeText(getActivity(), "没有未订阅数据", 0xff99cc00, 1500).show();
                             }
+                            progressDialog.dismiss();
                             mSubsTypeAdapter.notifyDataSetChanged();
                             mTypeListView.setVisibility(View.GONE);
                             return;
@@ -523,6 +523,7 @@ public class SubscriptionAllFragment extends BaseFragment {
                         mAllSubscriptionAdapter.notifyDataSetChanged();
                     }
                     initKeyStrings();
+                    progressDialog.dismiss();
 
                     if (mPullToRefreshListView.isRefreshing()) {
                         mPullToRefreshListView.onRefreshComplete();
@@ -534,6 +535,8 @@ public class SubscriptionAllFragment extends BaseFragment {
                     Crouton.makeText(getActivity(), msg.getData().getString("result"), 0xffff4444, 1500).show();
                     if (mPullToRefreshListView.isRefreshing()){
                         mPullToRefreshListView.onRefreshComplete();
+                    }else {
+                        getDbSubsData();
                     }
                     break;
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java

@@ -6,6 +6,7 @@ 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.Menu;
 import android.view.MenuItem;
@@ -26,6 +27,7 @@ import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
 import com.xzjmyk.pm.activity.db.dao.SubscriptionDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.SubcribeManageActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.WebViewCommActivity;
 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;
@@ -79,6 +81,7 @@ public class SubscriptionActivity extends BaseActivity {
             switch (msg.what) {
                 case LOAD_NET:
                     String message = msg.getData().getString("result");
+                    Log.i("handleSubs", message);
                     if (message != null && JSON.parseObject(message).containsKey("data")) {
                         String str = JSON.parseObject(message).getJSONArray("data").toJSONString();
                         SubscriptionMessages = JSON.parseArray(str, SubscriptionMessage.class);
@@ -148,7 +151,7 @@ public class SubscriptionActivity extends BaseActivity {
                 calendar.set(Calendar.MINUTE, 0);
                 calendar.set(Calendar.SECOND, 0);
                 newlong = calendar.getTimeInMillis();
-                oldTime=newlong;
+                oldTime = newlong;
                 loadNetData(newlong);//获取当天的网络数据
             }
 
@@ -480,9 +483,8 @@ public class SubscriptionActivity extends BaseActivity {
                 @Override
                 public void onClick(View view) {
                     SubscriptionMessage bean = sortSubsrciprions.get(position).beans.get(i);
-                    String url = baseUrl + "common/charts/mobileCharts.action?" + "numId=" + bean.getNUM_ID_() +
-                            "&mainId=" + bean.getINSTANCE_ID_() + "&insId=" + bean.getID_() +
-                            "&title=" + bean.getTITLE_();
+                    String url = baseUrl + "common/charts/mobileCharts.action";
+                    Log.i("weburl: ", url);
                     String chche = bean.getTITLE_() == null ? "" : bean.getTITLE_();
 //                    String title = TimeUtils.long2str(sortSubsrciprions.get(position).tiem, "yyyyMMdd") + "  " + bean.getTITLE_();
                     String title = bean.getTITLE_();
@@ -491,7 +493,16 @@ public class SubscriptionActivity extends BaseActivity {
                         title = bean.getTITLE_();
                     }
 
-                    ViewUtil.webLinks(activity, url, title, true);
+//                    ViewUtil.webLinks(activity, url, title, true);
+                    Intent intent_web = new Intent(ct, WebViewCommActivity.class);
+                    intent_web.putExtra("url", url);
+                    intent_web.putExtra("p", title);
+                    intent_web.putExtra("cookie", true);
+                    intent_web.putExtra("subsact", "subsDetail");
+                    intent_web.putExtra("position", i);
+                    intent_web.putExtra("subsdata", beans);
+                    ct.startActivity(intent_web);
+
                     if (bean.getSTATUS_() == 0) {//当点击未读消息
                         SubscriptionDao.getInstance().UpdateStatus(bean.getID_() + "", true);
                         sortSubsrciprions.get(position).beans.get(i).setSTATUS_(-1);

WeiChat/src/main/res/drawable/selector_flip_btn.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_flip_btn_press" android:state_checked="true"/>
+    <item android:drawable="@drawable/shape_flip_btn_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/shape_flip_btn_press" android:state_selected="true"/>
+
+    <item android:drawable="@drawable/shape_flip_btn_normal"/>
+</selector>

WeiChat/src/main/res/drawable/shape_flip_btn_normal.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="10dp"/>
+
+    <solid android:color="#fffb9129"/>
+
+</shape>

WeiChat/src/main/res/drawable/shape_flip_btn_press.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="10dp"/>
+
+    <solid android:color="#90da7d22"/>
+
+</shape>

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

@@ -47,6 +47,7 @@
                     android:minHeight="120dp"
                     android:padding="5dp"
                     android:maxHeight="1000dp"
+
                     />
                 <View
                     android:layout_width="match_parent"

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

@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/lightgrey"
-    android:orientation="vertical" >
+    android:orientation="vertical">
+
     <ProgressBar
         android:id="@+id/pb"
         style="?android:attr/progressBarStyleHorizontal"
@@ -14,13 +15,48 @@
         android:indeterminateDuration="500"
         android:indeterminateOnly="false"
         android:max="100"
-        android:visibility="gone"
-        android:progressDrawable="@drawable/webview_progress_bar" >
-    </ProgressBar>
-    <com.handmark.pulltorefresh.library.PullToRefreshWebView
-        android:id="@+id/webView_listview"
+        android:progressDrawable="@drawable/webview_progress_bar"
+        android:visibility="gone"></ProgressBar>
+
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layerType="software"
-        android:background="@color/linen" />
+        android:layout_height="match_parent">
+
+        <com.handmark.pulltorefresh.library.PullToRefreshWebView
+            android:id="@+id/webView_listview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/linen"
+            android:layerType="software" />
+
+        <TextView
+            android:id="@+id/web_previous_tv"
+            android:layout_width="100dp"
+            android:layout_height="36dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="25dp"
+            android:layout_marginLeft="30dp"
+            android:background="@drawable/selector_flip_btn"
+            android:gravity="center"
+            android:text="＜上一条"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/web_next_tv"
+            android:layout_width="100dp"
+            android:layout_height="36dp"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginBottom="25dp"
+            android:layout_marginRight="30dp"
+            android:background="@drawable/selector_flip_btn"
+            android:gravity="center"
+            android:text="下一条＞"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:visibility="gone"/>
+    </RelativeLayout>
+
 </LinearLayout>

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

@@ -153,7 +153,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:background="#f6f5f5">
+                    android:background="#f6f5f5"
+                    android:visibility="gone">
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -201,7 +202,7 @@
                         android:textSize="15sp"/>
                 </RelativeLayout>
 
-                </LinearLayout>
+
                 <com.xzjmyk.pm.activity.view.MyListView
                     android:id="@+id/work_daily_detail_task_lv"
                     android:layout_width="match_parent"
@@ -234,7 +235,8 @@
                 android:layout_marginLeft="5dp"
                 android:layout_marginRight="5dp"
                 android:background="@color/item_line" />
-        </LinearLayout>
+                 </LinearLayout>
+             </LinearLayout>
         </LinearLayout>
     </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
 

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

@@ -15,8 +15,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|center_horizontal"
-        android:text="加载数据·····"
         android:textColor="#6B99C9"
         android:textSize="15sp"
-        android:visibility="gone" />
+        android:visibility="visible" />
 </LinearLayout>

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

@@ -12,7 +12,7 @@
             android:layout_height="15dp"
             android:background="@drawable/node_wait3"
             android:contentDescription="@string/app_name"
-            android:layout_marginLeft="40px"
+            android:layout_marginLeft="20px"
              android:layout_marginTop="20dp"
 
              />
@@ -23,10 +23,10 @@
             android:layout_height="40dp"
             android:background="@drawable/avatar_normal"
             android:contentDescription="@string/app_name"
-            android:layout_marginLeft="20dp"
+            android:layout_marginLeft="5dp"
             android:layout_toRightOf="@id/item_daily_details_approval_flow_node_img"
             android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"/>
+            android:layout_marginBottom="10dp" />
 
         <TextView
             android:id="@+id/item_daily_details_approval_flow_name_tv"
@@ -36,7 +36,7 @@
             android:layout_toRightOf="@+id/item_daily_details_approval_flow_photo_img"
             android:text="方龙海"
             android:textColor="#575757"
-            android:textSize="@dimen/text_main"
+            android:textSize="@dimen/text_hine"
             android:layout_marginTop="10dp"
 
             />
@@ -49,7 +49,8 @@
             android:layout_below="@id/item_daily_details_approval_flow_name_tv"
             android:text="待审批"
             android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
+            android:textSize="@dimen/text_hine"
+            android:layout_marginTop="4dp"/>
 
         <TextView
             android:id="@+id/item_daily_details_approval_flow_time_tv"
@@ -59,7 +60,7 @@
             android:layout_marginRight="20dp"
             android:text="2016-11-4 19:40"
             android:textColor="#9F9595"
-            android:textSize="@dimen/text_main"
+            android:textSize="@dimen/text_hine"
             android:layout_marginTop="10dp"
             />
 

WeiChat/src/main/res/values/styles.xml

@@ -520,7 +520,6 @@
     </style>
     <!--适用于考勤单据修改后style-->
     <style name="from_button_base_bule2">
-
         <item name="android:layout_marginBottom">10dp</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">45dp</item>