跌你老母的适配11

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="990"
-    android:versionName="9.5.7.6" >
+    android:versionCode="90"
+    android:versionName="5.7.6" >
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -935,9 +935,7 @@
             android:name=".ui.erp.activity.crm.AddBusinessActivity"
             android:label="@string/crm_creat_business" />
         <activity android:name=".ui.erp.activity.setting.SelectLanguageActivity"></activity>
-        <activity
-            android:name=".ui.erp.activity.oa.SearchSelectActivity"
-            android:label="@string/describe" />
+        <activity android:name=".ui.erp.activity.oa.SearchSelectActivity"></activity>
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/SignAutoLogDao.java

@@ -54,8 +54,9 @@ public class SignAutoLogDao {
     public List<SignAutoLogEntity> getAllDatas() {
         List<SignAutoLogEntity> dataList = new ArrayList<>();
         SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
-        Cursor  cursor = stepDb.rawQuery("select * from SignAutoLog", null);
+        Cursor  cursor = null;
         try {
+            cursor = stepDb.rawQuery("select * from SignAutoLog", null);
             stepDb.beginTransaction();
             while (cursor.moveToNext()) {
                 int id = cursor.getInt(cursor.getColumnIndex("_id"));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -81,6 +81,9 @@ import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.FastVolley;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
+import com.xzjmyk.pm.activity.wxapi.ApiConfig;
+import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.xmpp.ListenerManager;
 import com.xzjmyk.pm.activity.xmpp.listener.AuthStateListener;
@@ -186,6 +189,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private int mImStatus = AuthStateListener.AUTH_STATE_NOT;
     private List<SignAutoLogEntity> signAutoLogEntity;
     private List<SignAutoLogEntity> isendEntity;
+    private Boolean platform;
 
     public int getmImStatus() {
         return mImStatus;
@@ -609,7 +613,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             }
         });
         PreferenceUtils.putInt(MainActivity.NEW_VERSION_RATING, 1);
-        PushManager.resumeWork(MyApplication.getInstance());
     }
 
     private void setbg(float alpha) {
@@ -749,7 +752,12 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         param.put("map", JSON.toJSONString(isendEntity));
         LogUtil.prinlnLongMsg("isendEntity", JSON.toJSONString(isendEntity));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        if (platform) {
+            headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+        }
+        else {
+            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        }
         ViewUtil.httpSendRequest(this, url, param, mUserCheckHander, headers, LOG_SEND_REQUEST, null, null, "post");
     }
 
@@ -797,7 +805,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         mWorksFragment = (WorksFragment) getSupportFragmentManager().findFragmentByTag(TAG_NEARBY);
         mGroupChatFragment = (GroupChatFragment) getSupportFragmentManager().findFragmentByTag(TAG_GROUP_CHAT);
         mMeFragment = (MeFragment) getSupportFragmentManager().findFragmentByTag(TAG_ME);
-
         mBusinessCircleFragment = (ContactFragment) getSupportFragmentManager().findFragmentByTag(TAG_BusinessCircle);
     }
 
@@ -826,6 +833,8 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
 
         unWorkReadTV.setVisibility(CommonUtil.getSharedPreferencesBoolean(ct, com.xzjmyk.pm.activity.ui.erp.util.Constants.NEW_ME_TAG, false) ? View.GONE : View.VISIBLE);
         Log.i("new_function_notice", new_function_notice + "");
+
+        platform = ApiUtils.getApiModel() instanceof ApiPlatform;
     }
 
     private void changeFragment(Fragment addFragment, String tag) {

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

@@ -151,6 +151,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
         Bundle bundle = new Bundle();
         bundle.putParcelableArrayList("models", models);
+
         String url = "mobile/addMobileMac.action";
         Request request = new Request.Bulider()
                 .setUrl(url)
@@ -168,6 +169,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
         if (iWorkView != null) iWorkView.showLoading();
         Map<String, Object> param = new HashMap<>();
         Map<String, Object> form = new HashMap<>();
+
         //如果是erp就上传code
         if (!isB2b)
             form.put("cl_code", code);
@@ -203,6 +205,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
         param.put("formStore", formStore);
         if (!isB2b)
             param.put("caller", "CardLog");
+
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_worksignin_url : "mobile/saveCardLog.action";
         Request request = new Request.Bulider()
                 .setUrl(url)
@@ -313,7 +316,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
         }
         Intent intent = new Intent(ct, SearchLocationActivity.class);
         SearchPoiParam poiParam = new SearchPoiParam();
-        poiParam.setType(2);
+        poiParam.setType(1);
         poiParam.setTitle(MyApplication.getInstance().getResources().getString(R.string.unoffice));
         poiParam.setRadius(300);
         poiParam.setContrastLatLng(new LatLng(companyLocation.getLocation().longitude, companyLocation.getLocation().latitude));
@@ -372,11 +375,11 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
         //获取当前最近的位置信息
         if (!ListUtils.isEmpty(locationList)) {
             float dis = 0;
-            boolean first = true;
+            boolean first=true;
             for (WorkLocationModel location : locationList) {
-                float distance = BaiduMapUtil.getInstence().autoDistance(location.getLocation());
-                if (first || dis > distance) {
-                    dis = distance;
+                float distance=BaiduMapUtil.getInstence().autoDistance(location.getLocation());
+                if (first||dis > distance) {
+                    dis =distance;
                     companyLocation = location;
                 }
             }
@@ -520,7 +523,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
             return;
         }
         if (isB2b)
-            loadWorkData(time);
+            loadWorkData(time);//TODO 如果是b2b的情况就先下拉打卡，因为没有排班设计只有默认班次
         else
             loadWorkSet(time);
     }
@@ -554,7 +557,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
      * @param models     班次以及打卡记录数据
      * @param macAddress mac地址
      */
-    private void submitWork(ArrayList<WorkModel> models, String macAddress) {
+    private void submitWork(final ArrayList<WorkModel> models, String macAddress) {
         subMitTime = System.currentTimeMillis();
         if (isB2b) {
             Bundle bundle = new Bundle();

WeiChat/src/main/res/layout/fragment_me.xml

@@ -192,7 +192,7 @@
 
         <RelativeLayout
             android:id="@+id/my_friend_rl"
-            style="@style/IMTbleLine"
+            style="@style/IMTbleLine_UP_Me"
             android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView

WeiChat/src/main/res/layout/fragment_works.xml

@@ -44,7 +44,7 @@
 
         <RelativeLayout
             android:id="@+id/my_client_rl"
-            style="@style/IMTbleLine"
+            style="@style/IMTbleLine_UP_Me"
             android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
@@ -77,7 +77,7 @@
 
         <RelativeLayout
             android:id="@+id/rl_uas_sys"
-            style="@style/IMTbleLine"
+            style="@style/IMTbleLine_UP_Me"
             android:background="@drawable/selector_me_menu_item_bg">
             <TextView
                 android:id="@+id/tv_oa_desc"
@@ -185,7 +185,7 @@
 
         <RelativeLayout
             android:id="@+id/setting_rl"
-            style="@style/IMTbleLine"
+            style="@style/IMTbleLine_UP_Me"
             android:background="@drawable/selector_me_menu_item_bg">
             <TextView
                 android:id="@+id/tv_desc_business"
@@ -247,7 +247,7 @@
 
         <RelativeLayout
             android:id="@+id/goods_find"
-            style="@style/IMTbleLine"
+            style="@style/IMTbleLine_UP_Me"
             android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView