Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

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

@@ -11,15 +11,15 @@ import android.widget.EditText;
 import android.widget.RelativeLayout;
 
 import com.alibaba.fastjson.JSON;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
+import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
 import com.core.utils.timeutils.wheel.DatePicker;
 import com.core.utils.timeutils.wheel.OptionPicker;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.Calendar;
 import java.util.HashMap;

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

@@ -16,29 +16,29 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
 import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.core.model.SelectBean;
 import com.core.base.BaseActivity;
-import com.core.widget.view.Activity.SelectActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.Employees;
+import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.core.utils.timeutils.wheel.DateTimePicker;
 import com.core.utils.timeutils.wheel.OptionPicker;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
+import com.core.widget.view.Activity.SelectActivity;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.Employees;
+import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -30,6 +30,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.core.utils.timeutils.wheel.DateTimePicker;
 
 import java.util.ArrayList;
 import java.util.Calendar;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/adapter/DataInquirySchemeConditionAdapter.java

@@ -15,10 +15,10 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.common.data.CalendarUtil;
+import com.core.utils.timeutils.wheel.OASigninPicker;
 import com.core.widget.view.MyGridView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.SchemeConditionBean;
-import com.core.utils.timeutils.wheel.OASigninPicker;
 
 import java.util.ArrayList;
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/adapter/ReportQueryConditionAdapter.java

@@ -15,10 +15,10 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.common.data.CalendarUtil;
+import com.core.utils.timeutils.wheel.OASigninPicker;
 import com.core.widget.view.MyGridView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.ReportConditionBean;
-import com.core.utils.timeutils.wheel.OASigninPicker;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

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

@@ -21,16 +21,22 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
+import com.core.utils.RecognizerDialogUtil;
+import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.PopupWindowHelper;
+import com.core.utils.timeutils.wheel.OASigninPicker;
+import com.core.widget.MyListView;
+import com.core.widget.view.model.SelectAimModel;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
-import com.core.widget.view.model.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.AddVisitReportPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IAddVisitReport;
 import com.core.utils.TimeUtils;

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

@@ -16,6 +16,7 @@ import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.base.OABaseActivity;
 import com.core.model.SelectBean;
+import com.core.utils.timeutils.wheel.TimePicker;
 import com.core.widget.view.Activity.SelectActivity;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -24,7 +25,6 @@ import com.uas.appworks.OA.erp.utils.MostLinearLayoutManager;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.view.RecycleViewDivider;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
-import com.core.utils.timeutils.wheel.TimePicker;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -30,6 +30,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshScrollView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.OA.erp.activity.MissionActivity;
 import com.uas.appworks.OA.erp.activity.WorkActivity;
 import com.uas.appworks.OA.erp.activity.WorkDailyAddActivity;
 import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;

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

@@ -21,21 +21,21 @@ import com.common.LogUtil;
 import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.core.xmpp.utils.AppConstant;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.core.utils.helper.AvatarHelper;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.core.utils.TimeUtils;
+import com.core.utils.helper.AvatarHelper;
+import com.core.utils.timeutils.wheel.OASigninPicker;
 import com.core.widget.EmptyLayout;
+import com.core.xmpp.utils.AppConstant;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
-import com.core.utils.timeutils.wheel.OASigninPicker;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/AutoErpSigninUitl.java

@@ -685,8 +685,8 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
             if (!b) {
                 //TODO 关闭任务
                 Intent intent = new Intent();
-                intent.setAction(CHANGE_WORK_TASK);
-                intent.putExtra(CHANGE_WORK_TASK, false);
+                intent.setAction(AppConstant.CHANGE_WORK_TASK);
+                intent.putExtra(AppConstant.CHANGE_WORK_TASK, false);
                 MsgBroadcast.sendLocalBroadcast(intent);
             }
         } else if (StringUtil.isEmpty(model.getOffSignin()) && model.getOffTime().compareTo(time) <= 0
@@ -699,8 +699,8 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
             boolean b = hasMore();
             if (!b) {
                 Intent intent = new Intent();
-                intent.setAction(CHANGE_WORK_TASK);
-                intent.putExtra(CHANGE_WORK_TASK, false);
+                intent.setAction(AppConstant.CHANGE_WORK_TASK);
+                intent.putExtra(AppConstant.CHANGE_WORK_TASK, false);
                 MsgBroadcast.sendLocalBroadcast(intent);
             }
         }
@@ -768,8 +768,8 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                             @Override
                             public void run() {
                                 Intent intent = new Intent();
-                                intent.putExtra(CHANGE_WORK_TASK, true);
-                                intent.setAction(CHANGE_WORK_TASK);//保存到数据库成功，开启
+                                intent.putExtra(AppConstant.CHANGE_WORK_TASK, true);
+                                intent.setAction(AppConstant.CHANGE_WORK_TASK);//保存到数据库成功，开启
                                 MsgBroadcast.sendLocalBroadcast(intent);
                             }
                         });

app_modular/appmoments/.gitignore

@@ -0,0 +1 @@
+/build

app_modular/appmoments/build.gradle

@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 26
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:26.0.0-alpha1'
+}

app_modular/appmoments/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in D:\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

app_modular/appmoments/src/main/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<manifest package="com.modular.appmoments"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        >
+
+    </application>
+
+</manifest>

app_modular/appmoments/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">AppMoments</string>
+</resources>

settings.gradle

@@ -1,18 +1,19 @@
 //主工程
-include ':WeiChat', ':appmessages'
+include ':WeiChat'
 
 //核心模块
 include ':network'
 include ':imageload'
 include ':common'
 include ':message'
-include ':appme'
-include ':appworks'
 
 //业务模块
 include ':applogin'
 include ':appcontact'
-
+include ':appmessages'
+include ':appme'
+include ':appworks'
+include ':appmoments'
 
 //第三库模块
 include ':lib-zxing'
@@ -39,6 +40,7 @@ project(':appme').projectDir = new File('app_modular/appme')
 project(':appworks').projectDir = new File('app_modular/appworks')
 project(':appcontact').projectDir = new File('app_modular/appcontact')
 project(':appmessages').projectDir = new File('app_modular/appmessages')
+project(':appmoments').projectDir = new File('app_modular/appmoments')
 
 //第三库模块
 project(':lib-zxing').projectDir = new File('app_third/lib-zxing')