合并两个分支的代码

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

@@ -136,7 +136,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         isCookie = intent.getBooleanExtra("cookie", false);
         String msg_title = intent.getStringExtra("title");
         if (!StringUtil.isEmpty(msg_title)) {
-            getSupportActionBar().setTitle(msg_title + "详情");
+            getSupportActionBar().setTitle(msg_title);
         }
         String StartApp = intent.getStringExtra("isStartApp");//参数账套
 

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

@@ -26,29 +26,11 @@ import com.core.app.MyApplication;
 import com.core.base.HttpImp;
 import com.core.base.OABaseActivity;
 import com.core.net.http.ViewUtil;
-import com.core.widget.CustomerScrollView;
-import com.core.widget.EmptyLayout;
-import com.core.widget.MyListView;
-import com.core.widget.view.selectcalendar.OACalendarView;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.erp.adapter.booking.BookAdapter;
-import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OACalenderViewPagerAdapter;
-import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;
-import com.xzjmyk.pm.activity.ui.erp.model.book.SureBookModel;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.core.app.MyApplication;
-import com.core.base.HttpImp;
-import com.core.base.OABaseActivity;
-import com.core.net.http.ViewUtil;
-import com.core.selectcalendar.OACalendarView;
 import com.core.utils.CommonUtil;
 import com.core.widget.CustomerScrollView;
 import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
+import com.core.widget.view.selectcalendar.OACalendarView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.modular.booking.adapter.BookAdapter;
@@ -56,6 +38,7 @@ import com.modular.booking.model.BookingModel;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OACalenderViewPagerAdapter;
+import com.xzjmyk.pm.activity.ui.erp.model.book.SureBookModel;
 
 import java.util.ArrayList;
 import java.util.Calendar;

app_core/common/src/main/java/com/core/app/AppConstant.java

@@ -67,4 +67,6 @@ public class AppConstant {
     public static final String INIT_MISSION_TASK = "INIT_MISSION_TASK";//初始化外勤签到任务
     public static final String DEPOSIT_NOTICE_TASK = "DEPOSIT_NOTICE_TASK";//预约计划提醒任务
     public static final String NEW_FUNCTION_NOTICE = "NEW_FUNCTION_NOTICE";
+
+    public static final String UPDATA_UUHELPER = "UPDATA_UUHELPER";
 }

app_core/common/src/main/java/com/core/app/Constants.java

@@ -275,6 +275,7 @@ public class Constants {
     public static final String TABLE_UUHELPER_RECORD = "create table "
             + DatabaseTables.UUHelperTable.NAME + "("
             + DatabaseTables.UUHelperTable.Cols.ID + " integer primary key autoincrement"
+            + "," + DatabaseTables.UUHelperTable.Cols.USER_ID
             + "," + DatabaseTables.UUHelperTable.Cols.TIME_SEND
             + "," + DatabaseTables.UUHelperTable.Cols.DATE
             + "," + DatabaseTables.UUHelperTable.Cols.IMAGE_URL

app_core/common/src/main/java/com/core/dao/UUHelperDao.java

@@ -5,6 +5,7 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
+import com.core.app.MyApplication;
 import com.core.db.DatabaseManager;
 import com.core.db.DatabaseTables;
 import com.core.model.UUHelperModel;
@@ -45,6 +46,7 @@ public class UUHelperDao extends Dao<UUHelperModel.UUHelperItem> {
     protected ContentValues getValues(UUHelperModel.UUHelperItem uuHelperItem) throws Exception {
         ContentValues values = new ContentValues();
         values.put(DatabaseTables.UUHelperTable.Cols.TIME_SEND, uuHelperItem.getTimeSend());
+        values.put(DatabaseTables.UUHelperTable.Cols.USER_ID, MyApplication.getInstance().getLoginUserId());
         values.put(DatabaseTables.UUHelperTable.Cols.IMAGE_URL, uuHelperItem.getImageUrl());
         values.put(DatabaseTables.UUHelperTable.Cols.LINK_URL, uuHelperItem.getLinkUrl());
         values.put(DatabaseTables.UUHelperTable.Cols.CONTENT, uuHelperItem.getContent());
@@ -72,7 +74,9 @@ public class UUHelperDao extends Dao<UUHelperModel.UUHelperItem> {
 
     public List<UUHelperModel.UUHelperItem> getAllModels() {
         String orderBy = DatabaseTables.UUHelperTable.Cols.DATE + " asc";
-        return query(null, null, null, orderBy);
+        String where = DatabaseTables.UUHelperTable.Cols.USER_ID;
+        String[] whereArgs = {MyApplication.getInstance().getLoginUserId()};
+        return query(null, where, whereArgs, orderBy);
     }
 
     public boolean deleteData(int id) {

app_core/common/src/main/java/com/core/db/DBOpenHelper.java

@@ -14,7 +14,7 @@ import com.core.app.Constants;
  */
 public class DBOpenHelper extends SQLiteOpenHelper {
     //TODO  上一个发布版本是81
-    private static final int DATABASE_VERSION = 84;
+    private static final int DATABASE_VERSION = 85;
     public static String dataBaseName = "erp.db";
     public Context context;
 

app_core/common/src/main/java/com/core/db/DatabaseTables.java

@@ -20,6 +20,7 @@ public class DatabaseTables {
 
         public static final class Cols {
             public static final String ID = "id";
+            public static final String USER_ID = "userId";
             public static final String TIME_SEND = "timeSend";
             public static final String DATE = "date";
             public static final String IMAGE_URL = "imageUrl";

app_core/common/src/main/java/com/core/model/UUHelperModel.java

@@ -15,7 +15,6 @@ import java.util.Map;
 
 public class UUHelperModel {
     private String date;
-    private String dateShow;
     private List<UUHelperItem> items;
 
     public static class UUHelperItem {
@@ -103,17 +102,11 @@ public class UUHelperModel {
         return date;
     }
 
-    public String getDateShow() {
-        return dateShow == null ? "" : dateShow;
-    }
 
     public List<UUHelperItem> getItems() {
         return items == null ? items = new ArrayList<UUHelperItem>() : items;
     }
 
-    public void setDateShow(String dateShow) {
-        this.dateShow = dateShow;
-    }
 
     public void addItem(long timeSend, String imageUrl, String linkUrl, String content) {
         getItems().add(new UUHelperItem(timeSend, imageUrl, linkUrl, content));

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

@@ -12,6 +12,7 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.NotificationCompat;
 
 import com.common.data.StringUtil;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.app.R;
 
@@ -91,7 +92,7 @@ public class NotificationManage {
         builder.setContentIntent(pendingIntent);
         mNotificationManager.notify(1000, builder.build());
         //发送本地广播
-        LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent());
+        LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent(AppConstant.UPDATA_UUHELPER));
 
     }
 

app_modular/appme/src/main/AndroidManifest.xml

@@ -20,7 +20,12 @@
         <activity android:name="com.uas.appme.settings.activity.BookingSetActivity"/>
         <activity
             android:name="com.uas.appme.settings.activity.FeedbackActivity"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden"/>
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden">
+            <intent-filter>
+                <action android:name="com.modular.main.FeedbackActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <activity android:name="com.uas.appme.settings.activity.SelectLanguageActivity"/>
         <activity

app_modular/appmessages/src/main/AndroidManifest.xml

@@ -25,7 +25,8 @@
             android:theme="@style/StyledIndicators" />
         <activity
             android:name=".activity.UUHelperActivity"
-            android:label="UU 助手">
+            android:label="UU 助手"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="com.modular.appmessage.UUHelperActivity" />
                 <category android:name="android.intent.category.DEFAULT" />

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/AppWebViewActivity.java

@@ -58,7 +58,6 @@ public class AppWebViewActivity extends BaseActivity {
                 case Constants.SUCCESS_ERP:
                     Bundle bundle = msg.getData();
                     String result = bundle.getString("result");
-                    Log.i("wang", "切换登录：" + result);
                     try {
                         String sessionId = FlexJsonUtil.fromJson(result).get("sessionId").toString();
                         String erpaccount = FlexJsonUtil.fromJson(result).get("erpaccount").toString();
@@ -103,7 +102,6 @@ public class AppWebViewActivity extends BaseActivity {
         webView = (PullToRefreshWebView) findViewById(R.id.webView_listview);
         pb = (ProgressBar) findViewById(R.id.pb);
         pb.setMax(100);
-
         Intent intent = this.getIntent();
         master = intent.getStringExtra("master");//参数账套
         String uu = intent.getStringExtra("uu");//参数账套
@@ -137,7 +135,7 @@ public class AppWebViewActivity extends BaseActivity {
         webView.getRefreshableView().getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
         webView.getRefreshableView().clearCache(true);
         webView.getRefreshableView().clearHistory();
-
+        boolean approval = intent.getBooleanExtra("approval", false);
         webView.getRefreshableView().setWebViewClient(new WebViewClient() {
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 if (!StringUtil.isEmpty(url) && url.contains("nodeId=")) {
@@ -170,7 +168,12 @@ public class AppWebViewActivity extends BaseActivity {
         if (!StringUtil.isEmpty(masterId) && !StringUtil.isEmpty(master)) {
             checkUUMaster(uu, masterId, master, url);// 推送，判别公司，账套，实现自动切换
         } else {
-            loadUrl(url, master);// UU为空，默认本公司
+            if (approval) {
+                loadUrl(url, master);// UU为空，默认本公司
+            } else {
+
+                webView.getRefreshableView().loadUrl(url);
+            }
         }
     }
 
@@ -370,10 +373,12 @@ public class AppWebViewActivity extends BaseActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_aproval_set, menu);
-        menu.getItem(0).setVisible(false);
-        MenuItem item = menu.getItem(1);
-        item.setTitle("使用新版");
+        if (getIntent().getBooleanExtra("approval", false)) {
+            getMenuInflater().inflate(R.menu.menu_aproval_set, menu);
+            menu.getItem(0).setVisible(false);
+            MenuItem item = menu.getItem(1);
+            item.setTitle("使用新版");
+        }
         return super.onCreateOptionsMenu(menu);
     }
 }

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalActivity.java

@@ -80,6 +80,7 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
             String url = mPresenter.getUrl(findViewById(R.id.takeOverTV).getVisibility() == View.VISIBLE ? "jsps/mobile/jprocand.jsp?nodeId=" : "", title);
             intent.putExtra("url", url);
             intent.putExtra("p", title);
+            intent.putExtra("approval", true);
             intent.putExtra("master", mPresenter.getMaster());
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(intent);

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/UUHelperActivity.java

@@ -1,36 +1,63 @@
 package com.modular.appmessages.activity;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Bundle;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.view.View;
 
+import com.core.app.AppConstant;
+import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.dao.UUHelperDao;
 import com.core.model.UUHelperModel;
+import com.core.utils.CommonUtil;
+import com.core.utils.IntentUtils;
 import com.modular.appmessages.R;
 import com.modular.appmessages.adapter.UUHelperAdapter;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class UUHelperActivity extends BaseActivity {
+public class UUHelperActivity extends BaseActivity implements View.OnClickListener {
 
     private RecyclerView contentRV;
     private UUHelperAdapter mAdapter;
 
+    private BroadcastReceiver updateReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            initData();
+        }
+    };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_uuhelper);
+        LocalBroadcastManager.getInstance(this).registerReceiver(updateReceiver, new IntentFilter(AppConstant.UPDATA_UUHELPER));
         initView();
         initData();
     }
 
+    @Override
+    protected void onDestroy() {
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(updateReceiver);
+        super.onDestroy();
+    }
+
     private void initView() {
         contentRV = (RecyclerView) findViewById(R.id.contentRV);
         contentRV.setItemAnimator(new DefaultItemAnimator());
         contentRV.setLayoutManager(new LinearLayoutManager(ct));
+        findViewById(R.id.successfulTV).setOnClickListener(this);
+        findViewById(R.id.experienceTV).setOnClickListener(this);
+        findViewById(R.id.serviceTV).setOnClickListener(this);
     }
 
     private void initData() {
@@ -68,5 +95,26 @@ public class UUHelperActivity extends BaseActivity {
             mAdapter.setModels(models);
             mAdapter.notifyDataSetChanged();
         }
+        contentRV.scrollToPosition(models.size() - 1);
+    }
+
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+        String url = null;
+        if (id == R.id.successfulTV) {
+            url = "http://113.105.74.140:8080/new/";
+            IntentUtils.webLinks(ct, url, "关于优软");
+        } else if (id == R.id.experienceTV) {
+            url = "http://113.105.74.140:8080/new/";
+            IntentUtils.webLinks(ct, url, "体验中心");
+        } else if (id == R.id.serviceTV) {
+            CommonUtil.setSharedPreferences(this, Constants.SET_CALL, true);
+            Intent intent = new Intent("com.modular.main.FeedbackActivity");
+            intent.putExtra("type", 1);
+            intent.putExtra(AppConstant.EXTRA_URL, mConfig.help_url);
+            intent.putExtra(AppConstant.EXTRA_TITLE, "客服中心");
+            startActivity(intent);
+        }
     }
 }

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/ApprovalAdapter.java

@@ -21,14 +21,14 @@ import com.common.LogUtil;
 import com.common.data.CalendarUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
-import com.core.app.AppConstant;
 import com.core.model.Approval;
 import com.core.utils.OpenFilesUtils;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
-import com.core.utils.timeutils.wheel.DatePicker;
+import com.core.utils.time.wheel.DatePicker;
 import com.core.widget.CustomProgressDialog;
 import com.core.widget.listener.EditChangeListener;
 import com.modular.appmessages.R;

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/UUHelperAdapter.java

@@ -1,9 +1,7 @@
 package com.modular.appmessages.adapter;
 
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -16,7 +14,6 @@ import android.widget.TextView;
 
 import com.common.LogUtil;
 import com.common.data.ListUtils;
-import com.core.dao.UUHelperDao;
 import com.core.model.UUHelperModel;
 import com.modular.appmessages.R;
 import com.modular.appmessages.activity.AppWebViewActivity;
@@ -79,7 +76,7 @@ public class UUHelperAdapter extends RecyclerView.Adapter<UUHelperAdapter.ViewHo
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
         UUHelperModel model = models.get(position);
-        holder.itemRV.setTag(model.getDateShow());
+        holder.timeTV.setText(model.getDate());
         holder.itemRV.setAdapter(new ItemAdapter(model.getItems()));
     }
 
@@ -194,23 +191,25 @@ public class UUHelperAdapter extends RecyclerView.Adapter<UUHelperAdapter.ViewHo
     }
 
     private void onItemClick(UUHelperModel.UUHelperItem item) {
-//        Intent intent = new Intent("com.modular.main.WebViewActivity");
+//         Intent intent = new Intent("com.modular.main.WebViewActivity");
         Intent intent = new Intent(ct, AppWebViewActivity.class);
         String title = item.getContent();
         String url = item.getLinkUrl();
         intent.putExtra("url", url);
+        intent.putExtra("p", title);
         intent.putExtra("title", title);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         ct.startActivity(intent);
     }
 
     private void onLongItemClick(final UUHelperModel.UUHelperItem item) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(ct);
-        builder.setTitle(R.string.prompt_title).setMessage("确定删除该消息吗?").setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                UUHelperDao.getInstance().deleteData(item.getId());
-            }
-        }).setNegativeButton(R.string.cancel, null).show();
+
+//        AlertDialog.Builder builder = new AlertDialog.Builder(ct);
+//        builder.setTitle(R.string.prompt_title).setMessage("确定删除该消息吗?").setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
+//            @Override
+//            public void onClick(DialogInterface dialogInterface, int i) {
+//                UUHelperDao.getInstance().deleteData(item.getId());
+//            }
+//        }).setNegativeButton(R.string.cancel, null).show();
     }
 }

app_modular/appmessages/src/main/res/drawable/text_hint_bg.xml

@@ -4,7 +4,7 @@
         <shape>
             <solid android:color="@color/subscrip_text" />
             <corners android:radius="8dp" />
-            <padding android:bottom="4dp" android:left="6dp" android:right="6dp" android:top="4dp" />
+            <padding android:bottom="2dp" android:left="2dp" android:right="2dp" android:top="2dp" />
         </shape>
     </item>
 </selector>

app_modular/appmessages/src/main/res/layout/activity_uuhelper.xml

@@ -1,13 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:background="@color/base_bg"
-              tools:context="com.modular.appmessages.activity.UUHelperActivity">
+                tools:context="com.modular.appmessages.activity.UUHelperActivity">
+
+    <LinearLayout
+        android:id="@+id/operationLL"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+
+        <Button
+            android:id="@+id/successfulTV"
+            style="@style/bottomTextStyle"
+            android:layout_weight="2"
+            android:background="@color/white"
+            android:text="关于优软"
+            android:textColor="@drawable/bg_bule_yellow_text" />
+
+        <View
+            android:layout_width="@dimen/line"
+            android:layout_height="20dp"
+            android:layout_gravity="center_vertical"
+            android:background="@color/item_line" />
+
+        <Button
+            android:id="@+id/experienceTV"
+            style="@style/bottomTextStyle"
+            android:layout_weight="3"
+            android:background="@color/white"
+            android:text="体验中心"
+            android:textColor="@drawable/bg_bule_yellow_text" />
+
+        <View
+            android:layout_width="@dimen/line"
+            android:layout_height="20dp"
+            android:layout_gravity="center_vertical"
+            android:background="@color/item_line" />
+
+        <TextView
+            android:id="@+id/changedealmanTV"
+            style="@style/bottomTextStyle"
+            android:layout_weight="5"
+            android:text="@string/common_changedealman"
+            android:visibility="gone" />
+
+        <View
+            android:layout_width="@dimen/line"
+            android:layout_height="20dp"
+            android:layout_gravity="center_vertical"
+            android:background="@color/item_line" />
+
+        <Button
+            android:id="@+id/serviceTV"
+            style="@style/bottomTextStyle"
+            android:layout_weight="3"
+            android:background="@color/white"
+            android:text="客服中心"
+            android:textColor="@drawable/bg_bule_yellow_text" />
+    </LinearLayout>
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/contentRV"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:layout_above="@id/operationLL" />
+
 </RelativeLayout>

app_modular/appmessages/src/main/res/layout/item_uuhelper.xml

@@ -7,10 +7,10 @@
         android:id="@+id/timeTV"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
         android:layout_marginTop="8dp"
         android:background="@drawable/text_hint_bg"
         android:text="2017-11-11 10:11:11"
+        android:layout_marginLeft="20dp"
         android:textColor="@color/white"
         android:textSize="@dimen/text_main" />
 
@@ -18,6 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/timeTV"
+        android:layout_marginBottom="10dp"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
         android:layout_marginTop="5dp"

app_modular/appmessages/src/main/res/layout/item_uuhelper_item.xml

@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:background="@color/subscrip_text"
+            android:background="#A0A0A0"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:lines="2"