BI报表

1、搜索页面点击条目跳转页面错误
2、网页横屏异常

app_core/common/src/main/AndroidManifest.xml

@@ -2,8 +2,9 @@
     package="com.core.app">
 
 
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
@@ -11,21 +12,23 @@
 
 
         <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"
-            android:label="@string/selector_caption"/>
+            android:name="com.core.widget.view.Activity.CommonWebviewActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name="com.core.widget.view.Activity.ImgFileListActivity"
+            android:label="相册列表" />
+        <activity
+            android:name="com.core.utils.pictureselector.ImgsActivity"
+            android:label="@string/selector_caption" />
 
-        <activity android:name="com.core.widget.view.Activity.SearchLocationActivity"
+        <activity
+            android:name="com.core.widget.view.Activity.SearchLocationActivity"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="stateUnspecified|adjustNothing" />
-        <activity android:name="com.core.widget.view.Activity.SelectActivity">
-        </activity>
+        <activity android:name="com.core.widget.view.Activity.SelectActivity"></activity>
         <activity
             android:name="com.core.widget.view.selectcalendar.SelectCalendarActivity"
-            android:label="@string/title_activity_select_calendar"/>
+            android:label="@string/title_activity_select_calendar" />
         <activity
             android:name="com.core.widget.view.Activity.MultiImagePreviewActivity"
             android:configChanges="orientation|screenSize" />

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

@@ -5,9 +5,11 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.WindowManager;
 import android.webkit.DownloadListener;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebSettings;
@@ -35,7 +37,7 @@ public class CommonWebviewActivity extends BaseActivity {
 
         mWebView.addJavascriptInterface(new JavaScriptinterface(this),
                 "android");
-        
+
 
         WebSettings webSettings = mWebView.getSettings();
         //允许加载JavaScript
@@ -78,7 +80,7 @@ public class CommonWebviewActivity extends BaseActivity {
 
         Intent intent = getIntent();
         mUrl = intent.getStringExtra("scan_url");
-        String mTitle= intent.getStringExtra("title");
+        String mTitle = intent.getStringExtra("title");
         setTitle(mTitle);
         mWebView.loadUrl(mUrl);
     }
@@ -104,11 +106,32 @@ public class CommonWebviewActivity extends BaseActivity {
         }
     }
 
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            if (getSupportActionBar() != null) {
+                getSupportActionBar().hide();
+            }
+            //设置全屏
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
+            if (getSupportActionBar() != null) {
+                getSupportActionBar().show();
+                //取消全屏
+                getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            }
+        }
+    }
+
 
     public class JavaScriptinterface {
         Context context;
+
         public JavaScriptinterface(Context c) {
-            context= c;
+            context = c;
         }
 
         /**
@@ -121,14 +144,14 @@ public class CommonWebviewActivity extends BaseActivity {
         }
 
         @JavascriptInterface
-        public void requestedOrientationLandscape(){
+        public void requestedOrientationLandscape() {
             // 设置为横屏模式  
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         }
 
         @JavascriptInterface
-        public void requestedOrientationPortrait(){
-            // 设置为横屏模式  
+        public void requestedOrientationPortrait() {
+            // 设置为竖屏模式
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         }
     }

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

@@ -18,18 +18,24 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
 import com.common.data.StringUtil;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
 import com.core.widget.CircleTextView;
 import com.core.widget.ClearEditText;
 import com.core.widget.EmptyLayout;
+import com.core.widget.view.Activity.CommonWebviewActivity;
 import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechConstant;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialog;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
+import com.me.network.app.base.HttpCallback;
+import com.me.network.app.base.HttpParams;
+import com.me.network.app.http.HttpRequest;
+import com.me.network.app.http.Method;
 import com.uas.appworks.R;
 import com.uas.appworks.datainquiry.Constants;
 import com.uas.appworks.datainquiry.bean.DataInquiryGirdItemBean;
@@ -53,8 +59,7 @@ public class ReportQuerySearchActivity extends BaseActivity {
     private ListView mResultListView;
     private ReportQuerySearchAdapter mReportQuerySearchAdapter;
     private List<ReportQuerySearchBean> mQuerySearchBeanList;
-    private String mCurrentMaster;
-    private String mCurrentUser;
+    private String mCurrentMaster, mCurrentUser, mWhichPage;
     private EmptyLayout mEmptyLayout;
 
     private int[] mColors = new int[]{R.color.data_inquiry_gird_menu_color1, R.color.data_inquiry_gird_menu_color2
@@ -65,7 +70,16 @@ public class ReportQuerySearchActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_report_query_search);
-        setTitle("报表统计");
+
+        Intent intent = getIntent();
+        if (intent != null) {
+            mWhichPage = intent.getStringExtra("whichPage");
+        }
+        if ("BI".equals(mWhichPage)) {
+            setTitle("BI服务");
+        } else {
+            setTitle("报表统计");
+        }
 
         initViews();
         initEvents();
@@ -123,7 +137,9 @@ public class ReportQuerySearchActivity extends BaseActivity {
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 DataInquiryGirdItemBean dataInquiryGirdItemBean = new DataInquiryGirdItemBean();
                 dataInquiryGirdItemBean.setColor(mReportQuerySearchAdapter.getObjects().get(position).getColor());
-                dataInquiryGirdItemBean.setIconText(mReportQuerySearchAdapter.getObjects().get(position).getListBean().getTitle());
+                GridMenuReportStatisticsBean.ListBean selectBean = mReportQuerySearchAdapter.getObjects().get(position).getListBean();
+
+                dataInquiryGirdItemBean.setIconText(selectBean.getTitle());
 
                 String dataInquiryMenuRecentCache = CommonUtil.getSharedPreferences(ReportQuerySearchActivity.this,
                         mCurrentUser + mCurrentMaster + Constants.CONSTANT.REPORT_QUERY_MENU_RECENT_CACHE);
@@ -133,7 +149,7 @@ public class ReportQuerySearchActivity extends BaseActivity {
                         recentBrowse = JSON.parseArray(dataInquiryMenuRecentCache, DataInquiryGirdItemBean.class);
 
                         for (int i = 0; i < recentBrowse.size(); i++) {
-                            if (mReportQuerySearchAdapter.getObjects().get(position).getListBean().getTitle() != null && mQuerySearchBeanList.get(position).getListBean().getTitle().equals(recentBrowse.get(i).getIconText())) {
+                            if (selectBean.getTitle() != null && mQuerySearchBeanList.get(position).getListBean().getTitle().equals(recentBrowse.get(i).getIconText())) {
                                 recentBrowse.remove(i);
                             }
                         }
@@ -149,10 +165,14 @@ public class ReportQuerySearchActivity extends BaseActivity {
                         , mCurrentUser + mCurrentMaster + Constants.CONSTANT.REPORT_QUERY_MENU_RECENT_CACHE
                         , recentJson);
 
-                Intent intent = new Intent();
-                intent.setClass(ReportQuerySearchActivity.this, ReportQueryCriteriaActivity.class);
-                intent.putExtra("reportinfo", mReportQuerySearchAdapter.getObjects().get(position).getListBean());
-                startActivity(intent);
+                if ("BI".equals(mWhichPage)) {
+                    getBiUrl(selectBean.getCaller(), selectBean.getTitle());
+                } else {
+                    Intent intent = new Intent();
+                    intent.setClass(ReportQuerySearchActivity.this, ReportQueryCriteriaActivity.class);
+                    intent.putExtra("reportinfo", selectBean);
+                    startActivity(intent);
+                }
             }
         });
 
@@ -181,6 +201,43 @@ public class ReportQuerySearchActivity extends BaseActivity {
         });
     }
 
+    /**
+     * 获取UI报表网页URL
+     *
+     * @param caller
+     * @param title
+     */
+    private void getBiUrl(String caller, final String title) {
+        progressDialog.show();
+        HttpRequest.getInstance().sendRequest(CommonUtil.getAppBaseUrl(ct),
+                new HttpParams.Builder()
+                        .url("common/bi/getToken.action")
+                        .method(Method.GET)
+                        .addParam("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"))
+                        .addParam("caller", caller)
+                        .addParam("master", CommonUtil.getMaster())
+                        .addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"))
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        String data = o.toString();
+                        String url = JSON.parseObject(data).getString("data");
+                        if (!StringUtil.isEmpty(url)) {
+                            startActivity(new Intent(mContext, CommonWebviewActivity.class)
+                                    .putExtra("title", title)
+                                    .putExtra("scan_url", url));
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        toast(failStr);
+                    }
+                });
+    }
+
     private void initDatas() {
         String reportQueryMenuCache = CommonUtil.getSharedPreferences(this,
                 mCurrentUser + mCurrentMaster + Constants.CONSTANT.REPORT_QUERY_MENU_CACHE);

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

@@ -50,7 +50,7 @@ import java.util.Map;
  */
 public class ReportStatisticsBiActivity extends BaseActivity {
     private final int GET_MENU_DATA = 0x16;
-    public static final int GET_CLICK_URL=0x17;
+    public static final int GET_CLICK_URL = 0x17;
     private PullToRefreshListView mMenuListView;
     private List<GridMenuReportStatisticsBean> mGridMenuReportStatisticsBeans;
     private ReportStatisticsMenuListAdapter mReportStatisticsMenuListAdapter;
@@ -146,7 +146,7 @@ public class ReportStatisticsBiActivity 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(ReportStatisticsBiActivity.this,
                         mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_QUERY_MENU_RECENT_CACHE);
@@ -180,12 +180,12 @@ public class ReportStatisticsBiActivity extends BaseActivity {
                     List<GridMenuReportStatisticsBean.ListBean> reportlist = mGridMenuReportStatisticsBeans.get(i).getList();
                     for (int j = 0; j < reportlist.size(); j++) {
                         if (dataInquiryGirdItemBean.getIconText().equals(reportlist.get(j).getTitle())) {
-                            Intent intent = new Intent();
-                            intent.setClass(ReportStatisticsBiActivity.this, ReportQueryCriteriaActivity.class);
-                            intent.putExtra("reportinfo", reportlist.get(j));
-                            String caller= reportlist.get(j).getCaller();
+                            String caller = reportlist.get(j).getCaller();
                             clickItem(caller);
-                           // ReportStatisticsActivity.this.startActivity(intent);
+//                            Intent intent = new Intent();
+//                            intent.setClass(ReportStatisticsBiActivity.this, ReportQueryCriteriaActivity.class);
+//                            intent.putExtra("reportinfo", reportlist.get(j));
+//                             ReportStatisticsActivity.this.startActivity(intent);
                             return;
                         }
                     }
@@ -198,6 +198,7 @@ public class ReportStatisticsBiActivity extends BaseActivity {
             public void onClick(View v) {
                 Intent intent = new Intent();
                 intent.setClass(ReportStatisticsBiActivity.this, ReportQuerySearchActivity.class);
+                intent.putExtra("whichPage", "BI");
                 startActivity(intent);
             }
         });
@@ -212,7 +213,7 @@ public class ReportStatisticsBiActivity extends BaseActivity {
         mMenuListView.setAdapter(mReportStatisticsMenuListAdapter);
         mReportStatisticsMenuListAdapter.setmHandler(mHandler);
         mReportStatisticsMenuListAdapter.setBiServer(true);
-                
+
         mRecentBrowseLl = (LinearLayout) View.inflate(this, R.layout.item_list_data_inquiry_menu, null);
         mReportStatisticsModulView = (View) mRecentBrowseLl.findViewById(R.id.data_inquiry_modul_view);
         mReportStatisticsModulTitleTv = (TextView) mRecentBrowseLl.findViewById(R.id.data_inquiry_modul_title_tv);
@@ -312,7 +313,7 @@ public class ReportStatisticsBiActivity extends BaseActivity {
 //        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<>();
@@ -322,33 +323,33 @@ public class ReportStatisticsBiActivity extends BaseActivity {
         ViewUtil.httpSendRequest(this, url, params, mHandler, headers, GET_MENU_DATA, null, null, "get");
 
     }
-    
-    public  void clickItem(String caller){
+
+    public void clickItem(String caller) {
+        progressDialog.show();
         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());
+        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:
+                    progressDialog.dismiss();
                     String data = msg.getData().getString("result");
                     LogUtil.d("arison", "data:" + data);
                     String url = JSON.parseObject(data).getString("data");
-                    if(!StringUtil.isEmpty(url)){
+                    if (!StringUtil.isEmpty(url)) {
                         startActivity(new Intent(mContext, CommonWebviewActivity.class)
-                                .putExtra("title",msg.getData().getString("mTitle"))
-                                .putExtra("scan_url",url));
+                                .putExtra("title", msg.getData().getString("mTitle"))
+                                .putExtra("scan_url", url));
                     }
                     break;
                 case GET_MENU_DATA:

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

@@ -156,23 +156,23 @@ public class ReportStatisticsMenuListAdapter extends BaseAdapter {
                     intent = new Intent();
                     intent.setClass(context, ReportQueryCriteriaActivity.class);
                     intent.putExtra("reportinfo", listBeans.get(position));
-                    
-                    if(isBiServer){
-                        String caller=listBeans.get(position).getCaller();
-                        String title=listBeans.get(position).getTitle();
-                        clickItem(caller,title);
-                    }else{
+
+                    if (isBiServer) {
+                        String caller = listBeans.get(position).getCaller();
+                        String title = listBeans.get(position).getTitle();
+                        clickItem(caller, title);
+                    } else {
                         context.startActivity(intent);
                     }
-                  
+
                 }
             }
         });
     }
 
     private Handler mHandler;
-    private Boolean isBiServer=false;
-    
+    private Boolean isBiServer = false;
+
 
     public void setBiServer(Boolean biServer) {
         isBiServer = biServer;
@@ -182,14 +182,14 @@ public class ReportStatisticsMenuListAdapter extends BaseAdapter {
         this.mHandler = mHandler;
     }
 
-    public  void clickItem(String caller,String title){
+    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);
+        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, ReportStatisticsBiActivity.GET_CLICK_URL, null, bundle, "get");