合并代码 draft -developer

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CompanyContactsActivity.java

@@ -56,25 +56,18 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
+/**
+  * @desc:企业架构
+  * @author：Arison on 2016/10/31
+  */
 public class CompanyContactsActivity extends BaseActivity {
 
     private Context ct;
     private String TAG = "CompanyContactsActivity";
-
-    //    public static final int LIST_LEFT_MODE = 0;
-//    public static final int LIST_RIGHT_MODE = 1;
     //关键变量
     public static ArrayList<String> tabTitle = new ArrayList<String>(); // 标题
     public static Map<String, Object> keystore = new LinkedHashMap<>(); // 标题
-    private final int LOAD_SUCCESS_LOGIN = 15;
-    private final int LOAD_SUCCESS_ALLDATA = 9;
-    private final int UPDATE_CHANGE_MASTER = 12;
-    private final int LOAD_SUCCESS_LEAFHRORG = 2;
-    private final int LOAD_SUCCESS_LEAFHRORG_RIGHT = 5;
-    private final int LOAD_SUCCESS_LEAFHRORG_RIGHTANDLEFT = 6;
-    private final int LOAD_SUCCESS_EMPLOYEE = 4;
-    private final int LOAD_SUCCESS_EMPLOYEEINFO = 3;
+  
     @ViewInject(R.id.lv_saff_list)
     public CustomerListView listview;
     @ViewInject(R.id.lv_left_list)
@@ -98,9 +91,20 @@ public class CompanyContactsActivity extends BaseActivity {
     private Hrorgs hrorgs_parent;
     private Hrorgs hrorgs_left;
     private int hrorgs_parent_position = 0;
+    private View viewHead;
     private DBManager manager;
     private DetailItemAdapter adapter;// 左边
     private DetailItemAdapter madapter;// 右边
+    
+    private final int LOAD_SUCCESS_LOGIN = 15;
+    private final int LOAD_SUCCESS_ALLDATA = 9;
+    private final int UPDATE_CHANGE_MASTER = 12;
+    private final int LOAD_SUCCESS_LEAFHRORG = 2;
+    private final int LOAD_SUCCESS_LEAFHRORG_RIGHT = 5;
+    private final int LOAD_SUCCESS_LEAFHRORG_RIGHTANDLEFT = 6;
+    private final int LOAD_SUCCESS_EMPLOYEE = 4;
+    private final int LOAD_SUCCESS_EMPLOYEEINFO = 3;
+    
     private Handler mHandler = new Handler() {
         public void handleMessage(android.os.Message msg) {
             HrorgsEntity hEntity;
@@ -383,7 +387,7 @@ public class CompanyContactsActivity extends BaseActivity {
         }
 
     };
-    private View viewHead;
+ 
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -411,12 +415,12 @@ public class CompanyContactsActivity extends BaseActivity {
     protected void onDestroy() {
         super.onDestroy();
         setResult(MainActivity.UPDATA_LIST);
+        manager.closeDB();
 
     }
 
     private void initView() {
         initListener();
-        //reScrollView.setRefreshing(true);
         mHandler.post(new Runnable() {
             @Override
             public void run() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -193,14 +193,14 @@ public class ViewUtil {
                             handler.sendMessage(message);
                         }
                     } else {
-                        Bundle bundle = new Bundle();
-                        Message message = new Message();
-                        bundle.putString("result", "{\n" +
-                                "\"exception\":\"系统内部错误！\"\n" +
-                                "}");
-                        message.setData(bundle);
-                        message.what = Constants.APP_SOCKETIMEOUTEXCEPTION;
-                        handler.sendMessage(message);
+//                        Bundle bundle = new Bundle();
+//                        Message message = new Message();
+//                        bundle.putString("result", "{\n" +
+//                                "\"exception\":\"系统内部错误！\"\n" +
+//                                "}");
+//                        message.setData(bundle);
+//                        message.what = Constants.APP_SOCKETIMEOUTEXCEPTION;
+//                        handler.sendMessage(message);
                     }
                 } else {
                     Bundle bundle = new Bundle();