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

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

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui;
 
+import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -7,6 +8,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -17,9 +19,14 @@ import android.os.PersistableBundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.util.DisplayMetrics;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -47,6 +54,7 @@ import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.contact.ContactFragment;
+import com.xzjmyk.pm.activity.ui.erp.activity.me.FeedbackActivity;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -60,8 +68,10 @@ import com.xzjmyk.pm.activity.ui.groupchat.GroupChatFragment;
 import com.xzjmyk.pm.activity.ui.me.MeFragment;
 import com.xzjmyk.pm.activity.ui.me.ScreenListener;
 import com.xzjmyk.pm.activity.ui.message.MessageFragment;
+import com.xzjmyk.pm.activity.ui.tool.WebViewActivity;
 import com.xzjmyk.pm.activity.util.Constants;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.view.DivideRadioGroup;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
@@ -543,8 +553,94 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         }
         //        CommonUtil.SaveAutoLogtoLocal("APP启动","外勤计划监控");
         doSendSignAutoLog(); // 获取数据库中监控日志上传至服务器操作
+        if (!CommonUtil.isReleaseVersion() && MyApplication.getInstance().isNetworkActive()){
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    initScoringWindows();  // 评价UU弹框
+                }
+            },1000);
+        }
+    }
+
+    private PopupWindow popupWindow;
+    private void initScoringWindows() {
+        View contentView = LayoutInflater.from(ct).inflate(R.layout.layout_menu_scoring,null);
+        DisplayMetrics dm = getResources().getDisplayMetrics();
+        int w_screen = dm.widthPixels;
+        int h_screen = dm.heightPixels;
+        w_screen = DisplayUtil.dip2px(this, 300);
+        h_screen = DisplayUtil.dip2px(this, 250);
+        popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
+        popupWindow.setTouchable(true);
+        popupWindow.setOutsideTouchable(false);
+        // 如果不设置PopupWindow的背景，无论是点击外部区域还是Back键都无法dismiss弹框
+//        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_main));
+        // 设置好参数之后再show
+        popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
+        setbg(0.4f);
+
+        contentView.findViewById(R.id.scoring_now_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
+                    Uri uri = Uri.parse("market://details?id=" + getPackageName());
+                    Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    startActivity(intent);
+                } catch (Exception e) {
+                    ViewUtil.webLinks(ct, "http://apk.91.com/Soft/Android/com.xzjmyk.pm.activity-54.html", "UU互联");
+                }
+                popupWindow.dismiss();
+            }
+        });
+
+        contentView.findViewById(R.id.complaints_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(mContext, FeedbackActivity.class);
+                intent.putExtra("type", 1);
+                intent.putExtra(WebViewActivity.EXTRA_URL, mConfig.help_url);
+                intent.putExtra(WebViewActivity.EXTRA_TITLE, getString(R.string.use_help));
+                startActivity(intent);
+                popupWindow.dismiss();
+            }
+        });
+
+        contentView.findViewById(R.id.no_thanking_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                popupWindow.dismiss();
+            }
+        });
     }
 
+    private void setbg(float alpha) {
+        setBackgroundAlpha(this, alpha);
+        if (popupWindow == null) return;
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                setBackgroundAlpha(MainActivity.this, 1f);
+            }
+        });
+    }
+    /**
+     * 设置页面的透明度
+     * 兼容华为手机（在个别华为手机上 设置透明度会不成功）
+     *
+     * @param bgAlpha 透明度   1表示不透明
+     */
+    public void setBackgroundAlpha(Activity activity, float bgAlpha) {
+        WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+        lp.alpha = bgAlpha;
+        if (bgAlpha == 1) {
+            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//不移除该Flag的话,在有视频的页面上的视频会出现黑屏的bug
+        } else {
+            activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//此行代码主要是解决在华为手机上半透明效果无效的bug
+        }
+        activity.getWindow().setAttributes(lp);
+    }
     private Messenger messenger;
     private Messenger mGetReplyMessenger = new Messenger(new Handler());
 
@@ -653,7 +749,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private void LogSendToHttp(List<SignAutoLogEntity> isendEntity) {
         String url = "http://113.105.74.140:8092/user/appAutoLog";
         Map<String, Object> param = new HashMap<>();
-        param.put("map",JSON.toJSONString(signAutoLogEntity));
+        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"));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -161,7 +161,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
             isMyInfo = false;
             loadOthersInfoFromDB();
         } else {
-            if (mLoginUserId.equals(userId)) {  //当点击的是自己的时候
+            if (userId.equals(mLoginUserId)) {  //当点击的是自己的时候 update : 2017-5-18->14:21
                 isMyInfo = true;
                 loadMyInfoFromDb();
             } else {

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/db/StepDataDao.java

@@ -46,19 +46,20 @@ public class StepDataDao {
         SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
         StepEntity stepEntity = null;
         Cursor cursor = stepDb.query("step", null, null, null, null, null, null);
-        while (cursor.moveToNext()) {
-            String date = cursor.getString(cursor.getColumnIndexOrThrow("curDate"));
-            if (curDate.equals(date)) {
-                String steps = cursor.getString(cursor.getColumnIndexOrThrow("totalSteps"));
-                stepEntity = new StepEntity(date, steps);
-                //跳出循环
-                break;
+
+            while (cursor.moveToNext()) {
+                String date = cursor.getString(cursor.getColumnIndexOrThrow("curDate"));
+                if (curDate.equals(date)) {
+                    String steps = cursor.getString(cursor.getColumnIndexOrThrow("totalSteps"));
+                    stepEntity = new StepEntity(date, steps);
+                    //跳出循环
+                    break;
+                }
             }
-        }
-        //关闭
-        cursor.close();
-        DatabaseManager.getInstance().closeDatabase();
-        return stepEntity;
+            //关闭数据库
+                cursor.close();
+                DatabaseManager.getInstance().closeDatabase();
+            return stepEntity;
     }
 
     /**

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/view/StepSplashActivity.java

@@ -104,7 +104,7 @@ public class StepSplashActivity extends Activity {
                         }
                     });
                 } else {
-                    Toast.makeText(StepSplashActivity.this, "没有网络连接!", Toast.LENGTH_LONG).show();
+                    Toast.makeText(StepSplashActivity.this, getString(R.string.networks_out), Toast.LENGTH_LONG).show();
                     startActivity();
                 }
             }

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

@@ -6,7 +6,8 @@
     android:orientation="vertical"
     android:paddingLeft="10dp"
     android:paddingRight="10dp"
-    android:paddingTop="10dp">
+    android:paddingTop="10dp"
+    android:background="@drawable/pop_round_bg">
 
     <TextView
         android:id="@+id/title_tv"

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

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="250dp"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_gravity="center"
+    android:background="@drawable/pop_round_bg">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:gravity="center"
+        android:text="为UU评分"
+        android:textColor="@color/black"
+        android:textSize="15sp"/>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="如果您觉得UU很好用，可否为其评一个分数？只需要花费您很少的时间的，感谢您的支持!"
+        android:textColor="@color/black"
+        android:textSize="15sp"
+        android:paddingBottom="5dp"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"/>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid"/>
+    <TextView
+        android:id="@+id/scoring_now_tv"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:gravity="center"
+        android:text="现在去评分"
+        android:textColor="@color/blue"
+        android:textSize="15sp"/>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid"/>
+    <TextView
+        android:id="@+id/complaints_tv"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:gravity="center"
+        android:text="我要吐槽"
+        android:textColor="@color/blue"
+        android:textSize="15sp"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid"/>
+    <TextView
+        android:id="@+id/no_thanking_tv"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:gravity="center"
+        android:textColor="@color/blue"
+        android:text="不了，谢谢"
+        android:textSize="15sp"/>
+
+</LinearLayout>

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

@@ -65,7 +65,7 @@
     <!-- start 打卡签到 oasign_title-->
     <string name = "super_setting"> Sdvanced Settings </string>
          <string name = "work_setting">Class setting </string>
-         <string name = "office_addr_setting"> Office settings </string>
+         <string name = "office_addr_setting"> Office Setting </string>
          <string name = "my_rule_setting">My attendance regulations </string>
          <string name = "sm_cancel_title"> Cancel </string>
     <!-- end 打卡签到 -->
@@ -111,7 +111,7 @@
     <!-- start 办公地址设置 office_settings_title-->
     <string name = "os_headerdescription1"> You can set multiple office addresses </string>
         <string name = "os_headerdescription2"> employees can punch in any of the following addresses: </string>
-        <string name = "os_signrange"> Punch Range </string>
+        <string name = "os_signrange"> Sign distance </string>
         <string name = "os_workrange"> Office Range </string>
         <string name = "os_add_address"> + Add Office Address </string>
         <string name = "os_range_notice1"> Address distance update succeed </string>
@@ -451,14 +451,14 @@
         <string name = "activity_select_aims"> select destination </string>
         <string name = "activity_flights"> Scheduling Settings </string>
         <string name = "activity_visit_aims"> visit destination </string>
-        <string name = "activity_mission_set"> Outwork settings </string>
+        <string name = "activity_mission_set"> Outwork Setting </string>
         <string name = "activity_mission_plan">Visiting plan</string>
         <string name = "minute"> minutes </string>
-        <string name = "effective_range"> effective distance </string>
-        <string name = "reserve_time"> reservation time </string>
-        <string name = "auto_mission"> Auto Field </string>
+        <string name = "effective_range"> Signing range </string>
+        <string name = "reserve_time"> Reserve time </string>
+        <string name = "auto_mission"> Automatic signing </string>
         <string name = "remind_time"> reminder time </string>
-        <string name = "neer_submit_able"> whether approval is required </string>
+        <string name = "neer_submit_able"> Whether need approval </string>
         <string name = "meet_signin"> meeting sign </string>
         <string name = "signin_setting"> check in settings </string>
         <string name = "signin_detail"> sign in details </string>
@@ -520,10 +520,10 @@
         <string name = "out_net_signin"> The network is not connected and can not sign in for you automatically </string>
         <string name = "auto_mission_signinup"> Auto attendance sign </string>
         <string name = "auto_mission_alert"> Auto Field Reminder </string>
-        <string name = "uu_auto_signined_down"> UU has helped you sign out automatically </string>
-        <string name = "uu_auto_signined_up"> UU has been able to help you sign out automatically </string>
+        <string name = "uu_auto_signined_down"> The UU helps you sign in automatically </string>
+        <string name = "uu_auto_signined_up"> The UU helps you sign in automatically for outwork </string>
         <string name = "visit"> visit </string>
-        <string name = "auto_mission_signindown"> auto attendance sign </string>
+        <string name = "auto_mission_signindown"> The UU helps you sign out automatically for outwork </string>
         <string name = "auto_work_signin_log"> Auto punch card record </string>
         <string name = "auto_signin"> The system has successfully typed for you </string>
         <string name = "success_signin_down_mission"> Field signout succeeds </string>
@@ -621,7 +621,7 @@
         <string name = "set_push">Push </string>
         <string name = "set_clear"> Clear Cache </string>
         <string name="set_sigin"> Sign settings</string>
-        <string name = "set_suggest"> Customer Feedback </string>
+        <string name = "set_suggest">Feedback </string>
         <string name = "set_about"> About UU</string>
         <string name = "set_version"> Current Version </string>
         <string name = "set_login_out">Logout</string>
@@ -638,16 +638,16 @@
         <string name = "about_us_copyright"> Copyright @ 2014-2016 UAS.All Rights Reserved </string>
         <string name = "about_share"> Share </string>
 
-        <string name = "suggest_hink"> Please enter your question ... (within 400 words) </string>
+        <string name = "suggest_hink"> Please input your question ... (within 400 words) </string>
 
-        <string name = "cache_msg"> whether to clear the local cache </string>
+        <string name = "cache_msg"> Clear the local cache? </string>
 
-        <string name = "sports_recode"> motion record </string>
-        <string name = "sports_recode_distance"> running + running distance (estimated) </string>
+        <string name = "sports_recode"> Sports Record </string>
+        <string name = "sports_recode_distance"> Walking+Running Distance(estimated) </string>
         <string name = "sports_kilometre"> km </string>
         <string name = "sports_tody"> today </string>
         <string name = "sports_step"> step </string>
-        <string name = "sports_step_tody"> Today steps </string>
+        <string name = "sports_step_tody"> Steps </string>
         <string name = "sports_recode_more"> More history </string>
 
         <string name = "sports_dialog_content"> More history </string>
@@ -1090,7 +1090,7 @@
     <string name="hot_city">hot city</string>
     <string name="select_city_by_province">select city</string>
     <string name="location_failed">positioning failed</string>
-    <string name="please_unput_yourP"> Please enter your question ... (within 400 words) </string>
+    <string name="please_unput_yourP"> Please input your question ... (within 400 words) </string>
     <string name="local_video">Local video</string>
     <string name="Business_license_number">Business License No</string>
     <string name="crm_branch">My subordinates</string>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -747,7 +747,7 @@
     <string name="cache_msg">是否确定清除本地缓存</string>
     <!--UU运动-->
     <string name="sports_recode">运动记录</string>
-    <string name="sports_recode_distance">跑步+跑步距离(估算)</string>
+    <string name="sports_recode_distance">步行+跑步距离(估算)</string>
     <string name="sports_kilometre">公里</string>
     <string name="sports_tody">今天</string>
     <string name="sports_step">步</string>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -721,7 +721,7 @@
     <string name="cache_msg">是否確定清除本地緩存</string>
     <!--UU运动-->
     <string name="sports_recode">運動記錄</string>
-    <string name="sports_recode_distance">跑步+跑步距離（估算）</string>
+    <string name="sports_recode_distance">步行+跑步距离(估算)</string>
     <string name="sports_kilometre">公里</string>
     <string name="sports_tody">今天</string>
     <string name="sports_step">步</string>

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

@@ -1247,7 +1247,7 @@
     <string name="cache_msg">是否确定清除本地缓存</string>
     <!--UU运动-->
     <string name="sports_recode">运动记录</string>
-    <string name="sports_recode_distance">跑步+跑步距离(估算)</string>
+    <string name="sports_recode_distance">步行+跑步距离(估算)</string>
     <string name="sports_kilometre">公里</string>
     <string name="sports_tody">今天</string>
     <string name="sports_step">步</string>