隐藏计步新功能

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

@@ -238,7 +238,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 
         if (PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP) == 1
                 && !CommonUtil.isReleaseVersion()  )
-            uustep_rl.setVisibility(View.VISIBLE);
+            uustep_rl.setVisibility(View.GONE);
         else
             uustep_rl.setVisibility(View.GONE);
         return view;

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

@@ -32,6 +32,7 @@ import com.common.data.StringUtil;
 import com.common.file.PropertiesUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
+import com.core.app.BuildConfig;
 import com.core.app.MyApplication;
 import com.core.app.R;
 import com.core.dao.SignAutoLogDao;
@@ -78,11 +79,11 @@ public class CommonUtil {
      * function:判断是不是发布版本，true：发布版本
      */
     public static Boolean isReleaseVersion() {
-        //        return !BuildConfig.DEBUG;  //垃圾方法，得根据自己选择的debug还是release模式返回，根本就不好用，
+                return !BuildConfig.DEBUG;  //垃圾方法，得根据自己选择的debug还是release模式返回，根本就不好用，
         //         只要改变 common目录下的versionconfiguration就可以了
-        if (!StringUtil.isEmpty(PropertiesUtil.readData(MyApplication.getInstance(), "release_version", R.raw.versionconfiguration)) &&                "true".equals(PropertiesUtil.readData(MyApplication.getInstance(), "release_version", R.raw.versionconfiguration)))            return true;
-        else
-            return false;
+//        if (!StringUtil.isEmpty(PropertiesUtil.readData(MyApplication.getInstance(), "release_version", R.raw.versionconfiguration)) &&                "true".equals(PropertiesUtil.readData(MyApplication.getInstance(), "release_version", R.raw.versionconfiguration)))            return true;
+//        else
+//            return false;
     }
 
 

app_modular/appme/src/main/java/com/uas/appme/pedometer/service/StepService.java

@@ -188,19 +188,23 @@ public class StepService extends Service implements SensorEventListener {
                     case Intent.ACTION_SCREEN_OFF:
                         //屏幕熄灭改为10秒一存储
                         saveDuration = 10000;
+                        StepUtils.doSaveLocalStepsToJudgeHttps();
                         break;
                     //关机广播，保存好当前数据
                     case Intent.ACTION_SHUTDOWN:
                         saveStepData();
+                        StepUtils.doSaveLocalStepsToJudgeHttps();
                         break;
                     // 屏幕解锁广播
                     case Intent.ACTION_USER_PRESENT:
                         saveDuration = 3000;
+                        StepUtils.doSaveLocalStepsToJudgeHttps();
                         break;
                     // 当长按电源键弹出“关机”对话或者锁屏时系统会发出这个广播
                     // example：有时候会用到系统对话框，权限可能很高，会覆盖在锁屏界面或者“关机”对话框之上，
                     // 所以监听这个广播，当收到时就隐藏自己的对话，如点击pad右下角部分弹出的对话框
                     case Intent.ACTION_CLOSE_SYSTEM_DIALOGS:
+                        StepUtils.doSaveLocalStepsToJudgeHttps();
                         saveStepData();
                         break;
                     //监听日期变化
@@ -396,7 +400,7 @@ public class StepService extends Service implements SensorEventListener {
             //调用更新
             notificationManager.notify(110, stepNotification);
         }
-        StepUtils.doSaveLocalStepsToJudgeHttps();
+//        StepUtils.doSaveLocalStepsToJudgeHttps();
 //        TrackUtils.doSaveTrackPoint(latLngsList);
     }
 

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/NewStepActivity.java

@@ -308,8 +308,9 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         if (!CommonUtil.isReleaseVersion()
-                && StepUtils.isCanStep())
-            getMenuInflater().inflate(R.menu.menu_uusport_list, menu);
+                && StepUtils.isCanStep()) {
+//            getMenuInflater().inflate(R.menu.menu_uusport_list, menu);
+        }
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -318,9 +319,10 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
         if (item.getItemId() == android.R.id.home){
 //            startActivity(new Intent(getApplicationContext(), SettingActivity.class));
             finish();
-        } else if (StepUtils.isCanStep() && !CommonUtil.isReleaseVersion() && item.getItemId() == R.id.more){
-            startActivity(new Intent(this,UURanking.class));
         }
+//        else if (StepUtils.isCanStep() && !CommonUtil.isReleaseVersion() && item.getItemId() == R.id.more){
+//            startActivity(new Intent(this,UURanking.class));
+//        }
         return super.onOptionsItemSelected(item);
     }
 

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/UURanking.java

@@ -27,6 +27,7 @@ import com.uas.appme.pedometer.bean.StepEntity;
 import com.uas.appme.pedometer.bean.StepsRankingBean;
 import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.db.StepDataDao;
+import com.uas.appme.pedometer.utils.StepUtils;
 import com.uas.appme.pedometer.utils.TimeUtil;
 
 import java.util.ArrayList;
@@ -64,6 +65,7 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.uu_ranking_activity);
+        StepUtils.doSaveLocalStepsToJudgeHttps();
         initView();
         initData();
         initEvents();