外勤签到列表界面修改

WeiChat/src/main/AndroidManifest.xml

@@ -552,8 +552,8 @@
             android:theme="@style/OAThemeMeet" />
         <activity
             android:name=".ui.erp.activity.oa.OAListActivity"
-            android:label="外勤签到列表" />
-        <activity android:name=".ui.erp.activity.oa.OptionActivity"></activity>
+            android:label="外勤签到列表"
+            android:theme="@style/OAThemeOutOffice" />
+        <activity android:name=".ui.erp.activity.oa.OptionActivity" />
     </application>
-
 </manifest>

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

@@ -298,9 +298,6 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 if (!user_tv.getText().toString().trim().equals(MyApplication.getInstance().mLoginUser.getNickName().trim())) {
                     Crouton.makeText(ct, "你不是会议管理员，没有权限编写会议纪要");
                     return;
-                } else if ("已结束".equals(status_tv.getText().toString().trim())) {
-                    Crouton.makeText(ct, "当前会议已经结束，不能在填写会议纪要");
-                    return;
                 }
                 StringBuilder name = new StringBuilder();
                 StringBuilder emcome = new StringBuilder();

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

@@ -14,18 +14,42 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baidu.mapapi.map.MapView;
+import com.baidu.mapapi.model.LatLng;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.util.CalendarUtils;
+import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class OAListActivity extends BaseActivity {
+    @ViewInject(R.id.rili_tv)
+    private TextView rili_tv;
+    @ViewInject(R.id.name_tv)
+    private TextView name_tv;
+    @ViewInject(R.id.num_tv)
+    private TextView num_tv;
+    @ViewInject(R.id.prot_tv)
+    private TextView prot_tv;
+    @ViewInject(R.id.head_img)
+    private ImageView head_img;
+    @ViewInject(R.id.mapView)
+    private MapView mapView;
+    @ViewInject(R.id.listview)
+    private ListView listview;
 
     private Handler handler = new Handler() {
         @Override
@@ -33,21 +57,76 @@ public class OAListActivity extends BaseActivity {
             progressDialog.dismiss();
             String message = (String) msg.getData().get("result");
             if (msg.what == 0x13) {
-                listview.setAdapter(new SigninAdapter(JSON.parseObject(message).getJSONArray("listdata")));
+                adapter.setJson(JSON.parseObject(message).getJSONArray("listdata"));
+//                listview.setAdapter(new SigninAdapter(JSON.parseObject(message).getJSONArray("listdata")));
             }
         }
     };
-    private ListView listview;
+
+    private String date = null;
+    private SigninAdapter adapter = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_oalist);
+        ViewUtils.inject(this);
+        init();
         initView();
     }
 
+    private void init() {
+        date = TimeUtils.s_long_2_str(System.currentTimeMillis());
+
+    }
+
+    private void initView() {
+        rili_tv.setText(StringUtils.isEmpty(date) ? "" : date);
+        String name = MyApplication.getInstance().mLoginUser.getNickName();
+        name_tv.setText(StringUtils.isEmpty(name) ? "" : name);
+        prot_tv.setText("");
+        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
+        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
+        BaiduMapUtil.getInstence().setMapViewPoint(mapView, new LatLng(longitude, latitude), true);
+        AvatarHelper.getInstance().displayAvatar(MyApplication.getInstance().mLoginUser.getUserId(), head_img, true);
+        JSONArray array = getIntent().getParcelableExtra("data");
+        adapter = new SigninAdapter();
+        listview.setAdapter(adapter);
+        if (array == null || array.size() <= 0) {
+            loadLog(date);
+        } else {
+            adapter.setJson(array);
+            listview.setAdapter(adapter);
+        }
+        rili_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                showDateDialog();
+            }
+        });
+
+    }
+
+    private void showDateDialog() {
+        OASigninPicker picker = new OASigninPicker(this);
+        picker.setRange(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setOnDateTimePickListener(new OASigninPicker.OnDateTimePickListener() {
+            @Override
+            public void setTime(String year, String month, String day) {
+                String time = year + "-" + month + "-" + day;
+                if (!time.equals(date)) {
+                    date = time;
+                    rili_tv.setText(date);
+                    loadLog(date);
+                }
+            }
+        });
+        picker.show();
+    }
+
     //获取打卡记录 date:yyyy-MM-dd
-    private void loadLog() {
+    private void loadLog(String date) {
         progressDialog.show();
         //获取网络数据
         String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/common/list.action";
@@ -57,7 +136,7 @@ public class OAListActivity extends BaseActivity {
         param.put("page", 1);
         param.put("pageSize", 1000);
         param.put("emcode", emcode);
-        param.put("condition", "mo_mancode='" + emcode + "' and to_char(mo_signtime,'yyyy-MM-dd')='" + TimeUtils.s_long_2_str(System.currentTimeMillis()) + "'");
+        param.put("condition", "mo_mancode='" + emcode + "' and to_char(mo_signtime,'yyyy-MM-dd')='" + date + "'");
         param.put("caller", "Mobile_outsign");
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
@@ -65,20 +144,21 @@ public class OAListActivity extends BaseActivity {
         com.xzjmyk.pm.activity.ui.erp.util.ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x13, null, null, "get");
     }
 
-    private void initView() {
-        JSONArray array = getIntent().getParcelableExtra("data");
-        listview = (ListView) findViewById(R.id.listview);
-        if (array == null || array.size() <= 0)
-            loadLog();
-        else
-            listview.setAdapter(new SigninAdapter(array));
-    }
 
     class SigninAdapter extends BaseAdapter {
         private JSONArray json;
 
-        public SigninAdapter(JSONArray json) {
+        public SigninAdapter() {
+        }
+
+        public JSONArray getJson() {
+            return json;
+        }
+
+        public void setJson(JSONArray json) {
+            prot_tv.setText("本日签到 " + json.size() + " 次");
             this.json = json;
+            notifyDataSetChanged();
         }
 
         @Override
@@ -103,20 +183,26 @@ public class OAListActivity extends BaseActivity {
                 holder = new ViewHolder();
                 view = LayoutInflater.from(ct).inflate(R.layout.item_outoffice_list, null);
                 holder.time = (TextView) view.findViewById(R.id.time);
-                holder.name = (TextView) view.findViewById(R.id.name);
+                holder.day = (TextView) view.findViewById(R.id.day);
+                holder.location = (TextView) view.findViewById(R.id.location);
                 holder.addr = (TextView) view.findViewById(R.id.addr);
+                holder.remark = (TextView) view.findViewById(R.id.remark);
                 holder.image = (ImageView) view.findViewById(R.id.image);
-                holder.company = (TextView) view.findViewById(R.id.company);
                 view.setTag(holder);
             } else {
                 holder = (ViewHolder) view.getTag();
             }
             JSONObject object = json.getJSONObject(i);
-            holder.time.setText(object.getString("mo_signtime") == null ? "" : object.getString("mo_signtime"));
-            holder.name.setText(object.getString("mo_man") == null ? "" : object.getString("mo_man"));
-            holder.addr.setText(object.getString("mo_remark") == null ? "" : object.getString("mo_remark"));
-            holder.company.setText(object.getString("mo_company") == null ? "" : object.getString("mo_company"));
+            String str = getStrByJson(object, "mo_signtime");
+            if (!StringUtils.isEmpty(str)) {
+                holder.time.setText(TimeUtils.long2str(TimeUtils.f_str_2_long(str), "HH:mm"));
+                holder.day.setText(TimeUtils.long2str(TimeUtils.f_str_2_long(str), "MM/dd"));
+            }
+            holder.location.setText(getStrByJson(object, "mo_company"));
+            holder.addr.setText(getStrByJson(object, "mo_address"));
+            holder.remark.setText(getStrByJson(object, "mo_remark"));
             if (object.containsKey("mo_attachid") && object.getInteger("mo_attachid") > 1000) {
+                holder.image.setVisibility(View.VISIBLE);
                 ImageLoader.getInstance().displayImage(getImageUrl(object.getInteger("mo_attachid")), holder.image);
             } else {
                 holder.image.setVisibility(View.GONE);
@@ -124,16 +210,25 @@ public class OAListActivity extends BaseActivity {
             return view;
         }
 
+        private String getStrByJson(JSONObject object, String key) {
+            if (object.containsKey(key)) {
+                return object.getString(key) == null ? "" : object.getString(key);
+            }
+            return "";
+        }
+
         private String getImageUrl(int id) {
             return Constants.getAppBaseUrl(ct) + "common/downloadbyId.action?id=" + id;
         }
 
         class ViewHolder {
-            TextView time,//时间
-                    name,//签到人
-                    addr, //地址
-                    company;//签到公司
-            ImageView image;
+            TextView day,//日期
+                    time,//时间
+                    location,//位置名称
+                    addr,//位置详细
+                    remark;//备注
+            ImageView image;//图片
+
         }
     }
 }

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

@@ -206,7 +206,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                 break;
             case R.id.title:
                 showDateDialog();
-//                showPopMenu();
                 break;
             case R.id.unoffice_mm:
                 intent = new Intent(ct, LocationMapActivity.class);

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

@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp"
+                android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
         <shape>
             <solid android:color="@color/btn_orange_press" />
             <corners android:radius="8dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
+    </item>
 </selector>

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

@@ -8,7 +8,7 @@
         android:width="0.5dp"
         android:color="@android:color/black" />
     <!-- 圆角 -->
-    <corners android:radius="3dp" />
+    <corners android:radius="360dp" />
     <!-- 边距 -->
     <padding
         android:bottom="10dp"

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

@@ -10,55 +10,33 @@
     <LinearLayout
         android:id="@+id/top"
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="wrap_content"
         android:background="@color/oa_background_orange"
         android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:padding="10dp">
 
-        <LinearLayout
+        <TextView
             android:id="@+id/meet_save"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
             android:layout_weight="1"
-            android:clickable="true"
+            android:drawableTop="@drawable/oa_save_meet"
             android:gravity="center"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/oa_save_meet" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:text="会议纪要"
-                android:textColor="@color/white" />
-        </LinearLayout>
-
-        <LinearLayout
+            android:text="会议纪要"
+            android:textColor="@color/white" />
+
+        <TextView
             android:id="@+id/add_task_ll"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
+            android:layout_marginTop="2dp"
             android:layout_weight="1"
-            android:clickable="true"
+            android:drawableTop="@drawable/oa_add_task"
             android:gravity="center"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/oa_add_task" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:text="发起任务"
-                android:textColor="@color/white" />
-        </LinearLayout>
+            android:text="发起任务"
+            android:textColor="@color/white" />
     </LinearLayout>
 
     <RelativeLayout
@@ -153,6 +131,8 @@
             android:layout_alignTop="@id/addr"
             android:layout_marginLeft="10dp"
             android:layout_toRightOf="@id/addr"
+            android:ellipsize="end"
+            android:lines="1"
             android:text="未填写"
             android:textColor="@color/text_hine" />
 
@@ -286,16 +266,4 @@
         android:layout_alignParentBottom="true"
         android:background="@drawable/endmeeting" />
 
-    <!--<TextView-->
-    <!--android:id="@+id/end_meet_tv"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:layout_alignParentBottom="true"-->
-    <!--android:layout_below="@+id/meet_about"-->
-    <!--android:background="@color/white"-->
-    <!--android:clickable="true"-->
-    <!--android:gravity="center"-->
-    <!--android:padding="20dp"-->
-    <!--android:text="结束会议"-->
-    <!--android:textColor="@color/text_main" />-->
 </RelativeLayout>

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

@@ -1,14 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OAListActivity">
 
+    <FrameLayout
+        android:id="@+id/top_fl"
+        android:layout_width="match_parent"
+        android:layout_height="200dp">
+
+        <com.baidu.mapapi.map.MapView
+            android:id="@+id/mapView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clickable="false" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/rili_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:background="@drawable/oa_signin_tv_bg"
+                android:drawableLeft="@drawable/outoffice_sin"
+                android:drawableRight="@drawable/oa_next"
+                android:text="2016-07-01" />
+
+            <ImageView
+                android:id="@+id/head_img"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_alignParentBottom="true"
+                android:layout_margin="10dp" />
+            <TextView
+                android:id="@+id/name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/head_img"
+                android:layout_toRightOf="@id/head_img"
+                android:text="name"
+                android:textColor="@color/text_main" />
+
+            <TextView
+                android:id="@+id/num_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@id/name_tv"
+                android:layout_below="@id/name_tv"
+                android:layout_marginTop="5dp"
+                android:text="name"
+                android:textColor="@color/text_hine" />
+
+            <TextView
+                android:id="@+id/prot_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@id/num_tv"
+                android:layout_below="@id/num_tv"
+                android:layout_marginTop="5dp"
+                android:text="name"
+                android:textColor="@color/text_hine" />
+        </RelativeLayout>
+    </FrameLayout>
+
     <ListView
         android:id="@+id/listview"
-        android:divider="@color/item_line"
-        android:dividerHeight="2px"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</RelativeLayout>
+        android:layout_height="match_parent"
+        android:divider="@color/item_line"
+        android:dividerHeight="10px" />
+</LinearLayout>

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

@@ -1,46 +1,123 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="80dp"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:padding="8dp">
 
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-  />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/name"
-        android:layout_marginLeft="10dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/image"
-        android:text="签到人" />
+        <TextView
+            android:id="@+id/day"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="8/20"
+            android:textColor="@color/text_hine"
+            android:textSize="@dimen/text_hine" />
 
-    <TextView
-        android:id="@+id/company"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:text="签到企业"
-      />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dp"
+            android:background="@color/item_line" />
+    </LinearLayout>
 
-    <TextView
-        android:id="@+id/time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/name"
-        android:layout_below="@+id/name"
-        android:layout_marginTop="8dp"
-        android:text="签到地点" />
-
-    <TextView
-        android:id="@+id/addr"
-        android:layout_width="wrap_content"
+    <RelativeLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/name"
-        android:layout_below="@+id/time"
-        android:layout_marginTop="8dp"
-        android:text="签到地点" />
-</RelativeLayout>
+        android:layout_marginTop="8dp">
+
+        <TextView
+            android:id="@+id/time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="10:45"
+            android:textColor="@color/text_main"
+            android:textSize="20dp" />
+
+        <TextView
+            android:id="@+id/location"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_toRightOf="@id/time"
+            android:ellipsize="end"
+            android:lines="1"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/addr"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/location"
+            android:layout_below="@id/location"
+            android:layout_marginTop="6dp"
+            android:drawableLeft="@drawable/addr"
+            android:drawablePadding="4dp"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/remark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/addr"
+            android:layout_below="@id/addr"
+            android:layout_marginTop="6dp"
+  />
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_alignLeft="@id/remark"
+            android:layout_below="@id/remark"
+            android:layout_marginTop="6dp"
+            android:visibility="gone" />
+    </RelativeLayout>
+
+    <!--<ImageView-->
+    <!--android:id="@+id/image"-->
+    <!--android:layout_width="80dp"-->
+    <!--android:layout_height="80dp"-->
+    <!--/>-->
+
+    <!--<TextView-->
+    <!--android:id="@+id/name"-->
+    <!--android:layout_marginLeft="10dp"-->
+    <!--android:layout_width="wrap_content"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_toRightOf="@+id/image"-->
+    <!--android:text="签到人" />-->
+
+    <!--<TextView-->
+    <!--android:id="@+id/company"-->
+    <!--android:layout_width="wrap_content"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_alignParentRight="true"-->
+    <!--android:text="签到企业"-->
+    <!--/>-->
+
+    <!--<TextView-->
+    <!--android:id="@+id/time"-->
+    <!--android:layout_width="wrap_content"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_alignLeft="@id/name"-->
+    <!--android:layout_below="@+id/name"-->
+    <!--android:layout_marginTop="8dp"-->
+    <!--android:text="签到地点" />-->
+
+    <!--<TextView-->
+    <!--android:id="@+id/addr"-->
+    <!--android:layout_width="wrap_content"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_alignLeft="@id/name"-->
+    <!--android:layout_below="@+id/time"-->
+    <!--android:layout_marginTop="8dp"-->
+    <!--android:text="签到地点" />-->
+</LinearLayout>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://jcenter.bintray.com" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Aug 19 18:54:48 CST 2016
+#Wed Sep 14 12:34:53 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip