Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into uu_v2.0

# Conflicts:
#	settings.gradle

WeiChat/build.gradle

@@ -29,6 +29,10 @@ android {
         versionName rootProject.ext.android.versionName
         multiDexEnabled true
         signingConfig signingConfigs.config
+
+        // 默认是umeng的渠道
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        manifestPlaceholders = [UMENG_CHANNEL_VALUE: "umeng"]
     }
 
     useLibrary 'org.apache.http.legacy'
@@ -51,9 +55,19 @@ android {
             signingConfig signingConfigs.config
         }
     }
-    productFlavors {
+    productFlavors {   // 友盟多渠道打包
+        wandoujia {}
+        _360 {}
+        baidu {}
+        xiaomi {}
+        tencent {}
+        taobao {}
+
     }
 
+    productFlavors.all {
+        flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
+    }
 }
 
 dependencies {

WeiChat/src/main/AndroidManifest.xml

@@ -126,7 +126,7 @@
         android:theme="@style/AppTheme">
         <meta-data
             android:name="UMENG_CHANNEL"
-            android:value="baidu" />
+            android:value="${UMENG_CHANNEL_VALUE}" />
         <!-- 启动页面 -->
         <activity android:name=".ui.SplashActivity">
             <intent-filter>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -364,7 +364,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             public void onClick(View v) {
 //                startActivity(new Intent(ct, PictureSelectorDemo.class));
 //                startActivity(new Intent(ct, PersonalRegActivity.class));
-                startActivity(new Intent(ct,TemperatureActivity.class));
+//                startActivity(new Intent(ct,TemperatureActivity.class));
 //                startActivity(new Intent(ct,ToastDemoActivity.class));
             }
         });

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

@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
-    android:background="@color/bg_main">
+    android:background="@color/light_green"
+    >
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -40,7 +41,7 @@
             android:layout_width="80dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:text="Center"/>
+            android:text="Notifi"/>
     </LinearLayout>
     <LinearLayout
         android:layout_width="wrap_content"
@@ -79,7 +80,13 @@
             android:layout_width="80dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:text="Center"/>
+            android:text="Notifi"/>
+        <Button
+            android:id="@+id/btn_b6"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="WithPicuure"/>
     </LinearLayout>
 
     <LinearLayout
@@ -113,6 +120,12 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="Center"/>
+        <Button
+            android:id="@+id/btn_c5"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Notifi"/>
     </LinearLayout>
     <LinearLayout
         android:layout_width="wrap_content"
@@ -146,5 +159,17 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="Center"/>
+        <Button
+            android:id="@+id/btn_d5"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Notifi"/>
+        <Button
+            android:id="@+id/btn_d6"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="CusXml"/>
     </LinearLayout>
 </LinearLayout>

WeiChat/src/main/java/com/xzjmyk/pm/activity/AppConfig.java → app_core/common/src/main/java/com/core/app/AppConfig.java

@@ -6,7 +6,7 @@ import android.content.SharedPreferences.Editor;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.xzjmyk.pm.activity.bean.ConfigBean;
+import com.core.model.ConfigBean;
 
 public class AppConfig {
     public static final boolean COMPANY = true;//不可以乱动，调试接口

WeiChat/src/main/java/com/xzjmyk/pm/activity/NetWorkObservable.java → app_core/common/src/main/java/com/core/net/NetWorkObservable.java

@@ -8,8 +8,9 @@ import android.database.Observable;
 import android.net.ConnectivityManager;
 import android.util.Log;
 
+import com.core.app.AppConfig;
+import com.core.net.utils.NetUtils;
 import com.xzjmyk.pm.activity.NetWorkObservable.NetWorkObserver;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 public class NetWorkObservable extends Observable<NetWorkObserver> {
 	public static interface NetWorkObserver {
@@ -26,7 +27,7 @@ public class NetWorkObservable extends Observable<NetWorkObserver> {
 		// 获取程序启动时的网络状态
 		mConnectivityManager = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
 		
-		mIsNetWorkActive = CommonUtil.isNetWorkConnected(mContext);
+		mIsNetWorkActive = NetUtils.isNetWorkConnected(mContext);
 				//isGprsOrWifiConnected();
 		if (AppConfig.DEBUG) {
 			Log.d(AppConfig.TAG, "mIsNetWorkActive:" + mIsNetWorkActive);
@@ -38,11 +39,7 @@ public class NetWorkObservable extends Observable<NetWorkObserver> {
 	}
 
 	private boolean isGprsOrWifiConnected() {
-//		NetworkInfo gprs = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
-//		NetworkInfo wifi = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-//		boolean isConnectedGprs = gprs != null && gprs.isConnected();
-//		boolean isConnectedWifi = wifi != null && wifi.isConnected();
-		return CommonUtil.isNetWorkConnected(MyApplication.getInstance());
+		return NetUtils.isNetWorkConnected(MyApplication.getInstance());
 	}
 
 	private BroadcastReceiver mNetWorkChangeReceiver = new BroadcastReceiver() {

app_core/common/src/main/java/com/core/net/location/BdLocationHelper.java

@@ -0,0 +1,229 @@
+package com.xzjmyk.pm.activity;
+
+import android.content.Intent;
+import android.support.v4.content.LocalBroadcastManager;
+
+import com.baidu.location.BDLocation;
+import com.baidu.location.BDLocationListener;
+import com.baidu.location.LocationClient;
+import com.baidu.location.LocationClientOption;
+import com.baidu.mapapi.model.LatLng;
+import com.common.LogUtil;
+import com.common.data.StringUtil;
+import com.common.preferences.PreferenceUtils;
+
+public class BdLocationHelper {
+    public static final String UPLOCATION_ACTION = "UPLOCATION_ACTION";//更新位置时候广播数据
+
+    private boolean locationOk;//是否定位成功
+    private LatLng latLng;
+    private String location;//位置信息
+    private String address;//详细地址
+    private String province;// 省份
+    private String cityName;// 城市
+    private String district;// 街道
+    private String errorMessage;//定位错误信息
+
+    private final Intent broadcast = new Intent(UPLOCATION_ACTION);//更新后广播
+    private LocationClient mLocationClient = null;
+    private int mFaildCount = 0;//失败次数
+
+    public BdLocationHelper() {
+        initLocation();
+    }
+
+    private void initLocation() {
+        mLocationClient = new LocationClient(MyApplication.getInstance().getApplicationContext()); // 声明LocationClient类
+        mLocationClient.registerLocationListener(mLocationListener); // 注册监听函数
+        mLocationClient.setLocOption(getOptionByGPS());
+//        requestLocation();
+    }
+
+    /**
+     * 获取配置
+     *
+     * @return
+     */
+    private LocationClientOption getOptionByGPS() {
+        LocationClientOption option = new LocationClientOption();
+        option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);//可选，默认高精度，设置定位模式，高精度，低功耗，仅设备
+        option.setCoorType("bd09ll");//可选，默认gcj02，设置返回的定位结果坐标系
+        option.setScanSpan(20 * 1000);//可选，默认0，即仅定位一次，设置发起定位请求的间隔需要大于等于1000ms才是有效的
+        option.setIsNeedAddress(true);//可选，设置是否需要地址信息，默认不需要
+        option.setOpenGps(true);//可选，默认false,设置是否使用gps
+        option.setLocationNotify(false);//可选，默认false，设置是否当GPS有效时按照1S/1次频率输出GPS结果
+        option.setIsNeedLocationDescribe(true);//可选，默认false，设置是否需要位置语义化结果，可以在BDLocation.getLocationDescribe里得到，结果类似于“在北京天安门附近”
+        option.setIsNeedLocationPoiList(false);//可选，默认false，设置是否需要POI结果，可以在BDLocation.getPoiList里得到
+        option.setIgnoreKillProcess(false);//可选，默认true，定位SDK内部是一个SERVICE，并放到了独立进程，设置是否在stop的时候杀死这个进程，默认不杀死
+        option.SetIgnoreCacheException(false);//可选，默认false，设置是否收集CRASH信息，默认收集
+        option.setEnableSimulateGps(true);//可选，默认false，设置是否需要过滤GPS仿真结果，默认需要
+        option.setNeedDeviceDirect(false);
+        return option;
+    }
+
+    /**
+     * 获取配置
+     *
+     * @return
+     */
+    private LocationClientOption getOptionNotGPS() {
+        LocationClientOption option = getOptionByGPS();
+        option.setOpenGps(false);
+        return option;
+    }
+
+
+    /**
+     * 关闭定位
+     **/
+    public void release() {
+        if (mLocationClient.isStarted()) {
+            mLocationClient.stop();
+        }
+    }
+
+
+    /**
+     * 重新定位
+     **/
+    public void requestLocation() {
+        if (mLocationClient == null) return;
+        if (!mLocationClient.isStarted()) {
+            mFaildCount = 0;
+            mLocationClient.start();
+        } else {
+            mLocationClient.requestLocation();
+        }
+    }
+
+
+    private BDLocationListener mLocationListener = new BDLocationListener() {
+        @Override
+        public void onReceiveLocation(BDLocation location) {
+            try {
+                setLocation(location);
+            } catch (Exception e) {
+                if (e != null)
+                    log("onReceiveLocation Exception" + e.getMessage());
+                clearLocation();
+            }
+        }
+    };
+
+
+    private void setLocation(BDLocation location) throws Exception {
+        if (location.getLocType() == BDLocation.TypeGpsLocation// GPS定位结果
+                || location.getLocType() == BDLocation.TypeNetWorkLocation//网络定位
+                || location.getLocType() == BDLocation.TypeOffLineLocation//离线定位（未验证离线定位的有效性）
+                ) {
+            //定位成功
+            locationOk = true;
+            latLng = new LatLng(location.getLatitude(), location.getLongitude());
+            this.location = location.getLocationDescribe();
+            province = location.getProvince();
+            cityName = location.getCity();
+            district = location.getDistrict();
+            address = location.getAddrStr();
+            if (!StringUtil.isEmpty(this.location))
+                PreferenceUtils.putString("bdlocation", this.location);
+            if (!StringUtil.isEmpty(address))
+                PreferenceUtils.putString("bdaddress", address);
+            errorMessage = "";
+        } else {
+            //统一为定位失败
+            locationOk = false;
+            log("定位失败");
+            if (location.getLocType() == BDLocation.TypeServerError) {
+                //服务端网络定位失败，可以反馈IMEI号和大体定位时间到loc-bugs@baidu.com，会有人追查原因
+                errorMessage = "服务端网络定位失败";
+                log("服务端网络定位失败");
+            } else if (location.getLocType() == BDLocation.TypeNetWorkException) {
+                //网络不同导致定位失败，请检查网络是否通畅
+                errorMessage = "网络不同导致定位失败，请检查网络是否通畅";
+                log("网络不同导致定位失败，请检查网络是否通畅");
+            } else if (location.getLocType() == BDLocation.TypeCriteriaException) {
+                //无法获取有效定位依据导致定位失败，一般是由于手机的原因，处于飞行模式下一般会造成这种结果，可以试着重启手机
+                errorMessage = "无法获取有效定位依据导致定位失败";
+                log("无法获取有效定位依据导致定位失败");
+            } else {
+                errorMessage = "未知错误";
+                log("未知错误");
+            }
+            if (mFaildCount < 3) {
+                mFaildCount++;
+                requestLocation();
+                return;
+            }
+        }
+        //发送广播
+        broadcast.putExtra(UPLOCATION_ACTION, locationOk);
+        LocalBroadcastManager.getInstance(MyApplication.getInstance()).sendBroadcast(broadcast);
+    }
+
+    private void log(String message) {
+        LogUtil.i(message);
+    }
+
+
+    public String getName() {
+        return StringUtil.isEmpty(location) ? "" : location;
+    }
+
+
+    // 获取经纬度
+    public double getLongitude() {
+        return latLng == null ? 1 : latLng.longitude;
+    }
+
+    // 获取经纬度
+    public double getLatitude() {
+        return latLng == null ? 1 : latLng.latitude;
+    }
+
+    // 获取地址详情
+    public String getAddress() {
+        return StringUtil.isEmpty(address) ? PreferenceUtils.getString("bdaddress") : address;
+    }
+
+
+    public String getProvinceName() {
+        return province;
+    }
+
+    public LatLng getLocation() {
+        return latLng;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public String getDistrictName() {
+        return district;
+    }
+
+    public boolean locationOk() {
+        return locationOk;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public boolean isLocationUpdate() {
+        return true;
+    }
+
+    private void clearLocation() {
+        locationOk = false;
+        latLng = null;
+        location = null;
+        address = null;
+        province = null;
+        cityName = null;
+        district = null;
+        errorMessage = null;
+    }
+
+}
+

app_core/common/src/main/java/com/core/net/utils/NetUtils.java

@@ -0,0 +1,8 @@
+package com.core.net.utils;
+
+/**
+ * Created by Arison on 2017/8/26.
+ */
+
+public class NetUtils {
+}

app_core/common/src/main/java/com/core/net/volley/FastVolley.java

@@ -0,0 +1,118 @@
+package com.xzjmyk.pm.activity.volley;
+
+import android.content.Context;
+
+import com.android.volley.DefaultRetryPolicy;
+import com.android.volley.NetworkError;
+import com.android.volley.Request;
+import com.android.volley.RequestQueue;
+import com.android.volley.RetryPolicy;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.Volley;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+
+public class FastVolley {
+
+	static final String TAG = "Volley";
+	static final boolean DEBUG = true;
+
+	private RequestQueue mRequestQueue;
+
+	public FastVolley(Context context) {
+		mRequestQueue = Volley.newRequestQueue(context);
+	}
+
+	public void start() {
+		mRequestQueue.start();
+	}
+
+	public void stop() {
+		mRequestQueue.stop();
+	}
+
+	public void addDefaultRequest(String parentTag, Request<?> request) {
+		addRequest(parentTag, request, FastVolley.newDefaultRetryPolicy());
+	}
+
+	public void addShortRequest(String parentTag, Request<?> request) {
+		addRequest(parentTag, request, FastVolley.newShortRetryPolicy());
+	}
+
+	public void addRequest(String parentTag, Request<?> request, RetryPolicy retryPolicy) {
+		if (request == null) {
+			return;
+		}
+		if (!CommonUtil.isNetWorkConnected(MyApplication.getInstance())) {
+			request.deliverError(new VolleyError(new NetworkError()));
+			return;
+		}
+		if (retryPolicy == null) {
+			retryPolicy = FastVolley.newShortRetryPolicy();
+		}
+		request.setRetryPolicy(retryPolicy);
+
+		request.setTag(getRequestTag(parentTag, request.getTag()));
+		mRequestQueue.add(request);
+	}
+
+	private static String getRequestTag(String parentTag, Object realTag) {
+		if (realTag == null) {
+			return parentTag;
+		} else {
+			return realTag + Integer.toHexString(realTag.hashCode());
+		}
+	}
+
+	public void cancelAll(String parentTag, Object tag) {
+		mRequestQueue.cancelAll(getRequestTag(parentTag, tag));
+	}
+
+	public void cancelAll(final String parentTag) {
+		mRequestQueue.cancelAll(new RequestQueue.RequestFilter() {
+			@Override
+			public boolean apply(Request<?> arg0) {
+				Object tag = arg0.getTag();
+				if (tag == null) {
+					return false;
+				}
+				if (tag instanceof String) {
+					return ((String) tag).indexOf(parentTag) != -1;
+				}
+				return false;
+			}
+		});
+	}
+
+	/* 请求一次，重试两次，最长请求时间可达30s，5s+10s+15s，普通接口使用此默认配置 */
+	public static DefaultRetryPolicy newDefaultRetryPolicy() {
+		return new DefaultRetryPolicy(5000, 2, 1);
+	}
+
+	/* 请求一次，重试0次，最长请求时间可达5s，一些很小的数据请求用此接口 */
+	public static DefaultRetryPolicy newShortRetryPolicy() {
+		return new DefaultRetryPolicy(5000, 0, 0);
+	}
+
+	// private RequestQueue mRequestQueue;
+	// public FastVolley(Context context) {
+	// mRequestQueue = Volley.newRequestQueue(context);
+	// mRequestQueue.start();
+	// }
+	//
+	// public void stop() {
+	// mRequestQueue.stop();
+	// }
+	//
+	// public void add(Request<?> request) {
+	// if (request == null) {
+	// return;
+	// }
+	// if (!MyApplication.getInstance().isNetworkActive()) {
+	// request.deliverError(new VolleyError(new NetworkError()));
+	// return;
+	// }
+	// mRequestQueue.add(request);
+	// }
+
+}