添加了应用统计

WeiChat/build.gradle

@@ -66,4 +66,5 @@ dependencies {
     compile files('libs/xutils.jar')
     compile files('libs/flexjson-2.1.jar')
     compile 'com.android.support:support-v4:22+'
+    compile 'com.umeng.analytics:analytics:latest.integration'
 }

WeiChat/src/main/AndroidManifest.xml

@@ -46,7 +46,6 @@ b
 
     <!-- Push service 运行需要的权限 -->
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
@@ -72,6 +71,10 @@ b
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
 
+        <meta-data android:value="574504a167e58eec520017df" android:name="UMENG_APPKEY"/>
+        <meta-data android:value="baidu" android:name="UMENG_CHANNEL"/>
+
+
         <!-- 启动页面 -->
         <activity
             android:name=".ui.SplashActivity"

WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -20,11 +20,12 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
 import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
+import com.umeng.analytics.MobclickAgent;
 import com.xzjmyk.pm.activity.bean.ConfigBean;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.Constants;
+import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.volley.FastVolley;
 
 import org.apache.http.cookie.Cookie;
@@ -53,6 +54,9 @@ public class MyApplication extends Application {
 		new Handler().postDelayed(new Runnable() {
 			@Override
 			public void run() {
+				//定位场景设置
+				MobclickAgent.setScenarioType(MyApplication.this, MobclickAgent.EScenarioType. E_UM_NORMAL);
+
 				SDKInitializer.initialize(getApplicationContext());
 				// 初始化数据库
 				SQLiteHelper.copyDatabaseFile(getApplicationContext());

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/BaseActivity.java

@@ -2,88 +2,100 @@ package com.xzjmyk.pm.activity.ui.base;
 
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
-import android.util.Log;
 
 import com.android.volley.Request;
 import com.android.volley.RetryPolicy;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.umeng.analytics.MobclickAgent;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.util.Constants;
+import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.volley.FastVolley;
 
 /**
  * 带网络请求的Activity继承
- * 
+ *
  * @author Dean Tao
  */
 public abstract class BaseActivity extends ActionBackActivity {
 
-	private FastVolley mFastVolley;
-	private String HASHCODE;
-
-	public BaseActivity() {
-		super();
-		HASHCODE = Integer.toHexString(this.hashCode()) + "@";// 加上@符号，将拼在一起的两个HashCode分开
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		mFastVolley = MyApplication.getInstance().getFastVolley();
-		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
-	}
-
-	@Override
-	protected void onDestroy() {
-		// 取消所有HASHCODE包含该类名的request
-		mFastVolley.cancelAll(HASHCODE);
-		super.onDestroy();
-	}
-
-	@Override
-	protected void onStop() {
-		super.onStop();
+    private FastVolley mFastVolley;
+    private String HASHCODE;
+
+    public BaseActivity() {
+        super();
+        HASHCODE = Integer.toHexString(this.hashCode()) + "@";// 加上@符号，将拼在一起的两个HashCode分开
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        MobclickAgent.onResume(this);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        MobclickAgent.onPause(this);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mFastVolley = MyApplication.getInstance().getFastVolley();
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
+    }
+
+    @Override
+    protected void onDestroy() {
+        // 取消所有HASHCODE包含该类名的request
+        mFastVolley.cancelAll(HASHCODE);
+        super.onDestroy();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
 //		Log.i("Arison","BaseActivity onStop()");
-		//PreferenceUtils.putBoolean(this, Constants.IS_NOTIFICATION, true);//进行通知
-	}
-
-	@Override
-	protected void onStart() {
-		super.onStart();
-		PreferenceUtils.putBoolean(this, Constants.IS_NOTIFICATION, false);//不进行通知
-	}
-
-	public void addDefaultRequest(Request<?> request) {
-		mFastVolley.addDefaultRequest(HASHCODE, request);
-	}
-
-	public void addShortRequest(Request<?> request) {
-		mFastVolley.addShortRequest(HASHCODE, request);
-	}
-
-	public void addRequest(Request<?> request, RetryPolicy retryPolicy) {
-		mFastVolley.addRequest(HASHCODE, request, retryPolicy);
-	}
-
-	public void cancelAll(Object tag) {
-		mFastVolley.cancelAll(HASHCODE, tag);
-	}
-
-	public void cancelAll() {
-		mFastVolley.cancelAll(HASHCODE);
-	}
-
-	public boolean isNetworkActive() {
-		return MyApplication.getInstance().isNetworkActive();
-	}
-
-
-	/**
-	 * @author LiuJie
-	 * @功能:ToastMessage
-	 */
-	public void ToastMessage(String message) {
-		ViewUtil.ToastMessage(this, message);
-	}
+        //PreferenceUtils.putBoolean(this, Constants.IS_NOTIFICATION, true);//进行通知
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        PreferenceUtils.putBoolean(this, Constants.IS_NOTIFICATION, false);//不进行通知
+    }
+
+    public void addDefaultRequest(Request<?> request) {
+        mFastVolley.addDefaultRequest(HASHCODE, request);
+    }
+
+    public void addShortRequest(Request<?> request) {
+        mFastVolley.addShortRequest(HASHCODE, request);
+    }
+
+    public void addRequest(Request<?> request, RetryPolicy retryPolicy) {
+        mFastVolley.addRequest(HASHCODE, request, retryPolicy);
+    }
+
+    public void cancelAll(Object tag) {
+        mFastVolley.cancelAll(HASHCODE, tag);
+    }
+
+    public void cancelAll() {
+        mFastVolley.cancelAll(HASHCODE);
+    }
+
+    public boolean isNetworkActive() {
+        return MyApplication.getInstance().isNetworkActive();
+    }
+
+
+    /**
+     * @author LiuJie
+     * @功能:ToastMessage
+     */
+    public void ToastMessage(String message) {
+        ViewUtil.ToastMessage(this, message);
+    }
 }

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

@@ -1,15 +1,22 @@
 package com.xzjmyk.pm.activity.ui.erp.activity;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
-public class ClientActivity extends AppCompatActivity {
+public class ClientActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_client);
     }
+
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        finish();
+    }
 }

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

@@ -37,12 +37,9 @@ public class ErpMenActivity extends BaseActivity {
         ct = this;
         initData();
     }
-
     private void initData() {
         getSupportActionBar().setTitle("工作");
         menus = new ArrayList<String>();
-//        menus.add("销售订单");
-//        menus.add("报价单");
         menus.add("请假单");
         menus.add("出差单");
         menus.add("加班申请");
@@ -89,8 +86,6 @@ public class ErpMenActivity extends BaseActivity {
                 DetailItemAdapter.ListItem item = (DetailItemAdapter.ListItem) view.getTag();
                 String tag = item.menu_name.getText().toString();
                 int falg = 0;
-
-
                 if ("销售订单".equals(tag)) {
                     falg = 0;
                 }

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

@@ -182,11 +182,9 @@ public class TaskActivity extends BaseActivity {
                                     final int position, long id) {
                 SchedultAdapter.Store store = (SchedultAdapter.Store) view.getTag();
                 store.iv_website.setOnClickListener(new OnClickListener() {
-
                     @Override
                     public void onClick(View v) {
                         handler.postDelayed(new Runnable() {
-
                             @Override
                             public void run() {
                                 loadWebView(position);
@@ -207,12 +205,9 @@ public class TaskActivity extends BaseActivity {
                 intent.putExtra("taskcode", store.taskCode);//处理人编号
                 intent.putExtra("ra_taskid", store.task_id);//取回复内容id
                 intent.putExtra("attachs", store.attachs);
-                Log.i("gongpengming", store.tv_task_duration);
-
                 intent.putExtra("endtime", store.tv_task_duration);
                 startActivity(intent);
             }
-
             /**
              * @param position
              */
@@ -244,7 +239,6 @@ public class TaskActivity extends BaseActivity {
         });
 
         listview_main.setOnRefreshListener(new OnRefreshListener<ListView>() {
-
             @Override
             public void onRefresh(PullToRefreshBase<ListView> refreshView) {
                 if (state_all == null || state_finish == null
@@ -343,9 +337,7 @@ public class TaskActivity extends BaseActivity {
             sendBroadcast(intent_update);
             Looper.loop();
         }
-
     }
-
     public void sendHomeBroadcast(int count) {
         Intent intent_update = new Intent("com.activity.update.data");
         intent_update.putExtra("count", String.valueOf(count));
@@ -453,7 +445,6 @@ public class TaskActivity extends BaseActivity {
         Log.i("coder", "xPos:" + xPos);
         popupWindow.showAsDropDown(parent, windowManager.getDefaultDisplay().getWidth(), 0);
         state_start.setOnClickListener(new OnClickListener() {
-
             @Override
             public void onClick(View v) {
                 sendResquestForServer("START", 2);
@@ -581,7 +572,6 @@ public class TaskActivity extends BaseActivity {
         mparams.put("_noc", "1");
         String em_code = CommonUtil.getSharedPreferences(context, "erp_emid");
         mparams.put("condition", "recorderid='" + em_code + "'" + "and handstatuscode<>'FINISHED'");
-        //ViewUtil.startNetThread(context,url, mparams, handler, handlerWhat, null, null, "get");
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(context, "sessionId"));
         ViewUtil.httpSendRequest(
@@ -589,8 +579,6 @@ public class TaskActivity extends BaseActivity {
                 mparams,
                 handler, headers, handlerWhat, null, null, "get");
     }
-
-
     public void sendDataToServer(String url, Map<String, String> param, int what) {
         url = Constants.getAppBaseUrl(this) + url;
         param.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));

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

@@ -10,6 +10,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
-    android:textSize="25sp"
-    android:text="该功能尚未完善"/>
+    android:textSize="20sp"
+    android:text="该功能尚未开通"/>
 </RelativeLayout>

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

@@ -123,7 +123,6 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
-            android:layout_marginTop="7dp"
             android:background="@color/item_line" />
         <RelativeLayout
             android:id="@+id/my_client_rl"
@@ -180,6 +179,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
+            android:layout_marginTop="7dp"
             android:background="@color/item_line" />
 
         <RelativeLayout

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

@@ -42,6 +42,7 @@
         android:layout_height="35dp"
         android:drawableLeft="@drawable/dele"
         android:gravity="center"
+        android:visibility="gone"
         android:text="@string/send_gift"
         android:textColor="@color/white"
         android:textSize="@dimen/text_hine" />