Просмотр исходного кода

提交分类: 功能优化;
提交内容: 封装HttpRequest网络请求类, 简化发起网络请求的代码
当前版本: 测试版本6.1.1
是否冲突: 否

raomeng 8 лет назад
Родитель
Сommit
a443eea416
20 измененных файлов с 658 добавлено и 476 удалено
  1. 19 18
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorkPlatFragment.java
  2. 3 3
      WeiChat/version.properties
  3. 1 1
      app_core/common/build.gradle
  4. 335 265
      app_core/common/src/main/java/com/core/base/BaseActivity.java
  5. 0 73
      app_core/common/src/main/java/com/core/base/activity/BaseMVPActivity.java
  6. 0 14
      app_core/common/src/main/java/com/core/base/callback/BaseCallback.java
  7. 14 0
      app_core/network/src/main/java/com/me/network/app/base/HttpCallback.java
  8. 130 0
      app_core/network/src/main/java/com/me/network/app/base/HttpParams.java
  9. 94 0
      app_core/network/src/main/java/com/me/network/app/http/HttpRequest.java
  10. 8 7
      app_modular/appworks/src/main/java/com/uas/appworks/activity/CityIndustryFuncSetActivity.java
  11. 16 12
      app_modular/appworks/src/main/java/com/uas/appworks/activity/CityIndustryServiceMainActivity.java
  12. 9 7
      app_modular/appworks/src/main/java/com/uas/appworks/activity/DeviceQueryActivity.java
  13. 2 1
      app_modular/appworks/src/main/java/com/uas/appworks/activity/WorkFuncSetActivity.java
  14. 2 1
      app_modular/appworks/src/main/java/com/uas/appworks/activity/WorkModuleSortActivity.java
  15. 0 13
      app_modular/appworks/src/main/java/com/uas/appworks/callback/WorkPlatCallback.java
  16. 4 4
      app_modular/appworks/src/main/java/com/uas/appworks/model/IWorkPlatModel.java
  17. 9 46
      app_modular/appworks/src/main/java/com/uas/appworks/model/WorkPlatModel.java
  18. 3 3
      app_modular/appworks/src/main/java/com/uas/appworks/presenter/IWorkPlatPresenter.java
  19. 7 7
      app_modular/appworks/src/main/java/com/uas/appworks/presenter/WorkPlatPresenter.java
  20. 2 1
      version.gradle

+ 19 - 18
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorkPlatFragment.java

@@ -20,7 +20,8 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.fragment.BaseMVPFragment;
-import com.core.net.http.http.Request;
+import com.me.network.app.base.HttpParams;
+import com.me.network.app.http.Method;
 import com.uas.appworks.model.bean.WorkMenuBean;
 import com.uas.appworks.presenter.WorkPlatPresenter;
 import com.uas.appworks.view.WorkPlatView;
@@ -122,7 +123,7 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
         String userId = MyApplication.getInstance().mLoginUser.getUserId();
         if (role.equals("1")) {//个人用户
             if (userId != null && !userId.equals(mUserId)) {
-                mPresenter.uasRequest(mContext, new Request.Bulider().setWhat(Constants.LOAD_WORK_MENU_CACHE).bulid());
+                mPresenter.uasRequest(mContext, new HttpParams.Builder().flag(Constants.LOAD_WORK_MENU_CACHE).build());
             }
             mUserId = userId;
             mCompanyName = "";
@@ -131,7 +132,7 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
             String companyName = com.core.utils.CommonUtil.getSharedPreferences(mContext, "companyName");
             if (companyName != null && userId != null
                     && (!userId.equals(mUserId) || !companyName.equals(mCompanyName))) {
-                mPresenter.uasRequest(mContext, new Request.Bulider().setWhat(Constants.LOAD_WORK_MENU_CACHE).bulid());
+                mPresenter.uasRequest(mContext, new HttpParams.Builder().flag(Constants.LOAD_WORK_MENU_CACHE).build());
             }
             mUserId = userId;
             mCompanyName = companyName;
@@ -141,7 +142,7 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
             String erp_master = com.core.utils.CommonUtil.getSharedPreferences(mContext, "erp_master");
             if (erp_company != null && erp_master != null && userId != null
                     && (!userId.equals(mUserId) || !erp_company.equals(mCompanyName) || !erp_master.equals(mMaster))) {
-                mPresenter.uasRequest(mContext, new Request.Bulider().setWhat(Constants.LOAD_WORK_MENU_CACHE).bulid());
+                mPresenter.uasRequest(mContext, new HttpParams.Builder().flag(Constants.LOAD_WORK_MENU_CACHE).build());
             }
             mUserId = userId;
             mCompanyName = erp_company;
@@ -157,13 +158,13 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
         LinkedHashMap<String, Object> header = new LinkedHashMap<>();
         header.put("Cookie", "JSESSIONID=" + com.core.utils.CommonUtil.getSharedPreferences(mContext, "sessionId"));
 
-        Request request = new Request.Bulider()
-                .setWhat(OBTAIN_APP_CITY_INDUSTRY_SERVICE)
-                .setUrl("api/serve/mainPage/getServices.action")
+        HttpParams request = new HttpParams.Builder()
+                .flag(OBTAIN_APP_CITY_INDUSTRY_SERVICE)
+                .url("api/serve/mainPage/getServices.action")
                 .setHeaders(header)
-                .setParam(params)
-                .setMode(Request.Mode.GET)
-                .bulid();
+                .setParams(params)
+                .method(Method.GET)
+                .build();
         mPresenter.uasRequest(mContext, request);
     }
 
@@ -184,7 +185,7 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode == Constants.WORK_MODULE_SORT_REQUEST || resultCode == Constants.WORK_FUNC_SET) {
-            mPresenter.uasRequest(mContext, new Request.Bulider().setWhat(Constants.LOAD_WORK_MENU_CACHE).bulid());
+            mPresenter.uasRequest(mContext, new HttpParams.Builder().flag(Constants.LOAD_WORK_MENU_CACHE).build());
         }
     }
 
@@ -193,12 +194,12 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
             return;
         }
         String url = "mobile/oa/getoaconifg.action";
-        Request request = new Request.Bulider()
-                .setUrl(url)
-                .setParam(new HashMap<String, Object>())
-                .setWhat(LOAD_ORDERS_CALLER)
-                .setMode(Request.Mode.GET)
-                .bulid();
+        HttpParams request = new HttpParams.Builder()
+                .url(url)
+                .setParams(new HashMap<String, Object>())
+                .flag(LOAD_ORDERS_CALLER)
+                .method(Method.GET)
+                .build();
         mPresenter.uasRequest(mContext, request);
     }
 
@@ -403,7 +404,7 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
             String resultJson = JSON.toJSONString(mCacheMenuTypeBeans);
             com.core.utils.CommonUtil.setUniqueSharedPreferences(mContext, Constants.WORK_MENU_CACHE, resultJson);
 
-            mPresenter.uasRequest(mContext, new Request.Bulider().setWhat(Constants.LOAD_WORK_MENU_CACHE).bulid());
+            mPresenter.uasRequest(mContext, new HttpParams.Builder().flag(Constants.LOAD_WORK_MENU_CACHE).build());
         }
     }
 

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 10 15:56:45 CST 2018
-debugName=405
+#Fri Jan 12 16:09:43 CST 2018
+debugName=409
 versionName=624
-debugCode=405
+debugCode=409
 versionCode=163

+ 1 - 1
app_core/common/build.gradle

@@ -59,5 +59,5 @@ dependencies {
     compile project(':recyclerlibrary')
     //折线库
     compile files('libs/hellocharts-library-1.5.8.jar')
-    compile 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+'
+    compile deps.wechatSdk
 }

+ 335 - 265
app_core/common/src/main/java/com/core/base/BaseActivity.java

@@ -2,6 +2,7 @@ package com.core.base;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@@ -26,9 +27,9 @@ import com.common.preferences.PreferenceUtils;
 import com.core.app.ActionBackActivity;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.model.Approval;
 import com.core.net.volley.FastVolley;
 import com.core.utils.NotifyUtils;
+import com.core.utils.ToastUtil;
 import com.core.widget.CustomProgressDialog;
 import com.core.widget.crouton.Crouton;
 import com.umeng.analytics.MobclickAgent;
@@ -42,276 +43,345 @@ import java.util.Locale;
  * @author Dean Tao
  */
 public abstract class BaseActivity extends ActionBackActivity {
-	private FastVolley mFastVolley;
-	private String HASHCODE;
-	public CustomProgressDialog progressDialog;
-	public Context ct;
-	public Activity activity;
-
-	public void preOnCreacte() {
-	}
-
-	public BaseActivity() {
-		super();
-		HASHCODE = Integer.toHexString(this.hashCode()) + "@";// 加上@符号,将拼在一起的两个HashCode分开
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		MobclickAgent.onResume(this);
-		// getRootView().setFitsSystemWindows(true);
-	}
-
-	@Override
-	protected void onPause() {
-		super.onPause();
-		MobclickAgent.onPause(this);
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		initStyle();
-		super.onCreate(savedInstanceState);
-		if (android.os.Build.VERSION.SDK_INT > 108) {
-			Window window = getWindow();
-			window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
-					WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-			window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION,
-					WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-			//设置根布局的内边距
+    private FastVolley mFastVolley;
+    private String HASHCODE;
+    public CustomProgressDialog progressDialog;
+    public Context ct;
+    public Activity activity;
+
+    public void preOnCreacte() {
+    }
+
+    public BaseActivity() {
+        super();
+        HASHCODE = Integer.toHexString(this.hashCode()) + "@";// 加上@符号,将拼在一起的两个HashCode分开
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        MobclickAgent.onResume(this);
+        // getRootView().setFitsSystemWindows(true);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        MobclickAgent.onPause(this);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        initStyle();
+        super.onCreate(savedInstanceState);
+        if (android.os.Build.VERSION.SDK_INT > 108) {
+            Window window = getWindow();
+            window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
+                    WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION,
+                    WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+            //设置根布局的内边距
 //            RelativeLayout relativeLayout = (RelativeLayout)
 //                    findViewById(R.id.layout);
 //            relativeLayout.setPadding(0, getActionBarHeight() + getStatusBarHeight(), 0,
 //                    0);
-		}
-		preOnCreacte();
-		ct = this;
-		activity = this;
-		setNotTouchEvent(true);
-		mFastVolley = MyApplication.getInstance().getFastVolley();
-		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
-		progressDialog = CustomProgressDialog.createDialog(this);
-
-		//重启之后恢复到之前的语言
-		switchLanguage(PreferenceUtils.getString(this, "language", "rCN"));
-
-		// SystemUtil.setSystemBarTint(this);
-
-	}
-
-	private void initStyle() {
-		if (getIntent() == null || getIntent().getIntExtra("style", -1) == -1) return;
-		try {
-			int theme = getSharedPreferences("cons", MODE_PRIVATE).
-					getInt("theme", getIntent().getIntExtra("style", -1));
-			setTheme(theme);
-		} catch (Exception e) {
-		}
-	}
-
-	public View getRootView() {
-		return ((ViewGroup) findViewById(android.R.id.content)).getChildAt(0);
-	}
-
-
-	public int getStatusBarHeight() {
-		Class c = null;
-		Object obj = null;
-		Field field = null;
-		int x = 0, statusBarHeight = 0;
-		try {
-			c = Class.forName("com.android.internal.R$dimen");
-			obj = c.newInstance();
-			field = c.getField("status_bar_height");
-			x = Integer.parseInt(field.get(obj).toString());
-			statusBarHeight = getResources().getDimensionPixelSize(x);
-		} catch (Exception e1) {
-			e1.printStackTrace();
-		}
-		return statusBarHeight;
-	}
-
-	// 获取ActionBar的高度
-	public int getActionBarHeight() {
-		TypedValue tv = new TypedValue();
-		int actionBarHeight = 0;
-		if (getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true))// 如果资源是存在的、有效的
-		{
-			actionBarHeight = TypedValue.complexToDimensionPixelSize(tv.data, getResources().getDisplayMetrics());
-		}
-		return actionBarHeight;
-	}
-
-	public void setTouch(boolean b) {
-		setNotTouchEvent(b);
-	}
-
-	@Override
-	protected void onDestroy() {
-		// 取消所有HASHCODE包含该类名的request
-		mFastVolley.cancelAll(HASHCODE);
-
-		Crouton.cancelAllCroutons();
-		super.onDestroy();
-	}
-
-	@Override
-	protected void onStop() {
-		super.onStop();
-	}
-
-	@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();
-	}
-
-
-	public void ToastMessage(String message) {
-		NotifyUtils.ToastMessage(this, message);
-	}
-
-
-	/**
-	 * @desc:切换语言
-	 * @author:Arison on 2017/5/18
-	 */
-	protected void switchLanguage(String language) {
-		Resources resources = getResources();
-		Configuration config = resources.getConfiguration();
-		DisplayMetrics dm = resources.getDisplayMetrics();
-		if (language.equals("en")) {
-			config.locale = Locale.ENGLISH;
-		} else if (language.equals("rCN")) {
-			config.locale = Locale.SIMPLIFIED_CHINESE;
-		} else if (language.equals("rTW")) {
-			config.locale = Locale.TRADITIONAL_CHINESE;
-		} else if (language.equals("sys")) {
-			config.locale = Locale.getDefault();
-		}
-		LogUtil.d("MainActivity" + "当前语言版本模式:" + language);
-		resources.updateConfiguration(config, dm);
-		PreferenceUtils.putString("language", language);
-	}
-
-
-	/*处理权限问题*/
-	private SparseArray<Runnable> allowablePermissionRunnables;
-	private SparseArray<Runnable> disallowablePermissionRunnables;
-	private int permissionItem = 0;
-
-	/**
-	 * 判断是否缺少权限
-	 *
-	 * @param permission
-	 * @return true 缺少   false  以获取
-	 */
-	protected boolean lacksPermission(String permission) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-			return ContextCompat.checkSelfPermission(ct, permission) != PackageManager.PERMISSION_GRANTED;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * 请求权限,先判断,如果没有权限就去请求
-	 * 尽量不将权限请求放在onResume 中,会出现不断循环请求
-	 *
-	 * @param permission           权限
-	 * @param allowableRunnable    当取得权限后执行操作,主线程
-	 * @param disallowableRunnable 当用户拒绝权限后执行操作,主线程
-	 */
-	public void requestPermission(String permission, Runnable allowableRunnable, Runnable disallowableRunnable) {
-		permissionItem++;
-		LogUtil.i("requestPermission");
-		if (allowableRunnable != null) {
-			if (allowablePermissionRunnables == null) {
-				allowablePermissionRunnables = new SparseArray<>();
-			}
-			allowablePermissionRunnables.put(permissionItem, allowableRunnable);
-		}
-		if (disallowableRunnable != null) {
-			if (disallowablePermissionRunnables == null) {
-				disallowablePermissionRunnables = new SparseArray<>();
-			}
-			disallowablePermissionRunnables.put(permissionItem, disallowableRunnable);
-		}
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-			//减少是否拥有权限  
-			int checkCallPhonePermission = ContextCompat.checkSelfPermission(getApplicationContext(), permission);
-			if (checkCallPhonePermission != PackageManager.PERMISSION_GRANTED) {//没有获取到权限
+        }
+        preOnCreacte();
+        ct = this;
+        activity = this;
+        setNotTouchEvent(true);
+        mFastVolley = MyApplication.getInstance().getFastVolley();
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
+        progressDialog = CustomProgressDialog.createDialog(this);
+
+        //重启之后恢复到之前的语言
+        switchLanguage(PreferenceUtils.getString(this, "language", "rCN"));
+
+        // SystemUtil.setSystemBarTint(this);
+
+    }
+
+    private void initStyle() {
+        if (getIntent() == null || getIntent().getIntExtra("style", -1) == -1) return;
+        try {
+            int theme = getSharedPreferences("cons", MODE_PRIVATE).
+                    getInt("theme", getIntent().getIntExtra("style", -1));
+            setTheme(theme);
+        } catch (Exception e) {
+        }
+    }
+
+    public View getRootView() {
+        return ((ViewGroup) findViewById(android.R.id.content)).getChildAt(0);
+    }
+
+
+    public int getStatusBarHeight() {
+        Class c = null;
+        Object obj = null;
+        Field field = null;
+        int x = 0, statusBarHeight = 0;
+        try {
+            c = Class.forName("com.android.internal.R$dimen");
+            obj = c.newInstance();
+            field = c.getField("status_bar_height");
+            x = Integer.parseInt(field.get(obj).toString());
+            statusBarHeight = getResources().getDimensionPixelSize(x);
+        } catch (Exception e1) {
+            e1.printStackTrace();
+        }
+        return statusBarHeight;
+    }
+
+    // 获取ActionBar的高度
+    public int getActionBarHeight() {
+        TypedValue tv = new TypedValue();
+        int actionBarHeight = 0;
+        if (getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true))// 如果资源是存在的、有效的
+        {
+            actionBarHeight = TypedValue.complexToDimensionPixelSize(tv.data, getResources().getDisplayMetrics());
+        }
+        return actionBarHeight;
+    }
+
+    public void setTouch(boolean b) {
+        setNotTouchEvent(b);
+    }
+
+    @Override
+    protected void onDestroy() {
+        // 取消所有HASHCODE包含该类名的request
+        mFastVolley.cancelAll(HASHCODE);
+
+        Crouton.cancelAllCroutons();
+        super.onDestroy();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+    }
+
+    @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();
+    }
+
+
+    public void ToastMessage(String message) {
+        NotifyUtils.ToastMessage(this, message);
+    }
+
+
+    /**
+     * @desc:切换语言
+     * @author:Arison on 2017/5/18
+     */
+    protected void switchLanguage(String language) {
+        Resources resources = getResources();
+        Configuration config = resources.getConfiguration();
+        DisplayMetrics dm = resources.getDisplayMetrics();
+        if (language.equals("en")) {
+            config.locale = Locale.ENGLISH;
+        } else if (language.equals("rCN")) {
+            config.locale = Locale.SIMPLIFIED_CHINESE;
+        } else if (language.equals("rTW")) {
+            config.locale = Locale.TRADITIONAL_CHINESE;
+        } else if (language.equals("sys")) {
+            config.locale = Locale.getDefault();
+        }
+        LogUtil.d("MainActivity" + "当前语言版本模式:" + language);
+        resources.updateConfiguration(config, dm);
+        PreferenceUtils.putString("language", language);
+    }
+
+
+    /*处理权限问题*/
+    private SparseArray<Runnable> allowablePermissionRunnables;
+    private SparseArray<Runnable> disallowablePermissionRunnables;
+    private int permissionItem = 0;
+
+    /**
+     * 判断是否缺少权限
+     *
+     * @param permission
+     * @return true 缺少   false  以获取
+     */
+    protected boolean lacksPermission(String permission) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            return ContextCompat.checkSelfPermission(ct, permission) != PackageManager.PERMISSION_GRANTED;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 请求权限,先判断,如果没有权限就去请求
+     * 尽量不将权限请求放在onResume 中,会出现不断循环请求
+     *
+     * @param permission           权限
+     * @param allowableRunnable    当取得权限后执行操作,主线程
+     * @param disallowableRunnable 当用户拒绝权限后执行操作,主线程
+     */
+    public void requestPermission(String permission, Runnable allowableRunnable, Runnable disallowableRunnable) {
+        permissionItem++;
+        LogUtil.i("requestPermission");
+        if (allowableRunnable != null) {
+            if (allowablePermissionRunnables == null) {
+                allowablePermissionRunnables = new SparseArray<>();
+            }
+            allowablePermissionRunnables.put(permissionItem, allowableRunnable);
+        }
+        if (disallowableRunnable != null) {
+            if (disallowablePermissionRunnables == null) {
+                disallowablePermissionRunnables = new SparseArray<>();
+            }
+            disallowablePermissionRunnables.put(permissionItem, disallowableRunnable);
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            //减少是否拥有权限
+            int checkCallPhonePermission = ContextCompat.checkSelfPermission(getApplicationContext(), permission);
+            if (checkCallPhonePermission != PackageManager.PERMISSION_GRANTED) {//没有获取到权限
 //				if (!shouldShowRequestPermissionRationale(permission)) {
-				//弹出对话框接收权限  
-				LogUtil.i("ActivityCompat.requestPermissions=" + permission);
-				ActivityCompat.requestPermissions(BaseActivity.this, new String[]{permission}, permissionItem);
+                //弹出对话框接收权限
+                LogUtil.i("ActivityCompat.requestPermissions=" + permission);
+                ActivityCompat.requestPermissions(BaseActivity.this, new String[]{permission}, permissionItem);
 //				} else {
 //					ToastUtil.showToast(ct, R.string.not_camera_permission);
 //				}
-			} else {
-				if (allowableRunnable != null) {
-					allowableRunnable.run();
-				}
-			}
-		} else {
-			if (allowableRunnable != null) {
-				allowableRunnable.run();
-			}
-		}
-	}
-
-	@Override
-	public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-		if (permissions != null) {
-			for (String p : permissions) {
-				LogUtil.i("permission=" + p);
-			}
-		}
-		if (grantResults != null && grantResults.length > 0) {
-			if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-				if (allowablePermissionRunnables != null) {
-					Runnable allowRun = allowablePermissionRunnables.get(requestCode);
-					if (allowRun != null) {
-						allowRun.run();
-					}
-				}
-
-			} else {
-				if (disallowablePermissionRunnables != null) {
-					Runnable disallowRun = disallowablePermissionRunnables.get(requestCode);
-					if (disallowRun != null) {
-						disallowRun.run();
-					}
-				}
-
-			}
-		}
-	}
-
+            } else {
+                if (allowableRunnable != null) {
+                    allowableRunnable.run();
+                }
+            }
+        } else {
+            if (allowableRunnable != null) {
+                allowableRunnable.run();
+            }
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (permissions != null) {
+            for (String p : permissions) {
+                LogUtil.i("permission=" + p);
+            }
+        }
+        if (grantResults != null && grantResults.length > 0) {
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                if (allowablePermissionRunnables != null) {
+                    Runnable allowRun = allowablePermissionRunnables.get(requestCode);
+                    if (allowRun != null) {
+                        allowRun.run();
+                    }
+                }
+
+            } else {
+                if (disallowablePermissionRunnables != null) {
+                    Runnable disallowRun = disallowablePermissionRunnables.get(requestCode);
+                    if (disallowRun != null) {
+                        disallowRun.run();
+                    }
+                }
+
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T extends View> T $(int resId) {
+        return (T) super.findViewById(resId);
+    }
+
+    protected void toast(String text) {
+        ToastUtil.showToast(this, text);
+    }
+
+    protected void toast(int resId) {
+        try {
+            ToastUtil.showToast(this, resId);
+        } catch (Exception e) {
+
+        }
+    }
+
+    protected void toast(String text, ViewGroup viewGroup) {
+        ToastUtil.showToast(this, text, viewGroup);
+    }
+
+    protected void toast(int resId, ViewGroup viewGroup) {
+        try {
+            ToastUtil.showToast(this, resId, viewGroup);
+        } catch (Exception e) {
+
+        }
+    }
+
+    /**
+     * [页面跳转]
+     *
+     * @param clz
+     */
+    public void startActivity(Class<?> clz) {
+        startActivity(clz, null);
+    }
+
+    /**
+     * [携带数据的页面跳转]
+     *
+     * @param clz
+     * @param bundle
+     */
+    public void startActivity(Class<?> clz, Bundle bundle) {
+        Intent intent = new Intent();
+        intent.setClass(this, clz);
+        if (bundle != null) {
+            intent.putExtras(bundle);
+        }
+        startActivity(intent);
+    }
+
+    /**
+     * [含有Bundle通过Class打开编辑界面]
+     *
+     * @param cls
+     * @param bundle
+     * @param requestCode
+     */
+    public void startActivityForResult(Class<?> cls, Bundle bundle,
+                                       int requestCode) {
+        Intent intent = new Intent();
+        intent.setClass(this, cls);
+        if (bundle != null) {
+            intent.putExtras(bundle);
+        }
+        startActivityForResult(intent, requestCode);
+    }
 }

+ 0 - 73
app_core/common/src/main/java/com/core/base/activity/BaseMVPActivity.java

@@ -1,15 +1,11 @@
 package com.core.base.activity;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.view.View;
-import android.view.ViewGroup;
 
 import com.core.base.BaseActivity;
 import com.core.base.presenter.BasePresenter;
 import com.core.base.view.BaseView;
-import com.core.utils.ToastUtil;
 
 
 /**
@@ -57,73 +53,4 @@ public abstract class BaseMVPActivity<T extends BasePresenter> extends BaseActiv
         }
     }
 
-    @SuppressWarnings("unchecked")
-    public <T extends View> T $(int resId) {
-        return (T) super.findViewById(resId);
-    }
-
-    protected void toast(String text) {
-        ToastUtil.showToast(this, text);
-    }
-
-    protected void toast(int resId) {
-        try {
-            ToastUtil.showToast(this, resId);
-        } catch (Exception e) {
-
-        }
-    }
-
-    protected void toast(String text, ViewGroup viewGroup) {
-        ToastUtil.showToast(this, text, viewGroup);
-    }
-
-    protected void toast(int resId, ViewGroup viewGroup) {
-        try {
-            ToastUtil.showToast(this, resId, viewGroup);
-        } catch (Exception e) {
-
-        }
-    }
-
-    /**
-     * [页面跳转]
-     *
-     * @param clz
-     */
-    public void startActivity(Class<?> clz) {
-        startActivity(clz, null);
-    }
-
-    /**
-     * [携带数据的页面跳转]
-     *
-     * @param clz
-     * @param bundle
-     */
-    public void startActivity(Class<?> clz, Bundle bundle) {
-        Intent intent = new Intent();
-        intent.setClass(this, clz);
-        if (bundle != null) {
-            intent.putExtras(bundle);
-        }
-        startActivity(intent);
-    }
-
-    /**
-     * [含有Bundle通过Class打开编辑界面]
-     *
-     * @param cls
-     * @param bundle
-     * @param requestCode
-     */
-    public void startActivityForResult(Class<?> cls, Bundle bundle,
-                                       int requestCode) {
-        Intent intent = new Intent();
-        intent.setClass(this, cls);
-        if (bundle != null) {
-            intent.putExtras(bundle);
-        }
-        startActivityForResult(intent, requestCode);
-    }
 }

+ 0 - 14
app_core/common/src/main/java/com/core/base/callback/BaseCallback.java

@@ -1,14 +0,0 @@
-package com.core.base.callback;
-
-/**
- * @author RaoMeng
- * @describe 回调接口
- * @date 2017/11/9 14:47
- */
-
-public interface BaseCallback<T> {
-
-    void onSuccess(int what, T t);
-
-    void onFail(int what, String failStr);
-}

+ 14 - 0
app_core/network/src/main/java/com/me/network/app/base/HttpCallback.java

@@ -0,0 +1,14 @@
+package com.me.network.app.base;
+
+/**
+ * @author RaoMeng
+ * @describe 回调接口
+ * @date 2017/11/9 14:47
+ */
+
+public interface HttpCallback<T> {
+
+    void onSuccess(int flag, T t);
+
+    void onFail(int flag, String failStr);
+}

+ 130 - 0
app_core/network/src/main/java/com/me/network/app/base/HttpParams.java

@@ -0,0 +1,130 @@
+package com.me.network.app.base;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author RaoMeng
+ * @describe 网络请求参数
+ * @date 2018/1/3 15:18
+ */
+
+public class HttpParams {
+
+    /**
+     * 请求地址
+     */
+    private String url;
+
+    /**
+     * 回调标记
+     */
+    private int flag;
+
+    /**
+     * 请求参数
+     */
+    private Map<String, Object> params;
+
+    /**
+     * 请求头
+     */
+    private Map<String, Object> headers;
+
+    /**
+     * 请求方式
+     */
+    private int method;
+
+
+    public HttpParams(Builder builder) {
+        this.url = builder.url;
+        this.flag = builder.flag;
+        this.params = builder.params;
+        this.headers = builder.headers;
+        this.method = builder.method;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public int getFlag() {
+        return flag;
+    }
+
+    public Map<String, Object> getParams() {
+        return params;
+    }
+
+    public Map<String, Object> getHeaders() {
+        return headers;
+    }
+
+    public int getMethod() {
+        return method;
+    }
+
+    public static class Builder {
+        private String url;
+        private int flag;
+        private Map<String, Object> params = new HashMap<>();
+        private Map<String, Object> headers = new HashMap<>();
+        private int method;
+
+        public Builder url(String val) {
+            this.url = val;
+            return this;
+        }
+
+        public Builder flag(int val) {
+            this.flag = val;
+            return this;
+        }
+
+        public Builder method(int httpMethod) {
+            this.method = httpMethod;
+            return this;
+        }
+
+        public Builder setParams(Map<String, Object> params) {
+            if (this.params == null) {
+                this.params = new HashMap<>();
+            }
+            if (params != null) {
+                this.params.putAll(params);
+            }
+            return this;
+        }
+
+        public Builder addParam(String key, Object value) {
+            if (this.params == null) {
+                this.params = new HashMap<>();
+            }
+            this.params.put(key, value);
+            return this;
+        }
+
+        public Builder setHeaders(Map<String, Object> headers) {
+            if (this.headers == null) {
+                this.headers = new HashMap<>();
+            }
+            if (headers != null) {
+                this.headers.putAll(headers);
+            }
+            return this;
+        }
+
+        public Builder addHeader(String key, Object value) {
+            if (this.headers == null) {
+                this.headers = new HashMap<>();
+            }
+            this.headers.put(key, value);
+            return this;
+        }
+
+        public HttpParams build() {
+            return new HttpParams(this);
+        }
+    }
+}

+ 94 - 0
app_core/network/src/main/java/com/me/network/app/http/HttpRequest.java

@@ -0,0 +1,94 @@
+package com.me.network.app.http;
+
+import android.text.TextUtils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.me.network.app.base.HttpCallback;
+import com.me.network.app.base.HttpParams;
+import com.me.network.app.http.rx.Result2Listener;
+import com.me.network.app.http.rx.ResultSubscriber;
+
+/**
+ * @author RaoMeng
+ * @describe 发起网络请求
+ * @date 2018/1/4 10:59
+ */
+
+public class HttpRequest {
+
+    private static HttpRequest instance;
+
+    private static HttpClient mHttpClient;
+
+    private HttpRequest() {
+
+    }
+
+    public static final HttpRequest getInstance() {
+        if (instance == null) {
+            synchronized (HttpRequest.class) {
+                if (instance == null) {
+                    instance = new HttpRequest();
+                }
+            }
+        }
+        return instance;
+    }
+
+    /**
+     * 发送请求
+     *
+     * @param httpParams  参数
+     * @param callback    网络回调
+     * @param requestHost 接口host
+     */
+    public void sendRequest(final String requestHost, final HttpParams httpParams, final HttpCallback callback) {
+
+        if (httpParams == null) {
+            throw new IllegalArgumentException("httpParams can not be NULL");
+        }
+        if (requestHost == null) {
+            throw new IllegalArgumentException("requestHost can not be NULL");
+        }
+        if (callback == null) {
+            throw new IllegalArgumentException("callback can not be NULL");
+        }
+        if (httpParams.getUrl() == null) {
+            throw new IllegalArgumentException("requestUrl can not be NULL");
+        }
+
+        mHttpClient = new HttpClient.Builder(requestHost).build();
+
+        mHttpClient.Api().send(new HttpClient.Builder()
+                .url(httpParams.getUrl())
+                .addHeaders(httpParams.getHeaders())
+                .addParams(httpParams.getParams())
+                .method((httpParams.getMethod() == Method.GET) ? Method.GET : Method.POST)
+                .build(), new ResultSubscriber<Object>(new Result2Listener<Object>() {
+            @Override
+            public void onResponse(Object response) {
+                callback.onSuccess(httpParams.getFlag(), response == null ? "" : response);
+            }
+
+            @Override
+            public void onFailure(Object t) {
+                String failMsg = "";
+                if (t != null) {
+                    String result = t.toString();
+                    try {
+                        JSONObject resultObject = JSON.parseObject(result);
+                        failMsg = resultObject.getString("exceptionInfo");
+                        if (TextUtils.isEmpty(failMsg) || "(null)".equals(failMsg) || "null".equals(failMsg)) {
+                            failMsg = result;
+                        }
+                    } catch (Exception e) {
+                        failMsg = result;
+                    }
+                }
+                callback.onFail(httpParams.getFlag(), failMsg);
+            }
+        }));
+    }
+
+}

+ 8 - 7
app_modular/appworks/src/main/java/com/uas/appworks/activity/CityIndustryFuncSetActivity.java

@@ -7,11 +7,12 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.JSONUtil;
 import com.core.base.activity.BaseMVPActivity;
-import com.core.net.http.http.Request;
 import com.core.utils.CommonUtil;
 import com.google.gson.Gson;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.me.network.app.base.HttpParams;
+import com.me.network.app.http.Method;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.CityIndustryParentAdapter;
 import com.uas.appworks.model.bean.CityIndustryMenuBean;
@@ -77,13 +78,13 @@ public class CityIndustryFuncSetActivity extends BaseMVPActivity<WorkPlatPresent
         LinkedHashMap<String, Object> header = new LinkedHashMap<>();
         header.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
 
-        Request request = new Request.Bulider()
-                .setWhat(OBTAIN_CITY_INDUSTRY_SERVICE)
-                .setUrl("api/serve/mainPage/getServices.action")
+        HttpParams request = new HttpParams.Builder()
+                .flag(OBTAIN_CITY_INDUSTRY_SERVICE)
+                .url("api/serve/mainPage/getServices.action")
                 .setHeaders(header)
-                .setParam(params)
-                .setMode(Request.Mode.GET)
-                .bulid();
+                .setParams(params)
+                .method(Method.GET)
+                .build();
         mPresenter.cityRequest(this, request);
     }
 

+ 16 - 12
app_modular/appworks/src/main/java/com/uas/appworks/activity/CityIndustryServiceMainActivity.java

@@ -39,6 +39,8 @@ import com.core.utils.SpanUtils;
 import com.core.utils.StatusBarUtil;
 import com.core.widget.RecycleViewDivider;
 import com.me.imageloader.ImageLoaderUtil;
+import com.me.network.app.base.HttpParams;
+import com.me.network.app.http.Method;
 import com.scwang.smartrefresh.layout.api.RefreshHeader;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
@@ -61,6 +63,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import retrofit2.http.GET;
+
 /**
  * @author RaoMeng
  * @describe 智慧产城首页
@@ -301,13 +305,13 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
         LinkedHashMap<String, Object> header = new LinkedHashMap<>();
         header.put("Cookie", CommonUtil.getB2BUid(this));
 
-        Request request = new Request.Bulider()
-                .setUrl("api/serve/getDefaultServices.action")
-                .setWhat(GET_DEFAULT_SERVICE)
-                .setParam(params)
+        HttpParams request = new HttpParams.Builder()
+                .url("api/serve/getDefaultServices.action")
+                .flag(GET_DEFAULT_SERVICE)
+                .setParams(params)
                 .setHeaders(header)
-                .setMode(Request.Mode.GET)
-                .bulid();
+                .method(Method.GET)
+                .build();
         mPresenter.cityRequest(this, request);
     }
 
@@ -315,12 +319,12 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
         LinkedHashMap<String, Object> header = new LinkedHashMap<>();
         header.put("Cookie", CommonUtil.getB2BUid(this));
 
-        Request request = new Request.Bulider()
-                .setUrl("api/serve/mainPage/getRecyclePics.action")
-                .setWhat(GET_LOOP_PICS)
+        HttpParams request = new HttpParams.Builder()
+                .url("api/serve/mainPage/getRecyclePics.action")
+                .flag(GET_LOOP_PICS)
                 .setHeaders(header)
-                .setMode(Request.Mode.GET)
-                .bulid();
+                .method(Method.GET)
+                .build();
         mPresenter.cityRequest(this, request);
     }
 
@@ -443,7 +447,7 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
             CityIndustryServiceBean cityIndustryServiceBean = new CityIndustryServiceBean();
             cityIndustryServiceBean.setSv_name("全部服务");
             cityIndustryServiceBean.setSv_logourl("moreMenu");
-        mServesBeans.add(cityIndustryServiceBean);
+            mServesBeans.add(cityIndustryServiceBean);
         }
         if (mServesBeans.size() == 0) {
             CityIndustryServiceBean cityIndustryServiceBean = new CityIndustryServiceBean();

+ 9 - 7
app_modular/appworks/src/main/java/com/uas/appworks/activity/DeviceQueryActivity.java

@@ -34,6 +34,8 @@ import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.me.network.app.base.HttpParams;
+import com.me.network.app.http.Method;
 import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.DeviceQueryConditionAdapter;
@@ -341,14 +343,14 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
         LinkedHashMap<String, Object> header = new LinkedHashMap<>();
         header.put("Cookie", CommonUtil.getErpCookie(mContext));
 
-        Request request = new Request.Bulider()
-                .setUrl("mobile/common/list.action")
-                .setMode(Request.Mode.GET)
+        HttpParams httpParams = new HttpParams.Builder()
+                .url("mobile/common/list.action")
+                .method(Method.GET)
                 .setHeaders(header)
-                .setParam(params)
-                .setWhat(OBTAIN_DEVICE_LIST)
-                .bulid();
-        mPresenter.uasRequest(this, request);
+                .setParams(params)
+                .flag(OBTAIN_DEVICE_LIST)
+                .build();
+        mPresenter.uasRequest(this, httpParams);
     }
 
     private void initFuzzyHint() {

+ 2 - 1
app_modular/appworks/src/main/java/com/uas/appworks/activity/WorkFuncSetActivity.java

@@ -11,6 +11,7 @@ import com.core.app.Constants;
 import com.core.base.activity.BaseMVPActivity;
 import com.core.net.http.http.Request;
 import com.core.utils.CommonUtil;
+import com.me.network.app.base.HttpParams;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.WorkFuncSetParentAdapter;
 import com.uas.appworks.model.bean.WorkMenuBean;
@@ -68,7 +69,7 @@ public class WorkFuncSetActivity extends BaseMVPActivity<WorkPlatPresenter> impl
 
     @Override
     protected void initData() {
-        mPresenter.uasRequest(this, new Request.Bulider().setWhat(Constants.LOAD_WORK_MENU_CACHE).bulid());
+        mPresenter.uasRequest(this, new HttpParams.Builder().flag(Constants.LOAD_WORK_MENU_CACHE).build());
     }
 
 

+ 2 - 1
app_modular/appworks/src/main/java/com/uas/appworks/activity/WorkModuleSortActivity.java

@@ -19,6 +19,7 @@ import com.core.base.activity.BaseMVPActivity;
 import com.core.net.http.http.Request;
 import com.core.utils.CommonUtil;
 import com.core.widget.RecycleViewDivider;
+import com.me.network.app.base.HttpParams;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.WorkModuleSortAddAdapter;
 import com.uas.appworks.adapter.WorkModuleSortDeleteAdapter;
@@ -138,7 +139,7 @@ public class WorkModuleSortActivity extends BaseMVPActivity<WorkPlatPresenter> i
 
     @Override
     protected void initData() {
-        mPresenter.uasRequest(this, new Request.Bulider().setWhat(Constants.LOAD_WORK_MENU_CACHE).bulid());
+        mPresenter.uasRequest(this, new HttpParams.Builder().flag(Constants.LOAD_WORK_MENU_CACHE).build());
     }
 
     @Override

+ 0 - 13
app_modular/appworks/src/main/java/com/uas/appworks/callback/WorkPlatCallback.java

@@ -1,13 +0,0 @@
-package com.uas.appworks.callback;
-
-import com.core.base.callback.BaseCallback;
-
-/**
- * @author RaoMeng
- * @describe
- * @date 2017/11/9 14:54
- */
-
-public interface WorkPlatCallback extends BaseCallback<String> {
-
-}

+ 4 - 4
app_modular/appworks/src/main/java/com/uas/appworks/model/IWorkPlatModel.java

@@ -3,8 +3,8 @@ package com.uas.appworks.model;
 import android.content.Context;
 
 import com.core.base.model.BaseModel;
-import com.core.net.http.http.Request;
-import com.uas.appworks.callback.WorkPlatCallback;
+import com.me.network.app.base.HttpCallback;
+import com.me.network.app.base.HttpParams;
 import com.uas.appworks.model.bean.WorkMenuBean;
 
 import java.util.List;
@@ -17,9 +17,9 @@ import java.util.List;
 
 public interface IWorkPlatModel extends BaseModel {
 
-    void uasRequest(Context context, Request request, WorkPlatCallback workCallback);
+    void uasRequest(Context context, HttpParams httpParams, HttpCallback workCallback);
 
-    void cityRequest(Context context, Request request, WorkPlatCallback workCallback);
+    void cityRequest(Context context, HttpParams httpParams, HttpCallback workCallback);
 
     List<WorkMenuBean> getWorkData();
 }

+ 9 - 46
app_modular/appworks/src/main/java/com/uas/appworks/model/WorkPlatModel.java

@@ -8,18 +8,14 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.config.BaseConfig;
-import com.common.data.JSONUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.Constants;
-import com.core.net.http.http.Request;
 import com.core.utils.CommonUtil;
 import com.google.gson.Gson;
-import com.me.network.app.http.HttpClient;
-import com.me.network.app.http.Method;
-import com.me.network.app.http.rx.Result2Listener;
-import com.me.network.app.http.rx.ResultSubscriber;
-import com.uas.appworks.callback.WorkPlatCallback;
+import com.me.network.app.base.HttpCallback;
+import com.me.network.app.base.HttpParams;
+import com.me.network.app.http.HttpRequest;
 import com.uas.appworks.model.bean.WorkMenuBean;
 
 import java.util.ArrayList;
@@ -33,12 +29,11 @@ import java.util.List;
 
 public class WorkPlatModel implements IWorkPlatModel {
     private List<WorkMenuBean> mMenuTypeBeen;
-    private HttpClient mHttpClient;
     private Resources mResources;
 
     @Override
-    public void uasRequest(Context context, final Request request, final WorkPlatCallback workCallback) {
-        final int what = request.getWhat();
+    public void uasRequest(Context context, final HttpParams httpParams, final HttpCallback workCallback) {
+        final int what = httpParams.getFlag();
         if (what == Constants.LOAD_WORK_MENU_CACHE) {
             loadWorkMenuCache(context, workCallback, what);
         } else {
@@ -48,50 +43,18 @@ public class WorkPlatModel implements IWorkPlatModel {
             } else {
                 appBaseUrl = CommonUtil.getAppBaseUrl(BaseConfig.getContext());
             }
-            httpRequest(request, workCallback, appBaseUrl);
+            HttpRequest.getInstance().sendRequest(appBaseUrl, httpParams, workCallback);
         }
 
     }
 
     @Override
-    public void cityRequest(Context context, final Request request, final WorkPlatCallback workCallback) {
+    public void cityRequest(Context context, final HttpParams httpParams, final HttpCallback workCallback) {
         String appBaseUrl = CommonUtil.getCityBaseUrl(BaseConfig.getContext());
-        httpRequest(request, workCallback, appBaseUrl);
+        HttpRequest.getInstance().sendRequest(appBaseUrl, httpParams, workCallback);
     }
 
-    private void httpRequest(final Request request, final WorkPlatCallback workCallback, String appBaseUrl) {
-        if (appBaseUrl != null) {
-            mHttpClient = new HttpClient.Builder(appBaseUrl).build();
-            mHttpClient.Api().send(new HttpClient.Builder()
-                    .url(request.getUrl())
-                    .addHeaders(request.getHeaders())
-                    .addParams(request.getParam())
-                    .method((request.getMode() == Request.Mode.GET) ? Method.GET : Method.POST)
-                    .build(), new ResultSubscriber<Object>(new Result2Listener<Object>() {
-                @Override
-                public void onResponse(Object o) {
-                    workCallback.onSuccess(request.getWhat(), o == null ? "" : o.toString());
-                }
-
-                @Override
-                public void onFailure(Object t) {
-                    String failMsg = "";
-                    if (t != null) {
-                        String result = t.toString();
-                        if (JSONUtil.validate(result)) {
-                            JSONObject resultObject = JSON.parseObject(result);
-                            failMsg = JSONUtil.getText(resultObject, "exceptionInfo");
-                        } else {
-                            failMsg = result;
-                        }
-                    }
-                    workCallback.onFail(request.getWhat(), failMsg);
-                }
-            }));
-        }
-    }
-
-    private void loadWorkMenuCache(final Context context, final WorkPlatCallback workCallback, final int what) {
+    private void loadWorkMenuCache(final Context context, final HttpCallback workCallback, final int what) {
         mResources = context.getResources();
         String cacheJson = CommonUtil.getUniqueSharedPreferences(context, Constants.WORK_MENU_CACHE);
         String localJson = null;

+ 3 - 3
app_modular/appworks/src/main/java/com/uas/appworks/presenter/IWorkPlatPresenter.java

@@ -3,7 +3,7 @@ package com.uas.appworks.presenter;
 import android.content.Context;
 
 import com.core.base.presenter.BasePresenter;
-import com.core.net.http.http.Request;
+import com.me.network.app.base.HttpParams;
 import com.uas.appworks.view.WorkPlatView;
 
 
@@ -15,7 +15,7 @@ import com.uas.appworks.view.WorkPlatView;
 
 public interface IWorkPlatPresenter extends BasePresenter<WorkPlatView> {
 
-    void uasRequest(Context context, Request request);
+    void uasRequest(Context context, HttpParams httpParams);
 
-    void cityRequest(Context context, Request request);
+    void cityRequest(Context context, HttpParams httpParams);
 }

+ 7 - 7
app_modular/appworks/src/main/java/com/uas/appworks/presenter/WorkPlatPresenter.java

@@ -3,8 +3,8 @@ package com.uas.appworks.presenter;
 import android.content.Context;
 
 import com.core.app.Constants;
-import com.core.net.http.http.Request;
-import com.uas.appworks.callback.WorkPlatCallback;
+import com.me.network.app.base.HttpCallback;
+import com.me.network.app.base.HttpParams;
 import com.uas.appworks.model.WorkPlatModel;
 import com.uas.appworks.view.WorkPlatView;
 
@@ -14,7 +14,7 @@ import com.uas.appworks.view.WorkPlatView;
  * @date 2017/11/9 14:27
  */
 
-public class WorkPlatPresenter implements IWorkPlatPresenter, WorkPlatCallback {
+public class WorkPlatPresenter implements IWorkPlatPresenter, HttpCallback<String> {
     private WorkPlatView mWorkView;
     private WorkPlatModel mWorkModel;
 
@@ -25,21 +25,21 @@ public class WorkPlatPresenter implements IWorkPlatPresenter, WorkPlatCallback {
     }
 
     @Override
-    public void uasRequest(Context context, Request request) {
+    public void uasRequest(Context context, HttpParams httpParams) {
         if (mWorkView != null) {
             mWorkView.showLoading(null);
         }
 
-        mWorkModel.uasRequest(context, request, this);
+        mWorkModel.uasRequest(context, httpParams, this);
     }
 
     @Override
-    public void cityRequest(Context context, Request request) {
+    public void cityRequest(Context context, HttpParams httpParams) {
         if (mWorkView != null) {
             mWorkView.showLoading(null);
         }
 
-        mWorkModel.cityRequest(context, request, this);
+        mWorkModel.cityRequest(context, httpParams, this);
     }
 
     @Override

+ 2 - 1
version.gradle

@@ -99,7 +99,8 @@ ext {
             addSubUtils                  : 'com.mengfei:AddSubUtils:' + depsVersion.addSubUtilsVersion,
             banner                       : 'com.youth.banner:banner:' + depsVersion.bannerVersion,
             smartRefreshLayout           : 'com.scwang.smartrefresh:SmartRefreshLayout:' + depsVersion.smartRefreshLayoutVersion,
-            smartRefreshHeader           : 'com.scwang.smartrefresh:SmartRefreshHeader:' + depsVersion.smartRefreshLayoutVersion
+            smartRefreshHeader           : 'com.scwang.smartrefresh:SmartRefreshHeader:' + depsVersion.smartRefreshLayoutVersion,
+            wechatSdk                    : 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+'
     ]
 }