提交分类 修复BUG；功能优化；

提交内容
    1、解决工作汇报提交日报后删除，返回到日报主界面，页面交互效果的问题
    2、解决订阅详情分享到微信（手机没装微信），会弹出两次提示的bug
    3、解决审批列表页面偶尔会弹两次弹框的bug
当前版本	正式版本V6.1.0（测试版本6.1.0）
是否冲突

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

@@ -6,6 +6,8 @@ import android.app.Activity;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.net.http.SslError;
 import android.os.Build;
@@ -27,6 +29,7 @@ import android.webkit.WebViewClient;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.common.data.StringUtil;
@@ -42,6 +45,8 @@ import com.modular.login.activity.LoginActivity;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
+import com.umeng.socialize.shareboard.SnsPlatform;
+import com.umeng.socialize.utils.ShareBoardlistener;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
@@ -501,11 +506,36 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
                         SHARE_MEDIA.WEIXIN_CIRCLE,
                         SHARE_MEDIA.WEIXIN_FAVORITE,
                         SHARE_MEDIA.MORE)
-                        .withTitle(getSupportActionBar().getTitle().toString())
-                        .withText("UU互联 Android客户端" + SystemUtil.getVersionName(mContext))
-                        .withMedia(new UMImage(activity, "http://img.my.csdn.net/uploads/201609/30/1475204542_1365.png"))
-                        .withTargetUrl(url)
-                        .setCallback(CommonUtil.umShareListener)
+                        .setShareboardclickCallback(new ShareBoardlistener() {
+                            @Override
+                            public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
+                                if (share_media.name().equals("WEIXIN")
+                                        || share_media.name().equals("WEIXIN_CIRCLE")
+                                        || share_media.name().equals("WEIXIN_FAVORITE")) {
+                                    if (!isWeixinAvilible(WebViewCommActivity.this)) {
+                                        Toast.makeText(WebViewCommActivity.this, "您未安装微信", Toast.LENGTH_SHORT).show();
+                                        return;
+                                    }
+                                }
+
+                                if (share_media.name().equals("QQ")
+                                        || share_media.name().equals("QZONE")) {
+                                    if (!isQQClientAvailable(WebViewCommActivity.this)) {
+                                        Toast.makeText(WebViewCommActivity.this, "您未安装QQ", Toast.LENGTH_SHORT).show();
+                                        return;
+                                    }
+                                }
+
+                                new ShareAction(activity)
+                                        .setPlatform(share_media)
+                                        .withTitle(getSupportActionBar().getTitle().toString())
+                                        .withText("UU互联 Android客户端" + SystemUtil.getVersionName(mContext))
+                                        .withMedia(new UMImage(activity, "http://img.my.csdn.net/uploads/201609/30/1475204542_1365.png"))
+                                        .withTargetUrl(url)
+                                        .setCallback(CommonUtil.umShareListener)
+                                        .share();
+                            }
+                        })
                         .open();
                 break;
             case android.R.id.home:
@@ -515,6 +545,40 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         return true;
     }
 
+    public boolean isWeixinAvilible(Context context) {
+        final PackageManager packageManager = context.getPackageManager();// 获取packagemanager
+        List<PackageInfo> pinfo = packageManager.getInstalledPackages(0);// 获取所有已安装程序的包信息
+        if (pinfo != null) {
+            for (int i = 0; i < pinfo.size(); i++) {
+                String pn = pinfo.get(i).packageName;
+                if (pn.equals("com.tencent.mm")) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 判断qq是否可用
+     *
+     * @param context
+     * @return
+     */
+    public boolean isQQClientAvailable(Context context) {
+        final PackageManager packageManager = context.getPackageManager();
+        List<PackageInfo> pinfo = packageManager.getInstalledPackages(0);
+        if (pinfo != null) {
+            for (int i = 0; i < pinfo.size(); i++) {
+                String pn = pinfo.get(i).packageName;
+                if (pn.equals("com.tencent.mobileqq")) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 
     public class JSWebView {
 

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

@@ -111,7 +111,6 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
                     break;
                 case com.core.app.Constants.APP_SOCKETIMEOUTEXCEPTION:
                     result = msg.getData().getString("response");
-                    Log.d("pdfresult", result);
                     String exception = "系统错误";
                     if (JSONUtil.validate(result)) {
                         if (JSON.parse(result) instanceof com.alibaba.fastjson.JSONObject) {

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

@@ -1,7 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.fragment;
 
 import android.content.Intent;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -106,15 +105,18 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
 
     @Override
     protected void initDatas() {
+        getLocalMenu();
         if (isFirstLoad) {
             loadOrdersCaller();
         }
+        obtainCityIndustryService();
+    }
 
+    private void getLocalMenu() {
         String role = com.core.utils.CommonUtil.getUserRole();
         String userId = MyApplication.getInstance().mLoginUser.getUserId();
         if (role.equals("1")) {//个人用户
             if (userId != null && !userId.equals(mUserId)) {
-                Log.d("isreload", "个人用户->reload");
                 mPresenter.uasRequest(mContext, new Request.Bulider().setWhat(Constants.LOAD_WORK_MENU_CACHE).bulid());
             }
             mUserId = userId;
@@ -124,7 +126,6 @@ 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))) {
-                Log.d("isreload", "b2b用户->reload");
                 mPresenter.uasRequest(mContext, new Request.Bulider().setWhat(Constants.LOAD_WORK_MENU_CACHE).bulid());
             }
             mUserId = userId;
@@ -135,22 +136,17 @@ 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))) {
-                Log.d("isreload", "ERP用户->reload");
                 mPresenter.uasRequest(mContext, new Request.Bulider().setWhat(Constants.LOAD_WORK_MENU_CACHE).bulid());
             }
             mUserId = userId;
             mCompanyName = erp_company;
             mMaster = erp_master;
         }
-
-        obtainCityIndustryService();
     }
 
     private void obtainCityIndustryService() {
         Map<String, Object> params = new HashMap<>();
         params.put("kind", "app");
-//        params.put("client_type", "cc");
-//        params.put("access_token", "123456");
         params.put("Cookie", "JSESSIONID=" + com.core.utils.CommonUtil.getSharedPreferences(mContext, "sessionId"));
 
         LinkedHashMap<String, Object> header = new LinkedHashMap<>();
@@ -228,7 +224,6 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
             saveOrdersCaller(object);
         } else if (what == OBTAIN_APP_CITY_INDUSTRY_SERVICE) {
             String result = object.toString();
-            Log.e("cityindustryservice", result);
             if (JSONUtil.validate(result)) {
                 analyzeCityIndustry(result);
             }
@@ -366,7 +361,6 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
     private void saveOrdersCaller(Object object) {
         try {
             String result = object.toString();
-            Log.d("workplatcaler", result);
             if (JSONUtil.validate(result)) {
                 JSONObject resultObject = JSON.parseObject(result);
                 JSONArray listdata = JSONUtil.getJSONArray(resultObject, "listdata");

app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -234,7 +234,7 @@ public class MyApplication extends BaseApplication {
 		PlatformConfig.setWeixin("wx2539cc96bf158e00", "b057aa3e807ba7c505a2f03cc541bbf6");
 		PlatformConfig.setSinaWeibo("493318722", "7def652c3683603b08bab87d34b1f944");
 		PlatformConfig.setQQZone("1104894295", "Nk8zMIz5YSqwRQ1F");
-//		Config.IsToastTip = false;
+		Config.IsToastTip = false;
 	}
 
 	private void initUmengStatistics() {

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ProcessMsgActivity.java

@@ -272,9 +272,9 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Log.d("processstate","oncreate");
         setContentView(R.layout.activity_process_msg);
         initView();
-        initData();
     }
 
     private void initData() {
@@ -542,7 +542,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
 //        mList.setRefreshing(true);
         if (tab_type == 1) {
             voiceSearchView.setText("");
-            loadProcessToDo(page);
+            initData();
         }
 
     }

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/WorkDailyShowActivity.java

@@ -261,6 +261,7 @@ public class WorkDailyShowActivity extends BaseActivity {
                 startActivity(intent1);
             }
         }
+        super.onBackPressed();
         return true;
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/model/WorkPlatModel.java

@@ -104,8 +104,7 @@ public class WorkPlatModel implements IWorkPlatModel {
         }));
     }
 
-    private void loadWorkMenuCache(Context context, WorkPlatCallback workCallback, int what) {
-
+    private void loadWorkMenuCache(final Context context, final WorkPlatCallback workCallback, final int what) {
         String cacheJson = CommonUtil.getUniqueSharedPreferences(context, Constants.WORK_MENU_CACHE);
         String localJson = null;
         String role = CommonUtil.getUserRole();
@@ -225,9 +224,9 @@ public class WorkPlatModel implements IWorkPlatModel {
                 workCallback.onSuccess(what, localJson);
             }
         }
-
     }
 
+
     @NonNull
     private List<WorkMenuBean> getWorkMenuBeans(String menuJson) {
         List<WorkMenuBean> localWorkMenuBeans;

app_modular/appworks/src/main/res/layout/activity_work_module_sort.xml

@@ -22,7 +22,8 @@
             android:padding="10dp"
             android:text="@string/module_start_using"
             android:textColor="#97AEC2"
-            android:textSize="14sp" />
+            android:textSize="14sp"
+            android:visibility="gone" />
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/work_module_sort_add_rv"
@@ -31,7 +32,7 @@
             android:background="@color/white"
             android:fadingEdge="none"
             android:overScrollMode="never"
-            android:scrollbars="none"/>
+            android:scrollbars="none" />
 
 
         <TextView
@@ -43,7 +44,8 @@
             android:padding="10dp"
             android:text="@string/module_not_start_using"
             android:textColor="#97AEC2"
-            android:textSize="14sp" />
+            android:textSize="14sp"
+            android:visibility="gone" />
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/work_module_sort_delete_rv"
@@ -51,7 +53,7 @@
             android:layout_height="wrap_content"
             android:background="@color/white"
             android:overScrollMode="never"
-            android:scrollbars="none"/>
+            android:scrollbars="none" />
 
     </LinearLayout>