Browse Source

切换账套成功之后,保留powerList的值

shuij 4 years ago
parent
commit
41fc6d2309

+ 9 - 1
app/src/main/java/com/uas/uaspda/fragment/IndexSettingFragment.java

@@ -649,7 +649,8 @@ public class IndexSettingFragment extends BaseFragment implements View.OnClickLi
                                     String emname = dataObject.optString("em_name");
 
                                     if (!TextUtils.isEmpty(funname) && !TextUtils.isEmpty(mastername)) {
-                                        PdaApplication.removeAllDataCache();
+                                      //  PdaApplication.removeAllDataCache();
+                                        removeAllCache();
                                         SharedPreUtil.saveString(getActivity(), Constants.FLAG.ACCOUNT_FUNNAME_CACHE, funname);
                                         SharedPreUtil.saveString(getActivity(), Constants.FLAG.ACCOUNT_NAME_CACHE, mastername);
                                         Toast.makeText(getActivity(), "账套切换成功", Toast.LENGTH_SHORT).show();
@@ -715,4 +716,11 @@ public class IndexSettingFragment extends BaseFragment implements View.OnClickLi
     public boolean onFragmentBackPressed() {
         return false;
     }
+
+    private void removeAllCache() {
+        //原来的权限先予以保留
+        Object powerList =  PdaApplication.getDataCacheFromMap(Constants.FLAG.POWER_CALLER_CACHE);
+        PdaApplication.removeAllDataCache();
+        PdaApplication.putDataCache2Map(Constants.FLAG.POWER_CALLER_CACHE,powerList);
+    }
 }

+ 1 - 1
app/src/main/java/com/uas/uaspda/fragment/SCSMTCheckFragment.java

@@ -714,7 +714,7 @@ public class SCSMTCheckFragment extends BaseFragment implements View.OnClickList
 
                         mAutoStringAdapter = new MyArrayAdapter<String>(mActivity, android.R.layout.simple_dropdown_item_1line, new ArrayList<String>());
                         mCollectEditText.setAdapter(mAutoStringAdapter);
-
+                         //no use
                         if (mUpRadioButton.isChecked()) {
                             mCollectEditText.setHint(COLLECT_PRODCODE);
                             if (!TextUtils.isEmpty(psl_repcode)) {

+ 7 - 0
app/src/main/java/com/uas/uaspda/fragment/SmtRequestDetailListFragment.java

@@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.uas.uaspda.R;
+import com.uas.uaspda.activity.FunctionActivity;
 import com.uas.uaspda.adapter.SmtRequestDetailAdapter;
 import com.uas.uaspda.bean.SmtRequestBean;
 import com.uas.uaspda.bean.SmtRequestListBean;
@@ -127,6 +128,12 @@ public class SmtRequestDetailListFragment extends BaseFragment {
         }
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setTitle("备料单列表");
+    }
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         return false;

+ 2 - 3
app/src/main/java/com/uas/uaspda/presenter/SolderOperatePresenter.java

@@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
-import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.uas.uaspda.application.PdaApplication;
 import com.uas.uaspda.bean.SolderOperateEntity;
 import com.uas.uaspda.fragment.SolderPasteManageFragment;
@@ -36,9 +35,9 @@ public class SolderOperatePresenter {
         if (argument != null) {
             mWhichPage = argument.getInt(Constants.CONSTANT.EXTRA_WHICH_PAGE);
         }
-        if (mWhichPage == SolderPasteManageFragment.SOLDER_QUERY) {
+        if (mWhichPage == SolderPasteManageFragment.SOLDER_QUERY) {//日志查询
             isQuery = true;
-        } else {
+        } else {//非日志查询
             isQuery = false;
             List<SolderOperateEntity> operateEntities =
                     (List<SolderOperateEntity>) PdaApplication.getDataCacheFromMap("solderOperate" + mWhichPage);

+ 5 - 6
app/src/main/res/layout/fragment_scmake_smtfeederchild_check.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <!--上部:设备信息-->
+    <!--上部:设备信息  no use-->
     <include
         layout="@layout/card_device_msg"
         android:visibility="gone" />
@@ -72,12 +72,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
-                <!--中部:采集区域-->
+                <!--中部:采集区域   no use-->
                 <include
                     layout="@layout/include_scmake_smtfeederchild_check"
                     android:visibility="gone" />
-                <!--下部:提示TEXTView+显示TextView-->
-
+                <!--no  use-->
                 <RadioGroup
                     android:id="@+id/smt_check_mode_rg"
                     android:layout_width="match_parent"
@@ -194,7 +193,7 @@
 
                     </TableRow>
                 </TableLayout>
-
+               <!--no use-->
                 <Button
                     android:id="@+id/smt_check_confirm_btn"
                     style="@style/ButtonStyle"
@@ -207,7 +206,7 @@
                     style="@style/CardWhiteSytle_fillheight"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
-
+                    <!--no use-->
                     <TextView
                         style="@style/CardTitleStyle"
                         android:layout_marginBottom="5dp"

+ 4 - 1
app/src/main/res/layout/fragment_solder_operate.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -36,7 +37,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:orientation="horizontal"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible"
+        >
 
         <TextView
             style="@style/inputItemCaption"