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

# Conflicts:
#	WeiChat/src/main/AndroidManifest.xml
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

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="88"
-    android:versionName="5.7.4">
+    android:versionCode="89"
+    android:versionName="5.7.5" >
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -938,4 +938,4 @@
         <activity android:name=".ui.erp.activity.oa.SearchSelectActivity"></activity>
     </application>
 
-</manifest>
+</manifest>

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

@@ -80,11 +80,11 @@ public class SignAutoLogDao {
     }
 
     /**
-     * 当本地数据超过50条时开始删除 sendstatus = 1 的数据
+     * 删除 sendstatus = 1 的数据
      */
     public void cleanLocalData(){
-        List<SignAutoLogEntity> signAutoLogEntity = getAllDatas();
-        if (signAutoLogEntity.size() < 50) return;
+//        List<SignAutoLogEntity> signAutoLogEntity = getAllDatas();
+//        if (signAutoLogEntity.size() < 50) return;
         SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
         stepDb.beginTransaction();
         stepDb.delete("SignAutoLog", "sendstatus=?", new String[]{"1"});

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

@@ -152,14 +152,14 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             
             if (msg.what == LOG_SEND_REQUEST){
                 String Log_Send_request = msg.getData().getString("result");
-                Log.i("Log_Send_request",Log_Send_request);
+                Log.i("Log_Send_request",Log_Send_request+"");
+                signAutoLogDao.cleanLocalData(); // 整理本地数据
                 try {
                     if (!StringUtils.isEmpty(Log_Send_request) &&
                             JSON.parseObject(Log_Send_request).containsKey("result") &&
-                            JSON.parseObject(Log_Send_request).getBoolean("result")){
+                            JSON.parseObject(Log_Send_request).getBoolean("result")) {
 
-                        signAutoLogDao.updateCurData(isendEntity); // 将上传的日志状态标为1
-                        signAutoLogDao.cleanLocalData(); // 整理本地数据
+                        signAutoLogDao.updateCurData(isendEntity); // 将上传的日志状态标为1 ，是本地数据保留本次上传的和产生的
                         Toast.makeText(ct,"日志上传成功",Toast.LENGTH_LONG);
                     }
                 } catch (Exception e) {

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

@@ -27,6 +27,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshWebView;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.bean.SHARE_MEDIA;
@@ -123,7 +124,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         webView = (PullToRefreshWebView) findViewById(R.id.webView_listview);
         mPreTv = (TextView) findViewById(R.id.web_previous_tv);
         mNextTv = (TextView) findViewById(R.id.web_next_tv);
-
+        webView.setMode(PullToRefreshBase.Mode.DISABLED);
         mReadSubs = new ArrayList<>();
         isStartApp = false;
         pb = (ProgressBar) findViewById(R.id.pb);

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

@@ -303,9 +303,12 @@ public class Constants {
     public final static String new_signout = "signout";
     public final static String new_oa = "oa_menu";
     public final static String new_business = "business";
-    public final static String NEW_SETING = "seting";
+    
+    public final static String NEW_SETING = "seting_2";
+ 
     public final static String NEW_UURUN = "NEW_UURUN";
     public final static String NEW_ME_TAG = "ME_TAG";
 
-  
+    public final static String SET_SIGN_AUTO="set_sign_auto";
+    public final static String SET_SIGN_IN="set_sign_in";
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -75,7 +75,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     @ViewInject(R.id.tv_menu_setting)
     private TextView tv_menu_setting;
 
-    
+
     @ViewInject(R.id.tv_oa_desc)
     private TextView tv_oa_desc;
     @ViewInject(R.id.iv_desc_oa)
@@ -99,8 +99,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     @ViewInject(R.id.app_drafts_rl)
     private RelativeLayout app_drafts_rl;
     @ViewInject(R.id.test_rl)
-    private RelativeLayout  test_rl;
-   
+    private RelativeLayout test_rl;
+
 
     @ViewInject(R.id.app_friend_rl)
     private RelativeLayout app_friend_rl;
@@ -250,9 +250,9 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         mNickNameTv = (TextView) findViewById(R.id.nick_name_tv);
         mPhoneNumTv = (TextView) findViewById(R.id.phone_number_tv);
 
-        if (CommonUtil.isReleaseVersion()){
+        if (CommonUtil.isReleaseVersion()) {
             test_rl.setVisibility(View.GONE);
-        }else {
+        } else {
             test_rl.setVisibility(View.VISIBLE);
         }
 
@@ -313,10 +313,14 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 startActivity(new Intent(ct, TimeStatisticsActivity.class));
             }
         });
+        
+        
         boolean seting = CommonUtil.getSharedPreferencesBoolean(ct, Constants.NEW_SETING);
         tv_menu_setting.setVisibility(seting ? View.GONE : View.VISIBLE);
-        tv_oa_desc.setVisibility(seting ? View.GONE : View.VISIBLE);
-        iv_desc_oa.setVisibility(seting ? View.GONE : View.VISIBLE);
+//        tv_oa_desc.setVisibility(seting ? View.GONE : View.VISIBLE);
+//        iv_desc_oa.setVisibility(seting ? View.GONE : View.VISIBLE);
+        CommonUtil.clearSharedPreferences(ct, "seting");
+        CommonUtil.clearSharedPreferences(ct,"seting_1");
     }
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SettingActivity.java

@@ -229,7 +229,9 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         });
         
        tv_menu_setting.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.NEW_UURUN, false) ? View.GONE : View.VISIBLE);
-       
+       tv_signauto_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_SIGN_AUTO, false) ? View.GONE : View.VISIBLE);
+       tv_sign_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_SIGN_IN, false) ? View.GONE : View.VISIBLE); 
+        
         speech_recognition_rl.setOnClickListener(this);
         sign_in_rl.setOnClickListener(this);
         sign_out_rl.setOnClickListener(this);
@@ -306,12 +308,14 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                 break;
             case R.id.sign_in_rl:
                 showPopupWindow();
+                CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_IN, true);
                 tv_sign_new.setVisibility(View.GONE);
                 break;
             case R.id.sign_out_rl:
                 Intent intent = new Intent(mContext, MissionSetActivity.class);
                 intent.putExtra(AppConfig.IS_ADMIN, PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false));
                 startActivity(intent);
+                CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_AUTO,true);
                 tv_signauto_new.setVisibility(View.GONE);
                 break;
             case R.id.new_step_rl:

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -98,10 +98,9 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
     @Override
     public void onDestroy() {
         super.onDestroyView();
-        if (mContext!=null) {
-            presenter.onDestroyView(mContext);
-            ct.unregisterReceiver(receiver);
-        }
+        presenter.onDestroyView(mContext);
+        LocalBroadcastManager.getInstance(MyApplication.getInstance()).unregisterReceiver(receiver);
+    
     }
 
     @Override
@@ -169,7 +168,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
         LogUtil.d(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE);
         inputFilter.addAction(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE);
         inputFilter.addAction("com.app.home.update");
-        LocalBroadcastManager.getInstance(ct).registerReceiver(receiver, inputFilter);
+        LocalBroadcastManager.getInstance(MyApplication.getInstance()).registerReceiver(receiver, inputFilter);
     }
 
     private BroadcastReceiver receiver = new BroadcastReceiver() {

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

@@ -459,7 +459,8 @@
                 android:layout_width="10dp"
                 android:layout_height="10dp"
                 android:layout_alignParentRight="true"
-                android:layout_alignTop="@+id/tv_oa"
+                android:layout_toLeftOf="@+id/iv_arrow"
+                android:layout_centerInParent="true"
                 android:layout_marginRight="23dp"
                 android:layout_marginTop="12dp"
                 android:background="@drawable/hongdian"
@@ -473,6 +474,7 @@
                 android:layout_alignBottom="@+id/oa_next"
                 android:layout_centerVertical="true"
                 android:layout_toLeftOf="@+id/tv_menu_setting"
+                android:visibility="gone"
                 android:src="@drawable/kaoqintongji" />
 
             <TextView
@@ -482,10 +484,12 @@
                 android:layout_centerVertical="true"
                 android:layout_margin="3dp"
                 android:layout_toLeftOf="@+id/iv_desc_oa"
+                android:visibility="gone"
                 android:text="@string/set_sport" />
 
 
             <TextView
+             
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
@@ -497,6 +501,7 @@
                 android:textSize="@dimen/text_main" />
 
             <ImageView
+                android:id="@+id/iv_arrow"
                 android:layout_width="@dimen/next_width"
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"

WeiChat/src/main/res/values/strings.xml

@@ -1536,7 +1536,7 @@
     <string name="auto_outplan_failed">自动外勤签到失败</string>
     <string name="app_start_log">APP启动</string>
     <string name="app_monitor_log">APP监控</string>
-    <string name="app_outplan_running">APP外勤任务开启中</string>
+    <string name="app_outplan_running">APP外勤任务进行中</string>
 
     <string name="create_business">创建商机</string>
     <string name="describe">描述</string>