Browse Source

位置问题修改(待验证)

Bitliker 9 years ago
parent
commit
1ad19bf18d

+ 22 - 26
WeiChat/src/main/AndroidManifest.xml

@@ -2,12 +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="55"
-    android:versionName="5.5.0">
-
-    <uses-sdk
-        android:minSdkVersion="11"
-        android:targetSdkVersion="23" />
+    android:versionCode="56"
+    android:versionName="5.6.0">
     <!--share umeng-->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -80,7 +76,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
@@ -90,8 +85,6 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <!-- 震动权限 -->
-    <uses-permission android:name="android.permission.CAMERA" />
 
     <uses-feature android:name="android.hardware.camera" />
     <!-- 使用照相机权限 -->
@@ -106,7 +99,7 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:theme="@style/AppTheme">
-       
+
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="baidu" />
@@ -418,6 +411,11 @@
             android:name="BDAPPKEY"
             android:value="GMZFDGbbchdQQXjpabX38rTlychRGnEF" />
 
+        <service
+            android:name="com.baidu.location.f"
+            android:enabled="true"
+            android:process=":remote" />
+
         <activity
             android:name="com.baidu.autoupdatesdk.ConfirmDialoigActivity"
             android:configChanges="keyboardHidden|orientation"
@@ -598,18 +596,17 @@
         <activity android:name=".ui.erp.activity.oa.OptionActivity" />
         <activity android:name=".ui.erp.activity.oa.SelectListActivity" />
         <activity android:name=".ui.erp.activity.crm.SubsActivity" />
-        <activity android:name=".ui.erp.activity.me.UpdateSingleTextActivity"/>
-        <activity android:name=".ui.erp.activity.me.UpdateSexActivity"/>
+        <activity android:name=".ui.erp.activity.me.UpdateSingleTextActivity" />
+        <activity android:name=".ui.erp.activity.me.UpdateSexActivity" />
         <activity
             android:name=".ui.erp.activity.me.FeedbackActivity"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden"/>
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
         <activity android:name=".ui.erp.activity.oa.OAActivity" />
-        
+
         <!--umeng api key-->
         <meta-data
             android:name="UMENG_APPKEY"
-            android:value="57ea27bb67e58e088c003bbf" >
-        </meta-data>
+            android:value="57ea27bb67e58e088c003bbf"></meta-data>
         <!--weixin-->
         <activity
             android:name=".wxapi.WXEntryActivity"
@@ -617,11 +614,11 @@
             android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-       <!--qq-->
+        <!--qq-->
         <activity
             android:name="com.tencent.tauth.AuthActivity"
             android:launchMode="singleTask"
-            android:noHistory="true" >
+            android:noHistory="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -633,14 +630,14 @@
         </activity>
         <activity
             android:name="com.tencent.connect.common.AssistActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:configChanges="orientation|keyboardHidden|screenSize"/>
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
         <activity
             android:name=".WBShareActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="portrait" >
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="com.sina.weibo.sdk.action.ACTION_SDK_REQ_ACTIVITY" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -649,11 +646,10 @@
         <activity
             android:name="com.sina.weibo.sdk.component.WeiboSdkBrowser"
             android:configChanges="keyboardHidden|orientation"
-            android:windowSoftInputMode="adjustResize"
-            android:exported="false" >
-        </activity>
-     
-        <activity android:name=".ui.erp.activity.oa.SelectActivity"/>
+            android:exported="false"
+            android:windowSoftInputMode="adjustResize"></activity>
+
+        <activity android:name=".ui.erp.activity.oa.SelectActivity" />
 
         <activity
             android:name="com.umeng.socialize.editorpage.ShareActivity"

+ 4 - 5
WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -37,7 +37,7 @@ public class BdLocationHelper {
         mProvinceName = LocationSp.getInstance(context).getProvinceName("");
         mCityName = LocationSp.getInstance(context).getCityName("");
         mDistrictName = LocationSp.getInstance(context).getDistrictName("");
-        mLocationClient = new LocationClient(context); // 声明LocationClient类
+        mLocationClient = new LocationClient(context.getApplicationContext()); // 声明LocationClient类
         mLocationClient.registerLocationListener(mMyLocationListener); // 注册监听函数
         LocationClientOption option = new LocationClientOption();
         option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);//可选,默认高精度,设置定位模式,高精度,低功耗,仅设备
@@ -97,9 +97,6 @@ public class BdLocationHelper {
                 }
                 return;
             }
-            if (listener != null) {
-                listener.result(true);
-            }
             // 百度定位成功
             mLongitude = location.getLongitude();
             mLatitude = location.getLatitude();
@@ -125,7 +122,6 @@ public class BdLocationHelper {
                 LocationSp.getInstance(mContext).setDistrictName(mDistrictName);
                 isLocationUpdate = true;
             }
-
             if (AppConfig.DEBUG) {
                 Log.d(AppConfig.TAG, "百度定位信息  mLongitude:" + mLongitude + "  mLatitude:" + mLatitude + "  mAddressDetail:" + mAddress);
             }
@@ -134,6 +130,9 @@ public class BdLocationHelper {
             // mLocationClient.getLocOption().setScanSpan(100);
             // }
             mContext.sendBroadcast(new Intent(ACTION_LOCATION_UPDATE));// 发送广播
+            if (listener != null) {
+                listener.result(true);
+            }
         }
 
     };

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

@@ -535,7 +535,7 @@ public class TaskActivity extends BaseActivity {
         mparams.put("pageSize", "100");
         mparams.put("_noc", "1");
         String em_code = CommonUtil.getSharedPreferences(context, "erp_username");
-        mparams.put("condition", "ra_resourcecode='" + em_code + "' and ra_statuscode='" + status + "'");
+        mparams.put("condition", "ra_resourcecode='" + em_code + "' and ra_statuscode='" + status + "' "+"and nvl(class,' ')<>'projecttask'");
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(context, "sessionId"));
         ViewUtil.httpSendRequest(

+ 0 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddMeetTaskActivity.java

@@ -143,18 +143,14 @@ public class AddMeetTaskActivity extends BaseActivity {
 
     class AddMeetTaskAdapter extends BaseAdapter {
         private JSONArray array;
-
         public AddMeetTaskAdapter() {
         }
-
         public AddMeetTaskAdapter(JSONArray array) {
             this.array = array;
         }
-
         public JSONArray getArray() {
             return array;
         }
-
         public void setArray(JSONArray array) {
             this.array = array;
             notifyDataSetChanged();

+ 20 - 14
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AlarmaActivity.java

@@ -6,7 +6,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
-import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -22,6 +21,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
 import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -60,7 +60,6 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         //测试使用
         editText.setVisibility(View.GONE);
         editText2.setVisibility(View.GONE);
-
         //初始化界面显示时间
         tv_alar.setOnClickListener(this);
         tv_ualar.setOnClickListener(this);
@@ -92,19 +91,25 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
     }
 
     private void startThread(final boolean isChecked) {
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                if (isChecked) {
-                    unArmmanager();
-//                    tast();
-                    initArmmanager();
-                } else {
-                    unArmmanager();
-                }
-            }
-        }).start();
+        if (isChecked) {
+            unArmmanager();
+            initArmmanager();
+        } else {
+            unArmmanager();
+        }
     }
+//        new Thread(new Runnable() {
+//            @Override
+//            public void run() {
+//                if (isChecked) {
+//                    unArmmanager();
+//                    initArmmanager();
+//                } else {
+//                    unArmmanager();
+//                }
+//            }
+//        }).start();
+//    }
 
     private void tast() {
         String hh = null, mm = null;
@@ -173,6 +178,7 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         AlarmManager alarm = (AlarmManager) getSystemService(ALARM_SERVICE);
         Calendar calendar = Calendar.getInstance();
         calendar.setTimeInMillis(time);
+        Crouton.makeText(ct,"将在"+TimeUtils.long2str(time,"yyyy-MM-dd HH:mm")+"为您提醒");
         alarm.set(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), getPendingIntent(intent));
     }
 

+ 5 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/LocationMapActivity.java

@@ -1,7 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -28,6 +27,7 @@ import com.xzjmyk.pm.activity.BdLocationHelper;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 
@@ -47,6 +47,7 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
     private PoiInfo myPoInfo;
     private int location;
     private LatLng point;
+    private EmptyLayout emptyLayout;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -59,7 +60,6 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
         BaiduMapUtil.getInstence().getNearInfo(location, 0, point, mPoiSearch, "公司", new BaiduMapUtil.OnNeerPoiListener() {
             @Override
             public void result(SearchResult result) {
-//                PoiResult poiResult = msg.getData().getParcelable("data");
                 if (result instanceof PoiResult)
                     updataByHandle((PoiResult) result);
             }
@@ -74,10 +74,10 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
             if (action.equals("SigninFragment")) {
                 theme = getSharedPreferences("cons", MODE_PRIVATE).getInt("theme",
                         R.style.OAThemeSignin);
-            } else if (action.equals("MeetDetailsActivity")){
+            } else if (action.equals("MeetDetailsActivity")) {
                 theme = getSharedPreferences("cons", MODE_PRIVATE).getInt("theme",
                         R.style.OAThemeMeet);
-            }else if (action.equals("Outoffice")){
+            } else if (action.equals("Outoffice")) {
                 theme = getSharedPreferences("cons", MODE_PRIVATE).getInt("theme",
                         R.style.OAThemeOutOffice);
             }
@@ -88,6 +88,7 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
     private void initView() {
         mapView = (MapView) findViewById(R.id.bmapView);
         listView = (PullToRefreshListView) findViewById(R.id.listview);
+        listView.setEmptyView(R.layout.view_empty);
         BaiduMapUtil.getInstence().setMapViewPoint(mapView, point);
         adapter = new LocationMapAdapter();
         listView.setAdapter(adapter);

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

@@ -208,7 +208,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         oa_meeting_end.setText(TimeUtils.long2str(endLongTime, "MM月dd"));
         oa_meeting_start_date.setText(TimeUtils.long2str(startLongTime, "HH:mm"));
         oa_meeting_end_date.setText(TimeUtils.long2str(endLongTime, "HH:mm"));
-        if (entity.getMa_recorder() != null && !MyApplication.getInstance().mLoginUser.getNickName().equals(entity.getMa_recorder()) || "已结束".equals(status_tv.getText().toString().trim())) {
+        if (!StringUtils.isEmpty(MyApplication.getInstance().mLoginUser.getNickName()) && entity.getMa_recorder() != null && !MyApplication.getInstance().mLoginUser.getNickName().equals(entity.getMa_recorder()) || "已结束".equals(status_tv.getText().toString().trim())) {
             end_meet_tv.setVisibility(View.GONE);
         } else {
             end_meet_tv.setVisibility(View.VISIBLE);

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutSigninOKActivity.java

@@ -73,7 +73,7 @@ public class OutSigninOKActivity extends BaseActivity {
     private ImageView image;
     private String baseUrl;
     private Uri mNewPhotoUri;
-
+    private boolean isSubmit=false;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -304,7 +304,7 @@ public class OutSigninOKActivity extends BaseActivity {
                     }
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    ToastUtil.showToast(ct, message == null ? "" : message);
+                    Crouton.makeText(ct, message);
                     break;
             }
         }

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/SigninAdapter.java

@@ -142,7 +142,7 @@ public class SigninAdapter extends RecyclerView.Adapter<SigninAdapter.ViewHoler>
      */
     private String getTag(String workTime, String startSignin, String endSignin, String proit, boolean isU) {
         String tag = "";
-        if (proit.compareTo(workTime) < 0 && proit.compareTo(startSignin) > 0) { //判断正常签到 在startSignin到workTime之间
+        if (proit.compareTo(workTime) <= 0 && proit.compareTo(startSignin) >=0) { //判断正常签到 在startSignin到workTime之间
             tag = isU ? "-1" : "早退";
         } else if (proit.compareTo(workTime) > 0 && proit.compareTo(endSignin) < 0) { //判断迟到签到 在workTime到endSignin
             tag = isU ? "迟到" : "-1";

+ 16 - 7
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.fragment;
 
+import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -10,6 +11,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.text.Spanned;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -38,6 +40,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.tool.ThreadUtil;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
+import com.xzjmyk.pm.activity.util.PermissionUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
@@ -125,7 +128,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                         Crouton.makeText(ct, "系统尚未找到您的班次,请联系管理员设置班次");
 //                        handler.postDelayed(new Runnable() {
 //                            @Override
-//                            public void run() {
+//                            public void run (){
 //                                ct.finish();
 //                            }
 //                        }, 2000);
@@ -161,7 +164,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                         Crouton.makeText(ct, message);
                     break;
             }
-
         }
     };
 
@@ -300,6 +302,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         locationHelper.setListener(new BdLocationHelper.OnBaiduResultListener() {
             @Override
             public void result(boolean isOk) {
+                Log.i("gongpengming", "aaaaaa");
                 setBaiduLocation();
             }
         });
@@ -323,6 +326,12 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         listview.setAdapter(adapter);
         office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + addr + "</font>"));
         loadNetData(System.currentTimeMillis());//获取打卡班次信息
+        //判断是否有定位权限
+        PermissionUtil util = new PermissionUtil(ct);
+        String[] permission = {Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION};
+        if (!util.hasPermissionGranted(permission)) {
+            Crouton.makeText(ct, "定位权限被禁止,请到设置中打开", 3000);
+        }
     }
 
     private void showDateDialog() {
@@ -394,11 +403,11 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             }
         }, 5000);
         ArrayList<Bean> beans = getDataByAdapter();
-        String time =null;
+        String time = null;
         if (!StringUtils.isEmpty(signinTime)) {
-            time= TimeUtils.long2str(TimeUtils.f_str_2_long(signinTime),"HH:mm");
-        }else{
-            time= TimeUtils.long2str(this.time,"HH:mm");
+            time = TimeUtils.long2str(TimeUtils.f_str_2_long(signinTime), "HH:mm");
+        } else {
+            time = TimeUtils.long2str(this.time, "HH:mm");
         }
         for (int i = 0; i < beans.size(); i++) {
             Bean b = beans.get(i);
@@ -570,7 +579,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         bean.setCl_code(code);
         bean.setCl_distance(distance);
         bean.setCl_emcode(CommonUtil.getSharedPreferences(ct, "erp_username"));
-//        bean.setCl_time(time);
+//      bean.setCl_time(time);
         bean.setCl_location(loaction);
         bean.setCl_address(addr);
         bean.setCl_emname(MyApplication.getInstance().mLoginUser.getNickName());

+ 81 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/util/PermissionUtil.java

@@ -0,0 +1,81 @@
+package com.xzjmyk.pm.activity.util;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.content.pm.PackageManager;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
+
+/**
+ * android6.0以上权限控制
+ * 使用:
+ * 1.hasPermissionGranted(..) 判断有没有需要使用的权限
+ * 2.如果没有权限请求权限requestRequiredPermissions(..)
+ * 3.在对应的activity的onRequestPermissionsResult或是对应的Fragment的onRequestPermissions中获取请求的结果
+ * 4.进行权限之后动作
+ */
+public class PermissionUtil {
+    private Activity activity;
+
+    public PermissionUtil(Activity activity) {
+        this.activity = activity;
+    }
+
+    /**
+     * 判断是否拥有指定权限
+     *
+     * @param permissions 要检查的权限
+     * @return 若有一个权限没有,就返回false,全部权限都拥有,返回true
+     */
+    public boolean hasPermissionGranted(String[] permissions) {
+        for (String permission : permissions) {
+            if (ContextCompat.checkSelfPermission(activity, permission) == PackageManager.PERMISSION_DENIED) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 判断是否向用户显示权限请求的依据(向用户解释为什么要申请该权限)
+     *
+     * @param permissions 要申请的权限
+     * @return 若有一个权限应该显示依据,返回true,若全部权限都不应该显示依据,返回false
+     */
+    private boolean shouldShowRequestPermissionRationale(String[] permissions) {
+        for (String permission : permissions) {
+            if (ActivityCompat.shouldShowRequestPermissionRationale(activity, permission)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 请求所需所有的权限
+     *
+     * @param permissions 要请求的权限  对应onRequestPermissionsResult中的第二个参数permissions
+     * @param requestCode 权限请求码  对应onRequestPermissionsResult中的第一个参数requestCode
+     */
+    public void requestRequiredPermissions(final String[] permissions,  final int requestCode) {
+        if (shouldShowRequestPermissionRationale(permissions)) {
+            new AlertDialog.Builder(activity)
+                    .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            ActivityCompat.requestPermissions(activity, permissions, requestCode);
+                        }
+                    })
+                    .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            activity.finish();
+                        }
+                    })
+                    .show();
+        } else {
+            ActivityCompat.requestPermissions(activity, permissions, requestCode);
+        }
+    }
+}

+ 3 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/view/crouton/Crouton.java

@@ -181,7 +181,9 @@ public final class Crouton {
     public static void makeText(Context ct, String message) {
         makeText((BaseActivity) ct, message, ct.getResources().getColor(R.color.light_green), 1000).show();
     }
-
+    public static void makeText(Context ct, String message,int time) {
+        makeText((BaseActivity) ct, message, ct.getResources().getColor(R.color.light_green),  time).show();
+    }
     /**
      * 自定义设置背景色,延时时间
      *