新增设置模块

app/src/main/java/com/uas/gdstorage/activity/FunctionActivity.java

@@ -2,7 +2,6 @@ package com.uas.gdstorage.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -14,7 +13,6 @@ import android.widget.TextView;
 
 import com.android.volley.toolbox.StringRequest;
 import com.uas.gdstorage.R;
-import com.uas.gdstorage.bean.StorageInBillBean;
 import com.uas.gdstorage.fragment.BaseFragment;
 import com.uas.gdstorage.fragment.GdMaterialInFragment;
 import com.uas.gdstorage.fragment.GdStaffChangeFragment;
@@ -22,10 +20,8 @@ import com.uas.gdstorage.fragment.GdTimeReportFragment;
 import com.uas.gdstorage.fragment.GdWorkPauseFragment;
 import com.uas.gdstorage.fragment.GdWorkStartFragment;
 import com.uas.gdstorage.fragment.GdWorkSwitchFragment;
+import com.uas.gdstorage.fragment.IndexSettingFragment;
 import com.uas.gdstorage.fragment.QualityManageFragment;
-import com.uas.gdstorage.fragment.StorageInAddDetailFragment;
-import com.uas.gdstorage.fragment.StorageInAddFragment;
-import com.uas.gdstorage.fragment.StorageInAddListFragment;
 import com.uas.gdstorage.global.GloableParams;
 import com.uas.gdstorage.interfaces.BackHandlerInterface;
 import com.uas.gdstorage.tools.DataSourceManager;
@@ -108,6 +104,9 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                 case GloableParams.HOME_QUALITY_MANAGE:
                     mFragment = new QualityManageFragment();
                     break;
+                case GloableParams.GRIDNAME_SETTING:
+                    mFragment = new IndexSettingFragment();
+                    break;
             }
             //添加Fragment
             mbundle.putString(Constants.FLAG.SC_CODE, sc_code);

app/src/main/java/com/uas/gdstorage/activity/HomeActivity.java

@@ -1,6 +1,5 @@
 package com.uas.gdstorage.activity;
 
-import android.Manifest;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.BitmapDrawable;
@@ -16,7 +15,6 @@ import android.widget.PopupWindow;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
-import com.android.volley.toolbox.StringRequest;
 import com.uas.gdstorage.R;
 import com.uas.gdstorage.application.PdaApplication;
 import com.uas.gdstorage.global.GloableParams;
@@ -132,6 +130,7 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
                 startActivity(new Intent(HomeActivity.this, IndexActivity.class));
                 break;
             case GloableParams.HOME_QUALITY_MANAGE:
+            case GloableParams.GRIDNAME_SETTING:
                 Intent intent = new Intent(HomeActivity.this, FunctionActivity.class);
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);

app/src/main/java/com/uas/gdstorage/global/GloableParams.java

@@ -720,10 +720,10 @@ public class GloableParams {
     //home主页面
     public static final String HOME_DISPATCH_MANAGE = "派工管理";
     public static final String HOME_QUALITY_MANAGE = "品质管理";
-
-    public static String[] homeMenuNames = {HOME_DISPATCH_MANAGE, HOME_QUALITY_MANAGE};
+    public static final String GRIDNAME_SETTING = "设置";
+    public static String[] homeMenuNames = {HOME_DISPATCH_MANAGE, HOME_QUALITY_MANAGE,GRIDNAME_SETTING};
     public static int[] homeMenuIcons = {R.drawable.ic_dispatch_manage,
-            R.drawable.ic_quality_manage};
+            R.drawable.ic_quality_manage,R.drawable.mainmenu_usersetting};
 
     //index界面
     public static final String GRIDNAME_IN_MATERIAL = "上料";

app/src/main/res/layout/fragment_setting.xml

@@ -148,11 +148,13 @@
 
             <LinearLayout
                 style="@style/SettingListBlockStyle"
-                android:background="@color/background_color_first">
+                android:background="@color/background_color_first"
+                >
 
                 <RelativeLayout
                     android:id="@+id/setting_printer_rl"
-                    style="@style/SettingListItemStyle">
+                    style="@style/SettingListItemStyle"
+                    android:visibility="gone">
 
                     <ImageView
                         android:id="@+id/printer_img"