提交类型 合并发布

1.去除一元捐，添加设备管理
2.去除本地网址，采用全部的公网
3.测试部分可能错误地方，防止闪退

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Dec 29 16:05:43 CST 2017
-debugName=346
+#Tue Jan 02 14:29:27 CST 2018
+debugName=366
 versionName=624
-debugCode=346
+debugCode=366
 versionCode=163

app_core/common/src/main/assets/work_menu.json

@@ -23,15 +23,6 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "str_work_charitable_donations",
-        "menuIcon": "ic_work_charitable_donations",
-        "menuActivity": "com.modular.work.CharitableActivity",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
       }
     ]
   },
@@ -149,6 +140,15 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "title_device_manage",
+        "menuIcon": "ic_device_manage",
+        "menuActivity": "com.modular.work.DeviceManageActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
       }
     ]
   },

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -1047,10 +1047,10 @@ public class ViewUtil {
                                     String password) {
         mdProcessDialog.setContent(MyApplication.getInstance().getString(R.string.login_progress_erp));
         url = url + "mobile/login.action";
-        if (BaseConfig.isDebug()){
-            master=CommonUtil.getMaster();
-            url="http://192.168.253.203:8090/ERP/mobile/login.action";
-        }
+//        if (BaseConfig.isDebug()){
+//            master=CommonUtil.getMaster();
+//            url="http://192.168.253.203:8090/ERP/mobile/login.action";
+//        }
  //       url="http://192.168.253.58:8080/ERP/mobile/login.action";
 //        url = "http://192.168.253.29:8080/ERP/mobile/login.action";
 //        url = "http://192.168.253.6/uas_dev/mobile/login.action";

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -99,9 +99,9 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
-        if (BaseConfig.isDebug()){
-            baseUrl="http://192.168.253.203:8090/ERP/";
-        }
+//        if (BaseConfig.isDebug()){
+//            baseUrl="http://192.168.253.203:8090/ERP/";
+//        }
 //        baseUrl="http://192.168.253.203:8090/ERP/
 
         return baseUrl;
@@ -475,9 +475,9 @@ public class CommonUtil {
         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         String master = isB2b ? CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu")
                 : CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master");
-      if (BaseConfig.isDebug()){
-          master="UAS_DEV";
-      }
+//      if (BaseConfig.isDebug()){
+//          master="UAS_DEV";
+//      }
         return master;
 
     }

app_core/common/src/main/res/layout/seach_include.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="48dp"
     android:background="@drawable/bg_bar"
@@ -8,17 +8,6 @@
     android:paddingRight="15dp"
     android:paddingTop="5dp">
 
-    <ImageView
-        android:id="@+id/voice_search_iv"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_alignParentRight="true"
-        android:layout_alignRight="@+id/search_edit"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="6dp"
-        android:background="@drawable/btn_yuyin_nor"
-        android:visibility="visible" />
-
     <com.core.widget.ClearEditText
         android:id="@+id/search_edit"
         android:layout_width="fill_parent"
@@ -28,9 +17,18 @@
         android:drawableLeft="@drawable/search"
         android:drawableRight="@drawable/search_clear"
         android:hint="@string/search"
-        android:imeOptions="actionSearch"
-        android:paddingRight="26dp"
         android:textColor="@color/dark_grey"
         android:textColorHint="@color/grey"
-        android:textSize="15sp"/>
-</merge>
+        android:textSize="15sp" />
+
+    <ImageView
+        android:id="@+id/voice_search_iv"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_alignParentRight="true"
+        android:layout_alignRight="@+id/search_edit"
+        android:layout_marginRight="25dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/btn_yuyin_nor"
+        android:visibility="visible" />
+</RelativeLayout>

app_modular/apputils/src/main/java/com/modular/apputils/utils/SwitchUtil.java

@@ -1,6 +1,5 @@
 package com.modular.apputils.utils;
 
-import com.common.config.BaseConfig;
 
 /**
  * Created by Bitlike on 2017/11/22.
@@ -9,13 +8,12 @@ import com.common.config.BaseConfig;
 public class SwitchUtil {
 
     public static boolean showYiyuanjuan() {
-        return BaseConfig.isDebug() && true;
+        return false;
     }
 
     public static boolean showShebeiguanli() {
-        return   true;
+        return  false;
     }
 
 
-
 }

app_modular/appworks/src/main/AndroidManifest.xml

@@ -327,7 +327,13 @@
 
         <activity
             android:name=".CRM.erp.activity.DeviceManageActivity"
-            android:label="@string/title_device_manage" />
+            android:label="@string/title_device_manage" >
+            <intent-filter>
+                <action android:name="com.modular.work.DeviceManageActivity" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".CRM.erp.activity.ScanDetailActivity"
             android:label="@string/text_scan_device" />

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/WorkActivity.java

@@ -339,7 +339,7 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
 
 	//显示时间选择器
 	private void showDateDialog() {
-		OASigninPicker picker = new OASigninPicker(this);
+		OASigninPicker picker = new OASigninPicker(this,CalendarUtil.getYear()-1,CalendarUtil.getYear());
 		picker.setRange(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
 		picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
 		picker.setOnDateTimePickListener(new OASigninPicker.OnDateTimePickListener() {

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/CharitSearchActivity.java

@@ -15,10 +15,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.baidu.cyberplayer.utils.G;
 import com.common.LogUtil;
 import com.common.config.BaseConfig;
+import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.data.TextUtil;
+import com.common.preferences.PreferenceUtils;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
@@ -110,9 +112,9 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
         voiceSearchView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-               if (TextUtils.isEmpty( v.getText())){
-                   loadData( v.getText().toString());
-               }
+                if (TextUtils.isEmpty(v.getText())) {
+                    loadData(v.getText().toString());
+                }
                 return false;
             }
         });
@@ -136,6 +138,15 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
             ToastUtil.showToast(ct, R.string.networks_out);
             return;
         }
+        if (StringUtil.isEmpty(keyWork)) {
+            String activitys = PreferenceUtils.getString("activitys");
+            try {
+                handlerData(activitys);
+            } catch (Exception e) {
+                progressDialog.dismiss();
+                e.printStackTrace();
+            }
+        }
         httpClient.Api().send(new HttpClient.Builder()
                 .url("activities")
                 .add("keyWork", keyWork)
@@ -151,6 +162,7 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
                         handlerData(o.toString());
                     }
                 } catch (Exception e) {
+                    progressDialog.dismiss();
                     if (e != null) {
                         LogUtil.i("e=" + e.getMessage());
                     }
@@ -184,27 +196,57 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
     }
 
     private void handlerData(String message) throws Exception {
+        if (JSONUtil.validateJSONObject(message)) {
+            handlerDataThread(message);
+        } else if (JSONUtil.validateJSONArray(message)) {
+            handlerDataThread2(message);
+        } else {
+            setAdapter(null);
+        }
+    }
+
+    private void handlerDataThread(String message) throws Exception {
+        List<CharitActModel> allModels = new ArrayList<>();
         if (JSONUtil.validateJSONObject(message)) {
             JSONObject object = JSON.parseObject(message);
             JSONArray array = JSONUtil.getJSONArray(object, "activityList");
-            List<CharitActModel> allModels = JSON.parseArray(array.toString(), CharitActModel.class);
-
-            List<CharitActModel> showModels = null;
-            if (StringUtil.isEmpty(lastKeyWork)) {
-                showModels = allModels;
-            } else {
-                showModels = new ArrayList<>();
-                for (CharitActModel e : allModels) {
-                    if (e.getStage().toLowerCase().contains(lastKeyWork) ||
-                            e.getName().toLowerCase().contains(lastKeyWork)) {
-                        showModels.add(e);
-                    }
+            for (int i = 0; i < array.size(); i++) {
+                JSONObject o = array.getJSONObject(i);
+                CharitActModel e = new CharitActModel();
+                e.setActImg(JSONUtil.getText(o, "actImg"));
+                e.setId(JSONUtil.getInt(o, "id"));
+                e.setName(JSONUtil.getText(o, "name"));
+                e.setStage(JSONUtil.getText(o, "stage"));
+                JSONArray awards = JSONUtil.getJSONArray(o, "awards");
+                StringBuilder builder = new StringBuilder();
+                for (int j = 0; j < awards.size(); j++) {
+                    String awardLevel = JSONUtil.getText(awards.getJSONObject(j), "awardLevel");
+                    String awardName = JSONUtil.getText(awards.getJSONObject(j), "awardName");
+                    builder.append(awardLevel + ":" + awardName + "\n");
                 }
+                e.setSubTitle(builder.toString());
+                allModels.add(e);
+            }
+        }
+        setAdapter(allModels);
+    }
+
+    private void handlerDataThread2(String message) throws Exception {
+        List<CharitActModel> allModels = new ArrayList<>();
+        if (JSONUtil.validateJSONArray(message)) {
+            JSONArray array = JSON.parseArray(message);
+            for (int i = 0; i < array.size(); i++) {
+                JSONObject o = array.getJSONObject(i);
+                CharitActModel e = new CharitActModel();
+                e.setActImg(JSONUtil.getText(o, "actImg"));
+                e.setId(JSONUtil.getInt(o, "id"));
+                e.setName(JSONUtil.getText(o, "name"));
+                e.setStage(JSONUtil.getText(o, "stage"));
+                e.setSubTitle(JSONUtil.getText(o, "subTitle"));
+                allModels.add(e);
             }
-            setAdapter(showModels);
-        } else {
-            setAdapter(null);
         }
+        setAdapter(allModels);
     }
 
     private ActivityAdapter activityAdapter;
@@ -218,6 +260,7 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
             activityAdapter.setKeyWork(lastKeyWork);
             activityAdapter.setModels(models);
         }
+        progressDialog.dismiss();
         showModels(models);
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/ActivityFragment.java

@@ -114,7 +114,7 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
         statusTv.setOnClickListener(this);
         findViewById(R.id.statusRl).setOnClickListener(this);
 
-
+        allModels = new ArrayList<>();
         refreshListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
@@ -152,11 +152,11 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
 
     private void loadData(String keyWork, final String status) {
         String activitys = PreferenceUtils.getString("activitys");
-        try {
+        if (!StringUtil.isEmpty(activitys)) try {
             handlerData(false, activitys, "全部");
         } catch (Exception e) {
-            e.printStackTrace();
         }
+
         if (!NetUtils.isNetWorkConnected(ct)) {
             ToastUtil.showToast(ct, R.string.networks_out);
         } else {
@@ -194,9 +194,11 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
 
 
     private void handlerDataThread(String message, String status) throws Exception {
+        List<CharitActModel> allModels = new ArrayList<>();
         if (JSONUtil.validateJSONObject(message)) {
             JSONObject object = JSON.parseObject(message);
             JSONArray array = JSONUtil.getJSONArray(object, "activityList");
+            LogUtil.prinlnLongMsg("gongpengming", " array.size()=" + array.size());
             for (int i = 0; i < array.size(); i++) {
                 JSONObject o = array.getJSONObject(i);
                 CharitActModel e = new CharitActModel();
@@ -231,17 +233,18 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
                 }
             }
         } else {
-            allModels = new ArrayList<>();
             setAdapter(status, allModels);
         }
+        this.allModels = allModels;
         PreferenceUtils.putString("activitys", JSON.toJSONString(allModels));
     }
 
     private void handlerDataThread2(String message, String status) throws Exception {
-        if (JSONUtil.validateJSONObject(message)) {
-            LogUtil.prinlnLongMsg("gongpengming", "time1=" + DateFormatUtil.long2Str("HH:mm:ss"));
-            JSONObject object = JSON.parseObject(message);
-            JSONArray array = JSONUtil.getJSONArray(object, "activityList");
+        List<CharitActModel> allModels = new ArrayList<>();
+        if (JSONUtil.validateJSONArray(message)) {
+            LogUtil.prinlnLongMsg("gongpengming", "time1=" + System.currentTimeMillis());
+            LogUtil.prinlnLongMsg("gongpengming", "message=" + message);
+            JSONArray array = JSON.parseArray(message);
             for (int i = 0; i < array.size(); i++) {
                 JSONObject o = array.getJSONObject(i);
                 CharitActModel e = new CharitActModel();
@@ -270,9 +273,9 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
                 }
             }
         } else {
-            allModels = new ArrayList<>();
             setAdapter(status, allModels);
         }
+        this.allModels = allModels;
     }
 
     private void handlerData(final boolean isNet, final String message, final String status) throws Exception {
@@ -286,6 +289,7 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
                         handlerDataThread2(message, status);
                     }
                 } catch (Exception e) {
+                    LogUtil.prinlnLongMsg("gongpengming", "e=" + e.getMessage());
                     e.printStackTrace();
                 }
             }
@@ -294,19 +298,15 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
 
     private void setAdapter(String status, List<CharitActModel> models) {
         final List<CharitActModel> showModels = new ArrayList<>();
-        LogUtil.prinlnLongMsg("gongpengming", "time3=" + System.currentTimeMillis() / 1000);
         if (!"全部".equals(status)) {
-            LogUtil.prinlnLongMsg("gongpengming", "time4=" + System.currentTimeMillis() / 1000);
             for (CharitActModel model : models) {
                 if (status.equals(model.getStage())) {
                     showModels.add(model);
                 }
             }
-            LogUtil.prinlnLongMsg("gongpengming", "time5=" + System.currentTimeMillis() / 1000);
         } else {
-            showModels.addAll(allModels);
+            showModels.addAll(models);
         }
-        LogUtil.prinlnLongMsg("gongpengming", "time6=" + System.currentTimeMillis() / 1000);
         OAHttpHelper.getInstance().post(new Runnable() {
             @Override
             public void run() {

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/CharitableListFragment.java

@@ -207,8 +207,8 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
                 TextView textView = new TextView(ct);
                 textView.setTextSize(textSize);
                 textView.setText(String.valueOf(c));
-                textView.setGravity(Gravity.CENTER_VERTICAL);
                 textView.setBackgroundResource(R.drawable.text_frame_hint_bg);
+                textView.setGravity(Gravity.CENTER);
                 textView.setTextColor(Color.BLACK);
                 moneyAmountLL.addView(textView);
             }

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/UserFragment.java

@@ -24,6 +24,9 @@ import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appworks.OA.platform.activity.JoinCharitActivity;
 import com.uas.appworks.R;
 
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+
 /**
  * Created by Bitlike on 2017/11/8.
  */
@@ -87,8 +90,19 @@ public class UserFragment extends EasyFragment implements View.OnClickListener {
             }
             return;
         }
+
+
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        loadData();
+    }
+
+    private void loadData() {
         String imid = MyApplication.getInstance().mLoginUser.getUserId();
-        LogUtil.i("imid="+imid);
+        LogUtil.i("imid=" + imid);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("center")
                 .add("imid", imid)
@@ -105,11 +119,9 @@ public class UserFragment extends EasyFragment implements View.OnClickListener {
                 }
             }
         }));
-
     }
 
     private void handleData(String message) {
-        LogUtil.i("message=" + message);
         JSONObject object = JSON.parseObject(message);
         String sumMoney = JSONUtil.getText(object, "sumMoney");
         String sumActJoin = JSONUtil.getText(object, "sumActJoin");
@@ -120,7 +132,7 @@ public class UserFragment extends EasyFragment implements View.OnClickListener {
             String name = JSONUtil.getText(user, "name");
             String tel = JSONUtil.getText(user, "tel");
 
-            if (!StringUtil.isEmpty(name)&&!name.endsWith("军")) {
+            if (!StringUtil.isEmpty(name) && !name.endsWith("军")) {
                 nameTv.setText(name);
             }
             if (!StringUtil.isEmpty(company)) {
@@ -130,8 +142,10 @@ public class UserFragment extends EasyFragment implements View.OnClickListener {
                 phoneTv.setText(tel);
             }
         }
-
-        charitTv.setText(sumMoney);
+        DecimalFormat df = new DecimalFormat(".##");
+        if (sumMoney != null) {
+            charitTv.setText(df.format(sumMoney));
+        }
         projectNumTv.setText("(" + sumProJoin + ")");
         activityNumTv.setText("(" + sumActJoin + ")");
 

app_modular/appworks/src/main/res/layout/pop_device_cyclecount.xml

@@ -26,28 +26,28 @@
             android:background="@drawable/bg_bule_btn"
             android:text="取消"
             android:textColor="@color/white" />
-
         <Button
-            android:id="@+id/sureBtn"
+            android:id="@+id/resetBtn"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="2"
-            android:background="@drawable/bg_bule_btn"
-            android:text="确认"
             android:paddingTop="@dimen/padding"
             android:paddingBottom="@dimen/padding"
+            android:background="@drawable/bg_bule_btn"
+            android:text="重置"
             android:textColor="@color/white" />
-
         <Button
-            android:id="@+id/resetBtn"
+            android:id="@+id/sureBtn"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="2"
+            android:background="@drawable/bg_bule_btn"
+            android:text="确认"
             android:paddingTop="@dimen/padding"
             android:paddingBottom="@dimen/padding"
-            android:background="@drawable/bg_bule_btn"
-            android:text="重置"
             android:textColor="@color/white" />
+
+
     </LinearLayout>
 
     <android.support.v7.widget.RecyclerView