Merge branch 'release' of ssh://10.10.100.21/source/uu-android

WeiChat/build.gradle

@@ -88,7 +88,7 @@ android {
         versionCode versionArray[1]
         versionName versionNames
         multiDexEnabled true
-        signingConfig signingConfigs.config
+//        signingConfig signingConfigs.config
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "umeng"]
         ndk {
             abiFilters "armeabi", "armeabi-v7a", "x86", "mips", "x86_64", "mips64"
@@ -116,7 +116,7 @@ android {
             signingConfig signingConfigs.config
         }
         debug {
-            signingConfig signingConfigs.config
+            //signingConfig signingConfigs.config
         }
     }
 

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

@@ -74,7 +74,6 @@ import com.uas.appme.settings.activity.CheckWagesActivity;
 import com.uas.appme.settings.activity.SettingActivity;
 import com.uas.appme.settings.activity.SystemAdminActivity;
 import com.uas.appme.widget.MasterDialog;
-import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;
 import com.uas.appworks.crm3_0.activity.CustomerManageActivity;
 import com.uas.appworks.crm3_0.activity.CustomerVisitActivity;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
@@ -556,6 +555,10 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
                 tv_menu_setting.setVisibility(View.GONE);
                 tv_oa_desc.setVisibility(View.GONE);
                 iv_desc_oa.setVisibility(View.GONE);
+                
+//                ct.startActivity(new Intent(getActivity(), CommonWebviewActivity.class)
+//                        .putExtra("scan_url","http://10.1.80.118:3000/android")
+//                .putExtra("title",""));
                 break;
             case R.id.me_admin_rl://系统管理员
                 startActivity(new Intent(getActivity(), SystemAdminActivity.class));

app_core/common/src/main/AndroidManifest.xml

@@ -10,7 +10,9 @@
         android:supportsRtl="true">
 
 
-        <activity android:name="com.core.widget.view.Activity.CommonWebviewActivity"/>
+        <activity
+            android:configChanges="keyboardHidden|orientation"
+            android:name="com.core.widget.view.Activity.CommonWebviewActivity"/>
         <activity android:name="com.core.widget.view.Activity.ImgFileListActivity"
             android:label="相册列表"/>
         <activity android:name="com.core.utils.pictureselector.ImgsActivity"

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -649,7 +649,7 @@ public class ViewUtil {
                     if (BaseConfig.isDebug()&&model.getName().equals("UAS研发系统（测试）")){
                         model.setWebsite("https://218.17.158.219:9443/uas_dev/");
                     }
-
+                    //model.setWebsite("http://10.1.80.90:8080/uas/");
                     loginEntities.add(model);
                 } else if (model.getPlatform().equals("B2B")) {
                     List<LoginEntity.Spaces> sModel = model.getSpaces();
@@ -801,6 +801,7 @@ public class ViewUtil {
         }
         if (!StringUtil.isEmpty(text.toString())) {
             LoginEntity entity = erpEntities.get(which);
+            LogUtil.d("arison","login model:"+JSON.toJSONString(entity));
             erp_phone = phone;
             erp_password = password;
             mBusinessCode = entity.getBusinessCode();

app_core/common/src/main/java/com/core/widget/view/Activity/CommonWebviewActivity.java

@@ -1,25 +1,29 @@
 package com.core.widget.view.Activity;
 
-import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.webkit.DownloadListener;
+import android.webkit.JavascriptInterface;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.Toast;
 
 import com.common.file.DownloadUtil;
 import com.core.app.R;
+import com.core.base.BaseActivity;
 
 /**
  * 公共网页打开页面
  * Created by RaoMeng on 2016/9/14.
  */
-public class CommonWebviewActivity extends Activity {
+public class CommonWebviewActivity extends BaseActivity {
     private WebView mWebView;
     private String mUrl;
 
@@ -29,6 +33,10 @@ public class CommonWebviewActivity extends Activity {
         setContentView(R.layout.activity_common_webview);
         mWebView = (WebView) findViewById(R.id.webview);
 
+        mWebView.addJavascriptInterface(new JavaScriptinterface(this),
+                "android");
+        
+
         WebSettings webSettings = mWebView.getSettings();
         //允许加载JavaScript
         webSettings.setJavaScriptEnabled(true);
@@ -70,7 +78,8 @@ public class CommonWebviewActivity extends Activity {
 
         Intent intent = getIntent();
         mUrl = intent.getStringExtra("scan_url");
-
+        String mTitle= intent.getStringExtra("title");
+        setTitle(mTitle);
         mWebView.loadUrl(mUrl);
     }
 
@@ -94,4 +103,33 @@ public class CommonWebviewActivity extends Activity {
             mWebView.destroy();
         }
     }
+
+
+    public class JavaScriptinterface {
+        Context context;
+        public JavaScriptinterface(Context c) {
+            context= c;
+        }
+
+        /**
+         * 与js交互时用到的方法，在js里直接调用的
+         */
+        @JavascriptInterface
+        public void showToast(String ssss) {
+
+            Toast.makeText(CommonWebviewActivity.this, ssss, Toast.LENGTH_LONG).show();
+        }
+
+        @JavascriptInterface
+        public void requestedOrientationLandscape(){
+            // 设置为横屏模式  
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        }
+
+        @JavascriptInterface
+        public void requestedOrientationPortrait(){
+            // 设置为横屏模式  
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
+    }
 }

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/activity/ReportStatisticsActivity.java

@@ -17,12 +17,14 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
+import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.widget.DrawableCenterTextView;
 import com.core.widget.EmptyLayout;
+import com.core.widget.view.Activity.CommonWebviewActivity;
 import com.core.widget.view.MyGridView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -48,6 +50,7 @@ import java.util.Map;
  */
 public class ReportStatisticsActivity extends BaseActivity {
     private final int GET_MENU_DATA = 0x16;
+    public static final int GET_CLICK_URL=0x17;
     private PullToRefreshListView mMenuListView;
     private List<GridMenuReportStatisticsBean> mGridMenuReportStatisticsBeans;
     private ReportStatisticsMenuListAdapter mReportStatisticsMenuListAdapter;
@@ -143,6 +146,7 @@ public class ReportStatisticsActivity extends BaseActivity {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 DataInquiryGirdItemBean dataInquiryGirdItemBean = mDataInquiryMenuGridAdapter.getObjects().get(position);
+                
                 String iconText = dataInquiryGirdItemBean.getIconText();
                 String dataInquiryMenuRecentCache = CommonUtil.getSharedPreferences(ReportStatisticsActivity.this,
                         mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_QUERY_MENU_RECENT_CACHE);
@@ -179,7 +183,9 @@ public class ReportStatisticsActivity extends BaseActivity {
                             Intent intent = new Intent();
                             intent.setClass(ReportStatisticsActivity.this, ReportQueryCriteriaActivity.class);
                             intent.putExtra("reportinfo", reportlist.get(j));
-                            ReportStatisticsActivity.this.startActivity(intent);
+                            String caller= reportlist.get(j).getCaller();
+                            clickItem(caller);
+                           // ReportStatisticsActivity.this.startActivity(intent);
                             return;
                         }
                     }
@@ -204,6 +210,7 @@ public class ReportStatisticsActivity extends BaseActivity {
         mGridMenuReportStatisticsBeans = new ArrayList<>();
         mReportStatisticsMenuListAdapter = new ReportStatisticsMenuListAdapter(this, mGridMenuReportStatisticsBeans);
         mMenuListView.setAdapter(mReportStatisticsMenuListAdapter);
+        mReportStatisticsMenuListAdapter.setmHandler(mHandler);
 
         mRecentBrowseLl = (LinearLayout) View.inflate(this, R.layout.item_list_data_inquiry_menu, null);
         mReportStatisticsModulView = (View) mRecentBrowseLl.findViewById(R.id.data_inquiry_modul_view);
@@ -298,18 +305,51 @@ public class ReportStatisticsActivity extends BaseActivity {
 
 
     private void getMenuData() {
-        String url = CommonUtil.getAppBaseUrl(this) + "mobile/qry/getReport.action";
+//        String url = CommonUtil.getAppBaseUrl(this) + "mobile/qry/getReport.action";
+//        Map<String, Object> params = new HashMap<>();
+//        params.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+//        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+//        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+//        ViewUtil.httpSendRequest(this, url, params, mHandler, headers, GET_MENU_DATA, null, null, "get");
+       
+        //common/getSearchByTree.action
+        String url = CommonUtil.getAppBaseUrl(this) + "common/getSearchByTree.action";
         Map<String, Object> params = new HashMap<>();
         params.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(this, url, params, mHandler, headers, GET_MENU_DATA, null, null, "get");
+
+    }
+    
+    public  void clickItem(String caller){
+        String url = CommonUtil.getAppBaseUrl(this) + "common/bi/getToken.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        params.put("caller",caller);
+        params.put("master",CommonUtil.getMaster());
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(this, url, params, mHandler, headers, GET_CLICK_URL, null, null, "get");
     }
+    
+    
+    
 
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
+                case GET_CLICK_URL:
+                    String data = msg.getData().getString("result");
+                    LogUtil.d("arison", "data:" + data);
+                    String url = JSON.parseObject(data).getString("data");
+                    if(!StringUtil.isEmpty(url)){
+                        startActivity(new Intent(mContext, CommonWebviewActivity.class)
+                                .putExtra("title",msg.getData().getString("mTitle"))
+                                .putExtra("scan_url",url));
+                    }
+                    break;
                 case GET_MENU_DATA:
                     if (progressDialog.isShowing()) {
                         progressDialog.dismiss();

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/adapter/ReportStatisticsMenuListAdapter.java

@@ -2,6 +2,8 @@ package com.uas.appworks.datainquiry.adapter;
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,18 +13,23 @@ import android.widget.BaseAdapter;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.widget.view.MyGridView;
 import com.uas.appworks.R;
 import com.uas.appworks.datainquiry.Constants;
 import com.uas.appworks.datainquiry.activity.ReportQueryCriteriaActivity;
+import com.uas.appworks.datainquiry.activity.ReportStatisticsActivity;
 import com.uas.appworks.datainquiry.activity.ReportStatisticsMoreMenuActivity;
 import com.uas.appworks.datainquiry.bean.DataInquiryGirdItemBean;
 import com.uas.appworks.datainquiry.bean.GridMenuReportStatisticsBean;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by RaoMeng on 2017/8/14.
@@ -149,12 +156,34 @@ public class ReportStatisticsMenuListAdapter extends BaseAdapter {
                     intent = new Intent();
                     intent.setClass(context, ReportQueryCriteriaActivity.class);
                     intent.putExtra("reportinfo", listBeans.get(position));
-                    context.startActivity(intent);
+                   // context.startActivity(intent);
+                    String caller=listBeans.get(position).getCaller();
+                    String title=listBeans.get(position).getTitle();
+                    clickItem(caller,title);
                 }
             }
         });
     }
 
+    private Handler mHandler;
+
+    public void setmHandler(Handler mHandler) {
+        this.mHandler = mHandler;
+    }
+
+    public  void clickItem(String caller,String title){
+        String url = CommonUtil.getAppBaseUrl(context) + "common/bi/getToken.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("emcode", CommonUtil.getSharedPreferences(context, "erp_username"));
+        params.put("caller",caller);
+        params.put("master",CommonUtil.getMaster());
+        Bundle bundle=new Bundle();
+        bundle.putString("mTitle",title);
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(context, "sessionId"));
+        ViewUtil.httpSendRequest(context, url, params, mHandler, headers, ReportStatisticsActivity.GET_CLICK_URL, null, bundle, "get");
+    }
+
     protected class ViewHolder {
         private View dataInquiryModulView;
         private TextView dataInquiryModulTitleTv;