解决UU互联报表统计和BI服务功能菜单数据混乱的bug

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Dec 10 10:03:30 CST 2019
+#Wed Dec 11 18:56:48 CST 2019
 debugName=972
-versionName=710
+versionName=711
 debugCode=972
-versionCode=264
+versionCode=265

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/Constants.java

@@ -17,9 +17,11 @@ public interface Constants {
 
         String DATA_INQUIRY_MENU_CACHE = "data_inquiry_menu_cache";
         String REPORT_QUERY_MENU_CACHE = "report_query_menu_cache";
+        String REPORT_BI_MENU_CACHE = "report_bi_menu_cache";
 
         String DATA_INQUIRY_MENU_RECENT_CACHE = "data_inquiry_menu_recent_cache";
         String REPORT_QUERY_MENU_RECENT_CACHE = "report_query_menu_recent_cache";
+        String REPORT_BI_MENU_RECENT_CACHE = "report_bi_menu_recent_cache";
 
         //打印成功
         int DOWNLOAD_SUCCESS = 1;

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

@@ -141,8 +141,12 @@ public class ReportQuerySearchActivity extends BaseActivity {
 
                 dataInquiryGirdItemBean.setIconText(selectBean.getTitle());
 
+                String key = Constants.CONSTANT.REPORT_QUERY_MENU_RECENT_CACHE;
+                if ("BI".equals(mWhichPage)) {
+                    key = Constants.CONSTANT.REPORT_BI_MENU_RECENT_CACHE;
+                }
                 String dataInquiryMenuRecentCache = CommonUtil.getSharedPreferences(ReportQuerySearchActivity.this,
-                        mCurrentUser + mCurrentMaster + Constants.CONSTANT.REPORT_QUERY_MENU_RECENT_CACHE);
+                        mCurrentUser + mCurrentMaster + key);
                 List<DataInquiryGirdItemBean> recentBrowse = new ArrayList<DataInquiryGirdItemBean>();
                 if (!TextUtils.isEmpty(dataInquiryMenuRecentCache)) {
                     try {
@@ -162,7 +166,7 @@ public class ReportQuerySearchActivity extends BaseActivity {
 
                 String recentJson = JSON.toJSON(recentBrowse).toString();
                 CommonUtil.setSharedPreferences(ReportQuerySearchActivity.this
-                        , mCurrentUser + mCurrentMaster + Constants.CONSTANT.REPORT_QUERY_MENU_RECENT_CACHE
+                        , mCurrentUser + mCurrentMaster + key
                         , recentJson);
 
                 if ("BI".equals(mWhichPage)) {
@@ -239,8 +243,12 @@ public class ReportQuerySearchActivity extends BaseActivity {
     }
 
     private void initDatas() {
+        String key = Constants.CONSTANT.REPORT_QUERY_MENU_CACHE;
+        if ("BI".equals(mWhichPage)) {
+            key = Constants.CONSTANT.REPORT_BI_MENU_CACHE;
+        }
         String reportQueryMenuCache = CommonUtil.getSharedPreferences(this,
-                mCurrentUser + mCurrentMaster + Constants.CONSTANT.REPORT_QUERY_MENU_CACHE);
+                mCurrentUser + mCurrentMaster + key);
         if (TextUtils.isEmpty(reportQueryMenuCache)) {
             mEmptyLayout.showEmpty();
         } else {

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

@@ -88,7 +88,7 @@ public class ReportStatisticsBiActivity extends BaseActivity {
 
     private void initDatas() {
         String reportQueryMenuCache = CommonUtil.getSharedPreferences(this,
-                mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_QUERY_MENU_CACHE);
+                mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_BI_MENU_CACHE);
         if (reportQueryMenuCache != null) {
             try {
                 JSONObject resultObject = new JSONObject(reportQueryMenuCache);
@@ -149,7 +149,7 @@ public class ReportStatisticsBiActivity extends BaseActivity {
 
                 String iconText = dataInquiryGirdItemBean.getIconText();
                 String dataInquiryMenuRecentCache = CommonUtil.getSharedPreferences(ReportStatisticsBiActivity.this,
-                        mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_QUERY_MENU_RECENT_CACHE);
+                        mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_BI_MENU_RECENT_CACHE);
                 List<DataInquiryGirdItemBean> recentBrowse = new ArrayList<DataInquiryGirdItemBean>();
                 if (!TextUtils.isEmpty(dataInquiryMenuRecentCache)) {
                     try {
@@ -169,7 +169,7 @@ public class ReportStatisticsBiActivity extends BaseActivity {
 
                 String recentJson = JSON.toJSON(recentBrowse).toString();
                 CommonUtil.setSharedPreferences(ReportStatisticsBiActivity.this
-                        , mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_QUERY_MENU_RECENT_CACHE
+                        , mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_BI_MENU_RECENT_CACHE
                         , recentJson);
 
 //                mDataInquiryGirdItemBeans.clear();
@@ -261,7 +261,7 @@ public class ReportStatisticsBiActivity extends BaseActivity {
     private synchronized void getRecentBrowse() {
         try {
             String reportRecentMenuRecentCache = CommonUtil.getSharedPreferences(this,
-                    mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_QUERY_MENU_RECENT_CACHE);
+                    mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_BI_MENU_RECENT_CACHE);
             if (!TextUtils.isEmpty(reportRecentMenuRecentCache)) {
                 List<GridMenuReportStatisticsBean> reportStatisticsBeans = mReportStatisticsMenuListAdapter.getObjects();
                 mDataInquiryGirdItemBeans.clear();
@@ -296,7 +296,7 @@ public class ReportStatisticsBiActivity extends BaseActivity {
 
                 String recentJson = JSON.toJSON(resultBrowse).toString();
                 CommonUtil.setSharedPreferences(ReportStatisticsBiActivity.this
-                        , mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_QUERY_MENU_RECENT_CACHE
+                        , mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_BI_MENU_RECENT_CACHE
                         , recentJson);
 
                 mDataInquiryMenuGridAdapter.notifyDataSetChanged();
@@ -366,7 +366,7 @@ public class ReportStatisticsBiActivity extends BaseActivity {
                     String result = msg.getData().getString("result");
                     if (result != null) {
                         CommonUtil.setSharedPreferences(ReportStatisticsBiActivity.this,
-                                mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_QUERY_MENU_CACHE,
+                                mCurrentUser + mCurrentMaster + com.uas.appworks.datainquiry.Constants.CONSTANT.REPORT_BI_MENU_CACHE,
                                 result);
                     }
                     mGridMenuReportStatisticsBeans.clear();