CNLive Android Team / ModulePedometer · Commits

Commit 375a509b130c6dec31ce4f5982e91ddd8d879d6f

Authored by 韩亚云
1 parent 68129c7f

分享功能完善，部分页面Ui控件修改

Inline Side-by-side
Showing 15 changed files with 48 additions and 19 deletions
app/src/main/java/com/example/modulepedometer/MyApp.java
  View file @375a509
... ... @@ -14,7 +14,7 @@ public class MyApp extends Application {
14 14 String userId = "";
15 15 AppConfig.init(getApplicationContext(), BuildConfig.APP_ID, BuildConfig.APP_KEY, BuildConfig.APP_SCERET,
16 16 0, BuildConfig.DEBUG, "", "",
17   - userId, "", "", "", "");
  17 + userId, "", "", "", "","","","");
18 18 initARouter();
19 19 //在使用SDK各组件之前初始化context信息，传入ApplicationContext
20 20 SDKInitializer.initialize(getApplicationContext());
... ...
build.gradle
  View file @375a509
... ... @@ -68,7 +68,7 @@ ext {
68 68 //qmui
69 69 qmui = '1.1.5'
70 70  
71   - libBase = '1.0.9'
  71 + libBase = '1.3.4'
72 72 libNetwork = '1.1.0'
73 73 libLargeImage = '1.0.1'
74 74 libEmoj = '1.9.8'
... ...
config.gradle
  View file @375a509
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.1.5",
  24 + version: "0.1.7",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/TakePartView.java
  View file @375a509
... ... @@ -111,7 +111,7 @@ public class TakePartView implements MvpView {
111 111 public void showEmpty(){
112 112 fragment.binding.empty.setVisibility(View.VISIBLE);
113 113 fragment.binding.refreshLayout.setVisibility(View.GONE);
114   - fragment.binding.empty.show("还没有人参加哦", "", R.drawable.zhuangtai_kong);
  114 + fragment.binding.empty.show("暂无参与", "", R.drawable.bmcg_tak);
115 115 }
116 116  
117 117  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/MyRecordInfo.java
  View file @375a509
... ... @@ -100,6 +100,7 @@ public class MyRecordInfo {
100 100 private int signupNum;
101 101 private long start_time;
102 102 private String title;
  103 + private String day;
103 104 private List<String> faceUrl;
104 105  
105 106 public String getAddress() {
... ... @@ -158,6 +159,14 @@ public class MyRecordInfo {
158 159 this.title = title;
159 160 }
160 161  
  162 + public String getDay() {
  163 + return day;
  164 + }
  165 +
  166 + public void setDay(String day) {
  167 + this.day = day;
  168 + }
  169 +
161 170 public List<String> getFaceUrl() {
162 171 return faceUrl;
163 172 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunLineActivity.java
  View file @375a509
... ... @@ -23,7 +23,5 @@ public class RunLineActivity extends AppCompatActivity {
23 23 setContentView(R.layout.activity_run_line);
24 24  
25 25 getSupportFragmentManager().beginTransaction().replace(R.id.run_line_container, new RunLineFragment()).commit();
26   -// getSupportFragmentManager().beginTransaction().replace(R.id.run_line_container, new CollRunningFinishFragment()).commit();
27   -
28 26 }
29 27 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ShareRecordActivity.java
  View file @375a509
... ... @@ -14,6 +14,7 @@ import android.widget.RelativeLayout;
14 14 import android.widget.TextView;
15 15  
16 16 import com.alibaba.android.arouter.launcher.ARouter;
  17 +import com.cnlive.libs.base.arouter.QrService;
17 18 import com.cnlive.libs.base.util.StatusBarUtil;
18 19 import com.cnlive.libs.base.util.StatusBarUtil2;
19 20 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsListener;
... ... @@ -53,7 +54,7 @@ public class ShareRecordActivity extends AppCompatActivity {
53 54 setContentView(R.layout.activity_share_record);
54 55  
55 56 cord_name = findViewById(R.id.cord_name);
56   - cord_name.setText("我在" + getIntent().getStringExtra("raceTitle") + "中的最佳成绩");
  57 + cord_name.setText("我在中国网家家" + getIntent().getStringExtra("raceTitle") + "中的最佳成绩");
57 58 ((TextView) findViewById(R.id.kilo_share)).setText(getIntent().getStringExtra("kilo"));
58 59 ((TextView) findViewById(R.id.step_share)).setText(getIntent().getStringExtra("step"));
59 60 ((TextView) findViewById(R.id.time_share)).setText(getIntent().getStringExtra("time"));
... ... @@ -97,9 +98,9 @@ public class ShareRecordActivity extends AppCompatActivity {
97 98 }
98 99 });
99 100  
100   -// QrService service= (QrService) ARouter.getInstance().build("/app/base/qrservice").navigation(this);
101   -// Bitmap bitmap= service.createQRNoIconBitmap("321212312312312",240);
102   -// ((ImageView) findViewById(R.id.down_img)).setImageBitmap(bitmap);
  101 + QrService service= (QrService) ARouter.getInstance().navigation(QrService.class);
  102 + Bitmap bitmap= service.createQRNoIconBitmap("http://apiwjj.cnlive.com/download/index.html",320);
  103 + ((ImageView) findViewById(R.id.down_img)).setImageBitmap(bitmap);
103 104 }
104 105  
105 106 private void share(){
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
  View file @375a509
... ... @@ -65,10 +65,11 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
65 65 myViewHolder.join_person.initIconData(list.get(i).getFaceUrl());
66 66 if(state.equals("0")){
67 67 myViewHolder.day_num.setVisibility(View.VISIBLE);
68   - myViewHolder.after_finish.setText("天后结束");
69   - myViewHolder.day_num.setText("2");
  68 + myViewHolder.after_finish.setVisibility(View.GONE);
  69 + myViewHolder.day_num.setText(list.get(i).getDay());
70 70 }else {
71 71 myViewHolder.day_num.setVisibility(View.GONE);
  72 + myViewHolder.after_finish.setVisibility(View.VISIBLE);
72 73 myViewHolder.after_finish.setText("已结束");
73 74 }
74 75 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
  View file @375a509
... ... @@ -41,6 +41,8 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
41 41 }
42 42  
43 43 public void commitInfo(){
44   - getPresenter().commitInfo(getActivity(),CommonInfo.getStreetId(getActivity()), "10514343","15210479774","","");
  44 + getPresenter().commitInfo(getActivity(),CommonInfo.getStreetId(getActivity()),"10514343","15210479774",
  45 + binding.sexText.getText().toString().trim().equals("未选择")?"":binding.sexText.getText().toString().trim(),
  46 + binding.birthday.getText().toString().trim().equals("未选择")?"":binding.birthday.getText().toString().trim());
45 47 }
46 48 }
... ...
moudle_pedometer/src/main/res/drawable-hdpi/bmcg_tak.png 0 → 100644
View file @375a509

14.4 KB
moudle_pedometer/src/main/res/drawable-xhdpi/bmcg_tak.png 0 → 100644
View file @375a509

16.3 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/bmcg_tak.png 0 → 100644
View file @375a509

31.4 KB
moudle_pedometer/src/main/res/layout/activity_share_record.xml
  View file @375a509
... ... @@ -258,8 +258,7 @@
258 258 android:id="@+id/down_img"
259 259 android:layout_width="0dp"
260 260 android:layout_height="wrap_content"
261   - android:layout_weight="1"
262   - android:src="@drawable/erwe" />
  261 + android:layout_weight="1" />
263 262 </LinearLayout>
264 263 </RelativeLayout>
265 264  
... ...
moudle_pedometer/src/main/res/layout/fragment_registration_info.xml
  View file @375a509
... ... @@ -83,14 +83,23 @@
83 83 android:padding="15dp">
84 84  
85 85 <TextView
86   - android:id="@+id/sex_text"
  86 + android:id="@+id/sex"
87 87 android:layout_width="wrap_content"
88 88 android:layout_height="wrap_content"
89 89 android:textColor="#333333"
90 90 android:textSize="16sp"
91   - android:text="性别（非必填） 未选择"
  91 + android:text="性别（非必填） "
92 92 />
93 93  
  94 + <TextView
  95 + android:id="@+id/sex_text"
  96 + android:layout_width="wrap_content"
  97 + android:layout_height="wrap_content"
  98 + android:layout_toRightOf="@id/sex"
  99 + android:text="未选择"
  100 + android:textColor="#333333"
  101 + android:textSize="16sp"/>
  102 +
94 103 <ImageView
95 104 android:layout_width="8dp"
96 105 android:layout_height="13dp"
... ... @@ -111,12 +120,22 @@
111 120 android:padding="15dp">
112 121  
113 122 <TextView
  123 + android:id="@+id/birthday_t"
  124 + android:layout_width="wrap_content"
  125 + android:layout_height="wrap_content"
  126 + android:textColor="#333333"
  127 + android:textSize="16sp"
  128 + android:text="生日（非必填） "
  129 + />
  130 +
  131 + <TextView
114 132 android:id="@+id/birthday"
115 133 android:layout_width="wrap_content"
116 134 android:layout_height="wrap_content"
  135 + android:layout_toRightOf="@id/birthday_t"
117 136 android:textColor="#333333"
118 137 android:textSize="16sp"
119   - android:text="生日（非必填） 未选择"
  138 + android:text="未选择 "
120 139 />
121 140  
122 141 <ImageView
... ...
moudle_pedometer/src/main/res/values/strings.xml
  View file @375a509
... ... @@ -48,7 +48,7 @@
48 48 <string name="loc_open_gps">定位失败，建议您打开GPS!</string>
49 49 <string name="loc_open_wifi">定位失败，建议您打开Wi-Fi!</string>
50 50 <string name="beijing">北京</string>
51   - <string name="goline">约跑线路</string>
  51 + <string name="goline">线上赛事</string>
52 52 <string name="myactivity">我的活动</string>
53 53 <string name="_123">123</string>
54 54 <string name="has_part">人已参与</string>
... ...