MainActivity 弹框显示完成4

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

@@ -49,6 +49,7 @@ import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.SignAutoLogDao;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
+import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
@@ -56,6 +57,7 @@ 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.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
@@ -73,6 +75,7 @@ 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.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.DivideRadioGroup;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.FastVolley;
@@ -149,6 +152,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private int mRetryCheckDelay = 0;
     public static int UPDATA_LIST = 101;
     public static String NEW_FUNCTION_NOTICE = "NEW_FUNCTION_NOTICE";
+    public static String NEW_VERSION_RATING = "NEW_VERSION_RATING";  // 判断是否为新版本弹出评分标志
     private TextView main_tab_three_tv;
     private SignAutoLogDao signAutoLogDao = new SignAutoLogDao();
     private Handler mUserCheckHander = new Handler() {
@@ -553,14 +557,6 @@ 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;
@@ -569,13 +565,13 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         DisplayMetrics dm = getResources().getDisplayMetrics();
         int w_screen = dm.widthPixels;
         int h_screen = dm.heightPixels;
-        w_screen = DisplayUtil.dip2px(this, 300);
+        w_screen = DisplayUtil.dip2px(this, 250);
         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));
+        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.pop_round_bg));
         // 设置好参数之后再show
         popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
         setbg(0.4f);
@@ -612,6 +608,8 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 popupWindow.dismiss();
             }
         });
+        PreferenceUtils.putInt(MainActivity.NEW_VERSION_RATING, 1);
+        PushManager.resumeWork(MyApplication.getInstance());
     }
 
     private void setbg(float alpha) {
@@ -748,7 +746,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(isendEntity));
+        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"));
@@ -914,6 +912,37 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             main_tab_three_tv.setVisibility(View.VISIBLE);
         }
         LogUtil.d("onResume end:" + DateFormatUtil.getDateTimeStr());
+
+        int new_version_rating = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_VERSION_RATING);
+        if (new_version_rating == 1 && !CommonUtil.isReleaseVersion() && MyApplication.getInstance().isNetworkActive()){
+//        if (new_version_rating == 1 && !CommonUtil.isReleaseVersion() && MyApplication.getInstance().isNetworkActive()){
+            showsScoreWindowJudge();  // 显示为UU评分对话框逻辑
+        }
+    }
+
+    private void showsScoreWindowJudge() {
+        List<WorkModel> models = WorkModelDao.getInstance().query(true);
+        if (ListUtils.isEmpty(models)) return;
+
+        String off_time = models.get(models.size() - 1).getOffTime();
+        if (StringUtils.isEmpty(off_time)) return;
+        String cur_time =  TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");
+        if (cur_time.compareTo(off_time) > 0){
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    initScoringWindows();  // 评价UU弹框
+                }
+            }, 1000);
+        }else {
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    initScoringWindows();  // 评价UU弹框
+                }
+            }, 1000);
+        }
+        Log.i("off_time,cur_time",cur_time.compareTo(off_time)+"");
     }
 
     @Override

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

@@ -174,7 +174,6 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
                 else
                     new UploadPhpto().execute();
             }
-
         }else {
             return super.onOptionsItemSelected(item);
         }return true;

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

@@ -211,12 +211,14 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
         tv_task_status.setText(intent.getStringExtra("status") == null ? getString(R.string.common_noinput) : intent.getStringExtra("status"));
         tv_task_duration.setText(intent.getStringExtra("duration") == null ? getString(R.string.common_noinput) : intent.getStringExtra("duration"));
         tv_task_describe
-                .setText(intent.getStringExtra("description") == null ? getString(R.string.common_noinput) :intent.getStringExtra("description"));
+                .setText(intent.getStringExtra("description") == null ? getString(R.string.common_noinput) : intent.getStringExtra("description"));
         tv_task_starttime.setText(intent.getStringExtra("tasktime") == null ? getString(R.string.common_noinput) :
-                TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("tasktime")), "yyyy-MM-dd HH:mm"));
+                intent.getStringExtra("tasktime"));
+//                TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("tasktime")), "yyyy-MM-dd HH:mm"));
         taskId = intent.getStringExtra("taskid");
         tv_task_endtime.setText(intent.getStringExtra("endtime") == null ? getString(R.string.common_noinput) :
                 TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("endtime")), "yyyy-MM-dd HH:mm"));
+        Log.i("tasktime2,endtime", intent.getStringExtra("tasktime") + "," + intent.getStringExtra("endtime"));
         String ra_taskid = intent.getStringExtra("ra_taskid");
         // String taskcode=intent.getStringExtra("taskcode");
         String attachs = intent.getStringExtra("attachs");

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

@@ -311,6 +311,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener, Recog
                 intent.putExtra("ra_taskid", store.task_id);//取回复内容id
                 intent.putExtra("attachs", store.attachs);
                 intent.putExtra("endtime", store.tv_task_duration);
+                Log.i("tasktime1,endtime",store.pTextView2.getText().toString()+","+store.tv_task_duration);
                 startActivityForResult(intent, 0x20);
             }
 

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

@@ -38,6 +38,8 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.CameraUtil;
@@ -77,6 +79,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
     private ArrayList<String> mPhotoList;
     private GridViewAdapter mAdapter;
     private String mImageData;
+    private String cb_emcode = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
 
     //添加位置和查阅人员选择
     private TextView location_tv, display_tv;
@@ -84,6 +87,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
 
     private int mType;
     private final int http_commit = 0;
+    private final int send_picture_request = 3;
 
     private Handler mHandler = new Handler() {
         @Override
@@ -93,6 +97,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     progressDialog.dismiss();
                     Toast.makeText(getApplicationContext(), getString(R.string.ask_submit_success), Toast.LENGTH_LONG);
+//                    sendPicture();
                     finish();
                     break;
                 case Constants.HTTP_SUCCESS_INIT:
@@ -100,6 +105,12 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                     cb_code = JSON.parseObject(msg.getData().getString("result")).getString("code");
                     progressDialog.dismiss();
                     break;
+                case send_picture_request:
+                    if (msg.getData() != null){
+                        String p_result = msg.getData().getString("result");
+                        Log.i("p_result",p_result+"");
+                    }
+                    break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     ToastMessage(msg.getData().getString("result"));
@@ -108,6 +119,8 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
             }
         }
     };
+
+
     private Boolean platform;
 
     @Override
@@ -134,7 +147,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
         if (mType == 0) {
             getSupportActionBar().setTitle(getString(R.string.send_words));
         } else {
-            getSupportActionBar().setTitle(getString(R.string.set_suggest));
+            getSupportActionBar().setTitle(getString(R.string.Rated_suggest));
         }
         mTextEdit = (EditText) findViewById(R.id.text_edit);
         mSelectImagePromptTv = (TextView) findViewById(R.id.select_img_prompt_tv);
@@ -350,7 +363,8 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 ToastMessage("该功能还未完善");
                 break;
             case R.id.release_btn:
-                commit();
+                sendWord();
+                LogUtil.prinlnLongMsg("mPhotoList",JSON.toJSONString(mPhotoList)+"");
                /* if (mPhotoList.size() <= 0 && TextUtils.isEmpty(mTextEdit.getText().toString())) {// 没有照片，也没有说说，直接返回
                     return;
                 }
@@ -497,7 +511,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
 
     String cb_code;
 
-    private void commit() {
+    private void sendWord() {
         if (!StringUtils.isEmpty(mTextEdit.getText().toString())) {
             String url = "http://218.18.115.198:8888/ERP/mobile/Commentsback_mobile.action";
             String emname = CommonUtil.getSharedPreferences(ct, "erp_emname");
@@ -505,6 +519,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
             }
             String formStore = "{\n" +
+                    " \"cb_emcode\":\"" + cb_emcode + "\",\n" +
                     " \"cb_code\":\"" + cb_code + "\",\n" +
                     " \"cb_company\":\"" + CommonUtil.getSharedPreferences(ct, "erp_commpany") + "\",\n" +
                     " \"cb_whichsys\":\"" + CommonUtil.getSharedPreferences(ct, "erp_master") + "\",\n" +
@@ -522,7 +537,19 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
             headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
             ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, http_commit, null, null, "post");
         } else {
-            ToastMessage("请输入您的问题！");
+            ToastMessage(getString(R.string.suggest_hink));
         }
     }
+
+    private void sendPicture() {
+        if (ListUtils.isEmpty(mPhotoList))  return;
+        String url = "http://218.18.115.198:8888/ERP/mobile/uploadEmployeeAttach.action";
+        Map<String,Object> params = new HashMap<>();
+        params.put("emcode",cb_emcode);
+        params.put("type","common");
+        params.put("img",mPhotoList);
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, send_picture_request, null, null, "post");
+    }
 }

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

@@ -307,7 +307,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="@string/set_suggest"
+                    android:text="@string/Rated_suggest"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 

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

@@ -1106,6 +1106,6 @@
     <string name="Rated_UU">Rated UU</string>
     <string name="Rated_notice1">Please give you a score for UU, you only need to spend your little time, thank you for your support!</string>
     <string name="Rated_now">Now to score</string>
-    <string name="Rated_suggest">Suggested feedback</string>
+    <string name="Rated_suggest">Feedback</string>
     <string name="Rated_next">Next time</string>
 </resources>

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

@@ -1220,6 +1220,6 @@
     <string name="Rated_UU">为UU评分</string>
     <string name="Rated_notice1">请您为UU评一个分数吧，只需要花费您很少的时间，感谢您的支持!</string>
     <string name="Rated_now">现在去评分</string>
-    <string name="Rated_suggest">建议反馈</string>
-    <string name="Rated_next">下次再说</string>
+    <string name="Rated_suggest">问题反馈</string>
+    <string name="Rated_next">以后再说</string>
 </resources>

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

@@ -1212,6 +1212,6 @@
     <string name="Rated_UU">為UU評分</string>
     <string name="Rated_notice1">請您為UU評一個分數吧，只需要花費您很少的時間，感謝您的支持!</string>
     <string name="Rated_now">現在去評分</string>
-    <string name="Rated_suggest">建議反饋</string>
+    <string name="Rated_suggest">問題反饋</string>
     <string name="Rated_next">下次再​​說</string>
 </resources>

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

@@ -1228,7 +1228,7 @@
     <string name="set_push">允许推送</string>
     <string name="set_clear">清除缓存</string>
     <string name="set_sigin">打卡设置</string>
-    <string name="set_suggest">用户反馈</string>
+    <string name="set_suggest">问题反馈</string>
     <string name="set_about">关于UU互联</string>
     <string name="set_version">当前版本</string>
     <string name="set_login_out">退出登录</string>
@@ -1567,6 +1567,6 @@
     <string name="Rated_UU">为UU评分</string>
     <string name="Rated_notice1">请您为UU评一个分数吧，只需要花费您很少的时间，感谢您的支持!</string>
     <string name="Rated_now">现在去评分</string>
-    <string name="Rated_suggest">建议反馈</string>
+    <string name="Rated_suggest">问题反馈</string>
     <string name="Rated_next">下次再说</string>
 </resources>